diff options
| author | Sam Tuke <samtuke@owncloud.com> | 2013-02-06 18:26:44 +0000 |
|---|---|---|
| committer | Sam Tuke <samtuke@owncloud.com> | 2013-02-06 18:26:44 +0000 |
| commit | faf6cb08686ed618eb08bce4a3035b3831ab10c8 (patch) | |
| tree | e382af4f563d3228124d702507750b27504c8836 /settings | |
| parent | 954a6274836e8fbf83fbbfb34fc89c250c7da13b (diff) | |
| parent | a26f17c1303d0f4e08144d9ca508488f09cbba3b (diff) | |
| download | nextcloud-server-faf6cb08686ed618eb08bce4a3035b3831ab10c8.tar.gz nextcloud-server-faf6cb08686ed618eb08bce4a3035b3831ab10c8.zip | |
Merge branch 'master' into files_encryption
Diffstat (limited to 'settings')
| -rw-r--r-- | settings/css/settings.css | 1 | ||||
| -rw-r--r-- | settings/templates/apps.php | 2 | ||||
| -rw-r--r-- | settings/templates/users.php | 2 |
3 files changed, 2 insertions, 3 deletions
diff --git a/settings/css/settings.css b/settings/css/settings.css index e722cca91ee..9dd17daaeb7 100644 --- a/settings/css/settings.css +++ b/settings/css/settings.css @@ -33,7 +33,6 @@ tr:hover>td.password>span, tr:hover>td.displayName>span { margin:0; cursor:point tr:hover>td.remove>a, tr:hover>td.password>img,tr:hover>td.displayName>img, tr:hover>td.quota>img { visibility:visible; cursor:pointer; } tr:hover>td.remove>a { float:right; } li.selected { background-color:#ddd; } -#content>table:not(.nostyle) { margin-top:3em; } table:not(.nostyle) { width:100%; } #rightcontent { padding-left: 1em; } div.quota { float:right; display:block; position:absolute; right:25em; top:0; } diff --git a/settings/templates/apps.php b/settings/templates/apps.php index 3f0d2a9d1c6..ed1232ac322 100644 --- a/settings/templates/apps.php +++ b/settings/templates/apps.php @@ -10,7 +10,7 @@ <a class="button" target="_blank" href="http://owncloud.org/dev"><?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"> +<ul id="leftcontent" class="applist hascontrols"> <?php foreach($_['apps'] as $app):?> <li <?php if($app['active']) echo 'class="active"'?> data-id="<?php echo $app['id'] ?>" <?php if ( isset( $app['ocs_id'] ) ) { echo "data-id-ocs=\"{$app['ocs_id']}\""; } ?> data-type="<?php echo $app['internal'] ? 'internal' : 'external' ?>" data-installed="1"> diff --git a/settings/templates/users.php b/settings/templates/users.php index 4d7c29678ce..b3cab526947 100644 --- a/settings/templates/users.php +++ b/settings/templates/users.php @@ -73,7 +73,7 @@ $_['subadmingroups'] = array_flip($items); </div> </div> -<table data-groups="<?php echo implode(', ', $allGroups);?>"> +<table class="hascontrols" data-groups="<?php echo implode(', ', $allGroups);?>"> <thead> <tr> <th id='headerName'><?php echo $l->t('Login Name')?></th> |