From e681e1eec094385e2a41ea301834d6593d97ec0b Mon Sep 17 00:00:00 2001
From: raghunayyar <me@iraghu.com>
Date: Wed, 19 Feb 2014 14:40:49 +0530
Subject: [PATCH] Initial Commit: Takes Quota Settings inside Navigation,
 Changes Create -> Add Group

---
 settings/js/users/groups.js  |  9 +++++
 settings/templates/users.php | 66 +++++++++++++++++++-----------------
 2 files changed, 44 insertions(+), 31 deletions(-)

diff --git a/settings/js/users/groups.js b/settings/js/users/groups.js
index 9920f72889b..5e9f5582b5a 100644
--- a/settings/js/users/groups.js
+++ b/settings/js/users/groups.js
@@ -127,4 +127,13 @@ $(document).ready( function () {
 		});
 	});
 
+	// Implements Quota Settings Toggle.
+	$('#app-navigation').find('.settings-button').on('click', function (e) {
+		e.stopPropagation();
+		$('#app-settings').removeClass('open');
+		$('#app-settings').toggleClass('open');
+		$(document).click(function() {
+			$('#app-settings').removeClass('open');
+    	});
+	});
 });
\ No newline at end of file
diff --git a/settings/templates/users.php b/settings/templates/users.php
index e9fa5df6675..1feaecd8e86 100644
--- a/settings/templates/users.php
+++ b/settings/templates/users.php
@@ -21,7 +21,7 @@ $_['subadmingroups'] = array_flip($items);
 		<li>
 			<form id="newgroup">
 				<input type="text" id="newgroupname" placeholder="<?php p($l->t('Group')); ?>..." />
-				<input type="submit" class="button" value="<?php p($l->t('Create'))?>" />
+				<input type="submit" class="button" value="<?php p($l->t('Add Group'))?>" />
 			</form>
 		</li>
 		<!-- Everyone -->
@@ -54,37 +54,41 @@ $_['subadmingroups'] = array_flip($items);
 		</li>
 	<?php endforeach; ?>
 	</ul>
-	<!-- Default storage -->
-	<div class="app-settings">
-		<div class="quota">
-			<span><?php p($l->t('Default Quota'));?></span>
-			<?php if((bool) $_['isadmin']): ?>
-			<select class='quota' data-inputtitle="<?php p($l->t('Please enter storage quota (ex: "512 MB" or "12 GB")')) ?>">
-				<option
-					<?php if($_['default_quota'] === 'none') print_unescaped('selected="selected"');?>
+
+	<div id="app-settings" class="" style="">
+		<div id="app-settings-header">
+			<button class="settings-button" tabindex="0"></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 class='quota' data-inputtitle="<?php p($l->t('Please enter storage quota (ex: "512 MB" or "12 GB")')) ?>">
+					<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']);?>
-				</option>
-				<?php endif;?>
-				<option data-new value='other'>
-					<?php p($l->t('Other'));?>
-					...
-				</option>
-			</select>
+						<?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']);?>
+						</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">
-- 
2.39.5