[Pkg-owncloud-commits] [owncloud] 05/22: make singleselect check for gravity wish, and make it south for default quota
David Prévot
taffit at moszumanska.debian.org
Fri Aug 29 14:48:56 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 a3a97cf1f56302c67375d733ec67bc176cbd9319
Author: Arthur Schiwon <blizzz at owncloud.com>
Date: Tue Aug 12 18:04:52 2014 +0200
make singleselect check for gravity wish, and make it south for default quota
---
core/js/singleselect.js | 6 +++++-
settings/templates/users/part.setquota.php | 2 +-
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/core/js/singleselect.js b/core/js/singleselect.js
index c22b523..6a4c104 100644
--- a/core/js/singleselect.js
+++ b/core/js/singleselect.js
@@ -2,10 +2,14 @@
$.fn.singleSelect = function () {
return this.each(function (i, select) {
var input = $('<input/>'),
+ gravity = $(select).attr('data-gravity'),
inputTooltip = $(select).attr('data-inputtitle');
if (inputTooltip){
input.attr('title', inputTooltip);
}
+ if (typeof gravity === 'undefined') {
+ gravity = 'n'
+ }
select = $(select);
input.css('position', 'absolute');
input.css({
@@ -35,7 +39,7 @@
input.css(select.offset());
input.show();
if ($.fn.tipsy){
- input.tipsy({gravity: 'n', trigger: 'manual'});
+ input.tipsy({gravity: gravity, trigger: 'manual'});
input.tipsy('show');
}
select.css('background-color', 'white');
diff --git a/settings/templates/users/part.setquota.php b/settings/templates/users/part.setquota.php
index ee9b918..55e31a9 100644
--- a/settings/templates/users/part.setquota.php
+++ b/settings/templates/users/part.setquota.php
@@ -6,7 +6,7 @@
<!-- 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")')) ?>">
+ <select id='default_quota' data-inputtitle="<?php p($l->t('Please enter storage quota (ex: "512 MB" or "12 GB")')) ?>" data-gravity="s">
<option <?php if($_['default_quota'] === 'none') print_unescaped('selected="selected"');?> value='none'>
<?php p($l->t('Unlimited'));?>
</option>
--
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