diff options
| -rw-r--r-- | app/firefoxshare.apd | 4 | ||||
| -rw-r--r-- | app/login.apd | 3 | ||||
| -rw-r--r-- | app/pphoto.apd | 4 | ||||
| -rw-r--r-- | app/profile.apd | 4 | ||||
| -rw-r--r-- | view/theme/redbasic/css/style.css | 5 | ||||
| -rw-r--r-- | view/tpl/app.tpl | 7 | ||||
| -rw-r--r-- | view/tpl/navapps.tpl | 4 |
7 files changed, 13 insertions, 18 deletions
diff --git a/app/firefoxshare.apd b/app/firefoxshare.apd deleted file mode 100644 index 5e0f38b4e..000000000 --- a/app/firefoxshare.apd +++ /dev/null @@ -1,4 +0,0 @@ -url: $baseurl/ffsapi -requires: local_channel -name: Firefox Share -photo: $baseurl/app/firefoxshare.png diff --git a/app/login.apd b/app/login.apd index e4cccbc7e..1cbb44f1b 100644 --- a/app/login.apd +++ b/app/login.apd @@ -1,4 +1,5 @@ +version: 1 url: $baseurl/login requires: nologin name: Login -photo: $baseurl/app/login.png +photo: icon:sign-in diff --git a/app/pphoto.apd b/app/pphoto.apd deleted file mode 100644 index 302b85d9e..000000000 --- a/app/pphoto.apd +++ /dev/null @@ -1,4 +0,0 @@ -url: $baseurl/profile_photo -requires: local_channel -name: Profile Photo -photo: $baseurl/app/pphoto.png diff --git a/app/profile.apd b/app/profile.apd deleted file mode 100644 index 48e5d5814..000000000 --- a/app/profile.apd +++ /dev/null @@ -1,4 +0,0 @@ -url: $baseurl/profile/$nick -requires: local_channel -name: View Profile -photo: $baseurl/app/profile.png diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 6a5b59ffd..db7e50fe7 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; } +.generic-icons-nav { + font-size: 1.2em; + margin-right: 7px; +} + nav .navbar-collapse.in .generic-icons, nav .navbar-collapse.collapsing .generic-icons { color: $nav_active_icon_colour; diff --git a/view/tpl/app.tpl b/view/tpl/app.tpl index a389695ee..d4b4c19e8 100644 --- a/view/tpl/app.tpl +++ b/view/tpl/app.tpl @@ -1,6 +1,6 @@ <div class="app-container"> <div class="app-detail{{if $deleted}} app-deleted{{/if}}"> - <a href="{{$app.url}}" {{if $ap.target}}target="{{$ap.target}}" {{/if}}{{if $app.desc}}title="{{$app.desc}}{{if $app.price}} ({{$app.price}}){{/if}}"{{else}}title="{{$app.name}}"{{/if}}>{{if $app.icon}}<i class="app-icon fa fa-fw fa-{{$app.icon}}"></i>{{else}}<img src="{{$app.photo}}" width="80" height="80" />{{/if}} + <a href="{{$app.url}}" {{if $ap.target}}target="{{$app.target}}" {{/if}}{{if $app.desc}}title="{{$app.desc}}{{if $app.price}} ({{$app.price}}){{/if}}"{{else}}title="{{$app.name}}"{{/if}}>{{if $app.icon}}<i class="app-icon fa fa-fw fa-{{$app.icon}}"></i>{{else}}<img src="{{$app.photo}}" width="80" height="80" />{{/if}} <div class="app-name" style="text-align:center;">{{$app.name}}</div> </a> </div> @@ -10,17 +10,18 @@ <a href="{{$app.page}}" class="btn btn-default" title="{{$purchase}}" ><i class="fa fa-external"></i></a> </div> {{/if}} - {{if $install || $update || $delete }} + <div class="app-tools"> <form action="{{$hosturl}}appman" method="post"> <input type="hidden" name="papp" value="{{$app.papp}}" /> + {{if $install || $update || $delete }} {{if $install}}<button type="submit" name="install" value="{{$install}}" class="btn btn-default btn-xs" title="{{$install}}" ><i class="fa fa-arrow-circle-o-down" ></i></button>{{/if}} {{if $edit}}<input type="hidden" name="appid" value="{{$app.guid}}" /><button type="submit" name="edit" value="{{$edit}}" class="btn btn-default btn-xs" title="{{$edit}}" ><i class="fa fa-pencil" ></i></button>{{/if}} {{if $delete}}<button type="submit" name="delete" value="{{if $deleted}}{{$undelete}}{{else}}{{$delete}}{{/if}}" class="btn btn-default btn-xs" title="{{if $deleted}}{{$undelete}}{{else}}{{$delete}}{{/if}}" ><i class="fa fa-trash-o drop-icons"></i></button>{{/if}} + {{/if}} <button type="submit" name="feature" value="feature" class="btn btn-default btn-xs" ><i class="fa fa-star"{{if $featured}} style="color: gold"{{/if}}></i></button> </form> </div> {{/if}} - {{/if}} </div> diff --git a/view/tpl/navapps.tpl b/view/tpl/navapps.tpl index 310ab5f42..735c322e5 100644 --- a/view/tpl/navapps.tpl +++ b/view/tpl/navapps.tpl @@ -1,8 +1,8 @@ {{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> +<li><a href="{{$app.url}}">{{if $app.icon}}<i class="generic-icons-nav 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> +<li><a href="/apps"><i class="generic-icons-nav fa fa-fw fa-plus-circle"></i>Add Apps</a></li> {{/if}} |