From d01a209cbf3377bc9c03719b00f2a3adbbb5b386 Mon Sep 17 00:00:00 2001
From: Marcel Klehr <mklehr@gmx.net>
Date: Tue, 26 Mar 2013 21:04:21 +0100
Subject: [PATCH] /admin/plugins: Dry up displaying of info messages

---
 src/static/css/admin.css         |  4 +--
 src/static/js/admin/plugins.js   | 42 +++++++++++++++++++++++---------
 src/templates/admin/plugins.html |  8 +++---
 3 files changed, 37 insertions(+), 17 deletions(-)

diff --git a/src/static/css/admin.css b/src/static/css/admin.css
index 322fe41c..31b16b9c 100644
--- a/src/static/css/admin.css
+++ b/src/static/css/admin.css
@@ -141,9 +141,9 @@ td, th {
   display: inline-block; /*make this fill the whole cell*/
 }
 
-.messages * {
-  text-align: center;
+.messages td>* {
   display: none;
+  text-align: center;
 }
 
 .messages .fetching {
diff --git a/src/static/js/admin/plugins.js b/src/static/js/admin/plugins.js
index 2ffb55b0..3937e666 100644
--- a/src/static/js/admin/plugins.js
+++ b/src/static/js/admin/plugins.js
@@ -30,17 +30,37 @@ $(document).ready(function () {
   search.sortBy = 'name';
   search.sortDir = /*DESC?*/true;
   search.end = true;// have we received all results already?
+  search.messages = {
+    show: function(msg) {
+      $('.search-results .messages').show()
+      $('.search-results .messages .'+msg+'').show()
+    },
+    hide: function(msg) {
+      $('.search-results .messages').hide()
+      $('.search-results .messages .'+msg+'').hide()
+    }
+  }
 
   var installed = {
     progress: {
       show: function(plugin, msg) {
-        $('#installed-plugins .'+plugin+' .progress').show()
-        $('#installed-plugins .'+plugin+' .progress .message').text(msg)
+        $('.installed-results .'+plugin+' .progress').show()
+        $('.installed-results .'+plugin+' .progress .message').text(msg)
         $(window).scrollTop(0)
       },
       hide: function(plugin) {
-        $('#installed-plugins .'+plugin+' .progress').hide()
-        $('#installed-plugins .'+plugin+' .progress .message').text('')
+        $('.installed-results .'+plugin+' .progress').hide()
+        $('.installed-results .'+plugin+' .progress .message').text('')
+      }
+    },
+    messages: {
+      show: function(msg) {
+        $('.installed-results .messages').show()
+        $('.installed-results .messages .'+msg+'').show()
+      },
+      hide: function(msg) {
+        $('.installed-results .messages').hide()
+        $('.installed-results .messages .'+msg+'').hide()
       }
     },
     list: []
@@ -99,7 +119,7 @@ $(document).ready(function () {
       $row.remove().appendTo('#installed-plugins')
       socket.emit("install", plugin);
       installed.progress.show(plugin, 'Installing')
-      $(".installed-results .nothing-installed").hide()
+      installed.messages.hide("nothing-installed")
     });
 
     // uninstall
@@ -132,8 +152,8 @@ $(document).ready(function () {
 
   socket.on('results:search', function (data) {
     if(!data.results.length) search.end = true;
-    $(".search-results .nothing-found").hide()
-    $(".search-results .fetching").hide()
+    search.messages.hide('nothing-found')
+    search.messages.hide('fetching')
     $("#search-query").removeAttr('disabled')
     
     console.log('got search results', data)
@@ -155,15 +175,15 @@ $(document).ready(function () {
     if(search.results.length > 0) {
       displayPluginList(search.results, searchWidget.find(".results"), searchWidget.find(".template tr"))
     }else {
-      $(".search-results .nothing-found").show()
+      search.messages.show('nothing-found')
     }
     $('#search-progress').hide()
     checkInfiniteScroll()
   });
 
   socket.on('results:installed', function (data) {
-    $(".installed-results .nothing-installed").hide()
-    $(".installed-results .fetching").hide()
+    installed.messages.hide("fetching")
+    installed.messages.hide("nothing-installed")
 
     installed.list = data.installed
     sortPluginList(installed.list, 'name', /*ASC?*/true);
@@ -181,7 +201,7 @@ $(document).ready(function () {
     if(installed.list.length > 0) {
       displayPluginList(installed.list, $("#installed-plugins"), $("#installed-plugin-template"));
     }else {
-      $(".installed-results .nothing-installed").show()
+      installed.messages.show("nothing-installed")
     }
   });
   
diff --git a/src/templates/admin/plugins.html b/src/templates/admin/plugins.html
index fe1f607a..270fbfd7 100644
--- a/src/templates/admin/plugins.html
+++ b/src/templates/admin/plugins.html
@@ -56,8 +56,8 @@
           </tbody>
           <tbody id="installed-plugins">
           </tbody>
-          <tbody>
-              <tr><td></td><td class="messages">
+          <tbody class="messages">
+              <tr><td></td><td>
                 <p class="nothing-installed">You haven't installed any plugins yet.</p>
                 <p class="fetching">Fetching installed plugins...</p>
               </td><td></td></tr>
@@ -96,8 +96,8 @@
             </tbody>
             <tbody class="results">
             </tbody>
-            <tbody>
-              <tr><td></td><td class="messages">
+            <tbody class="messages">
+              <tr><td></td><td>
                 <div class="search-progress" class="progress"><img src="../static/img/loading.gif"/></div>
                 <p class="nothing-found">No plugins found.</p>
                 <p class="fetching">Fetching catalogue...</p>