merge the app menus

2 files changed, 4 insertions, 5 deletions

diff --git a/view/tpl/app.tpl b/view/tpl/app.tpl
index 09894c3d8..4719f7f96 100644
--- a/view/tpl/app.tpl
+++ b/view/tpl/app.tpl
@@ -1,7 +1,8 @@
 <div class="app-container">
-<a href="{{if $app.alt_url}}{{$app.alt_url}}{{else}}{{$app.url}}{{/if}}" {{if $app.desc}}title="{{$app.desc}}{{if $app.price}} ({{$app.price}}){{/if}}"{{/if}}><img src="{{$app.photo}}" width="80" height="80" />
+<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}}><img src="{{$app.photo}}" width="80" height="80" />
 <div class="app-name">{{$app.name}}</div>
 </a>
+{{if $app.type !== 'system'}}
 {{if $purchase}}
 <a href="{{$app.page}}" class="btn btn-default" title="{{$purchase}}" ><i class="icon-external"></i></a>
 {{/if}}
@@ -13,5 +14,6 @@
 {{if $delete}}<button type="submit" name="delete" value="{{$delete}}" class="btn btn-default" title="{{$delete}}" ><i class="icon-remove drop-icons"></i></button>{{/if}}
 </form>
 {{/if}}
+{{/if}}
 </div>
 
diff --git a/view/tpl/app_select.tpl b/view/tpl/app_select.tpl
index 05f527371..5cf3f40d6 100644
--- a/view/tpl/app_select.tpl
+++ b/view/tpl/app_select.tpl
@@ -2,11 +2,8 @@
 <div class="widget">
 <h3>{{$title}}</h3>
 <ul>
-<li><a href="apps">{{$system}}</a></li>
-<li><a href="apps/personal">{{$personal}}</a></li>
-<br />
 <li><a href="appman">{{$new}}</a></li>
-<li><a href="apps/personal/edit">{{$edit}}</a></li>
+<li><a href="apps/edit">{{$edit}}</a></li>
 </ul>
 </div>
 {{/if}}