Make app updates better visible (part1)

owncloud · Feb 16, 2016 · ffc5336 · ffc5336
1 parent 1cb3583
commit ffc5336
Show file tree

Hide file tree

Showing 3 changed files with 49 additions and 2 deletions.
diff --git a/settings/css/settings.css b/settings/css/settings.css
@@ -383,6 +383,16 @@ span.version {
 	margin-bottom: 1em;
 }
 
+#apps-list.has-controls {
+	padding-top: 25px;
+}
+
+#controls .update-filter {
+	position: relative;
+	top: 12px;
+	left: 12px;
+}
+
 
 /* LOG */
 #log {

diff --git a/settings/js/apps.js b/settings/js/apps.js
@@ -78,6 +78,8 @@ OC.Settings.Apps = OC.Settings.Apps || {
 			.removeClass('hidden')
 			.html('');
 		$('#apps-list-empty').addClass('hidden');
+		$('#controls').addClass('hidden');
+
 		$('#app-category-' + OC.Settings.Apps.State.currentCategory).removeClass('active');
 		$('#app-category-' + categoryId).addClass('active');
 		OC.Settings.Apps.State.currentCategory = categoryId;
@@ -124,6 +126,7 @@ OC.Settings.Apps = OC.Settings.Apps || {
 				$('.app-level .experimental').tipsy({fallback: t('settings', 'This app is not checked for security issues and is new or known to be unstable. Install at your own risk.')});
 			},
 			complete: function() {
+				var availableUpdates = 0;
 				$('#apps-list').removeClass('icon-loading');
 				$.ajax(OC.generateUrl('settings/apps/list?category={categoryId}&includeUpdateInfo=1', {
 					categoryId: categoryId
@@ -135,8 +138,17 @@ OC.Settings.Apps = OC.Settings.Apps || {
 								var $update = $('#app-' + app.id + ' .update');
 								$update.removeClass('hidden');
 								$update.val(t('settings', 'Update to %s').replace(/%s/g, app.update));
+								availableUpdates++;
+								OC.Settings.Apps.State.apps[app.id].update = true;
 							}
-						})
+						});
+
+						if (availableUpdates > 0) {
+							$('#controls').removeClass('hidden');
+							$('#filter_update_apps').attr('checked', false);
+							$('#apps-list').addClass('has-controls');
+							OC.Notification.showTemporary(n('settings', 'You have %n app update pending', 'You have %n app updates pending', availableUpdates));
+						}
 					}
 				});
 			}
@@ -409,13 +421,22 @@ OC.Settings.Apps = OC.Settings.Apps || {
 		);
 	},
 
-	filter: function(query) {
+	filter: function(query, filterUpdate) {
 		var $appList = $('#apps-list'),
 			$emptyList = $('#apps-list-empty');
 		$appList.removeClass('hidden');
 		$appList.find('.section').removeClass('hidden');
 		$emptyList.addClass('hidden');
 
+		if (filterUpdate) {
+			_.each(OC.Settings.Apps.State.apps, function (app) {
+				if (!app.update) {
+					$('#app-' + app.id).addClass('hidden');
+				}
+			});
+			return;
+		}
+
 		if (query === '') {
 			return;
 		}
@@ -574,6 +595,11 @@ OC.Settings.Apps = OC.Settings.Apps || {
 				}
 			});
 		});
+
+		$(document).on('click', '#filter_update_apps', function () {
+			var state = $(this).prop('checked');
+			OC.Settings.Apps.filter('', state);
+		});
 	}
 };
 

diff --git a/settings/templates/apps.php b/settings/templates/apps.php
@@ -97,6 +97,10 @@
 	<div class="app-description-toggle-show"><?php p($l->t("Show description …"));?></div>
 	<div class="app-description-toggle-hide hidden"><?php p($l->t("Hide description …"));?></div>
 
+	<div class="app-dependencies update hidden">
+		<p><?php p($l->t('This app has an update available.')); ?></p>
+	</div>
+
 	{{#if missingMinOwnCloudVersion}}
 		<div class="app-dependencies">
 			<p><?php p($l->t('This app has no minimum ownCloud version assigned. This will be an error in ownCloud 11 and later.')); ?></p>
@@ -162,6 +166,13 @@
 	</div>
 </div>
 <div id="app-content">
+	<div id="controls" class="hidden">
+		<div class="update-filter">
+			<input id="filter_update_apps" name="filter_update_apps" type="checkbox" class="checkbox" />
+			<label for="filter_update_apps"><?php p($l->t('Only show apps with available updates')); ?></label>
+		</div>
+	</div>
+
 	<div id="apps-list" class="icon-loading"></div>
 	<div id="apps-list-empty" class="hidden emptycontent">
 		<div class="icon-search"></div>