aboutsummaryrefslogtreecommitdiffstats
path: root/view
diff options
context:
space:
mode:
Diffstat (limited to 'view')
-rw-r--r--view/css/bootstrap-red.css5
-rw-r--r--view/css/widgets.css4
-rw-r--r--view/tpl/menuedit.tpl1
-rw-r--r--view/tpl/mitemedit.tpl5
-rwxr-xr-xview/tpl/photos_upload.tpl2
-rw-r--r--view/tpl/usermenu.tpl9
6 files changed, 18 insertions, 8 deletions
diff --git a/view/css/bootstrap-red.css b/view/css/bootstrap-red.css
index 1d3c329ec..c6d99e7ae 100644
--- a/view/css/bootstrap-red.css
+++ b/view/css/bootstrap-red.css
@@ -56,6 +56,11 @@ nav .navbar-toggle {
/* nav overrides end */
+
+aside .nav-pills > li > a {
+ padding: 6px 10px;
+}
+
.dropdown-menu img {
float: left;
width: 32px;
diff --git a/view/css/widgets.css b/view/css/widgets.css
index 566dd2b8a..0a901b1f9 100644
--- a/view/css/widgets.css
+++ b/view/css/widgets.css
@@ -7,10 +7,6 @@
margin-top: 0px;
}
-.widget .nav-pills > li > a {
- padding: 6px 10px;
-}
-
.widget-input {
width: 100%;
border-top-right-radius: 0px;
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..305aeb2bf 100644
--- a/view/tpl/mitemedit.tpl
+++ b/view/tpl/mitemedit.tpl
@@ -11,6 +11,11 @@
{{/if}}
{{include file="field_input.tpl" field=$mitem_desc}}
{{include file="field_input.tpl" field=$mitem_link}}
+ <datalist id="menu-names">
+ {{foreach $menu_names as $menu_name}}
+ <option value="{{$menu_name}}">
+ {{/foreach}}
+ </datalist>
{{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/photos_upload.tpl b/view/tpl/photos_upload.tpl
index 06e3ef612..2d558c63d 100755
--- a/view/tpl/photos_upload.tpl
+++ b/view/tpl/photos_upload.tpl
@@ -6,7 +6,7 @@
<div class="form-group">
<label for="photos-upload-album">{{$newalbum_label}}</label>
<input type="text" class="form-control" id="photos-upload-album" name="newalbum" placeholder="{{$newalbum_placeholder}}" value="{{$selname}}" list="dl-photo-upload">
- <datalist id="dl-photo-upload">
+ <datalist id="menu-names">
{{foreach $albums as $al}}
{{if $al.text}}
<option value="{{$al.text}}">
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}}