diff options
| -rw-r--r-- | settings/css/settings.css | 8 | ||||
| -rw-r--r-- | settings/templates/apps.php | 15 |
2 files changed, 17 insertions, 6 deletions
diff --git a/settings/css/settings.css b/settings/css/settings.css index 950e8929012..3c406109a1f 100644 --- a/settings/css/settings.css +++ b/settings/css/settings.css @@ -61,7 +61,13 @@ select.quota.active { background: #fff; } /* APPS */ .appinfo { margin: 1em; } h3 { font-size: 1.4em; font-weight: bold; } -ul.applist li { height: 2.2em; padding: 0.2em 0.2em 0.2em 0.8em !important; } +ul.applist a { + height: 2.2em; + padding: 0.2em 0.2em 0.2em 0.8em !important; +} +ul.applist .app-external { + width: 100%; +} 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;} diff --git a/settings/templates/apps.php b/settings/templates/apps.php index d3639cbab34..cdb690f9a27 100644 --- a/settings/templates/apps.php +++ b/settings/templates/apps.php @@ -7,11 +7,12 @@ src="<?php print_unescaped(OC_Helper::linkToRoute('apps_custom'));?>?appid=<?php p($_['appid']); ?>"></script> <script type="text/javascript" src="<?php print_unescaped(OC_Helper::linkTo('settings/js', 'apps.js'));?>"></script> -<div id="controls"> - <a class="button" target="_blank" href="http://owncloud.org/dev"><?php p($l->t('Add your App'));?></a> - <a class="button" target="_blank" href="http://apps.owncloud.com"><?php p($l->t('More Apps'));?></a> -</div> -<ul id="leftcontent" class="applist hascontrols"> + +<ul id="leftcontent" class="applist"> + <li> + <a class="app-external" target="_blank" href="http://owncloud.org/dev">+ <?php p($l->t('Add your App'));?></a> + </li> + <?php foreach($_['apps'] as $app):?> <li <?php if($app['active']) print_unescaped('class="active"')?> data-id="<?php p($app['id']) ?>" <?php if ( isset( $app['ocs_id'] ) ) { print_unescaped("data-id-ocs=\"{".OC_Util::sanitizeHTML($app['ocs_id'])."}\""); } ?> @@ -22,6 +23,10 @@ print_unescaped('<small class="'.OC_Util::sanitizeHTML($app['internalclass']).' list">'.OC_Util::sanitizeHTML($app['internallabel']).'</small>') ?> </li> <?php endforeach;?> + + <li> + <a class="app-external" target="_blank" href="http://apps.owncloud.com"><?php p($l->t('More Apps'));?> …</a> + </li> </ul> <div id="rightcontent"> <div class="appinfo"> |