diff options
| author | zotlabs <mike@macgirvin.com> | 2017-10-11 15:14:18 -0700 |
|---|---|---|
| committer | zotlabs <mike@macgirvin.com> | 2017-10-11 15:14:18 -0700 |
| commit | ee307729fcbccebe468c5a994fcc65c5777beeab (patch) | |
| tree | 9047b2a00f587dc6a401dfd6750d72ab7a332a12 /view/tpl | |
| parent | 491856fa79cad2fd2b352af46fd45146b42e7e54 (diff) | |
| parent | 56a675f713f3e971b1c9ccb60ab818f583dfc29e (diff) | |
| download | volse-hubzilla-ee307729fcbccebe468c5a994fcc65c5777beeab.tar.gz volse-hubzilla-ee307729fcbccebe468c5a994fcc65c5777beeab.tar.bz2 volse-hubzilla-ee307729fcbccebe468c5a994fcc65c5777beeab.zip | |
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge
Diffstat (limited to 'view/tpl')
| -rw-r--r-- | view/tpl/app_nav.tpl | 2 | ||||
| -rwxr-xr-x | view/tpl/main_slider.tpl | 8 | ||||
| -rwxr-xr-x | view/tpl/navbar_default.tpl | 9 | ||||
| -rw-r--r-- | view/tpl/notifications_widget.tpl | 12 |
4 files changed, 24 insertions, 7 deletions
diff --git a/view/tpl/app_nav.tpl b/view/tpl/app_nav.tpl index 1ee5adb70..046cd7237 100644 --- a/view/tpl/app_nav.tpl +++ b/view/tpl/app_nav.tpl @@ -1 +1 @@ -<a class="navbar-app nav-link{{if $app.active}} active{{/if}}" href="{{$app.url}}" title="{{$app.name}}" >{{if $icon}}<i class="generic-icons-nav fa fa-fw fa-{{$icon}}"></i>{{else}}<img src="{{$app.photo}}" width="16" height="16" />{{/if}}</a> +<a class="navbar-app nav-link{{if $app.active}} active{{/if}}" href="{{$app.url}}" title="{{$app.name}}" >{{if $icon}}<i class="fa fa-fw fa-{{$icon}}"></i>{{else}}<img src="{{$app.photo}}" width="16" height="16" />{{/if}}</a> diff --git a/view/tpl/main_slider.tpl b/view/tpl/main_slider.tpl index 4cc265f59..f5c573970 100755 --- a/view/tpl/main_slider.tpl +++ b/view/tpl/main_slider.tpl @@ -1,5 +1,9 @@ -<div id="main-slider" class="slider" ><input id="main-range" type="text" name="cminmax" value="{{$val}}" /></div> -<div id="profile-jot-text-loading" class="spinner-wrapper"><div class="spinner m"></div></div> +<div id="main-slider" class="slider" > + <input id="main-range" type="text" name="cminmax" value="{{$val}}" /> + <div id="profile-jot-text-loading" class="spinner-wrapper"> + <div class="spinner m"></div> + </div> +</div> <script> $(document).ready(function() { var old_cmin = 0; diff --git a/view/tpl/navbar_default.tpl b/view/tpl/navbar_default.tpl index b6faad0c2..cf7235b14 100755 --- a/view/tpl/navbar_default.tpl +++ b/view/tpl/navbar_default.tpl @@ -67,7 +67,7 @@ <i class="fa fa-arrow-circle-right" id="expand-aside-icon"></i> </button> {{if $localuser || $nav.pubs}} - <button id="notifications-btn-1" type="button" class="navbar-toggler border-0 text-white"> + <button id="notifications-btn" type="button" class="navbar-toggler border-0 text-white"> <i class="fa fa-exclamation-circle"></i> </button> {{/if}} @@ -107,6 +107,13 @@ </div> </li> {{/if}} + {{if $navbar_apps}} + {{foreach $navbar_apps as $navbar_app}} + <li> + {{$navbar_app}} + </li> + {{/foreach}} + {{/if}} <li class="nav-item dropdown" id="app-menu"> <a class="nav-link" href="#" data-toggle="dropdown"><i class="fa fa-fw fa-bars"></i></a> <div id="dropdown-menu" class="dropdown-menu dropdown-menu-right"> diff --git a/view/tpl/notifications_widget.tpl b/view/tpl/notifications_widget.tpl index 73cf24071..6865879ad 100644 --- a/view/tpl/notifications_widget.tpl +++ b/view/tpl/notifications_widget.tpl @@ -17,7 +17,7 @@ width: 100%; max-width: 100%; height: 100%; - z-index: 1025; + z-index: 1029; overflow: auto; } @@ -26,6 +26,7 @@ } </style> +{{if $notifications}} <div id="notifications_wrapper"> <div id="notifications" class="navbar-nav" data-children=".nav-item"> <div id="nav-notifications-template" rel="template"> @@ -43,10 +44,14 @@ </a> <div id="nav-{{$notification.type}}-menu" class="collapse notification-content" rel="{{$notification.type}}"> {{if $notification.viewall}} - <a class="list-group-item" id="nav-{{$notification.type}}-see-all" href="{{$notification.viewall.url}}">{{$notification.viewall.label}}</a> + <a class="list-group-item text-dark" id="nav-{{$notification.type}}-see-all" href="{{$notification.viewall.url}}"> + <i class="fa fa-fw fa-external-link"></i> {{$notification.viewall.label}} + </a> {{/if}} {{if $notification.markall}} - <a class="list-group-item" id="nav-{{$notification.type}}-mark-all" href="{{$notification.markall.url}}" onclick="markRead('{{$notification.type}}'); return false;">{{$notification.markall.label}}</a> + <a class="list-group-item text-dark" id="nav-{{$notification.type}}-mark-all" href="{{$notification.markall.url}}" onclick="markRead('{{$notification.type}}'); return false;"> + <i class="fa fa-fw fa-check"></i> {{$notification.markall.label}} + </a> {{/if}} {{$loading}} </div> @@ -54,3 +59,4 @@ {{/foreach}} </div> </div> +{{/if}} |