provide ability to create submenus
This commit is contained in:
parent
2114bfafca
commit
616338c17e
@ -29,17 +29,33 @@ function menu_render($menu, $class='', $edit = false, $var = '') {
|
||||
if(! $menu)
|
||||
return '';
|
||||
|
||||
$uid = local_channel();
|
||||
$menu_list = menu_list($uid);
|
||||
|
||||
foreach($menu_list as $menus) {
|
||||
if($menus['menu_name'] != $menu['menu']['menu_name'])
|
||||
$menu_names[] = $menus['menu_name'];
|
||||
}
|
||||
|
||||
for($x = 0; $x < count($menu['items']); $x ++) {
|
||||
if(in_array($menu['items'][$x]['mitem_link'], $menu_names)) {
|
||||
$m = menu_fetch($menu['items'][$x]['mitem_link'],local_channel(), get_observer_hash());
|
||||
$submenu = menu_render($m, 'dropdown-menu', $edit = false, $var = array('wrap' => 'none'));
|
||||
$menu['items'][$x]['submenu'] = $submenu;
|
||||
}
|
||||
|
||||
if($menu['items'][$x]['mitem_flags'] & MENU_ITEM_ZID)
|
||||
$menu['items'][$x]['mitem_link'] = zid($menu['items'][$x]['mitem_link']);
|
||||
|
||||
if($menu['items'][$x]['mitem_flags'] & MENU_ITEM_NEWWIN)
|
||||
$menu['items'][$x]['newwin'] = '1';
|
||||
|
||||
$menu['items'][$x]['mitem_desc'] = bbcode($menu['items'][$x]['mitem_desc']);
|
||||
}
|
||||
|
||||
$wrap = (($var['wrap'] === 'none') ? false : true);
|
||||
|
||||
return replace_macros(get_markup_template('usermenu.tpl'),array(
|
||||
$ret = replace_macros(get_markup_template('usermenu.tpl'),array(
|
||||
'$menu' => $menu['menu'],
|
||||
'$class' => $class,
|
||||
'$edit' => (($edit) ? t("Edit") : ''),
|
||||
@ -47,6 +63,8 @@ function menu_render($menu, $class='', $edit = false, $var = '') {
|
||||
'$items' => $menu['items'],
|
||||
'$wrap' => $wrap
|
||||
));
|
||||
|
||||
return $ret;
|
||||
}
|
||||
|
||||
|
||||
|
@ -124,6 +124,13 @@ function mitem_content(&$a) {
|
||||
$m = menu_fetch($a->data['menu']['menu_name'],$uid,$ob_hash);
|
||||
$a->data['menu_item'] = $m;
|
||||
|
||||
$menu_list = menu_list($uid);
|
||||
|
||||
foreach($menu_list as $menus) {
|
||||
if($menus['menu_name'] != $m['menu']['menu_name'])
|
||||
$menu_names[] = $menus['menu_name'];
|
||||
}
|
||||
|
||||
$perm_defaults = array(
|
||||
'allow_cid' => $channel['channel_allow_cid'],
|
||||
'allow_gid' => $channel['channel_allow_gid'],
|
||||
@ -152,14 +159,15 @@ function mitem_content(&$a) {
|
||||
'$permdesc' => t("\x28click to open/close\x29"),
|
||||
'$aclselect' => populate_acl($perm_defaults,false),
|
||||
'$mitem_desc' => array('mitem_desc', t('Link Name'), '', 'Visible name of the link','*'),
|
||||
'$mitem_link' => array('mitem_link', t('Link Target'), '', 'URL of the link', '*'),
|
||||
'$mitem_link' => array('mitem_link', t('Link Target or Submenu'), '', 'Enter URL of the link or select a menu name to create a submenu', '*', 'list="menu-names"'),
|
||||
'$usezid' => array('usezid', t('Use RedMatrix magic-auth if available'), true, ''),
|
||||
'$newwin' => array('newwin', t('Open link in new window'), false,''),
|
||||
'$mitem_order' => array('mitem_order', t('Order in list'),'0',t('Higher numbers will sink to bottom of listing')),
|
||||
'$submit' => t('Submit and finish'),
|
||||
'$submit_more' => t('Submit and continue'),
|
||||
'$display' => $display,
|
||||
'$lockstate' => $lockstate
|
||||
'$lockstate' => $lockstate,
|
||||
'$menu_names' => $menu_names
|
||||
));
|
||||
|
||||
$o .= replace_macros(get_markup_template('mitemlist.tpl'),array(
|
||||
|
5
view/css/bootstrap-red.css
vendored
5
view/css/bootstrap-red.css
vendored
@ -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;
|
||||
|
@ -7,10 +7,6 @@
|
||||
margin-top: 0px;
|
||||
}
|
||||
|
||||
.widget .nav-pills > li > a {
|
||||
padding: 6px 10px;
|
||||
}
|
||||
|
||||
.widget-input {
|
||||
width: 100%;
|
||||
border-top-right-radius: 0px;
|
||||
|
@ -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>
|
||||
|
@ -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}}
|
||||
|
@ -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}}">
|
||||
|
@ -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}}
|
||||
|
Reference in New Issue
Block a user