mt-admin Commit - e8561709c1cb

Fix up style images and a couple of typos.

darkmorford -

e8561709c1cb

Not Reviewed

Context file:

Add another comment

Collapse all files

0 unresolved 0 Resolved

0 General 0 Inline

include/transcript.php ¶ +1 -1

             	$dbConnection->beginTransaction();
             	//remove any old transcript data - it's being replaced
-            	$dbConnection->executeUpdate('DELETE FROM transcript WHERE transcript.strip = ?', array($strip->id)));
+            	$dbConnection->executeUpdate('DELETE FROM transcript WHERE transcript.strip = ?', array($strip->id));
             	if( $strip->transcript_posted ) {
             		$inserter = 'INSERT INTO transcript (strip, panel, line, speaker, speech, search) VALUES (?, ?, ?, ?, ?, ?)';

index.php ¶ +4 -4

             <h2>Recent Strips</h2>
             <ul class="historic">
             <?php
-            $strips = $dbConnection->fetchAll('SELECT distinct id, title, UNIX_TIMESTAMP(published) as date FROM strip WHERE published <= NOW() order by id DESC LIMIT 5');
+            $strips = $dbConnection->fetchAll('SELECT id, title, UNIX_TIMESTAMP(published) as date FROM strip WHERE published <= NOW() order by id DESC LIMIT 5');
             foreach($strips as $k=>$v) {
             	printf( '<li>%d: <a href="%s/index.php?strip_id=%d">%s</a>, %s ago</li>', $v->id, SITE_HOST . SITE_PATH, $v->id, htmlspecialchars($v->title), human_time_diff($v->date) );
             <h2>Upcoming Strips</h2>
             <ul class="historic">
             <?php
-            $strips = $dbConnection->fetchAll('SELECT distinct id, title, UNIX_TIMESTAMP(published) as date FROM strip WHERE published > NOW() order by id ASC LIMIT 5');
+            $strips = $dbConnection->fetchAll('SELECT id, title, UNIX_TIMESTAMP(published) as date FROM strip WHERE published > NOW() order by id ASC LIMIT 5');
             foreach($strips as $k=>$v) {
             	printf( '<li>%d: <a href="%s/edit-comic.php?strip_id=%d">%s</a>, in %s</li>', $v->id, SITE_HOST . SITE_PATH . '/' . SITE_ADMIN, $v->id, htmlspecialchars($v->title), human_time_diff($v->date) );
             <h2>Recent Published Rants</h2>
             <ul class="historic">
             <?php
-            $rants = $dbConnection->fetchAll('SELECT distinct rant.id,UNIX_TIMESTAMP(rant.published) as date,rant.title,contributor.name from rant,contributor where rant.author=contributor.id AND rant.status=\'published\' ORDER BY rant.published DESC limit 5');
+            $rants = $dbConnection->fetchAll('SELECT rant.id,UNIX_TIMESTAMP(rant.published) as date,rant.title,contributor.name from rant,contributor where rant.author=contributor.id AND rant.status=\'published\' ORDER BY rant.published DESC limit 5');
             foreach($rants as $k=>$v) {
             	printf( '<li>%d: <a href="%s/index.php?rant_id=%d">%s</a> by %s, %s ago</li>', $v->id, SITE_HOST . SITE_PATH, $v->id, htmlspecialchars($v->title), htmlspecialchars($v->name), human_time_diff($v->date) );
             <h2>Recent Draft Rants</h2>
             <ul class="historic">
             <?php
-            $rants = $dbConnection->fetchAll('SELECT distinct rant.id,UNIX_TIMESTAMP(rant.published) as date,rant.title,contributor.name from rant,contributor where rant.author=contributor.id AND rant.status=\'draft\' ORDER BY rant.published DESC limit 5');
+            $rants = $dbConnection->fetchAll('SELECT rant.id,UNIX_TIMESTAMP(rant.published) as date,rant.title,contributor.name from rant,contributor where rant.author=contributor.id AND rant.status=\'draft\' ORDER BY rant.published DESC limit 5');
             foreach($rants as $k=>$v) {
             	printf( '<li>%d: <a href="%s/edit-rant.php?rant_id=%d">%s</a> by %s, %s ago</li>', $v->id, SITE_HOST . ADMIN_PATH, $v->id, htmlspecialchars($v->title), htmlspecialchars($v->name), human_time_diff($v->date) );

             	<title>Megatokyo Admin &rsaquo; Login</title>
             	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
             	<meta name="generator" content="Alan J Castonguay, Robert Sherby, Jeremy Wagner-Kaiser, Shawn Morford (!! nathanbp, jrl !!)" />
-            	<link rel="stylesheet" href="wp-admin.css" type="text/css" />
+            	<link rel="stylesheet" href="styles/wp-admin.css" type="text/css" />
             	<!--[if IE]><style type="text/css">#login h1 a { margin-top: 35px; } #login ul { padding-bottom: 65px; }</style><![endif]--><!-- Curse you, IE! -->
             	<script type="text/javascript">
             		function focusit() {

manage-twitter-users.php ¶ +1 -1

             if( isset($_POST['action']) && $_POST['action'] == 'new' ) {
             	check_nonce('new-twitter-user');
-            	if(! $dbConnection->executeUpdate('INSERT INTO twitter_user (username) VALUES (?)', array(md5( microtime() ) )) {
+            	if(! $dbConnection->executeUpdate('INSERT INTO twitter_user (username) VALUES (?)', array(md5( microtime() ) ))) {
             		adminlog("Error on insertion of new twitter user.", MTS_TWITTER, MTA_INSERT, E_WARNING);
             		mtdie("Error on insertion of new twitter user: ". $dbConnection->errorCode(), 'SQL Error');
             	} else {

styles/wp-admin.scss ¶ +19 -19

             }
             .submit input, .submit input:focus, .button, .button:focus {
-            	background: url( images/fade-butt.png );
+            	background: url( ../images/fade-butt.png );
             	border: 3px double $button-down-border;
             	border-left-color: $button-normal-border;
             	border-top-color: $button-normal-border;
             }
             .updated, .confirm {
-            	background: #CFEBF7 url(images/notice.gif) no-repeat 1em;
+            	background: #CFEBF7 url(../images/notice.gif) no-repeat 1em;
             	border: 1px solid #2580B2;
             	margin: 1em 5% 10px;
             	padding: 0 1em 0 3em;
             }
             #ed_toolbar input {
-            	background: #fff url( images/fade-butt.png ) repeat-x 0px -2px;
+            	background: #fff url( ../images/fade-butt.png ) repeat-x 0px -2px;
             	margin: 3px 2px 2px;
             }
             #login {
             	position: relative;
-            	background: url('images/login-bkg-tile.gif') no-repeat top center;
+            	background: url('../images/login-bkg-tile.gif') no-repeat top center;
             	color: #fff;
             	margin: 5em auto 1em;
             	padding: 20px 0 0;
             }
             #login form {
-            	background: url('images/login-bkg-bottom.gif') no-repeat bottom center;
+            	background: url('../images/login-bkg-bottom.gif') no-repeat bottom center;
             	padding: 0 50px 25px;
             }
             }
             #moremeta .dbx-content {
-            	background: url(images/box-butt.gif) no-repeat bottom right;
+            	background: url(../images/box-butt.gif) no-repeat bottom right;
             	padding-bottom: 10px;
             	padding-right: 2px;
             }
             #moremeta fieldset.dbx-box-closed {
-            	background: url(images/box-butt.gif) no-repeat bottom;
+            	background: url(../images/box-butt.gif) no-repeat bottom;
             	padding-bottom: 9px;
             }
             #moremeta .dbx-handle {
             	padding: 6px 1em 2px;
             	font-size: 12px;
-            	background: #2685af url(images/box-head.gif) no-repeat right;
+            	background: #2685af url(../images/box-head.gif) no-repeat right;
             }
             #moremeta .dbx-box {
-            	background: url(images/box-bg.gif) repeat-y right;
+            	background: url(../images/box-bg.gif) repeat-y right;
             }
             #advancedstuff h3.dbx-handle {
             	padding: 6px 1em 0 3px;
             	height: 19px;
             	font-size: 12px;
-            	background: #2685af url(images/box-head-right.gif) no-repeat top right;
+            	background: #2685af url(../images/box-head-right.gif) no-repeat top right;
             }
             #advancedstuff div.dbx-handle-wrapper {
             	margin: 0 0 0 -7px;
-            	background: #fff url(images/box-head-left.gif) no-repeat top left;
+            	background: #fff url(../images/box-head-left.gif) no-repeat top left;
             }
             #advancedstuff div.dbx-content {
             	margin-left: 8px;
-            	background: url(images/box-bg-right.gif) repeat-y right;
+            	background: url(../images/box-bg-right.gif) repeat-y right;
             	padding: 10px 10px 15px 0px;
             }
             #advancedstuff div.dbx-content-wrapper {
             	margin-left: -7px;
             	margin-right: 0;
-            	background: url(images/box-bg-left.gif) repeat-y left;
+            	background: url(../images/box-bg-left.gif) repeat-y left;
             }
             #advancedstuff fieldset.dbx-box {
             	padding-bottom: 9px;
             	margin-left: 6px;
-            	background: url(images/box-butt-right.gif) no-repeat bottom right;
+            	background: url(../images/box-butt-right.gif) no-repeat bottom right;
             }
             #advancedstuff div.dbx-box-wrapper {
-            	background: url(images/box-butt-left.gif) no-repeat bottom left;
+            	background: url(../images/box-butt-left.gif) no-repeat bottom left;
             }
             #advancedstuff .dbx-box-closed div.dbx-content-wrapper {
             	padding-bottom: 2px;
-            	background: url(images/box-butt-left.gif) no-repeat bottom left;
+            	background: url(../images/box-butt-left.gif) no-repeat bottom left;
             }
             #advancedstuff .dbx-box {
-            	background: url(images/box-butt-right.gif) no-repeat bottom right;
+            	background: url(../images/box-butt-right.gif) no-repeat bottom right;
             }
             a.dbx-toggle, a.dbx-toggle:visited {
             	display:block;
             	overflow: hidden;
-            	background-image: url( images/toggle.gif );
+            	background-image: url( ../images/toggle.gif );
             	position: absolute;
             	top: 0px;
             	right: 0px;
             }
             #edButtons input.edButtonBack, #edButtons input.edButtonBack:active {
-            	background: #fff url( images/fade-butt.png ) repeat-x 0px 15px;
+            	background: #fff url( ../images/fade-butt.png ) repeat-x 0px 15px;
             	border-bottom: 1px solid #ccc;
             }

Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings