aboutsummaryrefslogtreecommitdiffstats
path: root/view/tpl
diff options
context:
space:
mode:
authorMario <mario@mariovavti.com>2018-06-17 17:00:17 +0200
committerMario <mario@mariovavti.com>2018-06-17 17:00:17 +0200
commit28043726e64f750e646b42aa6f649e277fc3767e (patch)
tree18a41bea6a4805454e0b1a2dacdfeda451854690 /view/tpl
parent9c5df51141d68e50d3c1f5d3097160408debce48 (diff)
parent7e736c5359732647f5203bf2bb7fcd50c448fad9 (diff)
downloadvolse-hubzilla-28043726e64f750e646b42aa6f649e277fc3767e.tar.gz
volse-hubzilla-28043726e64f750e646b42aa6f649e277fc3767e.tar.bz2
volse-hubzilla-28043726e64f750e646b42aa6f649e277fc3767e.zip
Merge branch 'dev' of https://framagit.org/hubzilla/core into dev
Diffstat (limited to 'view/tpl')
-rwxr-xr-xview/tpl/admin_security.tpl2
-rwxr-xr-xview/tpl/build_query.tpl4
-rw-r--r--view/tpl/usermenu.tpl2
3 files changed, 5 insertions, 3 deletions
diff --git a/view/tpl/admin_security.tpl b/view/tpl/admin_security.tpl
index 409e9fc7d..493707a7a 100755
--- a/view/tpl/admin_security.tpl
+++ b/view/tpl/admin_security.tpl
@@ -7,6 +7,8 @@
{{include file="field_checkbox.tpl" field=$block_public}}
+ {{include file="field_checkbox.tpl" field=$cloud_noroot}}
+ {{include file="field_checkbox.tpl" field=$cloud_disksize}}
{{include file="field_checkbox.tpl" field=$transport_security}}
{{include file="field_checkbox.tpl" field=$content_security}}
{{include file="field_checkbox.tpl" field=$embed_sslonly}}
diff --git a/view/tpl/build_query.tpl b/view/tpl/build_query.tpl
index 754d5997c..2c55a8140 100755
--- a/view/tpl/build_query.tpl
+++ b/view/tpl/build_query.tpl
@@ -36,8 +36,8 @@
var udargs = ((page_load) ? "/load" : "");
var bCmd = bParam_cmd + udargs + "?f=" ;
if(bParam_uid) bCmd = bCmd + "&p=" + bParam_uid;
- if(bParam_cmin != 0) bCmd = bCmd + "&cmin=" + bParam_cmin;
- if(bParam_cmax != 99) bCmd = bCmd + "&cmax=" + bParam_cmax;
+ if(bParam_cmin != (-1)) bCmd = bCmd + "&cmin=" + bParam_cmin;
+ if(bParam_cmax != (-1)) bCmd = bCmd + "&cmax=" + bParam_cmax;
if(bParam_gid != 0) { bCmd = bCmd + "&gid=" + bParam_gid; } else
if(bParam_cid != 0) { bCmd = bCmd + "&cid=" + bParam_cid; }
if(bParam_static != 0) { bCmd = bCmd + "&static=" + bParam_static; }
diff --git a/view/tpl/usermenu.tpl b/view/tpl/usermenu.tpl
index c51728c34..8bbfedd07 100644
--- a/view/tpl/usermenu.tpl
+++ b/view/tpl/usermenu.tpl
@@ -2,7 +2,7 @@
<div id="pmenu-{{$id}}" class="pmenu{{if !$class}} widget{{else}} {{$class}}{{/if}}">
{{/if}}
{{if $menu.menu_desc}}
- <h3 class="pmenu-title">{{$menu.menu_desc}}{{if $edit}} <a href="mitem/{{$menu.menu_id}}" title="{{$edit}}"><i class="fa fa-pencil fakelink" title="{{$edit}}"></i></a>{{/if}}</h3>
+ <h3 class="pmenu-title">{{$menu.menu_desc}}{{if $edit}} <a href="mitem/{{$nick}}/{{$menu.menu_id}}" title="{{$edit}}"><i class="fa fa-pencil fakelink" title="{{$edit}}"></i></a>{{/if}}</h3>
{{/if}}
{{if $items}}
<ul class="pmenu-body{{if $wrap || !$class}} nav nav-pills flex-column{{elseif !$wrap || $class}} {{$class}}{{/if}}">