From 5f5cd62bd97356e4c46ca4852a6c9e1e8ae51fba Mon Sep 17 00:00:00 2001
From: Git Repository <git@macmediainc.com>
Date: Sun, 7 May 2017 08:56:38 -0700
Subject: [PATCH] Changed to save all assets in one folder

---
 management/templates/index.html |  8 ++++----
 setup/management.sh             | 35 ++++++++++++---------------------
 2 files changed, 17 insertions(+), 26 deletions(-)
diff --git a/management/templates/index.html b/management/templates/index.html
index ce9fbe31..15531c7d 100644
--- a/management/templates/index.html
+++ b/management/templates/index.html
@@ -9,7 +9,7 @@
 
         <meta name="robots" content="noindex, nofollow">
 
-        <link rel="stylesheet" href="/assets/css/lib/bootstrap.min.css">
+        <link rel="stylesheet" href="/assets/bootstrap.min.css">
         <style>
 	    body {
 		overflow-y: scroll;
@@ -63,7 +63,7 @@
 	       margin-bottom: 1em;
 	    }
         </style>
-        <link rel="stylesheet" href="/assets/css/lib/bootstrap-theme.min.css">
+        <link rel="stylesheet" href="/assets/bootstrap-theme.min.css">
     </head>
     <body>
 
@@ -191,8 +191,8 @@
           </div>
         </div>
 
-        <script src="/assets/js/lib/jquery.min.js"></script>
-        <script src="/assets/js/lib/bootstrap.min.js"></script>
+        <script src="/assets/jquery.min.js"></script>
+        <script src="/assets/bootstrap.min.js"></script>
 
         <script>
 var global_modal_state = null;
diff --git a/setup/management.sh b/setup/management.sh
index 7e6fe29b..aeaa9c0c 100755
--- a/setup/management.sh
+++ b/setup/management.sh
@@ -63,37 +63,28 @@ fi
 
 
 # Download jQuery and Bootstrap local files
-echo "Installing Mail-in-a-Box system management web assets..."
+
+# Make sure we have the directory to save to.
+assets_dir=$STORAGE_ROOT/www/default/assets
+mkdir -p $assets_dir
 
 # jQuery CDN URL
 jquery_version=2.1.4
 jquery_url=https://code.jquery.com
 
+# Get the Javascript files
+wget_verify $jquery_url/jquery-$jquery_version.min.js 43dc554608df885a59ddeece1598c6ace434d747 $assets_dir/jquery.min.js
+wget_verify $bootstrap_url/js/bootstrap.min.js 430a443d74830fe9be26efca431f448c1b3740f9 $assets_dir/bootstrap.min.js
+
 # Bootstrap CDN URL
 bootstrap_version=3.3.7
 bootstrap_url=https://maxcdn.bootstrapcdn.com/bootstrap/$bootstrap_version
 
-js_lib=$STORAGE_ROOT/www/default/assets/js/lib
-css_lib=$STORAGE_ROOT/www/default/assets/css/lib
-
-# Make sure we have the directories to save to.
-if [ ! -d $js_lib ]; then
-	mkdir -p $js_lib
-fi
-
-if [ ! -d $css_lib ]; then
-	mkdir -p $css_lib
-fi
-
-# Get the Javascript files
-wget_verify $jquery_url/jquery-$jquery_version.min.js 43dc554608df885a59ddeece1598c6ace434d747 $js_lib/jquery.min.js
-wget_verify $bootstrap_url/js/bootstrap.min.js 430a443d74830fe9be26efca431f448c1b3740f9 $js_lib/bootstrap.min.js
-
-# Get the CSS(map) files
-wget_verify $bootstrap_url/css/bootstrap-theme.min.css 8256575374f430476bdcd49de98c77990229ce31 $css_lib/bootstrap-theme.min.css
-wget_verify $bootstrap_url/css/bootstrap-theme.min.css.map 87f7dfd79d77051ac2eca7d093d961fbd1c8f6eb $css_lib/bootstrap-theme.min.css.map
-wget_verify $bootstrap_url/css/bootstrap.min.css 6527d8bf3e1e9368bab8c7b60f56bc01fa3afd68 $css_lib/bootstrap.min.css
-wget_verify $bootstrap_url/css/bootstrap.min.css.map e0d7b2bde55a0bac1b658a507e8ca491a6729e06 $css_lib/bootstrap.min.css.map
+# Get the CSS/Map files
+wget_verify $bootstrap_url/css/bootstrap-theme.min.css 8256575374f430476bdcd49de98c77990229ce31 $assets_dir/bootstrap-theme.min.css
+wget_verify $bootstrap_url/css/bootstrap-theme.min.css.map 87f7dfd79d77051ac2eca7d093d961fbd1c8f6eb $assets_dir/bootstrap-theme.min.css.map
+wget_verify $bootstrap_url/css/bootstrap.min.css 6527d8bf3e1e9368bab8c7b60f56bc01fa3afd68 $assets_dir/bootstrap.min.css
+wget_verify $bootstrap_url/css/bootstrap.min.css.map e0d7b2bde55a0bac1b658a507e8ca491a6729e06 $assets_dir/bootstrap.min.css.map
 
 
 # Link the management server daemon into a well known location.
