harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

some more work on photos

Browse Source
This commit is contained in:
marijus 2014-09-28 23:14:49 +02:00
parent ffe6d20dc0
commit 97c6ba77c7
4 changed files with 29 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mod/photos.php
View File

@ -654,7 +654,7 @@ function photos_content(&$a) {
); );
$o .= '<div class="section-title-wrapper">'; $o .= '<div class="section-title-wrapper">';
$o .= '<h3>' . $album . '</h3>'; $o .= '<h2>' . $album . '</h2>';
$o .= '<div class="section-title-submenu">'; $o .= '<div class="section-title-submenu">';
if($cmd === 'edit') { if($cmd === 'edit') {
if(($album !== t('Profile Photos')) && ($album !== 'Contact Photos') && ($album !== t('Contact Photos'))) { if(($album !== t('Profile Photos')) && ($album !== 'Contact Photos') && ($album !== t('Contact Photos'))) {
@ -1238,7 +1238,7 @@ function photos_content(&$a) {
$o .= replace_macros($tpl, array( $o .= replace_macros($tpl, array(
'$title' => t('Recent Photos'), '$title' => t('Recent Photos'),
'$can_post' => $can_post, '$can_post' => $can_post,
'$upload' => array(t('Upload New Photos'), $a->get_baseurl().'/photos/'.$a->data['channel']['channel_address'].'/upload'), '$upload' => array(t('Upload'), $a->get_baseurl().'/photos/'.$a->data['channel']['channel_address'].'/upload'),
'$photos' => $photos, '$photos' => $photos,
)); ));

30
view/theme/redbasic/css/style.css
View File

@ -24,15 +24,15 @@ body {
height: 100%; height: 100%;
} }
h1, h2 { h1, .h1, h2, .h2 {
font-size: 1.583em; font-size: 1.667em;
} }
h3, h4 { h3, .h3, h4, .h4 {
font-size: 1.334em; font-size: 1.334em;
} }
h5, h6 { h5, .h5, h6, .h6 {
font-size: 0.75rem; font-size: 0.75rem;
} }
@ -73,6 +73,15 @@ a:hover, .fakelink:hover { color: $link_colour; text-decoration: underline; }
cursor: pointer; cursor: pointer;
} }
a.btn-default {
color: #333;
}
a.btn-success {
color: #fff;
font-weight: normal;
}
input[type="text"], input[type="text"],
input[type="password"], input[type="password"],
@ -2415,16 +2424,16 @@ blockquote {
.btn-default { .btn-default {
background-color: $editbuttons_bgcolour; background-color: $editbuttons_bgcolour;
border-color: $editbuttons_bordercolour; border-color: $editbuttons_bordercolour;
color: $editbuttons_colour; color: $editbuttons_colour;
text-shadow: none; text-shadow: none;
box-shadow: none; box-shadow: none;
} }
.btn-default:hover, .btn-default:focus, .btn-default:active .btn-default.active { .btn-default:hover, .btn-default:focus, .btn-default:active .btn-default.active {
background-color: $editbuttons_bghover; background-color: $editbuttons_bghover;
border-color: $editbuttons_bordercolourhover; border-color: $editbuttons_bordercolourhover;
color: $input_colourhover; color: $input_colourhover;
text-decoration: $input_decohover; text-decoration: $input_decohover;
} }
.btn-default.btn-sm:hover, .btn-default.btn-sm:focus, .btn-default.btn-sm:active .btn-default.btn-sm.active { .btn-default.btn-sm:hover, .btn-default.btn-sm:focus, .btn-default.btn-sm:active .btn-default.btn-sm.active {
@ -2451,7 +2460,7 @@ blockquote {
margin-bottom: 10px; margin-bottom: 10px;
} }
.section-title-wrapper h3 { .section-title-wrapper h2 {
margin-top: 0px; margin-top: 0px;
margin-bottom: 0px; margin-bottom: 0px;
} }
@ -2464,6 +2473,7 @@ blockquote {
margin-right: 10px; margin-right: 10px;
} }
@media screen and (max-width: 767px) { @media screen and (max-width: 767px) {
aside#region_1 { aside#region_1 {
background: rgba(0, 0, 0, .1); background: rgba(0, 0, 0, .1);

3
view/tpl/photo_albums.tpl
View File

@ -4,10 +4,11 @@
{{if $upload}} {{if $upload}}
<li><a href="{{$baseurl}}/photos/{{$nick}}/upload" title="{{$upload}}">{{$upload}}</a></li> <li><a href="{{$baseurl}}/photos/{{$nick}}/upload" title="{{$upload}}">{{$upload}}</a></li>
{{/if}} {{/if}}
<li><a href="{{$baseurl}}/photos/{{$nick}}" title="{{$title}}" >Recent Photos</a></li>
{{if $albums}} {{if $albums}}
{{foreach $albums as $al}} {{foreach $albums as $al}}
{{if $al.text}} {{if $al.text}}
<li><a href="{{$baseurl}}/photos/{{$nick}}/album/{{$al.bin2hex}}">{{$al.text}}<span class="badge pull-right">{{$al.total}}</span></a></li> <li><a href="{{$baseurl}}/photos/{{$nick}}/album/{{$al.bin2hex}}"><span class="badge pull-right">{{$al.total}}</span>{{$al.text}}</a></li>
{{/if}} {{/if}}
{{/foreach}} {{/foreach}}

6
view/tpl/photos_recent.tpl
View File

@ -1,5 +1,9 @@
<div class="section-title-wrapper"> <div class="section-title-wrapper">
<h3>{{$title}}</h3> {{if $can_post}}
<a class="btn btn-xs btn-success pull-right" href="{{$upload.1}}"><i class="icon-upload"></i>&nbsp;{{$upload.0}}</a>
{{/if}}
<h2>{{$title}}</h2>
<div class="clear"></div>
</div> </div>
<div id="photo-album-contents"> <div id="photo-album-contents">
{{foreach $photos as $photo}} {{foreach $photos as $photo}}