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

edit bookmarks

Browse Source
This commit is contained in:
friendica 2014-02-18 14:26:23 -08:00
parent 0b4aa5a39c
commit 9a51f8ce65
7 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/menu.php
View File

@ -38,7 +38,7 @@ function menu_render($menu, $edit = false) {
return replace_macros(get_markup_template('usermenu.tpl'),array( return replace_macros(get_markup_template('usermenu.tpl'),array(
'$menu' => $menu['menu'], '$menu' => $menu['menu'],
'$edit' => $edit, '$edit' => (($edit) ? t("Edit") : ''),
'$items' => $menu['items'] '$items' => $menu['items']
)); ));
} }

4
mod/bookmarks.php
View File

@ -57,7 +57,7 @@ function bookmarks_content(&$a) {
if($x) { if($x) {
foreach($x as $xx) { foreach($x as $xx) {
$y = menu_fetch($xx['menu_name'],local_user(),get_observer_hash()); $y = menu_fetch($xx['menu_name'],local_user(),get_observer_hash());
$o .= menu_render($y); $o .= menu_render($y,true);
} }
} }
@ -69,7 +69,7 @@ function bookmarks_content(&$a) {
if($x) { if($x) {
foreach($x as $xx) { foreach($x as $xx) {
$y = menu_fetch($xx['menu_name'],local_user(),get_observer_hash()); $y = menu_fetch($xx['menu_name'],local_user(),get_observer_hash());
$o .= menu_render($y); $o .= menu_render($y,true);
} }
} }

2
mod/openid.php
View File

@ -6,7 +6,7 @@ require_once('include/auth.php');
function openid_content(&$a) { function openid_content(&$a) {
$noid = get_config('system','no_openid'); $noid = get_config('system','disable_openid');
if($noid) if($noid)
goaway(z_root()); goaway(z_root());

2
version.inc
View File

@ -1 +1 @@
2014-02-17.591 2014-02-18.592

7
view/css/mod_mitem.css Normal file
View File

@ -0,0 +1,7 @@
.menu-item-list {
list-style-type: none;
}
.mitem-edit {
margin-right: 15px;
}

5
view/tpl/mitemlist.tpl
View File

@ -4,12 +4,13 @@
<a href="menu/{{$menu_id}}" title="{{$hintmenu}}">{{$edmenu}}</a><br /> <a href="menu/{{$menu_id}}" title="{{$hintmenu}}">{{$edmenu}}</a><br />
<a href="mitem/{{$menu_id}}/new" title="{{$hintnew}}">{{$hintnew}}</a> <a href="mitem/{{$menu_id}}/new" title="{{$hintnew}}">{{$hintnew}}</a>
<br />
<br /> <br />
{{if $mlist }} {{if $mlist }}
<ul id="mitemlist"> <ul id="mitemlist" class="menu-item-list">
{{foreach $mlist as $m }} {{foreach $mlist as $m }}
<li><a href="mitem/{{$menu_id}}/{{$m.mitem_id}}" title="{{$hintedit}}">{{$edit}}</a> | <a href="mitem/{{$menu_id}}/{{$m.mitem_id}}/drop" title={{$hintdrop}}>{{$drop}}</a>&nbsp;&nbsp;&nbsp;&nbsp;<a href="mitem/{{$menu_id}}/{{$m.mitem_id}}" title="{{$hintcontent}}">{{$m.mitem_desc}}</a> ({{$m.mitem_link}})</li> <li><a href="mitem/{{$menu_id}}/{{$m.mitem_id}}" title="{{$hintedit}}"><i class="icon-pencil mitem-edit"></i></a><a href="mitem/{{$menu_id}}/{{$m.mitem_id}}/drop" title={{$hintdrop}}><i class="icon-remove"></i></a>&nbsp;&nbsp;&nbsp;&nbsp;<a href="mitem/{{$menu_id}}/{{$m.mitem_id}}" title="{{$hintcontent}}">{{$m.mitem_desc}}</a> ({{$m.mitem_link}})</li>
{{/foreach}} {{/foreach}}
</ul> </ul>
{{/if}} {{/if}}

3
view/tpl/usermenu.tpl
View File

@ -2,6 +2,9 @@
{{if $menu.menu_desc}} {{if $menu.menu_desc}}
<h3 class="pmenu-title">{{$menu.menu_desc}}</h3> <h3 class="pmenu-title">{{$menu.menu_desc}}</h3>
{{/if}} {{/if}}
{{if $edit}}
<a href="mitem/{{$menu.menu_id}}" title="{{$edit}}"><i class="icon-pencil fakelink" title="{{$edit}}"></i></a>
{{/if}}
{{if $items }} {{if $items }}
<ul class="pmenu-body"> <ul class="pmenu-body">
{{foreach $items as $mitem }} {{foreach $items as $mitem }}