diff options
Diffstat (limited to 'view')
| -rw-r--r-- | view/css/mod_apps.css | 13 | ||||
| -rw-r--r-- | view/tpl/app.tpl | 63 | ||||
| -rw-r--r-- | view/tpl/myapps.tpl | 2 |
3 files changed, 53 insertions, 25 deletions
diff --git a/view/css/mod_apps.css b/view/css/mod_apps.css index 62777bb39..ddf6d5c6b 100644 --- a/view/css/mod_apps.css +++ b/view/css/mod_apps.css @@ -10,3 +10,16 @@ text-overflow: ellipsis; margin: 10px 0px; } + +.app-icon { + display: table-cell; + table-layout: fixed; + vertical-align: top; +} + +.app-info { + display: table-cell; + table-layout: fixed; + vertical-align: top; + padding-left: 10px; +} diff --git a/view/tpl/app.tpl b/view/tpl/app.tpl index b5957a373..5809a3edb 100644 --- a/view/tpl/app.tpl +++ b/view/tpl/app.tpl @@ -1,32 +1,47 @@ {{if ! ($navapps || $order)}} -<div class="app-container"> - <div class="app-detail{{if $deleted}} app-deleted{{/if}}"> - <a class="app-link" href="{{$app.url}}"{{if $app.target}} target="{{$app.target}}"{{/if}}{{if $app.desc}} title="{{$app.desc}}{{if $app.price}} ({{$app.price}}){{/if}}"{{else}}title="{{$app.name}}"{{/if}}{{if $installed}} data-papp="{{$app.papp}}" data-icon="{{$icon}}" data-url="{{$app.url}}" data-name="{{$app.name}}"{{/if}}>{{if $icon}}<i class="app-icon fa fa-fw fa-{{$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> - {{if $app.type !== 'system'}} - {{if $purchase}} - <div class="app-purchase"> - <a href="{{$app.page}}" class="btn btn-outline-secondary" title="{{$purchase}}" ><i class="fa fa-external"></i></a> + +<div class="section-subtitle-wrapper clearfix"> + <div class="float-end"> + {{if $app.type !== 'system'}} + {{if $purchase}} + <div class="app-purchase"> + <a href="{{$app.page}}" class="btn btn-outline-secondary" title="{{$purchase}}" ><i class="fa fa-external"></i></a> + </div> + {{/if}} + {{if $action_label || $update || $delete || $feature}} + <div class="app-tools"> + <form action="{{$hosturl}}appman" method="post"> + <input type="hidden" name="papp" value="{{$app.papp}}" /> + {{if $action_label}}<button type="submit" name="install" value="{{$action_label}}" class="btn btn-outline-{{if $installed}}secondary{{else}}success{{/if}} btn-sm" title="{{$action_label}}" ><i class="fa fa-fw {{if $installed}}fa-refresh{{else}}fa-arrow-circle-o-down{{/if}}" ></i> {{$action_label}}</button>{{/if}} + {{if $edit}}<input type="hidden" name="appid" value="{{$app.guid}}" /><button type="submit" name="edit" value="{{$edit}}" class="btn btn-outline-secondary btn-sm" title="{{$edit}}" ><i class="fa fa-fw fa-pencil" ></i></button>{{/if}} + {{if $delete}}<button type="submit" name="delete" value="{{if $deleted}}{{$undelete}}{{else}}{{$delete}}{{/if}}" class="btn btn-outline-secondary btn-sm" title="{{if $deleted}}{{$undelete}}{{else}}{{$delete}}{{/if}}" ><i class="fa fa-fw fa-trash-o drop-icons"></i></button>{{/if}} + {{if $settings_url}}<a href="{{$settings_url}}/?f=&rpath={{$rpath}}" class="btn btn-outline-secondary btn-sm"><i class="fa fa-fw fa-cog"></i></a>{{/if}} + {{if $feature}}<button type="submit" name="feature" value="nav_featured_app" class="btn btn-outline-secondary btn-sm" title="{{if $featured}}{{$remove}}{{else}}{{$add}}{{/if}}"><i class="fa fa-fw fa-star{{if $featured}} text-warning{{/if}}"></i></button>{{/if}} + {{if $pin}}<button type="submit" name="pin" value="nav_pinned_app" class="btn btn-outline-secondary btn-sm" title="{{if $pinned}}{{$remove_nav}}{{else}}{{$add_nav}}{{/if}}"><i class="fa fa-fw fa-thumb-tack{{if $pinned}} text-success{{/if}}"></i></button>{{/if}} + </form> + </div> + {{/if}} + {{/if}} </div> - {{/if}} - {{if $action_label || $update || $delete || $feature}} - <div class="text-center app-tools"> - <form action="{{$hosturl}}appman" method="post"> - <input type="hidden" name="papp" value="{{$app.papp}}" /> - {{if $action_label}}<button type="submit" name="install" value="{{$action_label}}" class="btn btn-outline-{{if $installed}}secondary{{else}}success{{/if}} btn-sm" title="{{$action_label}}" ><i class="fa fa-fw {{if $installed}}fa-refresh{{else}}fa-arrow-circle-o-down{{/if}}" ></i> {{$action_label}}</button>{{/if}} - {{if $edit}}<input type="hidden" name="appid" value="{{$app.guid}}" /><button type="submit" name="edit" value="{{$edit}}" class="btn btn-outline-secondary btn-sm" title="{{$edit}}" ><i class="fa fa-fw fa-pencil" ></i></button>{{/if}} - {{if $delete}}<button type="submit" name="delete" value="{{if $deleted}}{{$undelete}}{{else}}{{$delete}}{{/if}}" class="btn btn-outline-secondary btn-sm" title="{{if $deleted}}{{$undelete}}{{else}}{{$delete}}{{/if}}" ><i class="fa fa-fw fa-trash-o drop-icons"></i></button>{{/if}} - {{if $feature}}<button type="submit" name="feature" value="nav_featured_app" class="btn btn-outline-secondary btn-sm" title="{{if $featured}}{{$remove}}{{else}}{{$add}}{{/if}}"><i class="fa fa-fw fa-star{{if $featured}} text-warning{{/if}}"></i></button>{{/if}} - {{if $pin}}<button type="submit" name="pin" value="nav_pinned_app" class="btn btn-outline-secondary btn-sm" title="{{if $pinned}}{{$remove_nav}}{{else}}{{$add_nav}}{{/if}}"><i class="fa fa-fw fa-thumb-tack{{if $pinned}} text-success{{/if}}"></i></button>{{/if}} - {{if $settings_url}}<a href="{{$settings_url}}/?f=&rpath={{$rpath}}" class="btn btn-outline-secondary btn-sm"><i class="fa fa-fw fa-cog"></i></a>{{/if}} - </form> + <h3>{{$app.name}}{{if $app.price}} ({{$app.price}}){{/if}}</h3> + +</div> +<div class="section-content-tools-wrapper container"> + <div class="{{if $deleted}} app-deleted{{/if}}"> + <a class="app-icon app-link" href="{{$app.url}}"{{if $app.target}} target="{{$app.target}}"{{/if}}{{if $installed}} data-papp="{{$app.papp}}" data-icon="{{$icon}}" data-url="{{$app.url}}" data-name="{{$app.name}}"{{/if}}> + {{if $icon}} + <i class="app-icon fa fa-fw fa-{{$icon}}"></i> + {{else}} + <img src="{{$app.photo}}" width="80" height="80" /> + {{/if}} + </a> + <div class="app-info"> + {{if $app.desc}}{{$app.desc}}{{/if}} + </div> </div> - {{/if}} - {{/if}} </div> {{/if}} + {{if $navapps}} <a class="dropdown-item{{if $app.active}} active{{/if}}" href="{{$app.url}}">{{if $icon}}<i class="generic-icons-nav fa fa-fw fa-{{$icon}}"></i>{{else}}<img src="{{$app.photo}}" width="16" height="16" style="margin-right:9px;"/>{{/if}}{{$app.name}}</a> {{/if}} diff --git a/view/tpl/myapps.tpl b/view/tpl/myapps.tpl index 0b74c7b27..404ab73d3 100644 --- a/view/tpl/myapps.tpl +++ b/view/tpl/myapps.tpl @@ -9,7 +9,7 @@ {{/if}} <h2>{{$title}}{{if $cat.0}} - {{$cat.0}}{{/if}}</h2> </div> - <div class="clearfix section-content-wrapper"> + <div class="clearfix section-content-wrapper-np"> {{foreach $apps as $ap}} {{$ap}} {{/foreach}} |