diff options
| author | redmatrix <git@macgirvin.com> | 2016-02-17 14:36:16 -0800 |
|---|---|---|
| committer | redmatrix <git@macgirvin.com> | 2016-02-17 14:36:16 -0800 |
| commit | 29284319a560af8d3888aadd333e57d7e21ecfeb (patch) | |
| tree | 09914f0210a523cf6ca01806c5b2d295c7411dce /view/tpl | |
| parent | 86e73fd31314c3f0244736bd531a9793223c0a02 (diff) | |
| parent | cd8b7687c1ffc8fa912126eaf61b3898954d1b4c (diff) | |
| download | volse-hubzilla-29284319a560af8d3888aadd333e57d7e21ecfeb.tar.gz volse-hubzilla-29284319a560af8d3888aadd333e57d7e21ecfeb.tar.bz2 volse-hubzilla-29284319a560af8d3888aadd333e57d7e21ecfeb.zip | |
Merge https://github.com/redmatrix/hubzilla into pending_merge
Diffstat (limited to 'view/tpl')
| -rwxr-xr-x | view/tpl/head.tpl | 1 | ||||
| -rwxr-xr-x | view/tpl/settings_display.tpl | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/view/tpl/head.tpl b/view/tpl/head.tpl index 8a007232e..322273193 100755 --- a/view/tpl/head.tpl +++ b/view/tpl/head.tpl @@ -28,6 +28,7 @@ var justifiedGalleryActive = false; {{if $channel_hash}}var channelHash = '{{$channel_hash}}';{{/if}} {{if $channel_id}}var channelId = '{{$channel_id}}';{{/if}}{{* Used in e.g. autocomplete *}} + var preloadImages = {{$preload_images}}; </script> diff --git a/view/tpl/settings_display.tpl b/view/tpl/settings_display.tpl index 02f679852..cf79671fd 100755 --- a/view/tpl/settings_display.tpl +++ b/view/tpl/settings_display.tpl @@ -65,6 +65,7 @@ {{include file="field_checkbox.tpl" field=$channel_list_mode}} {{include file="field_checkbox.tpl" field=$network_list_mode}} {{include file="field_checkbox.tpl" field=$user_scalable}} + {{include file="field_checkbox.tpl" field=$preload_images}} {{if $expert}} <div class="form-group"> <a class="btn btn-default "href="pdledit">{{$layout_editor}}</a> |