From 6d96ef757933a2fe3527da50e6e3831f93104b50 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julius=20H=C3=A4rtl?= <jus@bitgrid.net>
Date: Mon, 6 Aug 2018 20:25:17 +0200
Subject: [PATCH 1/2] Use OC.Settings.rebuildNavigation
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Julius Härtl <jus@bitgrid.net>
---
 js/admin.js            | 82 +-----------------------------------------
 templates/settings.php |  1 +
 2 files changed, 2 insertions(+), 81 deletions(-)

diff --git a/js/admin.js b/js/admin.js
index 1c6a2ffd..83efce4f 100644
--- a/js/admin.js
+++ b/js/admin.js
@@ -320,87 +320,7 @@
 		},
 
 		_rebuildNavigation: function() {
-			$.getJSON(OC.filePath('settings', 'ajax', 'navigationdetect.php')).done(function(response){
-				if(response.status === 'success') {
-					var addedApps = {};
-					var navEntries = response.nav_entries;
-					var container = $('#apps ul');
-
-					// remove disabled apps
-					for (var i = 0; i < navEntries.length; i++) {
-						var entry = navEntries[i];
-						if(container.children('li[data-id="' + entry.id + '"]').length === 0) {
-							addedApps[entry.id] = true;
-						}
-					}
-					container.children('li[data-id]').each(function (index, el) {
-						var id = $(el).data('id');
-						// remove all apps that are not in the correct order
-						if (!navEntries[index] || (navEntries[index] && navEntries[index].id !== $(el).data('id'))) {
-							$(el).remove();
-							$('#appmenu li[data-id='+id+']').remove();
-						}
-					});
-
-					var previousEntry = {};
-					// add enabled apps to #navigation and #appmenu
-					for (var i = 0; i < navEntries.length; i++) {
-						var entry = navEntries[i];
-						if (container.children('li[data-id="' + entry.id + '"]').length === 0) {
-							var li = $('<li></li>');
-							li.attr('data-id', entry.id);
-							var img = '<svg width="16" height="16" viewBox="0 0 16 16">';
-							img += '<defs><filter id="invert"><feColorMatrix in="SourceGraphic" type="matrix" values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 0 0 0 1 0" /></filter></defs>';
-							img += '<image x="0" y="0" width="16" height="16" preserveAspectRatio="xMinYMin meet" filter="url(#invert)" xlink:href="' + entry.icon + '"  class="app-icon" /></svg>';
-							var a = $('<a></a>').attr('href', entry.href);
-							var filename = $('<span></span>');
-							var loading = $('<div class="icon-loading-dark"></div>').css('display', 'none');
-							filename.text(entry.name);
-							a.prepend(filename);
-							a.prepend(loading);
-							a.prepend(img);
-							li.append(a);
-
-							$('#navigation li[data-id=' + previousEntry.id + ']').after(li);
-
-							// draw attention to the newly added app entry
-							// by flashing it twice
-							if(addedApps[entry.id]) {
-								$('#header .menutoggle')
-									.animate({opacity: 0.5})
-									.animate({opacity: 1})
-									.animate({opacity: 0.5})
-									.animate({opacity: 1})
-									.animate({opacity: 0.75});
-							}
-						}
-
-						if ($('#appmenu').children('li[data-id="' + entry.id + '"]').length === 0) {
-							var li = $('<li></li>');
-							li.attr('data-id', entry.id);
-							var img = '<img src="' + entry.icon + '" class="app-icon">';
-							var a = $('<a></a>').attr('href', entry.href);
-							var filename = $('<span></span>');
-							var loading = $('<div class="icon-loading-dark"></div>').css('display', 'none');
-							filename.text(entry.name);
-							a.prepend(filename);
-							a.prepend(loading);
-							a.prepend(img);
-							li.append(a);
-							$('#appmenu li[data-id='+ previousEntry.id+']').after(li);
-							if(addedApps[entry.id]) {
-								li.animate({opacity: 0.5})
-									.animate({opacity: 1})
-									.animate({opacity: 0.5})
-									.animate({opacity: 1});
-							}
-						}
-						previousEntry = entry;
-					}
-
-					$(window).trigger('resize');
-				}
-			});
+			OC.Settings.Apps.rebuildNavigation();
 		}
 	}
 })(OC, OCA, _, OC.Backbone);
diff --git a/templates/settings.php b/templates/settings.php
index e16b1ba2..90802762 100644
--- a/templates/settings.php
+++ b/templates/settings.php
@@ -25,6 +25,7 @@
 
 style('external', 'style');
 script('external', 'admin');
+script('settings', 'apps');
 
 /** @var array $_ */
 /** @var \OCP\IL10N $l */

From 5cea4f5edee07ca393c3ab25ef4e43f6f253119e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julius=20H=C3=A4rtl?= <jus@bitgrid.net>
Date: Mon, 6 Aug 2018 20:27:47 +0200
Subject: [PATCH 2/2] Make details hidden by default
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Julius Härtl <jus@bitgrid.net>
---
 templates/settings.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/settings.php b/templates/settings.php
index 90802762..eec8b1fd 100644
--- a/templates/settings.php
+++ b/templates/settings.php
@@ -48,7 +48,7 @@
 				<input type="text" class="site-url trigger-save"  name="site-url" value="{{url}}" placeholder="<?php p($l->t('URL')); ?>">
 				<a class="icon-more" href="#"></a>
 
-				<div class="options hidden-FIXME">
+				<div class="options hidden">
 					<div>
 						<label>
 							<span><?php p($l->t('Language')) ?></span>