diff options
| author | redmatrix <redmatrix@redmatrix.me> | 2015-09-02 21:59:44 -0700 |
|---|---|---|
| committer | redmatrix <redmatrix@redmatrix.me> | 2015-09-02 21:59:44 -0700 |
| commit | fb2d2c55851ce14fd0bd04b15be0518a86809b41 (patch) | |
| tree | 2a50f4c79cd097f177f0a1d37a32af8239c62a57 /view | |
| parent | 669e1111187d1d1888358d833c62b5445a2b360b (diff) | |
| parent | 945ba5d7884770501de6514b2942160fcd883ca4 (diff) | |
| download | volse-hubzilla-fb2d2c55851ce14fd0bd04b15be0518a86809b41.tar.gz volse-hubzilla-fb2d2c55851ce14fd0bd04b15be0518a86809b41.tar.bz2 volse-hubzilla-fb2d2c55851ce14fd0bd04b15be0518a86809b41.zip | |
Merge https://github.com/redmatrix/redmatrix into pending_merge
Diffstat (limited to 'view')
| -rw-r--r-- | view/css/mod_apps.css | 12 | ||||
| -rw-r--r-- | view/tpl/app.tpl | 4 | ||||
| -rwxr-xr-x | view/tpl/myapps.tpl | 2 |
3 files changed, 15 insertions, 3 deletions
diff --git a/view/css/mod_apps.css b/view/css/mod_apps.css index 5e98a6a18..cfaf5ef87 100644 --- a/view/css/mod_apps.css +++ b/view/css/mod_apps.css @@ -1,6 +1,16 @@ .app-container { float: left; width: 125px; - height: 160px; + height: 180px; padding: 20px; } + +.app-detail { + height: 130px; + overflow-x: hidden; + overflow-y: hidden; +} + +.app-tools { + margin-bottom: 0; +} diff --git a/view/tpl/app.tpl b/view/tpl/app.tpl index cebc17d45..727be5eba 100644 --- a/view/tpl/app.tpl +++ b/view/tpl/app.tpl @@ -1,4 +1,5 @@ <div class="app-container"> +<div class="app-detail"> <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" style="text-align:center;">{{$app.name}}</div> </a> @@ -6,7 +7,9 @@ {{if $purchase}} <a href="{{$app.page}}" class="btn btn-default" title="{{$purchase}}" ><i class="icon-external"></i></a> {{/if}} +</div> {{if $install || $update || $delete }} +<div class="app-tools"> <form action="{{$hosturl}}appman" method="post"> <input type="hidden" name="papp" value="{{$app.papp}}" /> {{if $install}}<button type="submit" name="install" value="{{$install}}" class="btn btn-default" title="{{$install}}" ><i class="icon-download-alt" ></i></button>{{/if}} @@ -16,4 +19,5 @@ {{/if}} {{/if}} </div> +</div> diff --git a/view/tpl/myapps.tpl b/view/tpl/myapps.tpl index 1a591f9f8..ccb995849 100755 --- a/view/tpl/myapps.tpl +++ b/view/tpl/myapps.tpl @@ -1,9 +1,7 @@ <h3>{{$title}}</h3> {{foreach $apps as $ap}} -<div class="app-container"> {{$ap}} -</div> {{/foreach}} <div class="clear"></div> |