diff options
| author | friendica <info@friendica.com> | 2014-09-14 17:11:50 -0700 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2014-09-14 17:11:50 -0700 |
| commit | 0a5f0fe10bf7310666b96102e8e0da754d6ca439 (patch) | |
| tree | 150bd622891d4e373325e79d77167612d40e4ad2 /view | |
| parent | 6be6b41a421f86579164288ea2fa7cebb6edd9d4 (diff) | |
| parent | b5241c610fe3eeaebedebc94e43edb802565123a (diff) | |
| download | volse-hubzilla-0a5f0fe10bf7310666b96102e8e0da754d6ca439.tar.gz volse-hubzilla-0a5f0fe10bf7310666b96102e8e0da754d6ca439.tar.bz2 volse-hubzilla-0a5f0fe10bf7310666b96102e8e0da754d6ca439.zip | |
Merge https://github.com/friendica/red into pending_merge
Diffstat (limited to 'view')
| -rw-r--r-- | view/js/main.js | 14 | ||||
| -rwxr-xr-x | view/tpl/admin_site.tpl | 1 | ||||
| -rwxr-xr-x | view/tpl/conv_item.tpl | 4 | ||||
| -rwxr-xr-x | view/tpl/settings_display.tpl | 2 |
4 files changed, 10 insertions, 11 deletions
diff --git a/view/js/main.js b/view/js/main.js index 13f1fea8f..d0fcf0077 100644 --- a/view/js/main.js +++ b/view/js/main.js @@ -708,16 +708,14 @@ function updateConvItems(mode,data) { 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': '-0', + 'lt640': '-1', + 'lt1024': '-0' } }).on('jg.complete', function(e){ justifiedGalleryActive = false; }); } 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 8607b8ee8..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>{{if $item.plink}}<a href="{{$item.plink.href}}" title="{{$item.title}} ({{$item.plink.title}})">{{/if}}{{$item.title}}{{if $item.plink}}</a>{{/if}}</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/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}}" /> |