Merge pull request #51 from joewashear007/DevBranch

Dev branch

Author: joewashear007

server.py

@@ -327,11 +327,12 @@ def _make_server_temp_dir(self):
         self.cwd = os.path.dirname(os.path.realpath(__file__))
         self.tempdir = tempfile.mkdtemp()
         os.chdir(self.tempdir)
+        print("New temp dir:", self.tempdir)
 
     def _make_webpage(self):
         shutil.copytree( self.cwd+"/web/js", self.tempdir+"/js/")
         shutil.copytree( self.cwd+"/web/css/", self.tempdir+"/css/")
-        shutil.copytree( self.cwd+"/web/fonts/", self.tempdir+"/fonts/")
+        #shutil.copytree( self.cwd+"/web/fonts/", self.tempdir+"/fonts/")
         html = open(self.tempdir + "/index.html" ,"w")
         for line in open(self.cwd + "/web/index.temp", "r"):
             if line.find("$address") > 0 :

test.blend

@@ -1,9 +1,9 @@
 /*!
-* jQuery Mobile 1.4.0
-* Git HEAD hash: f09aae0e035d6805e461a7be246d04a0dbc98f69 <> Date: Thu Dec 19 2013 17:34:22 UTC
+* jQuery Mobile 1.4.1
+* Git HEAD hash: 18c1e32bfc4e0e92756dedc105d799131607f5bb <> Date: Wed Feb 12 2014 22:15:20 UTC
 * http://jquerymobile.com
 *
-* Copyright 2010, 2013 jQuery Foundation, Inc. and other contributors
+* Copyright 2010, 2014 jQuery Foundation, Inc. and other contributors
 * Released under the MIT license.
 * http://jquery.org/license
 *
@@ -24,7 +24,7 @@ button,
 .ui-btn {
 	font-size: 1em;
 	line-height: 1.3;
-	    font-family: sans-serif /*{global-font-family}*/;
+	   font-family: sans-serif /*{global-font-family}*/;
 }
 legend,
 .ui-input-text input,
@@ -208,7 +208,7 @@ html .ui-alt-icon .ui-radio-off:after {
 }
 /* Loader */
 .ui-icon-loading {
-	background: url(images/ajax-loader.gif);
+	background: url("images/ajax-loader.gif");
 	background-size: 2.875em 2.875em;
 }
 /* Swatches */
@@ -220,10 +220,10 @@ html .ui-alt-icon .ui-radio-off:after {
 html .ui-bar-a .ui-bar-inherit,
 html .ui-body-a .ui-bar-inherit,
 html body .ui-group-theme-a .ui-bar-inherit {
-	background: #ba6505 /*{a-bar-background-color}*/;
-	border-color: #d09d6c /*{a-bar-border}*/;
-	color: #ffffff /*{a-bar-color}*/;
-	text-shadow: 0 /*{a-bar-shadow-x}*/ 2px /*{a-bar-shadow-y}*/ 0 /*{a-bar-shadow-radius}*/ #444444 /*{a-bar-shadow-color}*/;
+	background: #e28755 /*{a-bar-background-color}*/;
+	border-color: #f95806 /*{a-bar-border}*/;
+	color: #9e2200 /*{a-bar-color}*/;
+	text-shadow: 1px /*{a-bar-shadow-x}*/ 1px /*{a-bar-shadow-y}*/ 1px /*{a-bar-shadow-radius}*/ #ffd8b3 /*{a-bar-shadow-color}*/;
 	font-weight: bold;
 }
 .ui-bar-a {
@@ -234,10 +234,10 @@ html body .ui-group-theme-a .ui-bar-inherit {
 .ui-overlay-a,
 .ui-page-theme-a,
 .ui-page-theme-a .ui-panel-wrapper {
-	background: #292929 /*{a-page-background-color}*/;
+	background: #ffffff /*{a-page-background-color}*/;
 	border-color: #bbbbbb /*{a-page-border}*/;
 	color: #333333 /*{a-page-color}*/;
-	text-shadow: 0 /*{a-page-shadow-x}*/ 1px /*{a-page-shadow-y}*/ 0 /*{a-page-shadow-radius}*/ #f3f3f3 /*{a-page-shadow-color}*/;
+	text-shadow: 0 /*{a-page-shadow-x}*/ 0 /*{a-page-shadow-y}*/ 0 /*{a-page-shadow-radius}*/ #000000 /*{a-page-shadow-color}*/;
 }
 /* Body: Read-only lists, text inputs, collapsible content */
 .ui-body-a,
@@ -294,7 +294,7 @@ html .ui-body-a .ui-btn:visited,
 html body .ui-group-theme-a .ui-btn:visited,
 html head + body .ui-btn.ui-btn-a:visited {
 	background: #f6f6f6 /*{a-bup-background-color}*/;
-	border-color: #d09d6c /*{a-bup-border}*/;
+	border-color: #f95806 /*{a-bup-border}*/;
 	color: #333333 /*{a-bup-color}*/;
 	text-shadow: 0 /*{a-bup-shadow-x}*/ 2px /*{a-bup-shadow-y}*/ 0 /*{a-bup-shadow-radius}*/ #f3f3f3 /*{a-bup-shadow-color}*/;
 }
@@ -305,7 +305,7 @@ html .ui-body-a .ui-btn:hover,
 html body .ui-group-theme-a .ui-btn:hover,
 html head + body .ui-btn.ui-btn-a:hover {
 	background: #ededed /*{a-bhover-background-color}*/;
-	border-color: #dddddd /*{a-bhover-border}*/;
+	border-color: #f95806 /*{a-bhover-border}*/;
 	color: #333333 /*{a-bhover-color}*/;
 	text-shadow: 0 /*{a-bhover-shadow-x}*/ 2px /*{a-bhover-shadow-y}*/ 0 /*{a-bhover-shadow-radius}*/ #f3f3f3 /*{a-bhover-shadow-color}*/;
 }
@@ -315,7 +315,7 @@ html .ui-bar-a .ui-btn:active,
 html .ui-body-a .ui-btn:active,
 html body .ui-group-theme-a .ui-btn:active,
 html head + body .ui-btn.ui-btn-a:active {
-	background: #e8e8e8 /*{a-bdown-background-color}*/;
+	background: #e28755 /*{a-bdown-background-color}*/;
 	border-color: #dddddd /*{a-bdown-border}*/;
 	color: #333333 /*{a-bdown-color}*/;
 	text-shadow: 0 /*{a-bdown-shadow-x}*/ 2px /*{a-bdown-shadow-y}*/ 0 /*{a-bdown-shadow-radius}*/ #f3f3f3 /*{a-bdown-shadow-color}*/;
@@ -344,18 +344,18 @@ html .ui-bar-a .ui-slider-track .ui-btn-active,
 html .ui-body-a .ui-slider-track .ui-btn-active,
 html body .ui-group-theme-a .ui-slider-track .ui-btn-active,
 html body div.ui-slider-track.ui-body-a .ui-btn-active {
-	background-color: #ba6505 /*{a-active-background-color}*/;
-	border-color: #d09d6c /*{a-active-border}*/;
+	background-color: #e28755 /*{a-active-background-color}*/;
+	border-color: #f95806 /*{a-active-border}*/;
 	color: #ffffff /*{a-active-color}*/;
-	text-shadow: 0 /*{a-active-shadow-x}*/ 2px /*{a-active-shadow-y}*/ 0 /*{a-active-shadow-radius}*/ #eb7300 /*{a-active-shadow-color}*/;
+	text-shadow: 1px /*{a-active-shadow-x}*/ 1px /*{a-active-shadow-y}*/ 1px /*{a-active-shadow-radius}*/ #ffd8b3 /*{a-active-shadow-color}*/;
 }
 /* Active radio button icon */
 .ui-page-theme-a .ui-radio-on:after,
 html .ui-bar-a .ui-radio-on:after,
 html .ui-body-a .ui-radio-on:after,
 html body .ui-group-theme-a .ui-radio-on:after,
 .ui-btn.ui-radio-on.ui-btn-a:after {
-	border-color: #ba6505 /*{a-active-background-color}*/;
+	border-color: #e28755 /*{a-active-background-color}*/;
 }
 /* Focus */
 .ui-page-theme-a .ui-btn:focus,
@@ -370,9 +370,9 @@ html .ui-body-a .ui-focus,
 html body .ui-group-theme-a .ui-focus,
 html head + body .ui-btn-a.ui-focus,
 html head + body .ui-body-a.ui-focus {
-	-webkit-box-shadow: 0 0 12px #ba6505 /*{a-active-background-color}*/;
-	-moz-box-shadow: 0 0 12px #ba6505 /*{a-active-background-color}*/;
-	box-shadow: 0 0 12px #ba6505 /*{a-active-background-color}*/;
+	-webkit-box-shadow: 0 0 12px #e28755 /*{a-active-background-color}*/;
+	-moz-box-shadow: 0 0 12px #e28755 /*{a-active-background-color}*/;
+	box-shadow: 0 0 12px #e28755 /*{a-active-background-color}*/;
 }
 /* B
 -----------------------------------------------------------------------------------------------------------*/
@@ -382,10 +382,10 @@ html head + body .ui-body-a.ui-focus {
 html .ui-bar-b .ui-bar-inherit,
 html .ui-body-b .ui-bar-inherit,
 html body .ui-group-theme-b .ui-bar-inherit {
-	background: #ed1c24 /*{b-bar-background-color}*/;
-	border-color: #820f13 /*{b-bar-border}*/;
-	color: #fff55c /*{b-bar-color}*/;
-	text-shadow: 0 /*{b-bar-shadow-x}*/ 2px /*{b-bar-shadow-y}*/ 0 /*{b-bar-shadow-radius}*/ #444444 /*{b-bar-shadow-color}*/;
+	background: #ec798e /*{b-bar-background-color}*/;
+	border-color: #c41219 /*{b-bar-border}*/;
+	color: #c41219 /*{b-bar-color}*/;
+	text-shadow: 1px /*{b-bar-shadow-x}*/ 1px /*{b-bar-shadow-y}*/ 1px /*{b-bar-shadow-radius}*/ #fabdbd /*{b-bar-shadow-color}*/;
 	font-weight: bold;
 }
 .ui-bar-b {