faster animation, fixing some css

Signed-off-by: Maxence Lange <maxence@artificial-owl.com>

6 files changed, 38 insertions, 12 deletions

diff --git a/js/circles.app.actions.js b/js/circles.app.actions.js
index d431e20f..5d756dbb 100644
--- a/js/circles.app.actions.js
+++ b/js/circles.app.actions.js
@@ -114,8 +114,8 @@ var actions = {
 	unselectCircle: function (circle_id) {
 		elements.mainUIMembersTable.emptyTable();
 		elements.navigation.children(".circle[circle-id='" + circle_id + "']").remove();
-		elements.emptyContent.show(800);
-		elements.mainUI.fadeOut(800);
+		elements.emptyContent.show(400);
+		elements.mainUI.fadeOut(400);
 
 		curr.circle = 0;
 		curr.circleLevel = 0;
@@ -197,8 +197,8 @@ var actions = {
 		curr.circleLevel = 0;
 
 		elements.circlesList.children('div').removeClass('selected');
-		elements.emptyContent.show(800);
-		elements.mainUI.fadeOut(800);
+		elements.emptyContent.show(400);
+		elements.mainUI.fadeOut(400);
 	},
 
 
diff --git a/js/circles.app.elements.js b/js/circles.app.elements.js
index 747414e5..31d42df8 100644
--- a/js/circles.app.elements.js
+++ b/js/circles.app.elements.js
@@ -63,12 +63,15 @@ var elements = {
 	joinCircleRequest: null,
 	joinCircleInvite: null,
 	joinCircle: null,
+	adminSettingsCircle: null,
 	leaveCircle: null,
 	destroyCircle: null,
 
 	settingsPanel: null,
 	settingsName: null,
 	settingsDesc: null,
+	settingsLimit: null,
+	settingsEntryLimit: null,
 	settingsLink: null,
 	settingsLinkAuto: null,
 	settingsLinkFiles: null,
@@ -95,7 +98,7 @@ var elements = {
 		elements.newType = $('#circles_new_type');
 		elements.newSubmit = $('#circles_new_submit');
 		elements.newName = $('#circles_new_name');
-		elements.navigation = $('#app-navigation.circles');
+		elements.navigation = $('#circle-navigation.circles');
 		elements.circlesList = $('#circles_list');
 		elements.circlesSearch = $('#circles_search');
 		elements.circlesFilters = $('#circles_filters');
@@ -121,10 +124,18 @@ var elements = {
 		elements.joinCircle = $('#joincircle');
 		elements.leaveCircle = $('#leavecircle');
 		elements.destroyCircle = $('#circle-actions-delete');
+		elements.adminSettingsCircle = $('#adminsettingscircle');
+		elements.adminSettingsCircle.hide().on('click', function () {
+			settings.displaySettings(true);
+		});
 
 		elements.settingsPanel = $('#settings-panel');
 		elements.settingsName = $('#settings-name');
 		elements.settingsDesc = $('#settings-desc');
+		elements.settingsEntryLimit = $('#settings-entry-limit');
+		elements.settingsLimit = $('#settings-limit');
+		// elements.settingsLimit.prop('disabled', !OC.isUserAdmin());
+
 		elements.settingsLink = $('#settings-link');
 		elements.settingsLinkAuto = $('#settings-link-auto');
 		elements.settingsLinkFiles = $('#settings-link-files');
diff --git a/js/circles.app.js b/js/circles.app.js
index 61ee8dcc..4f2c837a 100644
--- a/js/circles.app.js
+++ b/js/circles.app.js
@@ -66,6 +66,7 @@ var curr = {
 		curr.circleDetails = data.details;
 		curr.circleName = data.details.name;
 		curr.circleDesc = data.details.description;
+		curr.circleLimit = data.details.settings.members_limit;
 		curr.circleSettings = data.details.settings;
 		curr.circleLevel = data.details.viewer.level;
 		curr.circleStatus = data.details.viewer.status;
@@ -219,6 +220,7 @@ $(document).ready(function () {
 			});
 
 			this.onSuccess = function (text) {
+
 				notyf.confirm(text);
 			};
 
diff --git a/js/circles.app.navigation.js b/js/circles.app.navigation.js
index 16ad799f..794203ca 100644
--- a/js/circles.app.navigation.js
+++ b/js/circles.app.navigation.js
@@ -60,7 +60,7 @@ var nav = {
 				return;
 			}
 
-			if(!_.isUndefined(elements.searchTimeoutID)) {
+			if (!_.isUndefined(elements.searchTimeoutID)) {
 				clearTimeout(elements.searchTimeoutID);
 			}
 			elements.searchTimeoutID = _.delay(function () {
@@ -210,9 +210,9 @@ var nav = {
 		curr.circle = 0;
 		curr.circleLevel = 0;
 
-		elements.navigation.show('slide', 800);
-		elements.emptyContent.show(800);
-		elements.mainUI.fadeOut(800);
+		elements.navigation.show('slide', 400);
+		elements.emptyContent.show(400);
+		elements.mainUI.fadeOut(400);
 
 		elements.circlesSearch.val('');
 		elements.addMember.val('');
@@ -637,9 +637,15 @@ var nav = {
 
 		this.displayNonMemberInteraction(details);
 
+		if (details.viewer.level !== define.levelOwner && OC.isUserAdmin()) {
+			elements.adminSettingsCircle.show();
+		} else {
+			elements.adminSettingsCircle.hide();
+		}
+
 		if (details.viewer.level === define.levelOwner) {
-			elements.destroyCircle.show();
 			elements.buttonCircleSettings.show();
+			elements.destroyCircle.show();
 			elements.buttonJoinCircle.hide();
 		}
 	},
diff --git a/js/circles.app.results.circles.js b/js/circles.app.results.circles.js
index d61cd8ff..c13bd20c 100644
--- a/js/circles.app.results.circles.js
+++ b/js/circles.app.results.circles.js
@@ -132,8 +132,8 @@ var resultCircles = {
 				$(this).addClass('selected');
 			});
 
-		elements.emptyContent.hide(800);
-		elements.mainUI.fadeIn(800);
+		elements.emptyContent.hide(400);
+		elements.mainUI.fadeIn(400);
 		curr.defineCircle(result);
 		nav.displayCircleDetails(result.details);
 		nav.displayMembersInteraction(result.details);
diff --git a/js/circles.app.settings.js b/js/circles.app.settings.js
index 7ddaf6fd..4de11d98 100644
--- a/js/circles.app.settings.js
+++ b/js/circles.app.settings.js
@@ -49,6 +49,13 @@ var settings = {
 	initUISettings: function () {
 		elements.settingsName.val(curr.circleName);
 		elements.settingsDesc.val(curr.circleDesc);
+		elements.settingsLimit.val(curr.circleLimit);
+		if (OC.isUserAdmin()) {
+			elements.settingsEntryLimit.show();
+		} else {
+			elements.settingsEntryLimit.hide();
+		}
+
 		elements.settingsLink.prop('checked', (curr.circleSettings['allow_links'] === 'true'));
 		elements.settingsLinkAuto.prop('checked',
 			(curr.circleSettings['allow_links_auto'] === 'true'));