diff options
| -rw-r--r-- | include/language.php | 2 | ||||
| -rw-r--r-- | mod/photos.php | 21 | ||||
| -rw-r--r-- | view/css/bootstrap-red.css | 34 | ||||
| -rw-r--r-- | view/css/conversation.css | 12 | ||||
| -rw-r--r-- | view/css/widgets.css | 2 | ||||
| -rw-r--r-- | view/theme/redbasic/css/style.css | 65 | ||||
| -rw-r--r-- | view/theme/redbasic/php/style.php | 6 | ||||
| -rwxr-xr-x | view/tpl/photo_albums.tpl | 27 | ||||
| -rwxr-xr-x | view/tpl/photos_recent.tpl | 16 |
9 files changed, 88 insertions, 97 deletions
diff --git a/include/language.php b/include/language.php index 855d94505..9db57dceb 100644 --- a/include/language.php +++ b/include/language.php @@ -146,7 +146,7 @@ function load_translation_table($lang, $install = false) { * * @param $s string that should get translated * @param $ctx optional context to appear in po file - * @return translated string if exsists, otherwise s + * @return translated string if exists, otherwise return $s * */ function t($s,$ctx = '') { diff --git a/mod/photos.php b/mod/photos.php index 44a7ce0f0..c2d90184e 100644 --- a/mod/photos.php +++ b/mod/photos.php @@ -652,9 +652,10 @@ function photos_content(&$a) { intval($a->pager['start']), intval($a->pager['itemspage']) ); - - $o .= '<h3>' . $album . '</h3>'; + $o .= '<div class="section-title-wrapper">'; + $o .= '<h3>' . $album . '</h3>'; + $o .= '<div class="section-title-submenu">'; if($cmd === 'edit') { if(($album !== t('Profile Photos')) && ($album !== 'Contact Photos') && ($album !== t('Contact Photos'))) { if($can_post) { @@ -680,22 +681,24 @@ function photos_content(&$a) { else { if(($album !== t('Profile Photos')) && ($album !== 'Contact Photos') && ($album !== t('Contact Photos'))) { if($can_post) { - $o .= '<div id="album-edit-link"><a href="'. $a->get_baseurl() . '/photos/' - . $a->data['channel']['channel_address'] . '/album/' . bin2hex($album) . '/edit' . '">' - . t('Edit Album') . '</a></div>'; + $o .= '<a href="'. $a->get_baseurl() . '/photos/' . $a->data['channel']['channel_address'] . '/album/' . bin2hex($album) . '/edit' . '">' . t('Edit Album') . '</a>'; } } } 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 - $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) { - $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 = ''; diff --git a/view/css/bootstrap-red.css b/view/css/bootstrap-red.css index a382a42b3..ba4cc08b0 100644 --- a/view/css/bootstrap-red.css +++ b/view/css/bootstrap-red.css @@ -1,37 +1,15 @@ /* override some bootstrap settings */ -html { - font-size: 100%; +h1, h2 { + font-size: 1.583em; } -h1, -.h1 { - font-size: 24px; +h3, h4 { + font-size: 1.334em; } -h2, -.h2 { - font-size: 18px; -} - -h3, -.h3 { - font-size: 16px; -} - -h4, -.h4 { - font-size: 14px; -} - -h5, -.h5 { - font-size: 12px; -} - -h6, -.h6 { - font-size: 10px; +h5, h6 { + font-size: 0.75rem; } /* nav overrides */ diff --git a/view/css/conversation.css b/view/css/conversation.css index c7b381928..80b5de250 100644 --- a/view/css/conversation.css +++ b/view/css/conversation.css @@ -107,6 +107,18 @@ overflow: auto; } +.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; +} + .wall-item-content img { max-width: 95%; } diff --git a/view/css/widgets.css b/view/css/widgets.css index 8bf5a9e97..96b4c1d60 100644 --- a/view/css/widgets.css +++ b/view/css/widgets.css @@ -2,6 +2,7 @@ /* Easiest way to indent the widget body - indent the entire widget and then shift the header label back to the left */ .widget { + word-wrap: break-word; margin-bottom: 10px; padding: 10px 10px 10px 20px; } @@ -9,7 +10,6 @@ .widget h3 { margin-left: -10px; margin-top: 0px; - margin-bottom: 10px; } /* suggest */ diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 4e662f1db..c908b9fc8 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -9,6 +9,7 @@ /* generals */ html { height: 100%; + font-size: 100%; } body { @@ -114,13 +115,7 @@ pre { border:1px solid $pre_borderc; } -blockquote { - background-color: $blockquote_bgcolour; - border-left: 4px solid $blockquote_bordercolour; - padding: 0.4em; - color: $blockquote_colour; - margin-left: 20px; -} + .ccollapse-wrapper { border: 1px solid #CCC; @@ -2206,10 +2201,6 @@ nav ul li { max-height: 50px } -nav .badge { - border-radius: $radiuspx; -} - nav .dropdown-menu { font-size: $body_font_size; border-top-right-radius: 0px; @@ -2251,32 +2242,20 @@ nav .dropdown-menu>li>a:hover,nav .dropdown-menu>li>a:focus{ } /* bootstrap overrides */ -blockquote { - font-size: 1em; -} -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; +blockquote { + font-size: $font_size; + font-style: italic; + background-color: $blockquote_bgcolour; + border-left: 3px solid $blockquote_bordercolour; + padding: 0.4em; + color: $blockquote_colour; + margin: 0px 0px 0px 20px; } -.wall-item-title h3, .wall-item-content h3, .wall-item-content h4 { - font-size: 1.112em; +.badge { + border-radius: $radiuspx; } .dropdown-menu { @@ -2448,6 +2427,26 @@ h5, h6 { 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) { aside#region_1 { background: rgba(0, 0, 0, .1); diff --git a/view/theme/redbasic/php/style.php b/view/theme/redbasic/php/style.php index d6d77e961..edf77cb0b 100644 --- a/view/theme/redbasic/php/style.php +++ b/view/theme/redbasic/php/style.php @@ -142,11 +142,11 @@ if(! $a->install) { if (! $widget_brdrcolour) $widget_brdrcolour = "rgba(238,238,238,0.8)"; if (! $blockquote_colour) - $blockquote_colour = "#000"; + $blockquote_colour = "#4d4d4d"; if (! $blockquote_bgcolour) - $blockquote_bgcolour = "#f4f8f9"; + $blockquote_bgcolour = ""; if (! $blockquote_bordercolour) - $blockquote_bordercolour = "#dae4ee"; + $blockquote_bordercolour = "#ccc"; if (! $code_borderc) $code_borderc = "#444"; if (! $code_bgcolour) diff --git a/view/tpl/photo_albums.tpl b/view/tpl/photo_albums.tpl index 7ff4a8cc0..5602f8571 100755 --- a/view/tpl/photo_albums.tpl +++ b/view/tpl/photo_albums.tpl @@ -1,15 +1,16 @@ <div id="side-bar-photos-albums" class="widget"> -<h3><a href="{{$baseurl}}/photos/{{$nick}}" title="{{$title}}" >{{$title}}</a></h3> -{{if $albums}} -<ul> -{{foreach $albums as $al}} -{{if $al.text}} -<li><a href="{{$baseurl}}/photos/{{$nick}}/album/{{$al.bin2hex}}">{{$al.text}}</a> ({{$al.total}})</li> -{{/if}} -{{/foreach}} -</ul> -{{/if}} -{{if $upload}} -<div id="photo-albums-upload-link"><a href="{{$baseurl}}/photos/{{$nick}}/upload" title="{{$upload}}">{{$upload}}</a></div> -{{/if}} + <h3>{{$title}}</h3> + <ul class="nav nav-pills nav-stacked"> + {{if $upload}} + <li><a href="{{$baseurl}}/photos/{{$nick}}/upload" title="{{$upload}}">{{$upload}}</a></li> + {{/if}} + {{if $albums}} + {{foreach $albums as $al}} + {{if $al.text}} + <li><a href="{{$baseurl}}/photos/{{$nick}}/album/{{$al.bin2hex}}">{{$al.text}}<span class="badge pull-right">{{$al.total}}</span></a></li> + {{/if}} + {{/foreach}} + + {{/if}} + </ul> </div> diff --git a/view/tpl/photos_recent.tpl b/view/tpl/photos_recent.tpl index fce518cfe..b4094512c 100755 --- a/view/tpl/photos_recent.tpl +++ b/view/tpl/photos_recent.tpl @@ -1,13 +1,11 @@ -<h3>{{$title}}</h3> -{{if $can_post}} -<a id="photo-top-upload-link" href="{{$upload.1}}">{{$upload.0}}</a> -{{/if}} - +<div class="section-title-wrapper"> + <h3>{{$title}}</h3> +</div> <div id="photo-album-contents"> -{{foreach $photos as $photo}} - {{include file="photo_top.tpl"}} -{{/foreach}} -<div id="page-end"></div> + {{foreach $photos as $photo}} + {{include file="photo_top.tpl"}} + {{/foreach}} + <div id="page-end"></div> </div> <div class="photos-end"></div> <script>$(document).ready(function() { loadingPage = false; justifyPhotos(); });</script> |