diff options
| -rw-r--r-- | app/channel.apd | 4 | ||||
| -rw-r--r-- | app/connections.apd | 4 | ||||
| -rw-r--r-- | app/directory.apd | 4 | ||||
| -rw-r--r-- | app/events.apd | 4 | ||||
| -rw-r--r-- | app/grid.apd | 4 | ||||
| -rw-r--r-- | app/help.apd | 4 | ||||
| -rw-r--r-- | app/mail.apd | 6 | ||||
| -rw-r--r-- | app/photos.apd | 4 | ||||
| -rw-r--r-- | app/storage.apd | 4 | ||||
| -rw-r--r-- | app/wiki.apd | 4 | ||||
| -rw-r--r-- | view/theme/redbasic/css/style.css | 7 | ||||
| -rw-r--r-- | view/tpl/navapps.tpl | 15 |
12 files changed, 45 insertions, 19 deletions
diff --git a/app/channel.apd b/app/channel.apd index 0b5400ae4..a13f9fd8b 100644 --- a/app/channel.apd +++ b/app/channel.apd @@ -1,4 +1,6 @@ +version: 1 url: $baseurl/channel/$nick requires: local_channel name: Channel Home -photo: $baseurl/app/home.png +photo: icon:home +categories: nav_featured_app, Conversation, Personal diff --git a/app/connections.apd b/app/connections.apd index f4b5ad87a..63bc1ef1f 100644 --- a/app/connections.apd +++ b/app/connections.apd @@ -1,4 +1,6 @@ +version: 1 url: $baseurl/connections requires: local_channel name: Connections -photo: $baseurl/app/connections.png +photo: icon:users +categories: nav_featured_app, Social diff --git a/app/directory.apd b/app/directory.apd index c4a6f12d9..a4efa1831 100644 --- a/app/directory.apd +++ b/app/directory.apd @@ -1,3 +1,5 @@ +version: 1 url: $baseurl/directory name: Directory -photo: $baseurl/app/directory.png +photo: icon:sitemap +categories: nav_featured_app, Social diff --git a/app/events.apd b/app/events.apd index dd725e177..dc3257d77 100644 --- a/app/events.apd +++ b/app/events.apd @@ -1,4 +1,6 @@ +version: 1 url: $baseurl/events requires: local_channel name: Events -photo: $baseurl/app/events.png +photo: icon:calendar +categories: nav_featured_app, Productivity diff --git a/app/grid.apd b/app/grid.apd index bc77aa6f1..e152c33d0 100644 --- a/app/grid.apd +++ b/app/grid.apd @@ -1,4 +1,6 @@ +version: 1 url: $baseurl/network requires: local_channel name: Grid -photo: $baseurl/images/hubzilla_logo_6.png +photo: icon:th +categories: nav_featured_app, Conversation, Social diff --git a/app/help.apd b/app/help.apd index ca7208e6a..8c7d2ea83 100644 --- a/app/help.apd +++ b/app/help.apd @@ -1,3 +1,5 @@ +version: 1 url: $baseurl/help name: Help -photo: $baseurl/app/help.png +photo: icon:question +categories: nav_featured_app diff --git a/app/mail.apd b/app/mail.apd index b9fdb9967..cc427500e 100644 --- a/app/mail.apd +++ b/app/mail.apd @@ -1,4 +1,6 @@ -url: $baseurl/message +version: 1 +url: $baseurl/mail/combined requires: local_channel name: Mail -photo: $baseurl/app/mail.png +photo: icon:envelope +categories: nav_featured_app, Conversation diff --git a/app/photos.apd b/app/photos.apd index 3422d5205..7a7a4b7b6 100644 --- a/app/photos.apd +++ b/app/photos.apd @@ -1,4 +1,6 @@ +version: 1 url: $baseurl/photos/$nick requires: local_channel name: Photos -photo: $baseurl/app/photos.png +photo: icon:photo +categories: Multimedia diff --git a/app/storage.apd b/app/storage.apd index c959a3cd4..7dcbcc089 100644 --- a/app/storage.apd +++ b/app/storage.apd @@ -1,4 +1,6 @@ +version: 1 url: $baseurl/cloud/$nick requires: local_channel name: Files -photo: $baseurl/app/storage.png +photo: icon:folder-open +categories: Productivity diff --git a/app/wiki.apd b/app/wiki.apd index 95245055c..94a3e6741 100644 --- a/app/wiki.apd +++ b/app/wiki.apd @@ -1,4 +1,6 @@ +version: 1 url: $baseurl/wiki/$nick requires: local_channel name: Wiki -photo: $baseurl/app/wiki.png +photo: icon:pencil-square-o +categories: Productivity diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index a3eaf67ae..6a5b59ffd 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -1188,6 +1188,11 @@ margin-right: 50px; color: $toolicon_colour; } +nav .navbar-collapse.in .generic-icons, +nav .navbar-collapse.collapsing .generic-icons { + color: $nav_active_icon_colour; +} + .admin-icons { font-size: 1.2em; color: $toolicon_colour; @@ -2092,6 +2097,8 @@ dl.bb-dl > dd > li { .app-icon { font-size: 80px; + color: $toolicon_colour; + text-shadow: 3px 3px 3px lightgrey; text-align: center; } diff --git a/view/tpl/navapps.tpl b/view/tpl/navapps.tpl index 07110706c..310ab5f42 100644 --- a/view/tpl/navapps.tpl +++ b/view/tpl/navapps.tpl @@ -1,9 +1,8 @@ - - {{foreach $apps as $app}} - <li><a href="{{$app.url}}">{{if $app.icon}}<i class="fa fa-{{$app.icon}}"></i>{{else}}<img src="{{$app.photo}}" width="16" height="16" />{{/if}} {{$app.name}}</a></li> - {{/foreach}} - {{if $localuser}} - <li class="divider"></li> - <li><a href="/apps/edit"><i class="generic-icons fa fa-plus-circle"></i>Add Apps</a></li> - {{/if}} +{{foreach $apps as $app}} +<li><a href="{{$app.url}}">{{if $app.icon}}<i class="generic-icons fa fa-fw fa-{{$app.icon}}"></i>{{else}}<img src="{{$app.photo}}" width="16" height="16" style="margin-right:9px;"/>{{/if}}{{$app.name}}</a></li> +{{/foreach}} +{{if $localuser}} +<li class="divider"></li> +<li><a href="/apps/edit"><i class="generic-icons fa fa-fw fa-plus-circle"></i>Add Apps</a></li> +{{/if}} |