diff options
| author | friendica <info@friendica.com> | 2014-06-10 21:21:50 -0700 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2014-06-10 21:21:50 -0700 |
| commit | 13ba9ef0037656b1e12d627f767fc2fc8781632a (patch) | |
| tree | d447808b595ca2ae26e24ea7ec0646c2a625e000 /view | |
| parent | e41375c8892b547c4bb01cb07fc5b771a756fd6e (diff) | |
| download | volse-hubzilla-13ba9ef0037656b1e12d627f767fc2fc8781632a.tar.gz volse-hubzilla-13ba9ef0037656b1e12d627f767fc2fc8781632a.tar.bz2 volse-hubzilla-13ba9ef0037656b1e12d627f767fc2fc8781632a.zip | |
merge the app menus
Diffstat (limited to 'view')
| -rw-r--r-- | view/css/mod_apps.css | 1 | ||||
| -rw-r--r-- | view/tpl/app.tpl | 4 | ||||
| -rw-r--r-- | view/tpl/app_select.tpl | 5 |
3 files changed, 5 insertions, 5 deletions
diff --git a/view/css/mod_apps.css b/view/css/mod_apps.css index 2788817d9..5e98a6a18 100644 --- a/view/css/mod_apps.css +++ b/view/css/mod_apps.css @@ -1,5 +1,6 @@ .app-container { float: left; width: 125px; + height: 160px; padding: 20px; } 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}} |