friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity

Merge pull request #1622 from rabuzarus/albums_widget 

move html to photo_albums.tpl
This commit is contained in:
fabrixxm 2015-05-31 10:07:43 +02:00
parent 2550e02399 b61e39a1cb
commit 1cf3e778e8
9 changed files with 74 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
mod/photos.php
View File

@ -42,42 +42,58 @@ function photos_init(&$a) {
$sql_extra = permissions_sql($a->data['user']['uid']); $sql_extra = permissions_sql($a->data['user']['uid']);
$albums = q("SELECT distinct(`album`) AS `album` FROM `photo` WHERE `uid` = %d $sql_extra order by created desc", $albums = q("SELECT count(distinct `resource-id`) AS `total`, `album` FROM `photo` WHERE `uid` = %d AND `album` != '%s' AND `album` != '%s'
intval($a->data['user']['uid']) $sql_extra group by album order by created desc",
intval($a->data['user']['uid']),
dbesc('Contact Photos'),
dbesc( t('Contact Photos'))
); );
if(count($albums)) { $albums_visible = ((intval($a->data['user']['hidewall']) && (! local_user()) && (! remote_user())) ? false : true);
$a->data['albums'] = $albums;
$albums_visible = ((intval($a->data['user']['hidewall']) && (! local_user()) && (! remote_user())) ? false : true); // add various encodings to the array so we can just loop through and pick them out in a template
$ret = array('success' => false);
if($albums_visible) { if($albums) {
$o .= '<div id="side-bar-photos-albums" class="widget">'; $a->data['albums'] = $albums;
$o .= '<h3>' . '<a href="' . $a->get_baseurl() . '/photos/' . $a->data['user']['nickname'] . '">' . t('Photo Albums') . '</a></h3>'; if ($albums_visible)
$ret['success'] = true;
$o .= '<ul>'; $ret['albums'] = array();
foreach($albums as $album) { 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']),
'urlencode' => urlencode($album['album']),
'bin2hex' => bin2hex($album['album'])
);
$ret['albums'][] = $entry;
}
}
// don't show contact photos. We once translated this name, but then you could still access it under $albums = $ret;
// a different language setting. Now we store the name in English and check in English (and translated for legacy albums).
if((! strlen($album['album'])) || ($album['album'] === 'Contact Photos') || ($album['album'] === t('Contact Photos'))) if(local_user() && $a->data['user']['uid'] == local_user())
continue; $can_post = true;
$o .= '<li>' . '<a href="photos/' . $a->argv[1] . '/album/' . bin2hex($album['album']) . '" >' . $album['album'] . '</a></li>';
} if($albums['success']) {
$o .= '</ul>'; $photo_albums_widget = replace_macros(get_markup_template('photo_albums.tpl'),array(
} '$nick' => $a->data['user']['nickname'],
if(local_user() && $a->data['user']['uid'] == local_user()) { '$title' => t('Photo Albums'),
$o .= '<div id="photo-albums-upload-link"><a href="' . $a->get_baseurl() . '/photos/' . $a->data['user']['nickname'] . '/upload" >' .t('Upload New Photos') . '</a></div>'; '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
));
}
$o .= '</div>';
}
if(! x($a->page,'aside')) if(! x($a->page,'aside'))
$a->page['aside'] = ''; $a->page['aside'] = '';
$a->page['aside'] .= $vcard_widget; $a->page['aside'] .= $vcard_widget;
$a->page['aside'] .= $o; $a->page['aside'] .= $photo_albums_widget;
$tpl = get_markup_template("photos_head.tpl"); $tpl = get_markup_template("photos_head.tpl");

17
view/templates/photo_albums.tpl Normal file
View File

@ -0,0 +1,17 @@
<div id="side-bar-photos-albums" class="widget">
<h3>{{$title}}</h3>
<ul>
<li><a href="{{$baseurl}}/photos/{{$nick}}" title="{{$title}}" >{{$recent}}</a></li>
{{if $albums}}
{{foreach $albums as $al}}
{{if $al.text}}
<li><a href="{{$baseurl}}/photos/{{$nick}}/album/{{$al.bin2hex}}"><span class="badge pull-right">{{$al.total}}</span>{{$al.text}}</a></li>
{{/if}}
{{/foreach}}
{{/if}}
</ul>
{{if $can_post}}
<div class="photos-upload-link" ><a href="{{$upload.1}}">{{$upload.0}}</a></div>
{{/if}}
</div>

6
view/theme/duepuntozero/style.css
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,7 +3445,7 @@ 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; }
} }

6
view/theme/frost/style.css
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; }

3
view/theme/quattro/dark/style.css
View File

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

3
view/theme/quattro/green/style.css
View File

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

3
view/theme/quattro/lilac/style.css
View File

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

2
view/theme/quattro/quattro.less
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; }

2
view/theme/smoothly/style.css
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 {