From e47a36393a02057ccd82537d9fbe2ee964ed18e6 Mon Sep 17 00:00:00 2001
From: ozhozh <ozhozh@12232710-3e20-11de-b438-597f59cd7555>
Date: Sat, 12 Sep 2009 11:55:22 +0000
Subject: [PATCH] Big cosmetic commit - fixed width layout - icons for action
 buttons - link to stats from main admin page - trim too long urls in the
 admin page

git-svn-id: http://yourls.googlecode.com/svn/trunk@136 12232710-3e20-11de-b438-597f59cd7555
---
 admin/index.php              |  13 ++-
 css/infos.css                |   2 +
 css/share.css                |  21 ----
 css/style.css                |  78 ++++++++++++++-
 images/chart_bar.png         | Bin 0 -> 541 bytes
 images/delete.png            | Bin 0 -> 715 bytes
 images/pencil.png            | Bin 0 -> 450 bytes
 includes/functions-infos.php |   4 +-
 includes/functions.php       |  22 ++++-
 js/infos.js                  |  11 ++-
 js/insert.js                 |  22 ++---
 yourls-infos.php             | 183 +++++++++++++++++++----------------
 12 files changed, 220 insertions(+), 136 deletions(-)
 create mode 100644 images/chart_bar.png
 create mode 100644 images/delete.png
 create mode 100644 images/pencil.png

diff --git a/admin/index.php b/admin/index.php
index 6171ce4..61f6878 100644
--- a/admin/index.php
+++ b/admin/index.php
@@ -15,7 +15,7 @@
 $sort_order_sql = 'desc';
 $page = ( isset( $_GET['page'] ) ? intval($_GET['page']) : 1 );
 $search = ( isset( $_GET['s_search'] ) ? mysql_real_escape_string(trim($_GET['s_search'])) : '' );
-$perpage = ( isset( $_GET['perpage'] ) && intval( $_GET['perpage'] ) ? intval($_GET['perpage']) : 10 );
+$perpage = ( isset( $_GET['perpage'] ) && intval( $_GET['perpage'] ) ? intval($_GET['perpage']) : 20 );
 $link_limit = ( isset( $_GET['link_limit'] ) && intval($_GET['link_limit']) ? intval($_GET['link_limit']) : '' );
 if ( $link_limit != '' ) {
 	$link_filter = ( isset( $_GET['link_filter'] ) && $_GET['link_filter'] == 'more' ? 'more' : 'less' ) ;
@@ -162,13 +162,12 @@
 		Your are logged in as: <strong><?php echo YOURLS_USER; ?></strong>. <a href="?mode=logout" title="Logout">Logout</a>.
 	<?php } ?>
 	Check the <a href="tools.php">Tools</a>.</p>
-	<p><?php if ( !$is_bookmark ) {
+	<?php if ( !$is_bookmark ) {
 	?>
-	Display <strong><?php echo $display_on_page; ?></strong> to <strong class='increment'><?php echo $max_on_page; ?></strong> of <strong class='increment'><?php echo $total_items; ?></strong> URLs.
-		<?php echo $search_display; ?>
+	<p>Display <strong><?php echo $display_on_page; ?></strong> to <strong class='increment'><?php echo $max_on_page; ?></strong> of <strong class='increment'><?php echo $total_items; ?></strong> URLs.</p>
+	<p><?php echo $search_display; ?></p>
 	<?php } ?>
-		Overall, tracking <strong class='increment'><?php echo number_format($total_urls); ?></strong> links, <strong><?php echo number_format($total_clicks); ?></strong> clicks, and counting!
-	</p>
+	<p>Overall, tracking <strong class='increment'><?php echo number_format($total_urls); ?></strong> links, <strong><?php echo number_format($total_clicks); ?></strong> clicks, and counting!</p>
 
 	<?php yourls_html_addnew(); ?>
 	
@@ -180,7 +179,7 @@
 	<table id="tblUrl" class="tblSorter" cellpadding="0" cellspacing="1">
 		<thead>
 			<tr>
-				<th>Short URL</th>
+				<th>Short URL&nbsp;</th>
 				<th>Original URL</th>
 				<th>Date</th>
 				<th>IP</th>
diff --git a/css/infos.css b/css/infos.css
index 9404994..2ea3e5b 100644
--- a/css/infos.css
+++ b/css/infos.css
@@ -47,6 +47,8 @@
 
 li#sites_various { padding-left:22px; padding-top:4px;}
 
+li.sites_list img {width:16px; height: 16px; display:inline-block;}
+
 #referrer_cell { min-width: 300px;}
 
 ul.no_bullet {
diff --git a/css/share.css b/css/share.css
index b71c526..0219331 100644
--- a/css/share.css
+++ b/css/share.css
@@ -41,24 +41,3 @@ div.share {
 #share_fb {background:transparent url(../images/facebook.png) left center no-repeat;}
 #share_ff {background:transparent url(../images/friendfeed.png) left center no-repeat;}
 
-#tools_desc {
-	width:550px;
-	zbackground:#ffe;
-	padding-bottom:10px;
-}
-#tools_desc span {
-	background:#ffa;
-	padding:0 2px;
-}
-
-#tools_desc .bookmarklet {
-	border:2px solid #2A85B3;
-	-moz-border-radius:3px;
-	-webkit-border-radius:3px;
-	padding:5px 5px 5px 20px;
-	background:#eef url(../images/favicon.gif) 2px center no-repeat;
-}
-
-#tools_desc .bookmarklet:hover {
-	text-decoration:none;
-}
\ No newline at end of file
diff --git a/css/style.css b/css/style.css
index c7e3410..2cd7434 100644
--- a/css/style.css
+++ b/css/style.css
@@ -2,6 +2,23 @@ body {
 	font-family: Verdana, Arial;
 	font-size: 12px;
 	color: #595441;
+	background:#E6EEEE;
+	text-align:center;
+	margin-top:0px;
+	padding-top:0px;
+}
+#wrap {
+	width:980px;
+	margin:0 auto;
+	border-left:2px solid #E6FFEE;
+	border-right:2px solid #E6eeff;
+	background:white;
+	text-align:justify;
+	padding:0 20px;
+	-moz-border-radius-bottomleft:20px;
+	-moz-border-radius-bottomright:20px;
+	-webkit-border-bottom-left-radius:20px;
+	-webkit-border-bottom-right-radius:20px;
 }
 div, p, td {
 	font-family: Verdana, Arial;
@@ -14,11 +31,11 @@ a, a:link, a:active, a:visited {
 a:hover {
 	text-decoration: underline;
 }
-h1 {height:50px;}
+h1 {height:50px;margin:0;}
 h1 a {float:right;text-align:right;}
 h1 a:hover{text-decoration:none;}
 h1 a:hover span{text-decoration:underline;color:#8dbdd8}
-input, textarea {
+input, textarea, .button_stats {
 	-moz-border-radius:3px;
 	-webkit-border-radius:3px;
 }
@@ -83,15 +100,31 @@ tr.edit-row  td {
 #new_url #feedback .fail {
 	color:#f55;
 }
-td.actions input{
+td.actions input, td.actions a {
 	visibility:hidden;
 }
-td.actions input.disabled, td.actions input.loading{
+td.actions input.disabled, td.actions input.loading {
 	visibility:visible;
 }
-tr:hover td.actions input{
+tr:hover td.actions input, tr:hover td.actions a {
 	visibility:visible;
 }
+td.actions .button {
+	height:22px;
+	width:22px;
+}
+td.actions .button_edit {
+	background:transparent url(../images/pencil.png) 2px center no-repeat;
+}
+td.actions .button_delete {
+	background:transparent url(../images/delete.png) 2px center no-repeat;
+}
+td.actions .button_stats {
+	background:transparent url(../images/chart_bar.png) 2px center no-repeat;
+}
+td.actions .button_stats:hover {
+	text-decoration:none;
+}
 .error {
 	color: red;
 }
@@ -135,3 +168,38 @@ tr:hover td.actions input{
 #login ul.success li {
 	background:transparent url(../images/accept.png) top left no-repeat;
 }
+#tools_desc {
+	width:550px;
+	zbackground:#ffe;
+	padding-bottom:10px;
+}
+#tools_desc span {
+	background:#ffa;
+	padding:0 2px;
+}
+#tools_desc .bookmarklet {
+	border:2px solid #2A85B3;
+	-moz-border-radius:3px;
+	-webkit-border-radius:3px;
+	padding:5px 5px 5px 20px;
+	background:#eef url(../images/favicon.gif) 2px center no-repeat;
+}
+#tools_desc .bookmarklet:hover {
+	text-decoration:none;
+}
+#footer {
+	text-align:center;
+	margin-top:10px;
+}
+#footer p {
+	padding:10px;
+	background:white;
+	margin:0 auto;
+	width:980px;
+	-moz-border-radius:10px;
+	-webkit-border-radius:10px;
+}
+#footer p a {
+	background:#fff url(../images/favicon.gif) 2px center no-repeat;
+	padding-left:20px;
+}
\ No newline at end of file
diff --git a/images/chart_bar.png b/images/chart_bar.png
new file mode 100644
index 0000000000000000000000000000000000000000..9051fbc609b92b15af9be410e368b7adc20283b8
GIT binary patch
literal 541
zcmV+&0^<FNP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004XF*Lt006JZ
zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUzuSrBfR5;6}
zle=nGQ4mJgi6?3#kjh|_LXhxRVy$+jvG4`#(h8QMc6L63wt`^o1EjQ5LBw|uQswfW
zz2|Omf<#CpkSPad&H4srs46Z~<5|sDpY|&<QHO{`JrPenJlh&B1Q1OgE^gqNWPwNV
z`Rn1u4Vony$^L<3QEaST;kf0+0n6s7C*2Z{LdF%2nx74**DvNPW>V&qIn(Wzh!))n
z^W^$!aM<HN29I_ilOcj3f}<aac+n)VfVI`)@Vp3R&fpH;zkwUvy~lA=x+Rm&5&G2u
zZ*~qqbOuNVb1>&X3bCX~Vo|JLOLCb!-`g!yN7b-yh!|sbVZ|M~fElQAyiB?lO%sjz
z7TJ==TTk%_A{<NO<Ck}g*-kc#fGW7-&1QqYfTWsZZv6cH3pHW;<{jFyGv?Ii!PaI2
zGjf@9{TGleFjtyRhzVjsUv|ct8k~;cPPU|-GEgf@KwN0j5EImuHVI=+C!6m-fCzA>
znxkIa+E~RC#EKF{U0G~y<6)R9(uCp7&f7|JN}RHwEO@{EgbF~D3a1<@ip|9yZb^6$
fo@6A$W#9P^w2GuX0-m@}00000NkvXXu0mjfB69Bi

literal 0
HcmV?d00001

diff --git a/images/delete.png b/images/delete.png
new file mode 100644
index 0000000000000000000000000000000000000000..08f249365afd29594b51210c6e21ba253897505d
GIT binary patch
literal 715
zcmV;+0yO=JP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004XF*Lt006JZ
zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU!T}ebiR5;6}
zllx0kVHn5#Tecsf1c`2hgi%nK^D=kV+T5njvrLa$EMjSnone|mjm2E}L#U;8)yiKo
zO>C4}Mrzlg<+1Y8PEBfUp0jJpx4B>@E+cy3`^(Gw`Mf+2&yxZm<$to~Vpgvg&QKNR
z_f#1(r6svZt%iF?s+n<8X?B&!h3g9Dbb8_=MX}!;HiQSAh`bp^WMl~Z-44teO7W_Y
zV4thSL{h;rJY7!l3%5J4H1!tIzB`Dv+YxO(haWeausGZYkI8^hWj6mzo=L0{%;<E2
z80_Y*w_}NMA$su)e0B@`wrYegSP*HT5w@N{_}&f79VIb*XrKGBY>yxzh{5!Htr?51
zvG|W62MzC8BZ76hRpCyO2zOn<%e)K>NHge!-~)Ap33OdWw6hsLYbCxGNt0%wk_2z7
zfyYvXheSG)5HRK1VB~%mq7Dmurw#bi@hEcOr3&G1ZiF*$M=&9nB#VNf&Q^r$4G5kp
zTURh&s)E0%5&hyVD}sp<72~zmAY`Y(9aqO6CXF%=zFHGzO-A&I(pE}v70YQxCPJ{Y
z4L+?5-crdLn3ZRPEs!A4ehEY3ZRpL~w9>@aMN+{F4dI@v&>(QDHQum!mG~E^$OS8l
z!7?%Uwib*ROP67Hw`ika)gX-(<Pal@1N`)16#~~<@x7jghg9OTS^;mJ8T{oIOsMnG
zla<QHU?S-#Kb7w%o*dlEj!JgnOSKW+hV$`!syc>8Ia`-u_IEhxG7U<13kSsMW+$<e
xd62)I>lbb2dUMm5p6pa}cjgA+U$^mJ^AjD?&bdi)8~y+Q002ovPDHLkV1g8IMc@Dc

literal 0
HcmV?d00001

diff --git a/images/pencil.png b/images/pencil.png
new file mode 100644
index 0000000000000000000000000000000000000000..0bfecd50ee9f5bc5828f0c0745aa3e0effcbe250
GIT binary patch
literal 450
zcmV;z0X_bSP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004XF*Lt006JZ
zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUzR7pfZR5;76
zlRroTaTtbOTML7haH*C+1e;vsXo!XsT5>Rq1}l<=psl5*5Xz9i;M}s*NP=ugs7Q<M
zyx=M%I@IDaEW#S>#8Z;Dyx|}!`#}xw_C3!B-yaPC&0j)XcpuX@rNfq|q}N(wJOjA&
z>u+z?dfJEuLePrqzy!)73pvLjxk4d6XNZt?hm_iYES{i}J5y3l?}PPNYDBR7oPc~6
zL^d)Bi4Q2L3pnp!nFxN9c2E+=@XAl&+;2m6a~kZj1r3Mz3C=hmUG<{+vWR@t4q?fJ
zhFc(ozZD#Mx`^Q~g1v=K6!QnfuqyD4>U4Ej<hH?toW!sy@VeSj6d6<>F0eamL}Jx|
z%&`kR-H+3GBYr*Qx}frLU4`%n9(`uSomzw)t%%NagXkA*R5Mbv9VLDp1wMo$cOMa~
s3Wm%r7^bwK$2$}-<~D8p`#1iScU4^XCLAA~0ssI207*qoM6N<$g3sK(Qvd(}

literal 0
HcmV?d00001

diff --git a/includes/functions-infos.php b/includes/functions-infos.php
index 3df6d8e..f597459 100644
--- a/includes/functions-infos.php
+++ b/includes/functions-infos.php
@@ -16,7 +16,7 @@ function yourls_stats_countries_map( $countries ) {
 }
 
 // Echoes an image tag of Google Charts pie from sorted array of 'data' => 'value' (sort by DESC). Optional $limit = (integer) limit list of X first countries, sorted by most visits
-function yourls_stats_pie( $data, $limit = 10, $size = '340x220' ) {
+function yourls_stats_pie( $data, $limit = 10, $size = '340x220', $colors = '202040,9090AA' ) {
 	// Trim array: $limit first item + the sum of all others
 	if ( count( $data ) > $limit ) {
 		$i= 0;
@@ -43,7 +43,7 @@ function yourls_stats_pie( $data, $limit = 10, $size = '340x220' ) {
 		'cht' => 'p',
 		'chs' => $size,
 		'chd' => 't:'.( join(',' ,  $data ) ),
-		'chco'=> '202040,9090AA',
+		'chco'=> $colors,
 		'chl' => join('|' , array_keys( $data ) )
 	);
 	$pie_src = 'http://chart.apis.google.com/chart?' . http_build_query( $pie );
diff --git a/includes/functions.php b/includes/functions.php
index 8aa475b..b3abd53 100644
--- a/includes/functions.php
+++ b/includes/functions.php
@@ -140,7 +140,7 @@ function yourls_table_edit_row( $keyword ) {
 	
 	if( $url ) {
 		$return = <<<RETURN
-<tr id="edit-$id" class="edit-row"><td colspan="5"><strong>Original URL</strong>:<input type="text" id="edit-url-$id" name="edit-url-$id" value="$safe_url" class="text" size="100" /> <strong>Short URL</strong>: $www/<input type="text" id="edit-keyword-$id" name="edit-keyword-$id" value="$keyword" class="text" size="10" /></td><td colspan="1"><input type="button" id="edit-submit-$id" name="edit-submit-$id" value="Save" title="Save new values" class="button" onclick="edit_save('$id');" />&nbsp;<input type="button" id="edit-close-$id" name="edit-close-$id" value="X" title="Cancel editing" class="button" onclick="hide_edit('$id');" /><input type="hidden" id="old_keyword_$id" value="$keyword"/></td></tr>
+<tr id="edit-$id" class="edit-row"><td colspan="5"><strong>Original URL</strong>:<input type="text" id="edit-url-$id" name="edit-url-$id" value="$safe_url" class="text" size="70" /> <strong>Short URL</strong>: $www/<input type="text" id="edit-keyword-$id" name="edit-keyword-$id" value="$keyword" class="text" size="10" /></td><td colspan="1"><input type="button" id="edit-submit-$id" name="edit-submit-$id" value="Save" title="Save new values" class="button" onclick="edit_save('$id');" />&nbsp;<input type="button" id="edit-close-$id" name="edit-close-$id" value="X" title="Cancel editing" class="button" onclick="hide_edit('$id');" /><input type="hidden" id="old_keyword_$id" value="$keyword"/></td></tr>
 RETURN;
 	} else {
 		$return = '<tr><td colspan="6">Error, URL not found</td></tr>';
@@ -157,9 +157,11 @@ function yourls_table_add_row( $keyword, $url, $ip, $clicks, $timestamp ) {
 	$clicks = number_format($clicks);
 	$www = YOURLS_SITE;
 	$shorturl = YOURLS_SITE.'/'.$keyword;
+	$display_url = yourls_trim_long_string( $url );
+	$statlink = $shorturl.'+';
 	
 	return <<<ROW
-<tr id="id-$id"><td id="keyword-$id"><a href="$shorturl">$shorturl</a></td><td id="url-$id"><a href="$url" title="$url">$url</a></td><td id="timestamp-$id">$date</td><td>$ip</td><td>$clicks</td><td class="actions"><input type="button" id="edit-button-$id" name="edit-button" value="Edit" class="button" onclick="edit('$id');" />&nbsp;<input type="button" id="delete-button-$id" name="delete-button" value="Del" class="button" onclick="remove('$id');" /><input type="hidden" id="keyword_$id" value="$keyword"/></td></tr>
+<tr id="id-$id"><td id="keyword-$id"><a href="$shorturl">$keyword</a></td><td id="url-$id"><a href="$url" title="$url">$display_url</a></td><td id="timestamp-$id">$date</td><td id="ip-$id">$ip</td><td id="clicks-$id">$clicks</td><td class="actions" id="actions-$id"><input type="button" id="stats-button-$id" name="stat-button" value="" title="Stats" class="button button_stats" onclick="stats('$statlink');" />&nbsp;<input type="button" id="edit-button-$id" name="edit-button" value="" title="Edit" class="button button_edit" onclick="edit('$id');" />&nbsp;<input type="button" id="delete-button-$id" name="delete-button" value="" title="Delete" class="button button_delete" onclick="remove('$id');" /><input type="hidden" id="keyword_$id" value="$keyword"/></td></tr>
 ROW;
 }
 
@@ -299,8 +301,8 @@ function yourls_edit_link($url, $keyword, $newkeyword='') {
 	
 	// All clear, update
 	if ( !$new_url_already_there && $keyword_is_ok ) {
-		$timestamp4screen = date( 'Y M d H:i', time()+( yourls_HOURS_OFFSET * 3600) );
-		$timestamp4db = date('Y-m-d H:i:s', time()+( yourls_HOURS_OFFSET * 3600) );
+		$timestamp4screen = date( 'Y M d H:i', time()+( YOURLS_HOURS_OFFSET * 3600) );
+		$timestamp4db = date('Y-m-d H:i:s', time()+( YOURLS_HOURS_OFFSET * 3600) );
 		$update_url = $ydb->query("UPDATE `$table` SET `url` = '$url', `timestamp` = '$timestamp4db', `keyword` = '$newkeyword' WHERE `keyword` = '$keyword';");
 		if( $update_url ) {
 			$return['url'] = array( 'keyword' => $newkeyword, 'shorturl' => YOURLS_SITE.'/'.$newkeyword, 'url' => $strip_url, 'date' => $timestamp4screen);
@@ -582,6 +584,7 @@ function yourls_html_head( $context = 'index' ) {
 	<?php } ?>
 </head>
 <body class="<?php echo $context; ?>">
+<div id="wrap">
 	<?php
 }
 
@@ -591,6 +594,7 @@ function yourls_html_footer() {
 	
 	$num_queries = $ydb->num_queries > 1 ? $ydb->num_queries.' queries' : $ydb->num_queries.' query';
 	?>
+	</div> <?php // wrap ?>
 	<div id="footer"><p>Powered by <a href="http://yourls.org/" title="YOURLS">YOURLS</a> v<?php echo YOURLS_VERSION; echo ' &ndash; '.$num_queries; ?></p></div>
 	<?php if( defined('YOURLS_DEBUG') && YOURLS_DEBUG == true ) {
 		echo '<p>'. $ydb->all_queries .'<p>';
@@ -813,7 +817,7 @@ function yourls_redirect( $location, $code = 301 ) {
 function yourls_redirect_javascript( $location ) {
 	echo <<<REDIR
 	<script type="text/javascript">
-	//window.location="$location";
+	window.location="$location";
 	</script>
 	<small>(if you are not redirected after 10 seconds, please <a href="$location">click here</a>)</small>
 REDIR;
@@ -1155,4 +1159,12 @@ function yourls_html_link( $href, $title = '' ) {
 // Return word or words if more than one
 function yourls_plural( $word, $count=1 ) {
 	return $word . ($count > 1 ? 's' : '');
+}
+
+// Return trimmed string
+function yourls_trim_long_string( $string, $length = 70, $append = '[...]' ) {
+	if ( strlen( $string ) > $length ) {
+		$string = substr( $string, 0, $length - strlen( $append ) ) . $append;	
+	}
+	return $string;
 }
\ No newline at end of file
diff --git a/js/infos.js b/js/infos.js
index 7d6506c..d229bd6 100644
--- a/js/infos.js
+++ b/js/infos.js
@@ -3,6 +3,7 @@ $(document).ready(function(){
 	$('#tabs ul#headers').css('display', 'block');
 	$('.tab h2').css('display','none');
 	
+	// Toggle tabs
 	$('#tabs ul#headers li a').click(function(){
 		var target = $(this).attr('href').replace('#', '');
 		$('#tabs div.tab').css('display', 'none');
@@ -11,9 +12,15 @@ $(document).ready(function(){
 		$(this).addClass('selected').css('outline', 'none').blur();
 		return false;
 	});
+
+	// Activate tab
+	if (location.hash) {
+		$('#tabs ul#headers li a[href="'+location.hash+'"]').click();
+	} else {
+		$('#tabs ul#headers li a:first').click();
+	}
 	
-	$('#tabs ul#headers li a:first').click();
-	
+	// Toggle detail lists
 	$('a.details').click(function(){
 		var target = $(this).attr('id').replace('more_', 'details_');
 		$('#'+target).toggle();
diff --git a/js/insert.js b/js/insert.js
index 3f6d815..75a57c8 100644
--- a/js/insert.js
+++ b/js/insert.js
@@ -41,8 +41,7 @@ function add() {
 
 // Display the edition interface
 function edit(id) {
-	add_loading("#edit-button-" + id);
-	add_loading("#delete-button-" + id);
+	add_loading('#actions-'+id+' .button');
 	var keyword = $('#keyword_'+id).val();
 	$.getJSON(
 		"index_ajax.php",
@@ -50,8 +49,7 @@ function edit(id) {
 		function(data){
 			$("#id-" + id).after( data.html );
 			$("#edit-url-"+ id).focus();
-			end_loading("#edit-button-" + id);
-			end_loading("#delete-button-" + id);
+			end_loading('#actions-'+id+' .button');
 		}
 	);
 }
@@ -75,11 +73,15 @@ function remove(id) {
 	);
 }
 
+// Redirect to stat page
+function stats(link) {
+	window.location=link;
+}
+
 // Cancel edition of a link
 function hide_edit(id) {
 	$("#edit-" + id).fadeOut(200, function(){
-		end_disable("#edit-button-" + id);
-		end_disable("#delete-button-" + id);
+		end_disable('#actions-'+id+' .button');
 	});
 }
 
@@ -96,17 +98,15 @@ function edit_save(id) {
 		function(data){
 			if(data.status == 'success') {
 				$("#url-" + id).html('<a href="' + data.url.url + '" title="' + data.url.url + '">' + data.url.url + '</a>');
-				$("#keyword-" + id).html('<a href="' + data.url.shorturl + '" title="' + data.url.shorturl + '">' + data.url.shorturl + '</a>');
+				$("#keyword-" + id).html('<a href="' + data.url.shorturl + '" title="' + data.url.shorturl + '">' + data.url.keyword + '</a>');
 				$("#timestamp-" + id).html(data.url.date);
 				$("#edit-" + id).fadeOut(200, function(){
 					$('#tblUrl tbody').trigger("update");
 				});
 			}
 			feedback(data.message, data.status);
-			end_disable("#edit-close-" + id);
-			end_loading("#edit-close-" + id);
-			end_disable("#edit-button-" + id);
-			end_disable("#delete-button-" + id);
+			end_disable('#actions-'+id+' .button');
+			end_loading('#actions-'+id+' .button');
 		}
 	);
 }
diff --git a/yourls-infos.php b/yourls-infos.php
index f2a82bd..5082e9c 100644
--- a/yourls-infos.php
+++ b/yourls-infos.php
@@ -25,7 +25,7 @@
 $dates = array();
 
 // Loop through all results and build list of referrers, countries and hits per day
-foreach( $hits as $hit ) {
+foreach( (array)$hits as $hit ) {
 	extract( (array)$hit );
 
 	if ( isset( $country_code ) && $country_code ) {
@@ -106,13 +106,12 @@
 <p>Your are logged in as: <strong><?php echo YOURLS_USER; ?></strong>. <a href="?mode=logout" title="Logout">Logout</a></p>
 <?php } ?>
 
-<h2>Informations</h2>
+<h2 id="informations">Informations</h2>
 
 <h3>Short URL: <?php yourls_html_link( YOURLS_SITE."/$keyword" ); ?></h3>
 <p>Long URL: <?php yourls_html_link( yourls_get_keyword_longurl( $keyword ) ); ?></p>
 <p>Number of hits since <?php echo date("F j, Y, g:i a", strtotime($timestamp)); ?>: <strong><?php echo $clicks; ?></strong> hit<?php echo ($clicks > 1 ? 's' : ''); ?></p>
 
-
 <div id="tabs">
 	<ul id="headers">
 		<li class="selected"><a href="#stats"><h2>Traffic statistics</h2></a></li>
@@ -125,106 +124,124 @@
 	<div id="stats" class="tab first_tab">
 		<h2>Traffic statistics</h2>
 		
-		<h3>Number of hits per day</h3>
+		<?php if ( $dates ) { ?>
 		
-		<p><?php yourls_stats_clicks_line( $dates ); ?></p>
+			<h3>Number of hits per day</h3>
 
-		<?php $best = yourls_stats_get_best_day( $dates ); ?>
-		
-		<h3>Best day</h3>
-		<p><strong><?php echo $best['max'];?></strong> hit<?php echo ($best['max'] > 1 ? 's' : ''); ?> on <?php echo date("F j, Y", strtotime($best['day'])); ?>. 
-		<a href="" class='details' id="more_clicks">Click for more details</a></p>
-		<ul id="details_clicks" style="display:none">
-			<?php
-			foreach( $dates as $year=>$months ) {
-				foreach( $months as $month=>$days) {
-					foreach( $days as $day=>$visits ) {
-						echo '<li>'.date("F j, Y", strtotime("$year-$month-$day"))." : $visits ".yourls_plural( 'hit', $visits )."</li>\n";
+			<p><?php yourls_stats_clicks_line( $dates ); ?></p>
+
+			<?php $best = yourls_stats_get_best_day( $dates ); ?>
+			
+			<h3>Best day</h3>
+			<p><strong><?php echo $best['max'];?></strong> hit<?php echo ($best['max'] > 1 ? 's' : ''); ?> on <?php echo date("F j, Y", strtotime($best['day'])); ?>. 
+			<a href="" class='details' id="more_clicks">Click for more details</a></p>
+			<ul id="details_clicks" style="display:none">
+				<?php
+				foreach( $dates as $year=>$months ) {
+					foreach( $months as $month=>$days) {
+						foreach( $days as $day=>$visits ) {
+							echo '<li>'.date("F j, Y", strtotime("$year-$month-$day"))." : $visits ".yourls_plural( 'hit', $visits )."</li>\n";
+						}
 					}
 				}
-			}
-			?>
-		</ul>
+				?>
+			</ul>
+		
+		<?php } else {
+			echo "<p>No traffic yet. Get some clicks first!</p>";
+		} ?>
 	</div>
 
 
 	<div id="location" class="tab">
 		<h2>Traffic location</h2>
 		
-		<table border="0" cellspacing="2">
-		<tr>
-			<td valign="top">
-				<h3>Top 5 countries</h3>
-				<?php yourls_stats_pie( $countries, 5 ); ?>
-				<p><a href="" class='details' id="more_countries">Click for more details</a></p>
-				<ul id="details_countries" style="display:none" class="no_bullet">
-				<?php
-				foreach( $countries as $code=>$count ) {
-					echo "<li><img src='".yourls_geo_get_flag( $code )."' /> $code (".yourls_geo_countrycode_to_countryname( $code ).") : $count ".yourls_plural('hit', $count)."</li>\n";
-				}		
-				?>
-				</ul>
-
-			</td>
-			<td valign="top">
-				<h3>Overall traffic</h3>
-				<?php yourls_stats_countries_map( $countries ); ?>
-			</td>
-		</tr>
-		</table>
+		<?php if ( $countries ) { ?>
+			
+			<table border="0" cellspacing="2">
+			<tr>
+				<td valign="top">
+					<h3>Top 5 countries</h3>
+					<?php yourls_stats_pie( $countries, 5 ); ?>
+					<p><a href="" class='details' id="more_countries">Click for more details</a></p>
+					<ul id="details_countries" style="display:none" class="no_bullet">
+					<?php
+					foreach( $countries as $code=>$count ) {
+						echo "<li><img src='".yourls_geo_get_flag( $code )."' /> $code (".yourls_geo_countrycode_to_countryname( $code ).") : $count ".yourls_plural('hit', $count)."</li>\n";
+					}		
+					?>
+					</ul>
+
+				</td>
+				<td valign="top">
+					<h3>Overall traffic</h3>
+					<?php yourls_stats_countries_map( $countries ); ?>
+				</td>
+			</tr>
+			</table>
+		
+		<?php } else {
+			echo "<p>No countrie data. Maybe the geolocation module is not installed, or no traffic yet.</p>";
+		} ?>
 	</div>
 				
 				
 	<div id="sources" class="tab">
 		<h2>Traffic Sources</h2>
 		
-		<table border="0" cellspacing="2">
-		<tr>
-			<td valign="top">
-				<h3>Referrer shares</h3>
-				<?php
-				$referrer_sort['Others'] = count( $referrers );
-				yourls_stats_pie( $referrer_sort, 5, '440x220' );
-				unset( $referrer_sort['Others'] );
-				?>
-				<h3>Referrers</h3>
-				<ul class="no_bullet">
+		<?php if ( $referrers ) { ?>
+			
+			<table border="0" cellspacing="2">
+			<tr>
+				<td valign="top">
+					<h3>Referrer shares</h3>
 					<?php
-					$i = 0;
-					foreach( $referrer_sort as $site => $count ) {
-						$i++;
-						echo "<li class='sites_list'><img src='http://$site/favicon.ico'/ width='16'> $site: <strong>$count</strong> <a href='' class='details' id='more_url$i'>(details)</a></li>\n";
-						echo "<ul id='details_url$i' style='display:none'>";
-						foreach( $referrers[$site] as $url => $count ) {
-							echo "<li>"; yourls_html_link($url); echo ": <strong>$count</strong></li>\n";
+					$referrer_sort['Others'] = count( $referrers );
+					yourls_stats_pie( $referrer_sort, 5, '440x220', '902020,FF6060' );
+					unset( $referrer_sort['Others'] );
+					?>
+					<h3>Referrers</h3>
+					<ul class="no_bullet">
+						<?php
+						$i = 0;
+						foreach( $referrer_sort as $site => $count ) {
+							$i++;
+							echo "<li class='sites_list'><img src='http://$site/favicon.ico'/> $site: <strong>$count</strong> <a href='' class='details' id='more_url$i'>(details)</a></li>\n";
+							echo "<ul id='details_url$i' style='display:none'>";
+							foreach( $referrers[$site] as $url => $count ) {
+								echo "<li>"; yourls_html_link($url); echo ": <strong>$count</strong></li>\n";
+							}
+							echo "</ul>\n";
+							unset( $referrers[$site] );
 						}
-						echo "</ul>\n";
-						unset( $referrers[$site] );
-					}
-					echo "<li id='sites_various'>Various: <strong>". count( $referrers ). "</strong> <a href='' class='details' id='more_various'>(details)</a></li>\n";
-					echo "<ul id='details_various' style='display:none'>";
-					foreach( $referrers as $url ) {
-						echo "<li>"; yourls_html_link(key($url)); echo ": 1</li>\n";	
-					}
-					echo "</ul>\n"
+						echo "<li id='sites_various'>Various: <strong>". count( $referrers ). "</strong> <a href='' class='details' id='more_various'>(details)</a></li>\n";
+						echo "<ul id='details_various' style='display:none'>";
+						foreach( $referrers as $url ) {
+							echo "<li>"; yourls_html_link(key($url)); echo ": 1</li>\n";	
+						}
+						echo "</ul>\n"
+						?>
+						
+					</ul>
+				
+				</td>
+				
+				<td valign="top">
+					<h3>Direct vs Referrer Traffic</h3>
+					<?php
+					$ref_traffic = count($referrer_sort) + count($referrers);
+					yourls_stats_pie( array('Direct'=>$direct, 'Referrers'=> $ref_traffic), 5, '440x220', '902020,FF6060' );
 					?>
-					
-				</ul>
-			
-			</td>
-			
-			<td valign="top">
-				<h3>Direct vs Referrer Traffic</h3>
-				<?php
-				$ref_traffic = count($referrer_sort) + count($referrers);
-				yourls_stats_pie( array('Direct'=>$direct, 'Referrers'=> $ref_traffic), 5, '440x220' );
-				?>
-				<p>Direct traffic: <strong><?php echo $direct; ?></strong> <?php echo yourls_plural( 'hit', $direct ); ?> </p>
-				<p>Referrer traffic: <strong><?php echo $ref_traffic; ?></strong> <?php echo yourls_plural( 'hit', $ref_traffic ); ?> </p>
+					<p>Direct traffic: <strong><?php echo $direct; ?></strong> <?php echo yourls_plural( 'hit', $direct ); ?> </p>
+					<p>Referrer traffic: <strong><?php echo $ref_traffic; ?></strong> <?php echo yourls_plural( 'hit', $ref_traffic ); ?> </p>
+
+				</td>
+			</tr>
+			</table>
 
-			</td>
-		</tr>
-		</table>
+		<?php } else {
+			echo "<p>No referrer data. Get some clicks first!</p>";
+		} ?>
 			
 	</div>
 
-- 
2.45.0