Merge branch 'master' into portable

.jshintrc

@@ -7,5 +7,6 @@
         "debug_socket": false
     },
     "globalstrict": true,
-    "browser": true
+    "browser": true,
+    "node": true
 }

debomatic-webui/lib/config.js

@@ -67,7 +67,7 @@ config.web.preferences.debug = 0; // debug level - 0 means disabled
 
 // DO NOT TOUCH these ones
 
-config.version = '0.3.0';
+config.version = '0.3.1';
 
 // A simple function to quickly have
 // get and set strings for client events

debomatic-webui/public/javascripts/main.js

@@ -19,8 +19,8 @@ if (window.location.pathname == '/') {
         }
         var real_email = $(this).attr('address').replace('AT', '@').replace('DOT', '.').replace(/ /g, '');
         var label = real_email;
-        if (config.debomatic.admin.name && config.debomatic.admin.name != 'Your Name');
-        label = config.debomatic.admin.name;
+        if (config.debomatic.admin.name && config.debomatic.admin.name != 'Your Name')
+            label = config.debomatic.admin.name;
         real_email = '<a href="mailto:' + real_email + subject + '">' + label + '</a>';
         $(this).html(real_email);
     })

debomatic-webui/public/javascripts/page_generic.js

@@ -107,8 +107,8 @@ function Page_Generic() {
                     // and show idle label if necessary.
                     setTimeout(function () {
                         li.remove();
-                        if ($('#status li').length === 0);
-                        $('#status .idle').show();
+                        if ($('#status li').length === 0)
+                            $('#status .idle').show();
                     }, config.status.delay.remove + 2000); // more delay on remove html
                 }, config.status.delay.remove);
             } else if (!status_data.hasOwnProperty('success')) {