diff options
| author | friendica <redmatrix@redmatrix.me> | 2015-04-06 16:14:58 -0700 |
|---|---|---|
| committer | friendica <redmatrix@redmatrix.me> | 2015-04-06 16:14:58 -0700 |
| commit | 821bbd41e13e73c5de9cb74b79d2cc54f78eda03 (patch) | |
| tree | 64e29cd06c6ac7e86e51243b77cd2ed9488b11bd /view | |
| parent | 04959a095f46272ecfee225e1dd85796f4e0676f (diff) | |
| parent | e7b2e315102fa1e94a0f965cc7de88ea217c8783 (diff) | |
| download | volse-hubzilla-821bbd41e13e73c5de9cb74b79d2cc54f78eda03.tar.gz volse-hubzilla-821bbd41e13e73c5de9cb74b79d2cc54f78eda03.tar.bz2 volse-hubzilla-821bbd41e13e73c5de9cb74b79d2cc54f78eda03.zip | |
Merge https://github.com/redmatrix/redmatrix into pending_merge
Diffstat (limited to 'view')
| -rw-r--r-- | view/tpl/menuedit.tpl | 3 | ||||
| -rw-r--r-- | view/tpl/menulist.tpl | 15 |
2 files changed, 8 insertions, 10 deletions
diff --git a/view/tpl/menuedit.tpl b/view/tpl/menuedit.tpl index 1ccfb3d68..9ea184269 100644 --- a/view/tpl/menuedit.tpl +++ b/view/tpl/menuedit.tpl @@ -5,7 +5,7 @@ <a href="mitem/{{$menu_id}}" title="{{$hintedit}}">{{$editcontents}}</a> {{/if}} -<form id="menuedit" action="menu{{if $menu_id}}/{{$menu_id}}{{/if}}" method="post" > +<form id="menuedit" action="menu{{if $menu_id}}/{{$menu_id}}{{/if}}{{if $sys}}?f=&sys=1{{/if}}" method="post" > {{if $menu_id}} <input type="hidden" name="menu_id" value="{{$menu_id}}" /> @@ -14,7 +14,6 @@ <input type="hidden" name="menu_system" value="{{$menu_system}}" /> {{/if}} - {{include file="field_input.tpl" field=$menu_name}} {{include file="field_input.tpl" field=$menu_desc}} {{include file="field_checkbox.tpl" field=$menu_bookmark}} diff --git a/view/tpl/menulist.tpl b/view/tpl/menulist.tpl index 35ad91937..679732c0f 100644 --- a/view/tpl/menulist.tpl +++ b/view/tpl/menulist.tpl @@ -1,17 +1,16 @@ <div class="generic-content-wrapper-styled"> - <h1>{{$title}}</h1> - -<a href="menu/new" title="{{$hintnew}}">{{$hintnew}}</a> - -<br /> +<a href="menu/new{{if $sys}}?f=&sys=1{{/if}}" title="{{$hintnew}}">{{$hintnew}}</a> +<br> {{if $menus }} <ul id="menulist"> {{foreach $menus as $m }} -<li><a href="menu/{{$m.menu_id}}" title="{{$hintedit}}"><i class="icon-pencil design-icons design-edit-icon btn btn-default"></i></a> <a href="menu/{{$m.menu_id}}/drop" title="{{$hintdrop}}"><i class="icon-trash drop-icons design-icons design-remove-icon btn btn-default"></i></a> {{if $m.bookmark}}<i class="icon-bookmark" title="{{$bmark}}" ></i> {{/if}}<a href="mitem/{{$m.menu_id}}/new" title="{{$hintcontent}}">{{$m.menu_name}}</a></li> +<li> +<a href="menu/{{$m.menu_id}}{{if $sys}}?f=&sys=1{{/if}}" title="{{$hintedit}}"><i class="icon-pencil design-icons design-edit-icon btn btn-default"></i></a> +<a href="menu/{{$m.menu_id}}/drop{{if $sys}}?f=&sys=1{{/if}}" title="{{$hintdrop}}"><i class="icon-trash drop-icons design-icons design-remove-icon btn btn-default"></i></a> {{if $m.bookmark}}<i class="icon-bookmark" title="{{$bmark}}" ></i> {{/if}}<a href="mitem/{{$m.menu_id}}/new{{if $sys}}?f=&sys=1{{/if}}" title="{{$hintcontent}}">{{$m.menu_name}}</a> +</li> {{/foreach}} </ul> {{/if}} - -</div> +</div>
\ No newline at end of file |