diff options
Diffstat (limited to 'view')
| -rw-r--r-- | view/css/mod_photos.css | 49 | ||||
| -rw-r--r-- | view/js/main.js | 21 | ||||
| -rw-r--r-- | view/theme/redbasic/css/style.css | 25 | ||||
| -rwxr-xr-x | view/tpl/admin_site.tpl | 1 | ||||
| -rwxr-xr-x | view/tpl/conv_item.tpl | 4 | ||||
| -rwxr-xr-x | view/tpl/head.tpl | 1 | ||||
| -rwxr-xr-x | view/tpl/settings_display.tpl | 2 |
7 files changed, 28 insertions, 75 deletions
diff --git a/view/css/mod_photos.css b/view/css/mod_photos.css index b81145cd5..0c4c25bae 100644 --- a/view/css/mod_photos.css +++ b/view/css/mod_photos.css @@ -1,11 +1,3 @@ - - -.photo-top-photo, .photo-album-photo { - padding: 10px; - max-width: 300px; -} - - .photos-end { clear: both; margin-bottom: 25px; @@ -30,51 +22,11 @@ clear: both; } -.photo-album-image-wrapper { - float: left; - margin-top: 15px; - margin-right: 15px; - margin-left: 15px; -} -.photo-album-image-wrapper .caption { - display: none; - width: 100%; - bottom: 0px; - padding: 0.5em 0.5em 0px 0.5em; - margin: 0px; -} -.photo-album-image-wrapper a:hover .caption { - display:block; -} - #photo-album-end { clear: both; margin-bottom: 25px; } -.photo-top-image-wrapper { - float: left; - margin-top: 15px; - margin-right: 15px; - margin-left: 15px; - margin-bottom: 15px; -} -.photo-top-album-name { - width: 100%; - min-height: 2em; - bottom: 0px; - padding: 0px 3px; - padding-top: 0.5em; -} -#photo-top-end { - clear: both; -} - -#photo-top-links { - margin-bottom: 30px; - margin-left: 30px; -} - #photos-upload-newalbum-div { float: left; width: 175px; @@ -83,6 +35,7 @@ #photos-upload-noshare { margin-bottom: 10px; } + #photos-upload-existing-album-text { float: left; width: 175px; diff --git a/view/js/main.js b/view/js/main.js index e263fd116..d6b405258 100644 --- a/view/js/main.js +++ b/view/js/main.js @@ -705,20 +705,19 @@ function updateConvItems(mode,data) { } function justifyPhotos(bParam_page) { + justifiedGalleryActive = true; $('#photo-album-contents-' + bParam_page).justifiedGallery({ lastRow : 'nojustify', - captions: true, margins: 3, - rowHeight : 150, sizeRangeSuffixes : { - 'lt100': '', - 'lt240': '', - 'lt320': '', - 'lt500': '', - 'lt640': '', - 'lt1024': '' + 'lt100': '-2', + 'lt240': '-2', + 'lt320': '-2', + 'lt500': '-1', + 'lt640': '-1', + 'lt1024': '-0' } - }); + }).on('jg.complete', function(e){ justifiedGalleryActive = false; }); } function notify_popup_loader(notifyType) { @@ -1134,9 +1133,9 @@ $(window).scroll(function () { $('#more').css("top","400"); $('#more').show(); } - + if($(window).scrollTop() + $(window).height() == $(document).height()) { - if((pageHasMoreContent) && (! loadingPage)) { + if((pageHasMoreContent) && (! loadingPage) && (! justifiedGalleryActive)) { $('#more').hide(); $('#no-more').hide(); diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 4062c259c..bb11ddbb9 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -675,10 +675,6 @@ aside li { margin: auto; } -.photo-top-image-wrapper, .photo-album-image-wrapper { - width: 240px; -} - .photo-top-photo-link, .photo-album-photo-link { display: block; width: 100%; @@ -688,15 +684,6 @@ aside li { overflow: hidden; } -.photo-album-image-wrapper .caption { - background-color: $acpopup_bgcolour; - border-bottom: 2px solid $acpopup_bordercolour; -} - -.photo-top-album-name { - background-color: $acpopup_bgcolour; -} - #photos-upload-perms-menu, #photos-upload-perms-menu:visited, #photos-upload-perms-menu:link { color: #8888FF; text-decoration: none; @@ -2268,6 +2255,18 @@ blockquote { font-size: 1em; } +h1, h2 { + font-size: 1.15rem; +} + +h3, h4 { + font-size: $font_size; +} + +h5, h6 { + font-size: $body_font_size; +} + .dropdown-menu { font-size: $body_font_size; border-radius: $radiuspx; diff --git a/view/tpl/admin_site.tpl b/view/tpl/admin_site.tpl index 788fef457..56485dff6 100755 --- a/view/tpl/admin_site.tpl +++ b/view/tpl/admin_site.tpl @@ -47,7 +47,6 @@ {{include file="field_select.tpl" field=$theme}} {{include file="field_select.tpl" field=$theme_mobile}} {{include file="field_select.tpl" field=$theme_accessibility}} - {{include file="field_input.tpl" field=$site_channel}} {{include file="field_checkbox.tpl" field=$no_login_on_homepage}} diff --git a/view/tpl/conv_item.tpl b/view/tpl/conv_item.tpl index bfa62f1b7..ff69fd379 100755 --- a/view/tpl/conv_item.tpl +++ b/view/tpl/conv_item.tpl @@ -15,7 +15,9 @@ <div class="wall-item-photo-end" style="clear:both"></div> </div> {{if $item.title}} - <div class="wall-item-title" id="wall-item-title-{{$item.id}}"><h3>{{$item.title}}</h3></div> + <div class="wall-item-title" id="wall-item-title-{{$item.id}}"> + <h3>{{if $item.title_tosource}}{{if $item.plink}}<a href="{{$item.plink.href}}" title="{{$item.title}} ({{$item.plink.title}})">{{/if}}{{/if}}{{$item.title}}{{if $item.title_tosource}}{{if $item.plink}}</a>{{/if}}{{/if}}</h3> + </div> {{/if}} {{if $item.lock}} <div class="wall-item-lock dropdown"> diff --git a/view/tpl/head.tpl b/view/tpl/head.tpl index 703b08547..9c9e7b970 100755 --- a/view/tpl/head.tpl +++ b/view/tpl/head.tpl @@ -25,6 +25,7 @@ var updateInterval = {{$update_interval}}; var localUser = {{if $local_user}}{{$local_user}}{{else}}false{{/if}}; var zid = {{if $zid}}'{{$zid}}'{{else}}null{{/if}}; + var justifiedGalleryActive = false; </script> diff --git a/view/tpl/settings_display.tpl b/view/tpl/settings_display.tpl index 6eda6a6ec..f10f2e1c2 100755 --- a/view/tpl/settings_display.tpl +++ b/view/tpl/settings_display.tpl @@ -12,7 +12,7 @@ {{include file="field_input.tpl" field=$ajaxint}} {{include file="field_input.tpl" field=$itemspage}} {{include file="field_checkbox.tpl" field=$nosmile}} - +{{include file="field_checkbox.tpl" field=$title_tosource}} <div class="settings-submit-wrapper" > <input type="submit" name="submit" class="settings-submit" value="{{$submit}}" /> |