diff options
| author | Habeas Codice <habeascodice@federated.social> | 2014-11-13 13:06:31 -0800 |
|---|---|---|
| committer | Habeas Codice <habeascodice@federated.social> | 2014-11-13 13:06:31 -0800 |
| commit | ac27db22c18ee7a82a52cbadb3efe2760b910499 (patch) | |
| tree | aa7002d73dbcd4136033589f1cb135184f4126c1 /view/tpl/menulist.tpl | |
| parent | 1a5a5c7edb8697c93f8bababbafa80245378dd7e (diff) | |
| parent | 109cb936632c693d3f24afb9e2ce533797ad1a7f (diff) | |
| download | volse-hubzilla-ac27db22c18ee7a82a52cbadb3efe2760b910499.tar.gz volse-hubzilla-ac27db22c18ee7a82a52cbadb3efe2760b910499.tar.bz2 volse-hubzilla-ac27db22c18ee7a82a52cbadb3efe2760b910499.zip | |
Merge remote-tracking branch 'upstream/master'
Conflicts:
boot.php
include/dba/dba_driver.php
include/diaspora.php
include/follow.php
include/session.php
include/zot.php
mod/photos.php
mod/ping.php
Diffstat (limited to 'view/tpl/menulist.tpl')
| -rw-r--r-- | view/tpl/menulist.tpl | 2 |
1 files changed, 1 insertions, 1 deletions
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> <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> {{if $m.bookmark}}<i class="icon-bookmark" title="{{$bmark}}" ></i> {{/if}}<a href="mitem/{{$m.menu_id}}/new" title="{{$hintcontent}}">{{$m.menu_name}}</a></li> {{/foreach}} </ul> {{/if}} |