harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

attach an id to menues, allow $menu_title to be empty, if no custom menu class is provided use default redbasic classes

Browse Source
This commit is contained in:
Mario Vavti 2015-04-19 15:22:50 +02:00
parent dd5b97639e
commit 71117628bc
3 changed files with 20 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
include/menu.php
View File

@ -25,6 +25,7 @@ function menu_fetch($name,$uid,$observer_xchan) {
} }
function menu_render($menu, $class='', $edit = false) { function menu_render($menu, $class='', $edit = false) {
if(! $menu) if(! $menu)
return ''; return '';
@ -40,6 +41,7 @@ function menu_render($menu, $class='', $edit = false) {
'$menu' => $menu['menu'], '$menu' => $menu['menu'],
'$class' => $class, '$class' => $class,
'$edit' => (($edit) ? t("Edit") : ''), '$edit' => (($edit) ? t("Edit") : ''),
'$id' => $menu['menu']['menu_id'],
'$items' => $menu['items'] '$items' => $menu['items']
)); ));
} }
@ -60,14 +62,13 @@ function menu_fetch_id($menu_id,$channel_id) {
function menu_create($arr) { function menu_create($arr) {
$menu_name = trim(escape_tags($arr['menu_name'])); $menu_name = trim(escape_tags($arr['menu_name']));
$menu_desc = trim(escape_tags($arr['menu_desc'])); $menu_desc = trim(escape_tags($arr['menu_desc']));
$menu_flags = intval($arr['menu_flags']); $menu_flags = intval($arr['menu_flags']);
//allow menu_desc (title) to be empty
if(! $menu_desc) //if(! $menu_desc)
$menu_desc = $menu_name; // $menu_desc = $menu_name;
if(! $menu_name) if(! $menu_name)
return false; return false;
@ -144,8 +145,9 @@ function menu_edit($arr) {
$menu_desc = trim(escape_tags($arr['menu_desc'])); $menu_desc = trim(escape_tags($arr['menu_desc']));
$menu_flags = intval($arr['menu_flags']); $menu_flags = intval($arr['menu_flags']);
if(! $menu_desc) //allow menu_desc (title) to be empty
$menu_desc = $menu_name; //if(! $menu_desc)
// $menu_desc = $menu_name;
if(! $menu_name) if(! $menu_name)
return false; return false;

1
view/css/widgets.css
View File

@ -7,7 +7,6 @@
margin-top: 0px; margin-top: 0px;
} }
.widget .nav-pills > li > a { .widget .nav-pills > li > a {
padding: 6px 10px; padding: 6px 10px;
} }

27
view/tpl/usermenu.tpl
View File

@ -1,16 +1,13 @@
<div class="pmenu{{if $class}} {{$class}}{{/if}}"> <div id="pmenu-{{$id}}" class="pmenu{{if !$class}} widget{{else}} {{$class}}{{/if}}">
{{if $menu.menu_desc}} {{if $menu.menu_desc}}
<h3 class="pmenu-title">{{$menu.menu_desc}}</h3> <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}}
{{if $edit}} {{if $items }}
<a href="mitem/{{$menu.menu_id}}" title="{{$edit}}"><i class="icon-pencil fakelink" title="{{$edit}}"></i></a> <ul class="pmenu-body{{if !$class}} nav nav-pills nav-stacked{{/if}}">
{{/if}} {{foreach $items as $mitem }}
{{if $items }} <li class="pmenu-item"><a href="{{$mitem.mitem_link}}" {{if $mitem.newwin}}target="_blank"{{/if}}>{{$mitem.mitem_desc}}</a></li>
<ul class="pmenu-body"> {{/foreach }}
{{foreach $items as $mitem }} </ul>
<li class="pmenu-item"><a href="{{$mitem.mitem_link}}" {{if $mitem.newwin}}target="_blank"{{/if}}>{{$mitem.mitem_desc}}</a></li> {{/if}}
{{/foreach }} <div class="pmenu-end"></div>
</ul>
{{/if}}
<div class="pmenu-end"></div>
</div> </div>