This commit is contained in:
rabuzarus 2015-05-29 16:08:17 +02:00
parent 415a606a59
commit 5cbb5b140c
9 changed files with 27 additions and 17 deletions

View file

@ -58,11 +58,11 @@ function photos_init(&$a) {
$ret['albums'] = array(); $ret['albums'] = array();
foreach($albums as $k => $album) { foreach($albums as $k => $album) {
$entry = array( $entry = array(
'text' => $album['album'], 'text' => $album['album'],
'total' => $album['total'], 'total' => $album['total'],
'url' => z_root() . '/photos/' . $a->data['user']['nickname'] . '/album/' . bin2hex($album['album']), 'url' => z_root() . '/photos/' . $a->data['user']['nickname'] . '/album/' . bin2hex($album['album']),
'urlencode' => urlencode($album['album']), 'urlencode' => urlencode($album['album']),
'bin2hex' => bin2hex($album['album']) 'bin2hex' => bin2hex($album['album'])
); );
$ret['albums'][] = $entry; $ret['albums'][] = $entry;
} }
@ -75,10 +75,11 @@ function photos_init(&$a) {
if($albums['success']) { if($albums['success']) {
$photo_albums_widget = replace_macros(get_markup_template('photo_albums.tpl'),array( $photo_albums_widget = replace_macros(get_markup_template('photo_albums.tpl'),array(
'$nick' => $a->data['user']['nickname'], '$nick' => $a->data['user']['nickname'],
'$title' => t('Photo Albums'), '$title' => t('Photo Albums'),
'$albums' => $albums['albums'], 'recent' => t('Recent Photos'),
'$baseurl' => z_root(), '$albums' => $albums['albums'],
'$baseurl' => z_root(),
'$upload' => array( t('Upload New Photos'), $a->get_baseurl() . '/photos/' . $a->data['user']['nickname'] . '/upload/' . bin2hex($album)), '$upload' => array( t('Upload New Photos'), $a->get_baseurl() . '/photos/' . $a->data['user']['nickname'] . '/upload/' . bin2hex($album)),
'$can_post' => $can_post '$can_post' => $can_post
)); ));

View file

@ -1,7 +1,7 @@
<div id="side-bar-photos-albums" class="widget"> <div id="side-bar-photos-albums" class="widget">
<h3>{{$title}}</h3> <h3>{{$title}}</h3>
<ul> <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}} {{if $albums}}
{{foreach $albums as $al}} {{foreach $albums as $al}}
{{if $al.text}} {{if $al.text}}

View file

@ -83,6 +83,8 @@ blockquote {
margin-right: 5px; margin-right: 5px;
} }
.pull-right { float: right }
/* nav */ /* nav */
@ -3367,7 +3369,7 @@ ul.menu-popup {
#recip { #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 { 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 .selected { background:#F0F0F0; }
.autocomplete div { padding:2px 5px; white-space:nowrap; overflow:hidden; } .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-ajax-left {margin-left: -1em; margin-top: 0px; }
nav #site-location, nav #site-location,
nav #banner { position: relative; clear:both; } nav #banner { position: relative; clear:both; }
ul.menu-popup { left: 0px; top 20px; } ul.menu-popup { left: 0px; top: 20px; }
} }

View file

@ -21,7 +21,7 @@ body {
div.container { div.container {
display: block; display: block;
width: 785 px; width: 785px;
margin-top: 0px; margin-top: 0px;
margin-bottom: 0px; margin-bottom: 0px;
margin-left: auto; margin-left: auto;
@ -111,6 +111,8 @@ blockquote {
margin-right: 5px; margin-right: 5px;
} }
.pull-right { float: right }
/* nav */ /* nav */
@ -4094,7 +4096,7 @@ ul.notifications-menu-popup {
#recip { #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 { 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 .selected { background:#F0F0F0; }
.autocomplete div { padding:2px 5px; white-space:nowrap; overflow:hidden; } .autocomplete div { padding:2px 5px; white-space:nowrap; overflow:hidden; }

View file

@ -414,7 +414,8 @@ a:hover {
.left { .left {
float: left; float: left;
} }
.right { .right,
.pull-right {
float: right; float: right;
} }
.hidden { .hidden {

View file

@ -414,7 +414,8 @@ a:hover {
.left { .left {
float: left; float: left;
} }
.right { .right,
.pull-right {
float: right; float: right;
} }
.hidden { .hidden {

View file

@ -414,7 +414,8 @@ a:hover {
.left { .left {
float: left; float: left;
} }
.right { .right,
.pull-right {
float: right; float: right;
} }
.hidden { .hidden {

View file

@ -44,7 +44,7 @@ a:visited { color: @LinkVisited; text-decoration: none; }
a:hover {color: @LinkHover; text-decoration: underline; } a:hover {color: @LinkHover; text-decoration: underline; }
.left { float: left; } .left { float: left; }
.right { float: right; } .right, .pull-right { float: right; }
.hidden { display: none; } .hidden { display: none; }
.clear { clear: both; } .clear { clear: both; }

View file

@ -104,6 +104,8 @@ input[type=submit]:active {
top: 1px; top: 1px;
} }
.pull-right { float: right }
#search-text, #search-text,
#search-submit, #search-submit,
#search-save { #search-save {