[Pkg-owncloud-commits] [owncloud] 11/258: user mgmt: move 'Show storage location' and 'Show last log in' to settings area
David Prévot
taffit at moszumanska.debian.org
Sat Oct 11 17:22:15 UTC 2014
This is an automated email from the git hooks/post-receive script.
taffit pushed a commit to branch master
in repository owncloud.
commit 4d9fd199ef44087237f1cf81a5505dbc8cb3d2bf
Author: Jan-Christoph Borchardt <hey at jancborchardt.net>
Date: Fri Aug 29 00:08:01 2014 +0200
user mgmt: move 'Show storage location' and 'Show last log in' to settings area
---
settings/css/settings.css | 10 -----
settings/templates/users/main.php | 18 +++++++-
settings/templates/users/part.createuser.php | 11 -----
settings/templates/users/part.setquota.php | 63 +++++++++++++---------------
4 files changed, 46 insertions(+), 56 deletions(-)
diff --git a/settings/css/settings.css b/settings/css/settings.css
index 204d699..a62a971 100644
--- a/settings/css/settings.css
+++ b/settings/css/settings.css
@@ -100,11 +100,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; }
-div.quota {
- margin: 10px;
- display: block;
-}
-div.quota-select-wrapper { position: relative; }
div.recoveryPassword { left:50em; display:block; position:absolute; top:-1px; }
input#recoveryPassword {width:15em;}
#controls select.quota {
@@ -113,11 +108,6 @@ input#recoveryPassword {width:15em;}
height: 37px;
}
select.quota-user { position:relative; left:0; top:0; width:10em; }
-div.quota>span {
- white-space: nowrap;
- color: #888;
- text-shadow: 0 1px 0 #fff;
-}
select.quota.active { background: #fff; }
input.userFilter {width: 200px;}
diff --git a/settings/templates/users/main.php b/settings/templates/users/main.php
index c5805d5..59284ea 100644
--- a/settings/templates/users/main.php
+++ b/settings/templates/users/main.php
@@ -22,7 +22,23 @@ $userlistParams['subadmingroups'] = array_flip($items);
<div id="app-navigation">
<?php print_unescaped($this->inc('users/part.grouplist')); ?>
<div id="app-settings">
- <?php print_unescaped($this->inc('users/part.setquota')); ?>
+ <div id="app-settings-header">
+ <button class="settings-button" tabindex="0" data-apps-slide-toggle="#app-settings-content"></button>
+ </div>
+ <div id="app-settings-content">
+ <?php print_unescaped($this->inc('users/part.setquota')); ?>
+
+ <div id="userlistoptions">
+ <p><label>
+ <input type="checkbox" name="StorageLocation" value="StorageLocation" id="CheckboxStorageLocation">
+ <?php p($l->t('Show storage location')) ?>
+ </label></p>
+ <p><label>
+ <input type="checkbox" name="LastLogin" value="LastLogin" id="CheckboxLastLogin">
+ <?php p($l->t('Show last log in')) ?>
+ </label></p>
+ </div>
+ </div>
</div>
</div>
diff --git a/settings/templates/users/part.createuser.php b/settings/templates/users/part.createuser.php
index 70e5a23..edec758 100644
--- a/settings/templates/users/part.createuser.php
+++ b/settings/templates/users/part.createuser.php
@@ -28,17 +28,6 @@
alt="<?php p($l->t('Enter the recovery password in order to recover the users files during password change'))?>"/>
</div>
<?php endif; ?>
-
- <form id="userlistoptions">
- <?php p($l->t('Display')) ?> :
- <label><input type="checkbox" name="StorageLocation" value="StorageLocation" id="CheckboxStorageLocation">
- <?php p($l->t('Location')) ?>
- </label>
- <label><input type="checkbox" name="LastLogin" value="LastLogin" id="CheckboxLastLogin">
- <?php p($l->t('Last login')) ?>
- </label>
- </form>
-
<form autocomplete="off" id="usersearchform">
<input type="text" class="input userFilter" placeholder="<?php p($l->t('Search Users and Groups')); ?>" />
</form>
diff --git a/settings/templates/users/part.setquota.php b/settings/templates/users/part.setquota.php
index afbbee8..b58df49 100644
--- a/settings/templates/users/part.setquota.php
+++ b/settings/templates/users/part.setquota.php
@@ -1,39 +1,34 @@
-<div id="app-settings-header">
- <button class="settings-button" tabindex="0" data-apps-slide-toggle="#app-settings-content"></button>
-</div>
-<div id="app-settings-content">
- <div class="quota">
- <!-- Default storage -->
- <span><?php p($l->t('Default Quota'));?></span>
- <?php if((bool) $_['isAdmin']): ?>
- <select id='default_quota' data-inputtitle="<?php p($l->t('Please enter storage quota (ex: "512 MB" or "12 GB")')) ?>" data-tipsy-gravity="s">
- <option <?php if($_['default_quota'] === 'none') print_unescaped('selected="selected"');?> value='none'>
- <?php p($l->t('Unlimited'));?>
- </option>
- <?php foreach($_['quota_preset'] as $preset):?>
- <?php if($preset !== 'default'):?>
- <option <?php if($_['default_quota']==$preset) print_unescaped('selected="selected"');?> value='<?php p($preset);?>'>
- <?php p($preset);?>
- </option>
- <?php endif;?>
- <?php endforeach;?>
- <?php if($_['defaultQuotaIsUserDefined']):?>
- <option selected="selected" value='<?php p($_['default_quota']);?>'>
- <?php p($_['default_quota']);?>
+<div class="quota">
+ <!-- Default storage -->
+ <span><?php p($l->t('Default Quota'));?></span>
+ <?php if((bool) $_['isAdmin']): ?>
+ <select id='default_quota' data-inputtitle="<?php p($l->t('Please enter storage quota (ex: "512 MB" or "12 GB")')) ?>" data-tipsy-gravity="s">
+ <option <?php if($_['default_quota'] === 'none') print_unescaped('selected="selected"');?> value='none'>
+ <?php p($l->t('Unlimited'));?>
+ </option>
+ <?php foreach($_['quota_preset'] as $preset):?>
+ <?php if($preset !== 'default'):?>
+ <option <?php if($_['default_quota']==$preset) print_unescaped('selected="selected"');?> value='<?php p($preset);?>'>
+ <?php p($preset);?>
</option>
<?php endif;?>
- <option data-new value='other'>
- <?php p($l->t('Other'));?>
- ...
- </option>
- </select>
- <?php endif; ?>
- <?php if((bool) !$_['isAdmin']): ?>
- <select class='quota' disabled="disabled">
- <option selected="selected">
+ <?php endforeach;?>
+ <?php if($_['defaultQuotaIsUserDefined']):?>
+ <option selected="selected" value='<?php p($_['default_quota']);?>'>
<?php p($_['default_quota']);?>
</option>
- </select>
- <?php endif; ?>
- </div>
+ <?php endif;?>
+ <option data-new value='other'>
+ <?php p($l->t('Other'));?>
+ ...
+ </option>
+ </select>
+ <?php endif; ?>
+ <?php if((bool) !$_['isAdmin']): ?>
+ <select class='quota' disabled="disabled">
+ <option selected="selected">
+ <?php p($_['default_quota']);?>
+ </option>
+ </select>
+ <?php endif; ?>
</div>
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud.git
More information about the Pkg-owncloud-commits
mailing list