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

some more work on photos - work in progress

Browse Source
This commit is contained in:
marijus 2014-09-26 12:29:07 +02:00
parent 1e7fbac6c1
commit b948ab5955
6 changed files with 73 additions and 84 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
mod/photos.php
View File

@ -653,8 +653,9 @@ function photos_content(&$a) {
intval($a->pager['itemspage']) intval($a->pager['itemspage'])
); );
$o .= '<div class="section-title-wrapper">';
$o .= '<h3>' . $album . '</h3>'; $o .= '<h3>' . $album . '</h3>';
$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'))) {
if($can_post) { if($can_post) {
@ -680,22 +681,24 @@ function photos_content(&$a) {
else { else {
if(($album !== t('Profile Photos')) && ($album !== 'Contact Photos') && ($album !== t('Contact Photos'))) { if(($album !== t('Profile Photos')) && ($album !== 'Contact Photos') && ($album !== t('Contact Photos'))) {
if($can_post) { if($can_post) {
$o .= '<div id="album-edit-link"><a href="'. $a->get_baseurl() . '/photos/' $o .= '<a href="'. $a->get_baseurl() . '/photos/' . $a->data['channel']['channel_address'] . '/album/' . bin2hex($album) . '/edit' . '">' . t('Edit Album') . '</a>';
. $a->data['channel']['channel_address'] . '/album/' . bin2hex($album) . '/edit' . '">'
. t('Edit Album') . '</a></div>';
} }
} }
} }
if($_GET['order'] === 'posted') if($_GET['order'] === 'posted')
$o .= '<div class="photos-upload-link" ><a href="' . $a->get_baseurl() . '/photos/' . $a->data['channel']['channel_address'] . '/album/' . bin2hex($album) . '" >' . t('Show Newest First') . '</a></div>'; $o .= '<a href="' . $a->get_baseurl() . '/photos/' . $a->data['channel']['channel_address'] . '/album/' . bin2hex($album) . '" >' . t('Show Newest First') . '</a>';
else else
$o .= '<div class="photos-upload-link" ><a href="' . $a->get_baseurl() . '/photos/' . $a->data['channel']['channel_address'] . '/album/' . bin2hex($album) . '?f=&order=posted" >' . t('Show Oldest First') . '</a></div>'; $o .= '<a href="' . $a->get_baseurl() . '/photos/' . $a->data['channel']['channel_address'] . '/album/' . bin2hex($album) . '?f=&order=posted" >' . t('Show Oldest First') . '</a>';
/*
if($can_post) { if($can_post) {
$o .= '<div class="photos-upload-link" ><a href="' . $a->get_baseurl() . '/photos/' . $a->data['channel']['channel_address'] . '/upload/' . bin2hex($album) . '" >' . t('Upload New Photos') . '</a></div>'; $o .= '<a href="' . $a->get_baseurl() . '/photos/' . $a->data['channel']['channel_address'] . '/upload/' . bin2hex($album) . '" >' . t('Upload New Photos') . '</<a>';
} }
*/
$o .= '</div>'; // section-title-submenu
$o .= '</div>'; // section-title-wrapper
$ajaxout = ''; $ajaxout = '';

39
view/css/bootstrap-red.css vendored
View File

@ -1,37 +1,27 @@
/* override some bootstrap settings */ /* override some bootstrap settings */
html { h1, h2 {
font-size: 100%; font-size: 1.583em;
} }
h1, h3, h4 {
.h1 { font-size: 1.334em;
font-size: 24px;
} }
h2, h5, h6 {
.h2 { font-size: 0.75rem;
font-size: 18px;
} }
h3, .wall-item-content h1, .wall-item-content h2 {
.h3 { font-size: 1.319em;
font-size: 16px;
} }
h4, .wall-item-title {
.h4 { font-size: $font_size;
font-size: 14px;
} }
h5, .wall-item-title h3, .wall-item-content h3, .wall-item-content h4 {
.h5 { font-size: 1.112em;
font-size: 12px;
}
h6,
.h6 {
font-size: 10px;
} }
/* nav overrides */ /* nav overrides */
@ -96,3 +86,8 @@ nav .navbar-collapse .navbar-right {
code { code {
white-space: normal; white-space: normal;
} }
blockquote {
font-size: 1em;
}

1
view/css/widgets.css
View File

@ -9,7 +9,6 @@
.widget h3 { .widget h3 {
margin-left: -10px; margin-left: -10px;
margin-top: 0px; margin-top: 0px;
margin-bottom: 10px;
} }
/* suggest */ /* suggest */

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

@ -9,6 +9,7 @@
/* generals */ /* generals */
html { html {
height: 100%; height: 100%;
font-size: 100%;
} }
body { body {
@ -2206,10 +2207,6 @@ nav ul li {
max-height: 50px max-height: 50px
} }
nav .badge {
border-radius: $radiuspx;
}
nav .dropdown-menu { nav .dropdown-menu {
font-size: $body_font_size; font-size: $body_font_size;
border-top-right-radius: 0px; border-top-right-radius: 0px;
@ -2251,32 +2248,8 @@ nav .dropdown-menu>li>a:hover,nav .dropdown-menu>li>a:focus{
} }
/* bootstrap overrides */ /* bootstrap overrides */
blockquote { .badge {
font-size: 1em; border-radius: $radiuspx;
}
h1, h2 {
font-size: 1.583em;
}
h3, h4 {
font-size: 1.334em;
}
h5, h6 {
font-size: 0.75rem;
}
.wall-item-content h1, .wall-item-content h2 {
font-size: 1.319em;
}
.wall-item-title {
font-size: $font_size;
}
.wall-item-title h3, .wall-item-content h3, .wall-item-content h4 {
font-size: 1.112em;
} }
.dropdown-menu { .dropdown-menu {
@ -2448,6 +2421,26 @@ h5, h6 {
background-image: linear-gradient(to bottom, $advperm_gradientcol 0px, $advperm_bgcolour 100%); background-image: linear-gradient(to bottom, $advperm_gradientcol 0px, $advperm_bgcolour 100%);
} }
.section-title-wrapper {
padding: 7px 10px;
background-color: $item_colour;
border-radius: $radiuspx;
margin-bottom: 10px;
}
.section-title-wrapper h3 {
margin-top: 0px;
margin-bottom: 0px;
}
.section-title-submenu {
margin-top: 10px;
}
.section-title-submenu a {
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);

27
view/tpl/photo_albums.tpl
View File

@ -1,15 +1,16 @@
<div id="side-bar-photos-albums" class="widget"> <div id="side-bar-photos-albums" class="widget">
<h3><a href="{{$baseurl}}/photos/{{$nick}}" title="{{$title}}" >{{$title}}</a></h3> <h3><a href="{{$baseurl}}/photos/{{$nick}}" title="{{$title}}" >{{$title}}</a></h3>
{{if $albums}} {{if $albums}}
<ul> <ul class="nav nav-pills nav-stacked">
{{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}}</a> ({{$al.total}})</li> <li><a href="{{$baseurl}}/photos/{{$nick}}/album/{{$al.bin2hex}}">{{$al.text}}<span class="badge pull-right">{{$al.total}}</span></a></li>
{{/if}} {{/if}}
{{/foreach}} {{/foreach}}
</ul>
{{/if}} {{/if}}
{{if $upload}} {{if $upload}}
<div id="photo-albums-upload-link"><a href="{{$baseurl}}/photos/{{$nick}}/upload" title="{{$upload}}">{{$upload}}</a></div> <li><a href="{{$baseurl}}/photos/{{$nick}}/upload" title="{{$upload}}">{{$upload}}</a></li>
{{/if}} {{/if}}
</ul>
</div> </div>

14
view/tpl/photos_recent.tpl
View File

@ -1,13 +1,11 @@
<h3>{{$title}}</h3> <div class="section-title-wrapper">
{{if $can_post}} <h3>{{$title}}</h3>
<a id="photo-top-upload-link" href="{{$upload.1}}">{{$upload.0}}</a> </div>
{{/if}}
<div id="photo-album-contents"> <div id="photo-album-contents">
{{foreach $photos as $photo}} {{foreach $photos as $photo}}
{{include file="photo_top.tpl"}} {{include file="photo_top.tpl"}}
{{/foreach}} {{/foreach}}
<div id="page-end"></div> <div id="page-end"></div>
</div> </div>
<div class="photos-end"></div> <div class="photos-end"></div>
<script>$(document).ready(function() { loadingPage = false; justifyPhotos(); });</script> <script>$(document).ready(function() { loadingPage = false; justifyPhotos(); });</script>