From c208796c470ff50db3a62141e0c8ae971991ec4a Mon Sep 17 00:00:00 2001
From: Vincent Petry <pvince81@owncloud.com>
Date: Mon, 11 Aug 2014 16:34:24 +0200
Subject: Use global apps slide toggle logic

Remove local app settings slide logic and make it use the global one
triggered by the "data-apps-slide-toggle" attribute.
---
 settings/templates/users/part.setquota.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'settings/templates')

diff --git a/settings/templates/users/part.setquota.php b/settings/templates/users/part.setquota.php
index fc5624d069a..ee9b918eace 100644
--- a/settings/templates/users/part.setquota.php
+++ b/settings/templates/users/part.setquota.php
@@ -1,5 +1,5 @@
 <div id="app-settings-header">
-	<button class="settings-button" tabindex="0"></button>
+	<button class="settings-button" tabindex="0" data-apps-slide-toggle="#app-settings-content"></button>
 </div>
 <div id="app-settings-content">
 	<div class="quota">
@@ -36,4 +36,4 @@
 			</select>
 		<?php endif; ?>
 	</div>
-</div>
\ No newline at end of file
+</div>
-- 
cgit v1.2.3


From 288b6d40713de3707b489a1028935fabae62e021 Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Tue, 12 Aug 2014 18:04:52 +0200
Subject: 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(-)

(limited to 'settings/templates')

diff --git a/core/js/singleselect.js b/core/js/singleselect.js
index c22b5232207..6a4c104ffba 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 ee9b918eace..55e31a930e9 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>
-- 
cgit v1.2.3


From 4220e0c7da091330f6a4f6a2e1669fb4ece482bd Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Wed, 13 Aug 2014 14:20:14 +0200
Subject: it does not affect gravity on planet earth, but only for tipsy

---
 core/js/singleselect.js                    | 2 +-
 settings/templates/users/part.setquota.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'settings/templates')

diff --git a/core/js/singleselect.js b/core/js/singleselect.js
index 6a4c104ffba..79ae0874dbd 100644
--- a/core/js/singleselect.js
+++ b/core/js/singleselect.js
@@ -2,7 +2,7 @@
 	$.fn.singleSelect = function () {
 		return this.each(function (i, select) {
 			var input = $('<input/>'),
-				gravity = $(select).attr('data-gravity'),
+				gravity = $(select).attr('data-tipsy-gravity'),
 				inputTooltip = $(select).attr('data-inputtitle');
 			if (inputTooltip){
 				input.attr('title', inputTooltip);
diff --git a/settings/templates/users/part.setquota.php b/settings/templates/users/part.setquota.php
index 55e31a930e9..afbbee82063 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")')) ?>" data-gravity="s">
+			<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>
-- 
cgit v1.2.3