diff options
| author | redmatrix <redmatrix@redmatrix.me> | 2015-06-07 21:38:11 -0700 |
|---|---|---|
| committer | redmatrix <redmatrix@redmatrix.me> | 2015-06-07 21:38:11 -0700 |
| commit | 10e88a3e45457e8d1f76f8ab2a989ffcb67e1883 (patch) | |
| tree | 3d304183eeea079659a86aa176d9f3aefb362c0c /view | |
| parent | 77314bfa1cd183ff0f1174ff4363df37fec124c7 (diff) | |
| parent | 9823541c4b98f6cf5e659a8379d0ea0eeeb0c529 (diff) | |
| download | volse-hubzilla-10e88a3e45457e8d1f76f8ab2a989ffcb67e1883.tar.gz volse-hubzilla-10e88a3e45457e8d1f76f8ab2a989ffcb67e1883.tar.bz2 volse-hubzilla-10e88a3e45457e8d1f76f8ab2a989ffcb67e1883.zip | |
Merge branch 'frontpage'
Diffstat (limited to 'view')
| -rw-r--r-- | view/js/main.js | 2 | ||||
| -rwxr-xr-x | view/tpl/admin_site.tpl | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/view/js/main.js b/view/js/main.js index 35944e13f..625ac5b01 100644 --- a/view/js/main.js +++ b/view/js/main.js @@ -372,7 +372,7 @@ function NavUpdate() { if($('#live-network').length) { src = 'network'; liveUpdate(); } if($('#live-channel').length) { src = 'channel'; liveUpdate(); } - if($('#live-home').length) { src = 'home'; liveUpdate(); } + if($('#live-public').length) { src = 'public'; liveUpdate(); } if($('#live-display').length) { src = 'display'; liveUpdate(); } if($('#live-search').length) { src = 'search'; liveUpdate(); } diff --git a/view/tpl/admin_site.tpl b/view/tpl/admin_site.tpl index 225b281cc..eabb6f067 100755 --- a/view/tpl/admin_site.tpl +++ b/view/tpl/admin_site.tpl @@ -46,7 +46,8 @@ {{include file="field_select.tpl" field=$language}} {{include file="field_select.tpl" field=$theme}} {{include file="field_select.tpl" field=$theme_mobile}} - {{include file="field_checkbox.tpl" field=$no_login_on_homepage}} + {{include file="field_input.tpl" field=$frontpage}} + {{include file="field_checkbox.tpl" field=$login_on_homepage}} <div class="submit"><input type="submit" name="page_site" value="{{$submit}}" /></div> |