Merge branch 'feature/printerdriver' of https://github.com/Doodle3D/doodle3d-client into feature/printerdriver

# By Wouter R
# Via Wouter R
* 'feature/printerdriver' of https://github.com/Doodle3D/doodle3d-client:
  Re-added two css files which were accidentally untracked.
  Untrack and ignore derived files in www/js and www/css directories.
  Change references to minified stylesheets.
  Add openwrt package Makefile. Add short description of steps to build css and js files.
  Fix permissions.

Conflicts:
	www/css/styles.css
	www/css/styles.min.css
	www/index.html
	www/js/doodle3d-client.js
	www/js/doodle3d-client.min.js

.gitignore

@@ -2,6 +2,9 @@
 .project
 
 .idea/*
+www/js/*.js
+www/css/styles.css
+www/css/*.min.css
 __index.html
 _index.html
 div_bgs.html
@@ -28,4 +31,4 @@ less/verticalshapes.css
 less/verticalshapes_backup.css
 __settings.html
 css/_settings.css
-node_modules/*
+node_modules/*

Makefile

@@ -0,0 +1,64 @@
+################################################
+# OpenWrt Makefile for Doodle3D Print3D driver #
+################################################
+include $(TOPDIR)/rules.mk
+
+PKG_NAME := doodle3d-client
+PKG_VERSION := 0.9.0
+PKG_RELEASE := 1
+
+PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/doodle3d-client
+	SECTION:=mods
+	CATEGORY:=Doodle3D
+	TITLE:=Doodle3D web client
+	DEPENDS:=
+endef
+
+define Package/doodle3d-client/description
+	This package provides the Doodle3D web client, which interacts with the wifibox package using a REST API.
+endef
+
+define Build/Prepare
+	mkdir -p $(PKG_BUILD_DIR)
+	$(CP) less $(PKG_BUILD_DIR)/
+	$(CP) www $(PKG_BUILD_DIR)/
+	$(CP) Gruntfile.js $(PKG_BUILD_DIR)/
+	$(CP) README.md $(PKG_BUILD_DIR)/
+	$(CP) ___settings.html $(PKG_BUILD_DIR)/
+	$(CP) lesstocss.sh $(PKG_BUILD_DIR)/
+	$(CP) package.json $(PKG_BUILD_DIR)/
+endef
+
+define Build/Compile
+	npm install
+	grunt less autoprefixer cssmin concat uglify
+endef
+
+define Package/doodle3d-client/install
+	$(INSTALL_DIR) $(1)/www
+	$(INSTALL_DIR) $(1)/www/css
+	$(INSTALL_DIR) $(1)/www/img
+	#$(INSTALL_DIR) $(1)/www/js
+	$(INSTALL_DIR) $(1)/www/js/libs
+	
+	$(CP) $(PKG_BUILD_DIR)/www/favicon* $(1)/www/
+	$(CP) $(PKG_BUILD_DIR)/www/index.html $(1)/www/
+	$(CP) $(PKG_BUILD_DIR)/www/settings.html $(1)/www/
+	
+	$(CP) $(PKG_BUILD_DIR)/www/css/debug.min.css $(1)/www/css/
+	$(CP) $(PKG_BUILD_DIR)/www/css/settings.min.css $(1)/www/css/
+	$(CP) $(PKG_BUILD_DIR)/www/css/styles.min.css $(1)/www/css/
+	
+	$(CP) $(PKG_BUILD_DIR)/www/img/* $(1)/www/img/
+	
+	$(CP) $(PKG_BUILD_DIR)/www/js/doodle3d-client.min.js $(1)/www/js/
+	$(CP) $(PKG_BUILD_DIR)/www/js/libs/* $(1)/www/js/libs/
+	
+	$(CP) $(PKG_BUILD_DIR)/www/library $(1)/www/
+endef
+
+$(eval $(call BuildPackage,doodle3d-client))

README.md

@@ -1 +1,13 @@
-Doodle3D client app
+Doodle3D client app
+===================
+
+
+# How to build
+
+## Prerequisites
+- get `npm`, the Node.js package manager, for instance using macports on OSX.
+- (prerequisite) install Grunt: `npm install -g grunt-cli`.
+- run npm install in the project root to install project dependencies
+
+Finally run grunt to build minified css and js files. By default, it will keep
+running to automatically rebuild when source files are changed.

www/css/debug.css

@@ -42,4 +42,4 @@
 	background-color: #fff;
 	opacity: .7;
 	color: #000;
-}
+}

www/css/debug.min.css

@@ -1 +0,0 @@
-.debugContainer{position:absolute;top:0;left:0;z-index:500;background-color:#f0f;display:none}#debug_textArea{position:absolute;bottom:0;z-index:500;display:none}.debugBtn{width:25px;height:25px;background-color:#03b;float:left}.agentInfo{background:#fff;border:1px #333 solid;display:none;float:left;opacity:.7}.agentInfoToggle{display:block}#debug_display{position:absolute;top:0;left:0;display:none;background-color:#fff;opacity:.7;color:#000}

www/css/settings.css

@@ -106,4 +106,4 @@ form dl dt {
 	float: left;
 	font-style: italic;
 	width: 10em;
-}
+}

www/css/settings.min.css

@@ -1 +0,0 @@
-form{margin:10px;max-width:600px}form input{margin:1px}body,th,td{font-family:Helvetica,Arial,"Nimbus Sans L",sans-serif;font-size:13px}.settingsContainer{position:relative;width:100%;height:100%}form fieldset{max-width:600px;border:1px solid #bbb;border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;margin-bottom:20px;padding:8px}form fieldset fieldset{max-width:580px;margin:15px 0 5px;clear:left;float:left}form fieldset legend{margin-left:10px;font-weight:700}form label{min-width:150px;display:block;float:left;margin:1px 0 0;clear:left}form div{float:left}form input[type=text],form input[type=number],form input[type=password]{border:1px solid #90c0ff;margin-right:5px;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px}form input[type=text].small,form input[type=number].small,form input[type=password].small{width:50px}form input[type=text].large,form input[type=number].large,form input[type=password].large{width:250px}form input[type=radio]{margin:4px 4px 0 0}form textarea{border:1px solid #90c0ff;-webkit-border-radius:5px;-moz-border-radius:5px;border-radius:5px}form .startgcode_left{float:left;margin-right:20px}form textarea.gcode{width:252px;height:150px}form small{margin:3px 0 0;display:block;clear:left}form .button{display:inline-block}form #passwordLabel,form #password{display:none}form input.error,form textarea.error,form select.error{border:red solid 2px}form .errorMsg{color:red;margin:0 0 0 1em}form dl dt{float:left;font-style:italic;width:10em}

www/index.html

@@ -11,9 +11,10 @@
 
   <meta id="Viewport" name="viewport" content="width=device-width,initial-scale=1.0,maximum-scale=1.0,user-scalable=no">
 
+  <!--link href="css/styles.css" rel="stylesheet" media="screen"-->
+  <!--link href="css/debug.css" rel="stylesheet" media="screen"-->
   <link href="css/styles.min.css" rel="stylesheet" media="screen">
   <link href="css/debug.min.css" rel="stylesheet" media="screen">
-  <!--<link href="css/joyride-2-1.css" rel="stylesheet" media="screen">-->
 
 </head>
 <body>
@@ -58,7 +59,7 @@
       <img class="btnSettings btn" src="img/buttons/btnSettings.png">
       <img class="btnInfo btn" src="img/buttons/btnInfo.png">
     </div>
-    
+
     <div id="message"></div>
   </div>
 
@@ -152,4 +153,4 @@
 -->
 
 </body>
-</html>
+</html>

www/settings.html

@@ -6,7 +6,8 @@
   <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
   <meta id="Viewport" name="viewport" content="width=device-width,initial-scale=1.0,maximum-scale=1.0,user-scalable=no">
 
-  <link href="css/settings.css" rel="stylesheet" media="screen">
+  <link href="css/settings.min.css" rel="stylesheet" media="screen">
+  <!--link href="css/settings.css" rel="stylesheet" media="screen"-->
 </head>
 <body>
 <div class="settingsContainer">
@@ -111,7 +112,7 @@
 
 	    <fieldset id="clientSettings">
 	      	<legend>Client mode settings</legend>
-	      
+
 	      	<label for="wifiboxid">Wi-Fi box id*:</label><input type="text" name="network.cl.wifiboxid" id="wifiboxid"><br>
         	<small>* Is used on <a href="http://connect.doodle3d.com">connect.doodle3d.com</a>. <br/>
         	The text <em>%%MAC_ADDR_TAIL%%</em> will be replaced by the last 6 digits of your Doodle3D Wi-Fi box's MAC address.</small>
@@ -157,4 +158,4 @@
   </form><br/>
 </div>
 </body>
-</html>
+</html>