Merge remote-tracking branch 'github/master' into portable

debomatic-webui/public/javascripts/page_distribution.js

@@ -440,7 +440,7 @@ function Page_Distrubion(socket) {
                 query_data.file.content = null;
                 query_data.file.force = force;
                 // get a feedback to user while downloading file
-                $('#file .content').html('Downloading file, please wait a while ...');
+                $('#file .content').html('<div class="loading">Downloading file, please wait a while ... <img src="/images/loading.gif" /></div>');
                 $('#file').show();
                 debug_socket('emit', _e.file, query_data);
                 socket.emit(_e.file, query_data);

debomatic-webui/public/javascripts/page_generic.js

@@ -143,12 +143,12 @@ function Page_Generic() {
             $('footer .info').show();
             $('.navbar .home-link').show();
         }
-
+        var bootstrap_theme_css = '/external_libs/bootstrap-3.2.0-dist/css/bootstrap-theme.min.css';
         if (config.preferences.glossy_theme) {
-            if ($('head').find('link[href="/external_libs/bootstrap-3.1.1-dist/css/bootstrap-theme.min.css"]').length === 0)
-                $('head').append('<link rel="stylesheet" href="/external_libs/bootstrap-3.1.1-dist/css/bootstrap-theme.min.css">');
+            if ($('head').find('link[href="' + bootstrap_theme_css + '"]').length === 0)
+                $('head').append('<link rel="stylesheet" href="' + bootstrap_theme_css + '">');
         } else {
-            $('head').find('link[href="/external_libs/bootstrap-3.1.1-dist/css/bootstrap-theme.min.css"]').remove();
+            $('head').find('link[href="' + bootstrap_theme_css + '"]').remove();
         }
     };
 

debomatic-webui/public/stylesheets/style.css

@@ -189,6 +189,10 @@ footer .info {
   overflow:hidden;
 }
 
+#file .loading img {
+  float: right;
+}
+
 #title a.btn {
   padding: 10px 12px;
   float: right;

debomatic-webui/scripts/install/download_external_libs.sh

@@ -3,7 +3,7 @@
 EXT_LIBS_DIR="${SCRIPTS_DIR}/../public/external_libs"
 
 get_bootstrap() {
-  VERSION="3.1.1"
+  VERSION="3.2.0"
   NAME="bootstrap-${VERSION}-dist"
   if [ -d ${EXT_LIBS_DIR}/${NAME} ] ; then return ; fi
   ARCHIVE=${NAME}.zip

debomatic-webui/views/footer.ejs

@@ -15,7 +15,7 @@
 
     <script src='/socket.io/socket.io.js?<%= version %>'></script>
     <script src='/external_libs/jquery/jquery-1.11.0.min.js'></script>
-    <script src="/external_libs/bootstrap-3.1.1-dist/js/bootstrap.min.js"></script>
+    <script src="/external_libs/bootstrap-3.2.0-dist/js/bootstrap.min.js"></script>
 
     <script>
     var config = <%- JSON.stringify(web) %>

debomatic-webui/views/header.ejs

@@ -4,8 +4,8 @@
     <link rel="shortcut icon" type="image/x-icon" href="/images/favicon.png" />
     <title><%= web.title %></title>
     <meta name="viewport" content="width=device-width, initial-scale=1">
-    <link rel="stylesheet" href="/external_libs/bootstrap-3.1.1-dist/css/bootstrap.min.css">
-    <link rel="stylesheet" href="/external_libs/bootstrap-3.1.1-dist/css/bootstrap-theme.min.css">
+    <link rel="stylesheet" href="/external_libs/bootstrap-3.2.0-dist/css/bootstrap.min.css">
+    <link rel="stylesheet" href="/external_libs/bootstrap-3.2.0-dist/css/bootstrap-theme.min.css">
     <link rel="stylesheet" href="/stylesheets/style.css?<%= version %>">
   </head>