diff options
| author | Frank Karlitschek <frank@owncloud.org> | 2012-10-08 15:49:48 +0200 |
|---|---|---|
| committer | Frank Karlitschek <frank@owncloud.org> | 2012-10-08 15:49:48 +0200 |
| commit | c701bed2e3572b3b5d5d192cbe3f801d016c881d (patch) | |
| tree | b5b5530ee9ced384a768f36a79663d6230445cf2 /settings | |
| parent | 3affeb5bd77715c84c70230d744de8d0f577a378 (diff) | |
| download | nextcloud-server-c701bed2e3572b3b5d5d192cbe3f801d016c881d.tar.gz nextcloud-server-c701bed2e3572b3b5d5d192cbe3f801d016c881d.zip | |
fix a lot of small layout bugs and make the apps page overall prettier plus add ratings finally
Diffstat (limited to 'settings')
| -rw-r--r-- | settings/css/settings.css | 3 | ||||
| -rw-r--r-- | settings/js/apps.js | 3 | ||||
| -rw-r--r-- | settings/templates/apps.php | 2 |
3 files changed, 7 insertions, 1 deletions
diff --git a/settings/css/settings.css b/settings/css/settings.css index d5e826b33ce..60a42784661 100644 --- a/settings/css/settings.css +++ b/settings/css/settings.css @@ -50,7 +50,7 @@ li { color:#888; } li.active { color:#000; } small.externalapp { color:#FFF; background-color:#BBB; font-weight:bold; font-size: 0.6em; margin: 0; padding: 0.1em 0.2em; border-radius: 4px;} small.externalapp.list { float: right; } -span.version { margin-left:3em; margin-right:3em; color:#555; } +span.version { margin-left:1em; margin-right:1em; color:#555; } .app { position: relative; display: inline-block; padding: 0.2em 0 0.2em 0 !important; text-overflow: hidden; overflow: hidden; white-space: nowrap; /*transition: .2s max-width linear; -o-transition: .2s max-width linear; -moz-transition: .2s max-width linear; -webkit-transition: .2s max-width linear; -ms-transition: .2s max-width linear;*/ } .app.externalapp { max-width: 12.5em; z-index: 100; } @@ -58,6 +58,7 @@ span.version { margin-left:3em; margin-right:3em; color:#555; } .app:hover, .app:active { max-width: inherit; } .appslink { text-decoration: underline; } +.score { color:#666; font-weight:bold; font-size:0.8em; } /* LOG */ #log { white-space:normal; } diff --git a/settings/js/apps.js b/settings/js/apps.js index 6ef33706f65..8de95100c4c 100644 --- a/settings/js/apps.js +++ b/settings/js/apps.js @@ -17,6 +17,7 @@ OC.Settings.Apps = OC.Settings.Apps || { } else { page.find('span.version').text(''); } + page.find('span.score').html(app.score); page.find('p.description').html(app.description); page.find('img.preview').attr('src', app.preview); page.find('small.externalapp').attr('style', 'visibility:visible'); @@ -28,11 +29,13 @@ OC.Settings.Apps = OC.Settings.Apps || { page.find('input.enable').data('appid', app.id); page.find('input.enable').data('active', app.active); if (app.internal == false) { + page.find('span.score').show(); page.find('p.appslink').show(); page.find('a').attr('href', 'http://apps.owncloud.com/content/show.php?content=' + app.id); page.find('small.externalapp').hide(); } else { page.find('p.appslink').hide(); + page.find('span.score').hide(); } }, enableApp:function(appid, active, element) { diff --git a/settings/templates/apps.php b/settings/templates/apps.php index 0662148ebf2..1e9598de1e3 100644 --- a/settings/templates/apps.php +++ b/settings/templates/apps.php @@ -8,6 +8,7 @@ </script> <div id="controls"> <a class="button" target="_blank" href="http://owncloud.org/dev/apps/getting-started/"><?php echo $l->t('Add your App');?></a> + <a class="button" target="_blank" href="http://apps.owncloud.com"><?php echo $l->t('More Apps');?></a> </div> <ul id="leftcontent" class="applist"> <?php foreach($_['apps'] as $app):?> @@ -24,6 +25,7 @@ <div id="rightcontent"> <div class="appinfo"> <h3><strong><span class="name"><?php echo $l->t('Select an App');?></span></strong><span class="version"></span><small class="externalapp" style="visibility:hidden;"></small></h3> + <span class="score"></span> <p class="description"></p> <img src="" class="preview" /> <p class="appslink hidden"><a href="#" target="_blank"><?php echo $l->t('See application page at apps.owncloud.com');?></a></p> |