diff options
| author | Paolo Tacconi <p.tacconi@giunti.it> | 2014-09-15 10:01:25 +0200 |
|---|---|---|
| committer | Paolo Tacconi <p.tacconi@giunti.it> | 2014-09-15 10:01:25 +0200 |
| commit | 4f793069bf4aafcfe77d50e47690173104ef23c7 (patch) | |
| tree | 7fe1bfcb18672300bf14967338690ea4fa51e640 /view/tpl | |
| parent | ed7f3001c1c1deec5076ae12114e5c42865b6251 (diff) | |
| parent | 58aad83e5cb0edaf1ccc543147030e782c5e7ba9 (diff) | |
| download | volse-hubzilla-4f793069bf4aafcfe77d50e47690173104ef23c7.tar.gz volse-hubzilla-4f793069bf4aafcfe77d50e47690173104ef23c7.tar.bz2 volse-hubzilla-4f793069bf4aafcfe77d50e47690173104ef23c7.zip | |
Merge branch 'master' of https://github.com/friendica/red
Diffstat (limited to 'view/tpl')
| -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 |
4 files changed, 5 insertions, 3 deletions
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}}" /> |