diff options
Diffstat (limited to 'view')
| -rw-r--r-- | view/css/mod_manage.css | 12 | ||||
| -rw-r--r-- | view/theme/redbasic/css/style.css | 5 | ||||
| -rw-r--r-- | view/theme/redbasic/js/redbasic.js | 2 | ||||
| -rwxr-xr-x | view/tpl/channel.tpl | 6 | ||||
| -rwxr-xr-x | view/tpl/mail_list.tpl | 2 | ||||
| -rwxr-xr-x | view/tpl/nav.tpl | 15 |
6 files changed, 17 insertions, 25 deletions
diff --git a/view/css/mod_manage.css b/view/css/mod_manage.css index 077b6b838..b08c90b62 100644 --- a/view/css/mod_manage.css +++ b/view/css/mod_manage.css @@ -4,10 +4,6 @@ text-decoration: none; } -.new-notification { - color: #c60032; -} - .channel-photo-wrapper { display: table-cell; table-layout: fixed; @@ -24,11 +20,3 @@ vertical-align: top; padding-left: 10px; } - -.selected-channel { - color: green; -} - -#all-channels-end { - margin-bottom: 20px; -} diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 7f2ca4853..2c881049e 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -1380,6 +1380,11 @@ blockquote { background-color: $item_colour; } +.dropdown-item.active { + color: #fff; + background-color: #007bff; +} + .bg-dark { background-color: $nav_bg !important; } diff --git a/view/theme/redbasic/js/redbasic.js b/view/theme/redbasic/js/redbasic.js index 14b977b80..a4fee495c 100644 --- a/view/theme/redbasic/js/redbasic.js +++ b/view/theme/redbasic/js/redbasic.js @@ -55,7 +55,7 @@ $(document).ready(function() { }); $("input[data-role=cat-tagsinput]").tagsinput({ - tagClass: 'badge badge-pill badge-warning' + tagClass: 'badge badge-pill badge-warning text-dark' }); var doctitle = document.title; diff --git a/view/tpl/channel.tpl b/view/tpl/channel.tpl index 1a84f1e66..63e09ec05 100755 --- a/view/tpl/channel.tpl +++ b/view/tpl/channel.tpl @@ -17,7 +17,7 @@ </div> <h3> {{if $selected == $channel.channel_id}} - <i class="selected-channel fa fa-circle" title="{{$msg_selected}}"></i> + <i class="fa fa-circle text-success" title="{{$msg_selected}}"></i> {{/if}} {{if $channel.delegate}} <i class="fa fa-arrow-circle-right" title="{{$delegated_desc}}"></i> @@ -37,11 +37,11 @@ <div class="channel-notifications-wrapper"> {{if !$channel.delegate}} <div class="channel-notification"> - <i class="fa fa-envelope{{if $channel.mail != 0}} new-notification{{/if}}"></i> + <i class="fa fa-fw fa-envelope{{if $channel.mail != 0}} text-danger{{/if}}"></i> {{if $channel.mail != 0}}<a href="manage/{{$channel.channel_id}}/mail/combined">{{/if}}{{$channel.mail|string_format:$mail_format}}{{if $channel.mail != 0}}</a>{{/if}} </div> <div class="channel-notification"> - <i class="fa fa-user{{if $channel.intros != 0}} new-notification{{/if}}"></i> + <i class="fa fa-fw fa-user{{if $channel.intros != 0}} text-danger{{/if}}"></i> {{if $channel.intros != 0}}<a href='manage/{{$channel.channel_id}}/connections/ifpending'>{{/if}}{{$channel.intros|string_format:$intros_format}}{{if $channel.intros != 0}}</a>{{/if}} </div> {{/if}} diff --git a/view/tpl/mail_list.tpl b/view/tpl/mail_list.tpl index 827c7628f..65d8dcdb4 100755 --- a/view/tpl/mail_list.tpl +++ b/view/tpl/mail_list.tpl @@ -1,6 +1,6 @@ <li class="nav-item"> <a href="mail/{{$message.mailbox}}/{{$message.id}}" class="nav-link{{if $message.selected}} active{{/if}}"> - <span class="{{if $message.seen}}seen{{else}}unseen{{/if}}">{{$message.subject}}</span><br> + <span class="{{if ! $message.seen || $message.selected}}font-weight-bold{{/if}}">{{$message.subject}}</span><br> <span class="conv-participants">{{$message.from_name}} > {{$message.to_name}}</span><br> <span class="wall-item-ago autotime" title="{{$message.date}}">{{$message.date}}</span> </a> diff --git a/view/tpl/nav.tpl b/view/tpl/nav.tpl index 93bbe187f..c0b34bbe8 100755 --- a/view/tpl/nav.tpl +++ b/view/tpl/nav.tpl @@ -1,5 +1,5 @@ {{if $nav.login && !$userinfo}} -<div class="d-md-none p-1"> +<div class="d-md-none pt-1 pb-1"> <a class="btn btn-primary btn-sm text-white" href="#" title="{{$nav.loginmenu.1.3}}" id="{{$nav.loginmenu.1.4}}_collapse" data-toggle="modal" data-target="#nav-login"> {{$nav.loginmenu.1.1}} </a> @@ -16,7 +16,7 @@ <img id="avatar" src="{{$userinfo.icon}}" alt="{{$userinfo.name}}"> <i class="fa fa-caret-down"></i> </div> - {{if $localuser}} + {{if $is_owner}} <div class="dropdown-menu"> {{foreach $nav.usermenu as $usermenu}} <a class="dropdown-item{{if $usermenu.2}} active{{/if}}" href="{{$usermenu.0}}" title="{{$usermenu.3}}" role="menuitem" id="{{$usermenu.4}}">{{$usermenu.1}}</a> @@ -26,7 +26,7 @@ {{/if}} {{if $nav.channels}} {{foreach $nav.channels as $chan}} - <a class="dropdown-item" href="manage/{{$chan.channel_id}}" title="{{$chan.channel_name}}" role="menuitem">{{$chan.channel_name}}</a> + <a class="dropdown-item" href="manage/{{$chan.channel_id}}" title="{{$chan.channel_name}}" role="menuitem"><i class="fa fa-circle{{if $localuser == $chan.channel_id}} text-success{{else}} invisible{{/if}}"></i> {{$chan.channel_name}}</a> {{/foreach}} {{/if}} {{if $nav.profiles}} @@ -45,14 +45,13 @@ <a class="dropdown-item" href="{{$nav.logout.0}}" title="{{$nav.logout.3}}" role="menuitem" id="{{$nav.logout.4}}">{{$nav.logout.1}}</a> {{/if}} </div> - {{else}} - {{if $nav.rusermenu}} + {{/if}} + {{if ! $is_owner}} <div class="dropdown-menu" role="menu" aria-labelledby="avatar"> <a class="dropdown-item" href="{{$nav.rusermenu.0}}" role="menuitem">{{$nav.rusermenu.1}}</a> <a class="dropdown-item" href="{{$nav.rusermenu.2}}" role="menuitem">{{$nav.rusermenu.3}}</a> </div> {{/if}} - {{/if}} </div> {{/if}} <div class="navbar-toggler-right"> @@ -204,7 +203,7 @@ {{if $channel_apps.0}} </div> {{/if}} - {{if $localuser}} + {{if $is_owner}} <div class="dropdown-divider"></div> <a class="dropdown-item" href="/apps"><i class="generic-icons-nav fa fa-fw fa-plus-circle"></i>{{$addapps}}</a> <a class="dropdown-item" href="/apporder"><i class="generic-icons-nav fa fa-fw fa-sort"></i>{{$orderapps}}</a> @@ -230,7 +229,7 @@ {{if $channel_apps.0}} </div> {{/if}} - {{if $localuser}} + {{if $is_owner}} <div class="dropdown-divider"></div> <a class="nav-link" href="/apps"><i class="generic-icons-nav fa fa-fw fa-plus-circle"></i>{{$addapps}}</a> <a class="nav-link" href="/apporder"><i class="generic-icons-nav fa fa-fw fa-sort"></i>{{$orderapps}}</a> |