aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2014-11-09 17:39:54 -0800
committerfriendica <info@friendica.com>2014-11-09 17:39:54 -0800
commit2e695d1da2383214995b850b7d539dfb08eb546e (patch)
tree3807e487502b99b20e5ec8b697f87a92c0884cb6
parentd5d1f655d97b389e6b2cae1c753e1377455b1721 (diff)
downloadvolse-hubzilla-2e695d1da2383214995b850b7d539dfb08eb546e.tar.gz
volse-hubzilla-2e695d1da2383214995b850b7d539dfb08eb546e.tar.bz2
volse-hubzilla-2e695d1da2383214995b850b7d539dfb08eb546e.zip
menu page cleanup
-rw-r--r--mod/menu.php32
-rw-r--r--view/css/mod_menu.css3
-rw-r--r--view/tpl/menulist.tpl2
3 files changed, 21 insertions, 16 deletions
diff --git a/mod/menu.php b/mod/menu.php
index a2d0c2385..a43ebfee6 100644
--- a/mod/menu.php
+++ b/mod/menu.php
@@ -52,25 +52,27 @@ function menu_content(&$a) {
if(argc() == 1) {
// list menus
$x = menu_list(local_user());
+ if($x) {
+ for($y = 0; $y < count($x); $y ++) {
+ $x[$y]['bookmark'] = (($x[$y]['menu_flags'] & MENU_BOOKMARK) ? true : false);
+ }
+ }
- $o = replace_macros(get_markup_template('menulist.tpl'),array(
- '$title' => t('Manage Menus'),
- '$menus' => $x,
- '$edit' => t('Edit'),
- '$drop' => t('Drop'),
- '$new' => t('New'),
- '$hintnew' => t('Create a new menu'),
- '$hintdrop' => t('Delete this menu'),
- '$hintcontent' => t('Edit menu contents'),
- '$hintedit' => t('Edit this menu')
- ));
+ $o = replace_macros(get_markup_template('menulist.tpl'),array(
+ '$title' => t('Manage Menus'),
+ '$menus' => $x,
+ '$edit' => t('Edit'),
+ '$drop' => t('Drop'),
+ '$new' => t('New'),
+ '$bmark' => t('Bookmarks allowed'),
+ '$hintnew' => t('Create a new menu'),
+ '$hintdrop' => t('Delete this menu'),
+ '$hintcontent' => t('Edit menu contents'),
+ '$hintedit' => t('Edit this menu')
+ ));
return $o;
-
-
-
-
}
diff --git a/view/css/mod_menu.css b/view/css/mod_menu.css
new file mode 100644
index 000000000..6123ea56b
--- /dev/null
+++ b/view/css/mod_menu.css
@@ -0,0 +1,3 @@
+#menulist > li {
+ margin-top: 15px;
+} \ No newline at end of file
diff --git a/view/tpl/menulist.tpl b/view/tpl/menulist.tpl
index 2feb75d90..bb862fef0 100644
--- a/view/tpl/menulist.tpl
+++ b/view/tpl/menulist.tpl
@@ -9,7 +9,7 @@
{{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"></i></a> <a href="menu/{{$m.menu_id}}/drop" title={{$hintdrop}}><i class="icon-remove drop-icons design-icons design-remove-icon"></i></a>&nbsp;&nbsp;&nbsp;&nbsp;<a href="mitem/{{$m.menu_id}}/new" title="{{$hintcontent}}">{{$m.menu_name}}</a></li>
+<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-remove drop-icons design-icons design-remove-icon btn btn-default"></i></a>&nbsp;&nbsp;&nbsp;&nbsp;{{if $m.bookmark}}<i class="icon-bookmark" title="{{$bmark}}" ></i>&nbsp;{{/if}}<a href="mitem/{{$m.menu_id}}/new" title="{{$hintcontent}}">{{$m.menu_name}}</a></li>
{{/foreach}}
</ul>
{{/if}}