diff options
| author | friendica <redmatrix@redmatrix.me> | 2015-04-19 13:41:38 -0700 |
|---|---|---|
| committer | friendica <redmatrix@redmatrix.me> | 2015-04-19 13:41:38 -0700 |
| commit | 82f2765f7bbc990c7106b3d1b3185c8bf04112fb (patch) | |
| tree | e94602dd0874209a188d8befec108ef05798de4b /view | |
| parent | 01efda6850db9347351f290da6026d6cbc0abe49 (diff) | |
| parent | 71117628bc0cba92b75caea46379b45c64c2cf43 (diff) | |
| download | volse-hubzilla-82f2765f7bbc990c7106b3d1b3185c8bf04112fb.tar.gz volse-hubzilla-82f2765f7bbc990c7106b3d1b3185c8bf04112fb.tar.bz2 volse-hubzilla-82f2765f7bbc990c7106b3d1b3185c8bf04112fb.zip | |
Merge https://github.com/redmatrix/redmatrix into pending_merge
Diffstat (limited to 'view')
| -rw-r--r-- | view/css/widgets.css | 1 | ||||
| -rwxr-xr-x | view/tpl/page_display.tpl | 2 | ||||
| -rw-r--r-- | view/tpl/usermenu.tpl | 27 |
3 files changed, 13 insertions, 17 deletions
diff --git a/view/css/widgets.css b/view/css/widgets.css index 8f31a3603..566dd2b8a 100644 --- a/view/css/widgets.css +++ b/view/css/widgets.css @@ -7,7 +7,6 @@ margin-top: 0px; } - .widget .nav-pills > li > a { padding: 6px 10px; } diff --git a/view/tpl/page_display.tpl b/view/tpl/page_display.tpl index e6a59a8c4..5328648b9 100755 --- a/view/tpl/page_display.tpl +++ b/view/tpl/page_display.tpl @@ -2,7 +2,7 @@ <div class="generic-content-wrapper" id="page-content-wrapper" > {{if $title}}<h2 class="page-title">{{$title}}</h2>{{/if}} - <div class="page-author"><a class=="page-author-link" href="{{$auth_url}}">{{$author}}</a></div> + <div class="page-author"><a class="page-author-link" href="{{$auth_url}}">{{$author}}</a></div> <div class="page-date">{{$date}}</div> <div class="page-body">{{$body}}</div> </div> diff --git a/view/tpl/usermenu.tpl b/view/tpl/usermenu.tpl index a5c6faa99..b05f785a8 100644 --- a/view/tpl/usermenu.tpl +++ b/view/tpl/usermenu.tpl @@ -1,16 +1,13 @@ -<div class="pmenu{{if $class}} {{$class}}{{/if}}"> -{{if $menu.menu_desc}} - <h3 class="pmenu-title">{{$menu.menu_desc}}</h3> -{{/if}} -{{if $edit}} -<a href="mitem/{{$menu.menu_id}}" title="{{$edit}}"><i class="icon-pencil fakelink" title="{{$edit}}"></i></a> -{{/if}} -{{if $items }} -<ul class="pmenu-body"> -{{foreach $items as $mitem }} -<li class="pmenu-item"><a href="{{$mitem.mitem_link}}" {{if $mitem.newwin}}target="_blank"{{/if}}>{{$mitem.mitem_desc}}</a></li> -{{/foreach }} -</ul> -{{/if}} -<div class="pmenu-end"></div> +<div id="pmenu-{{$id}}" class="pmenu{{if !$class}} widget{{else}} {{$class}}{{/if}}"> + {{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 !$class}} nav nav-pills nav-stacked{{/if}}"> + {{foreach $items as $mitem }} + <li class="pmenu-item"><a href="{{$mitem.mitem_link}}" {{if $mitem.newwin}}target="_blank"{{/if}}>{{$mitem.mitem_desc}}</a></li> + {{/foreach }} + </ul> + {{/if}} + <div class="pmenu-end"></div> </div> |