diff options
| author | redmatrix <redmatrix@redmatrix.me> | 2015-05-10 13:26:44 -0700 |
|---|---|---|
| committer | redmatrix <redmatrix@redmatrix.me> | 2015-05-10 13:26:44 -0700 |
| commit | 0a644a2f416e8e4a93df6b9e0a4497071ead4b56 (patch) | |
| tree | 1b01f2363c54e086224b6f9f7ad6b2d41feed255 /view/tpl | |
| parent | 37a63365f1143375a2382a26ad9b07048b9570a6 (diff) | |
| parent | 2cb8b19972eb6a023eca1297f281ef9f68934c64 (diff) | |
| download | volse-hubzilla-0a644a2f416e8e4a93df6b9e0a4497071ead4b56.tar.gz volse-hubzilla-0a644a2f416e8e4a93df6b9e0a4497071ead4b56.tar.bz2 volse-hubzilla-0a644a2f416e8e4a93df6b9e0a4497071ead4b56.zip | |
Merge branch 'master' of https://github.com/redmatrix/redmatrix
Conflicts:
mod/mitem.php
view/de/messages.po
view/de/strings.php
Diffstat (limited to 'view/tpl')
| -rw-r--r-- | view/tpl/menuedit.tpl | 1 | ||||
| -rw-r--r-- | view/tpl/mitemedit.tpl | 7 | ||||
| -rw-r--r-- | view/tpl/usermenu.tpl | 9 |
3 files changed, 14 insertions, 3 deletions
diff --git a/view/tpl/menuedit.tpl b/view/tpl/menuedit.tpl index b3704e86e..da3172434 100644 --- a/view/tpl/menuedit.tpl +++ b/view/tpl/menuedit.tpl @@ -19,6 +19,7 @@ {{/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}} <div class="menuedit-submit-wrapper form-group pull-right" > <button type="submit" name="submit" class="btn btn-primary">{{$submit}}</button> diff --git a/view/tpl/mitemedit.tpl b/view/tpl/mitemedit.tpl index 3200766ca..8b8afa24c 100644 --- a/view/tpl/mitemedit.tpl +++ b/view/tpl/mitemedit.tpl @@ -11,6 +11,13 @@ {{/if}} {{include file="field_input.tpl" field=$mitem_desc}} {{include file="field_input.tpl" field=$mitem_link}} + {{if $menu_names}} + <datalist id="menu-names"> + {{foreach $menu_names as $menu_name}} + <option value="{{$menu_name}}"> + {{/foreach}} + </datalist> + {{/if}} {{include file="field_input.tpl" field=$mitem_order}} {{include file="field_checkbox.tpl" field=$usezid}} {{include file="field_checkbox.tpl" field=$newwin}} diff --git a/view/tpl/usermenu.tpl b/view/tpl/usermenu.tpl index 7284826a2..4ecf823dd 100644 --- a/view/tpl/usermenu.tpl +++ b/view/tpl/usermenu.tpl @@ -4,10 +4,13 @@ {{if $menu.menu_desc}} <h3 class="pmenu-title">{{$menu.menu_desc}}{{if $edit}} <a href="mitem/{{$menu.menu_id}}" title="{{$edit}}"><i class="icon-pencil fakelink" title="{{$edit}}"></i></a>{{/if}}</h3> {{/if}} - {{if $items }} - <ul class="pmenu-body{{if $wrap && !$class}} nav nav-pills nav-stacked{{elseif !$wrap && $class}} {{$class}}{{/if}}"> + {{if $items}} + <ul class="pmenu-body{{if $wrap || !$class}} nav nav-pills nav-stacked{{elseif !$wrap || $class}} {{$class}}{{/if}}"> {{foreach $items as $mitem }} - <li id="pmenu-item-{{$mitem.mitem_id}}" class="pmenu-item"><a href="{{$mitem.mitem_link}}" {{if $mitem.newwin}}target="_blank"{{/if}}>{{$mitem.mitem_desc}}</a></li> + <li id="pmenu-item-{{$mitem.mitem_id}}" class="pmenu-item{{if $mitem.submenu}} dropdown{{/if}}"> + <a href="{{if $mitem.submenu}}#{{else}}{{$mitem.mitem_link}}{{/if}}"{{if $mitem.submenu}} class="dropdown-toggle" data-toggle="dropdown"{{/if}}{{if $mitem.newwin}}target="_blank"{{/if}}>{{$mitem.mitem_desc}}{{if $mitem.submenu}}<span class="caret"></span>{{/if}}</a> + {{if $mitem.submenu}}{{$mitem.submenu}}{{/if}} + </li> {{/foreach }} </ul> {{/if}} |