From 5cbb5b140c62c07a512861217ee61058580d6901 Mon Sep 17 00:00:00 2001
From: rabuzarus <>
Date: Fri, 29 May 2015 16:08:17 +0200
Subject: [PATCH] css work

---
 mod/photos.php                     | 17 +++++++++--------
 view/templates/photo_albums.tpl    |  2 +-
 view/theme/duepuntozero/style.css  |  6 ++++--
 view/theme/frost/style.css         |  6 ++++--
 view/theme/quattro/dark/style.css  |  3 ++-
 view/theme/quattro/green/style.css |  3 ++-
 view/theme/quattro/lilac/style.css |  3 ++-
 view/theme/quattro/quattro.less    |  2 +-
 view/theme/smoothly/style.css      |  2 ++
 9 files changed, 27 insertions(+), 17 deletions(-)

diff --git a/mod/photos.php b/mod/photos.php
index 1bb380696a..8ec83b622b 100644
--- a/mod/photos.php
+++ b/mod/photos.php
@@ -58,11 +58,11 @@ function photos_init(&$a) {
                         $ret['albums'] = array();
                         foreach($albums as $k => $album) {
                                 $entry = array(
-                                        'text' => $album['album'],
-                                        'total' => $album['total'], 
-                                        'url' => z_root() . '/photos/' . $a->data['user']['nickname'] . '/album/' . bin2hex($album['album']),
+                                        'text'      => $album['album'],
+                                        'total'     => $album['total'], 
+                                        'url'       => z_root() . '/photos/' . $a->data['user']['nickname'] . '/album/' . bin2hex($album['album']),
                                         'urlencode' => urlencode($album['album']),
-                                        'bin2hex' => bin2hex($album['album'])
+                                        'bin2hex'   => bin2hex($album['album'])
                                 );
                                 $ret['albums'][] = $entry;
                         }
@@ -75,10 +75,11 @@ function photos_init(&$a) {
 
                 if($albums['success']) {
                         $photo_albums_widget = replace_macros(get_markup_template('photo_albums.tpl'),array(
-                                '$nick'    => $a->data['user']['nickname'],
-                                '$title'   => t('Photo Albums'),
-                                '$albums'  => $albums['albums'],
-                                '$baseurl' => z_root(),
+                                '$nick'     => $a->data['user']['nickname'],
+                                '$title'    => t('Photo Albums'),
+                                'recent'    => t('Recent Photos'),
+                                '$albums'   => $albums['albums'],
+                                '$baseurl'  => z_root(),
                                 '$upload'   => array( t('Upload New Photos'), $a->get_baseurl() . '/photos/' . $a->data['user']['nickname'] . '/upload/' . bin2hex($album)),
                                 '$can_post' => $can_post
                         ));
diff --git a/view/templates/photo_albums.tpl b/view/templates/photo_albums.tpl
index de8f2cd16c..02b4392957 100644
--- a/view/templates/photo_albums.tpl
+++ b/view/templates/photo_albums.tpl
@@ -1,7 +1,7 @@
 <div id="side-bar-photos-albums" class="widget">
 	<h3>{{$title}}</h3>
 	<ul>
-		<li><a href="{{$baseurl}}/photos/{{$nick}}" title="{{$title}}" >Recent Photos</a></li>
+		<li><a href="{{$baseurl}}/photos/{{$nick}}" title="{{$title}}" >{{$recent}}</a></li>
 		{{if $albums}}
 		{{foreach $albums as $al}}
 		{{if $al.text}}
diff --git a/view/theme/duepuntozero/style.css b/view/theme/duepuntozero/style.css
index 024e63f5f6..583d4fe204 100644
--- a/view/theme/duepuntozero/style.css
+++ b/view/theme/duepuntozero/style.css
@@ -83,6 +83,8 @@ blockquote {
 	margin-right: 5px;
 }
 
+.pull-right { float: right }
+
 
 
 /* nav */
@@ -3367,7 +3369,7 @@ ul.menu-popup {
 #recip {
 	
 }
-.autocomplete-w1 { background: #ffffff; no-repeat bottom right; position:absolute; top:0px; left:0px; margin:6px 0 0 6px; /* IE6 fix: */ _background:none; _margin:1px 0 0 0; }
+.autocomplete-w1 { background: #ffffff no-repeat bottom right; position:absolute; top:0px; left:0px; margin:6px 0 0 6px; /* IE6 fix: */ _background:none; _margin:1px 0 0 0; }
 .autocomplete { color:#000; border:1px solid #999; background:#FFF; cursor:default; text-align:left; max-height:350px; overflow:auto; margin:-6px 6px 6px -6px; /* IE6 specific: */ _height:350px;  _margin:0; _overflow-x:hidden; }
 .autocomplete .selected { background:#F0F0F0; }
 .autocomplete div { padding:2px 5px; white-space:nowrap; overflow:hidden; }
@@ -3443,6 +3445,6 @@ ul.menu-popup {
 	.nav-ajax-left {margin-left: -1em; margin-top: 0px;	}
 	nav #site-location,
 	nav #banner { position: relative; clear:both; }
-	ul.menu-popup { left: 0px; top 20px; }
+	ul.menu-popup { left: 0px; top: 20px; }
 
 }
diff --git a/view/theme/frost/style.css b/view/theme/frost/style.css
index 74ae6c90aa..8b87c3bd42 100644
--- a/view/theme/frost/style.css
+++ b/view/theme/frost/style.css
@@ -21,7 +21,7 @@ body {
 
 div.container {
 	display: block;
-	width: 785 px;
+	width: 785px;
 	margin-top: 0px;
 	margin-bottom: 0px;
 	margin-left: auto;
@@ -111,6 +111,8 @@ blockquote {
 	margin-right: 5px;
 }
 
+.pull-right { float: right }
+
 
 
 /* nav */
@@ -4094,7 +4096,7 @@ ul.notifications-menu-popup {
 #recip {
 	
 }
-.autocomplete-w1 { background: #ffffff; no-repeat bottom right; position:absolute; top:0px; left:0px; margin:6px 0 0 6px; /* IE6 fix: */ _background:none; _margin:1px 0 0 0; }
+.autocomplete-w1 { background: #ffffff no-repeat bottom right; position:absolute; top:0px; left:0px; margin:6px 0 0 6px; /* IE6 fix: */ _background:none; _margin:1px 0 0 0; }
 .autocomplete { color:#000; border:1px solid #999; background:#FFF; cursor:default; text-align:left; max-height:350px; overflow:auto; margin:-6px 6px 6px -6px; /* IE6 specific: */ _height:350px;  _margin:0; _overflow-x:hidden; }
 .autocomplete .selected { background:#F0F0F0; }
 .autocomplete div { padding:2px 5px; white-space:nowrap; overflow:hidden; }
diff --git a/view/theme/quattro/dark/style.css b/view/theme/quattro/dark/style.css
index 1ec672d227..aa3f3ff1b4 100644
--- a/view/theme/quattro/dark/style.css
+++ b/view/theme/quattro/dark/style.css
@@ -414,7 +414,8 @@ a:hover {
 .left {
   float: left;
 }
-.right {
+.right,
+.pull-right {
   float: right;
 }
 .hidden {
diff --git a/view/theme/quattro/green/style.css b/view/theme/quattro/green/style.css
index 89dc3dad86..a214c9703e 100644
--- a/view/theme/quattro/green/style.css
+++ b/view/theme/quattro/green/style.css
@@ -414,7 +414,8 @@ a:hover {
 .left {
   float: left;
 }
-.right {
+.right,
+.pull-right {
   float: right;
 }
 .hidden {
diff --git a/view/theme/quattro/lilac/style.css b/view/theme/quattro/lilac/style.css
index 11adc44b92..d2cc2ec89f 100644
--- a/view/theme/quattro/lilac/style.css
+++ b/view/theme/quattro/lilac/style.css
@@ -414,7 +414,8 @@ a:hover {
 .left {
   float: left;
 }
-.right {
+.right,
+.pull-right {
   float: right;
 }
 .hidden {
diff --git a/view/theme/quattro/quattro.less b/view/theme/quattro/quattro.less
index dded1514a5..0716cc89ac 100644
--- a/view/theme/quattro/quattro.less
+++ b/view/theme/quattro/quattro.less
@@ -44,7 +44,7 @@ a:visited { color: @LinkVisited; text-decoration: none; }
 a:hover {color: @LinkHover; text-decoration: underline; }
 
 .left { float: left; }
-.right { float: right; }
+.right, .pull-right { float: right; }
 .hidden { display: none; }
 .clear { clear: both; }
 
diff --git a/view/theme/smoothly/style.css b/view/theme/smoothly/style.css
index 46d8902aeb..f3ca397284 100644
--- a/view/theme/smoothly/style.css
+++ b/view/theme/smoothly/style.css
@@ -104,6 +104,8 @@ input[type=submit]:active {
 	top: 1px;
 }
 
+.pull-right { float: right }
+
 #search-text,
 #search-submit,
 #search-save {