Merge branch 'release/fix_storage_heights'

Author: gregra81

assets/css/common.css

@@ -196,8 +196,8 @@ input[type="checkbox"]:checked + label span.chk {
     text-decoration: none;
     cursor: pointer;
     /* medium size is default */
-    height: 35px;
-    line-height: 35px;
+    height: 40px;
+    line-height: 40px;
     padding: 0px 32px;
     font-size: 14px;
     position: relative;
@@ -600,25 +600,25 @@ i.stooltip span {
 }
 
 .print-si-close-light {
-    background-position: -35px -5px;
+    background-position: -34px -5px;
     width: 26px;
     height: 26px;
 }
 
 .print-si-close-light:hover, .btn-simulator-container:hover .print-si-close-light {
-    background-position: -35px -31px;
+    background-position: -34px -31px;
     width: 26px;
     height: 26px;
 }
 
 .print-si-pause-light {
-    background-position: -65px -5px;
+    background-position: -69px -5px;
     width: 26px;
     height: 26px;
 }
 
 .print-si-pause-light:hover , .btn-simulator-container:hover .print-si-pause-light {
-    background-position: -65px -31px;
+    background-position: -69px -31px;
     width: 26px;
     height: 26px;
 }
@@ -659,6 +659,18 @@ i.stooltip span {
     height: 26px;
 }
 
+.print-si-round-resume-light {
+    background-position: -41px -66px;
+    width: 26px;
+    height: 26px;
+}
+
+.print-si-round-resume-light:hover {
+    background-position: -41px -95px;
+    width: 26px;
+    height: 26px;
+}
+
 
 .print-si-browse {
     background-position: -5px -30px;

assets/img/print_sprite.png

@@ -3,13 +3,14 @@ var APP_KEY = APP_KEY || '',
 	GUEST_TOKEN_URL = GUEST_TOKEN_URL || 'http://localhost:3000/guest_token',
 	ACCESS_TOKEN_URL = ACCESS_TOKEN_URL || 'http://localhost:3000/access_token',
 	REFRESH_TOKEN_URL = REFRESH_TOKEN_URL || 'http://localhost:3000/refresh_token',
-	API_URL = (typeof ENVIRONMENT !== 'undefined' && ENVIRONMENT === 'production') ?
-		ADSKSpark.Constants.API_HOST_PROD :
-		ADSKSpark.Constants.API_HOST_SANDBOX;
+	API_URL = (typeof ENVIRONMENT !== 'undefined' && ENVIRONMENT === 'production') ? 	ADSKSpark.Constants.API_HOST_PROD :
+																						ADSKSpark.Constants.API_HOST_SANDBOX,
+	REDIRECT_URI = REDIRECT_URI || ''
 
 ADSKSpark.Client.initialize(APP_KEY,// Your app key
 	GUEST_TOKEN_URL,// The guest token endpoint that is implemented by your server (i.e. http://example.com/guest_token)
 	ACCESS_TOKEN_URL,// The access token endpoint that is implemented by your server (i.e. http://example.com/access_token)
 	REFRESH_TOKEN_URL,// The refresh access token endpoint that is implemented by your server (i.e. http://example.com/refresh_token)
-	API_URL // api host
+	API_URL, // api host
+	REDIRECT_URI
 );

assets/img/simulator_panel_bg.png

@@ -46,7 +46,7 @@
 
 		#files .table-container{
 			overflow-y: auto;
-			height: 390px;
+			height: 290px;
 			margin-bottom: 25px;
 		}
 
@@ -90,7 +90,6 @@
 				<tr>
 					<th>Name<br/><span>file_name</span></th>
 					<th>ID<br/><span>file_id</span></th>
-					<th></th>
 				</tr>
 				</thead>
 				<tbody id="filesTbody">

assets/scripts/config.example.js

@@ -33,7 +33,7 @@
 			text-transform: uppercase;
 		}
 
-		#fileURL{
+		#fileId{
 			width: 350px;
 		}
 
@@ -95,6 +95,17 @@
 			margin-bottom: 0px;
 		}
 
+		.footer-action
+		{
+			border-top: 1px solid #e5e5e5;
+			padding: 18px 0;
+		}
+
+		.form-group
+		{
+			margin-bottom: 19px;
+		}
+
 	</style>
 </head>
 
@@ -106,20 +117,20 @@
 				<div class="sample-title">Create a 3D print job</div>
 				<hr>
 				<section class="form_field pull-left">
-					<label for="fileURL">
+					<label for="fileId">
 						Choose file to print <span class="field-label">&nbsp;/&nbsp;printable_id</span><i class="required"></i>
 						<i class="spark_icon si-help with_hover"></i>
-						<i class="stooltip"><span style="display: none;width:400px;">Enter the URL of a printable 3D file, the Spark ID of a printable 3D file or browse to locate one on your desktop. Printable files can be STL, OBJ or BLT 3D files, or a printable file created by Spark.</span></i>
+						<i class="stooltip"><span style="display: none;width:400px;">Enter the Spark ID of a printable 3D file or browse to select an existing file. Printable files can be gcode files, or a printable file created by Spark.</span></i>
 					</label>
 					<div class="clearfix"></div>
 					<!--<input type="text" class="form-control" id="fileURL" placeholder="File URL" required value="http://cdn.spark.com/print/abcefg">-->
 					<div class="pull-left">
-						<input type="text" class="form-control" id="fileURL" placeholder="Enter file URL" required>
+						<input type="text" class="form-control" id="fileId" placeholder="Enter printable file id" required>
 						<div class="field_error hidden">
 							<span>Required</span>
 						</div>
 					</div>
-					<div class="pull-left or-browse">OR</div><a class="spark_btn empty browse_btn pull-left" href="#" onclick="eventBroadCaster.broadcastEvent('printIframe.chooseAsset')"><i class="spark_print_icon print-si-browse"></i><span>Browse...</span></a>
+					<div class="pull-left or-browse">OR</div><a class="spark_btn empty browse_btn pull-left" href="#" onclick="eventBroadCaster.broadcastEvent('printIframe.chooseFile')"><i class="spark_print_icon print-si-browse"></i><span>Browse...</span></a>
 				</section>
 				<div class="spacer clearfix"></div>
 				<section class="form_field">
@@ -147,8 +158,8 @@
 				</div>
 				<input type="hidden" id="assetId">
 				</div>
-				<div class="pull-right">
-					<input class="spark_btn primary" type="submit" value="Print and continue" id="print">
+				<div class="footer-action ">
+					<input class="spark_btn primary pull-right" type="submit" value="Print and continue" id="print">
 				</div>
 			</form>
 
@@ -158,10 +169,10 @@
 				<div class="modal-content">
 					<div class="modal-header">
 						<button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-						<h4>WARNING</h4>
+						<h4>ERROR</h4>
 					</div>
 					<div class="modal-body">
-						An error occurred.
+
 					</div>
 					<div class="modal-footer">
 						<a class="spark_btn small cancel" type="button">Close</a>
@@ -207,7 +218,8 @@ <h4>WARNING</h4>
 		var urlParams = spark.util.extractParamsFromURL();
 		currentFileId = urlParams['fileId'] ? urlParams['fileId'] : "";
 		if (currentFileId != "") {
-			$("#fileURL").val(currentFileId);
+			//sending a printable id from the tray since currently there is a bug and we cant print files from the drive
+			$("#fileId").val("17223875");
 		}
 
 		var getAllPrinters = function(){
@@ -237,19 +249,27 @@ <h4>WARNING</h4>
 
 		$("#print-job-form").on('submit', function (e) {
 			e.preventDefault();
-			if (common.validateInput($('#fileURL')) && common.validateInput($('#printers-select'))) {
+			if (common.validateInput($('#fileId')) && common.validateInput($('#printers-select'))) {
 
-				var fileUrl = $('#fileURL').val();
+				var fileId = $('#fileId').val();
 				var printerId = $('#printers-select option:selected').val();
-				var settings = JSON.parse($('#printer-settings').val());
-
-				sparkPrint.printJob(fileUrl, printerId, settings, function (response) {
-							var printerId = response.printer_id;
-							eventBroadCaster.broadcastEvent('printIframe.jobExist');
-						},
-						function (response) {
-							$('#myModal').modal('show');
-						});
+
+				try{
+					var  settings = JSON.parse($('#printer-settings').val());
+					sparkPrint.printJob(fileId, printerId, settings, function (response) {
+								var printerId = response.printer_id;
+								eventBroadCaster.broadcastEvent('printIframe.jobExist');
+							},
+							function (response) {
+								var res = JSON.parse(response);
+								var message = res.message != undefined && res.message != "" ? res.message : "An error occurred.";
+								$('#myModal').find(".modal-body").html("<span>" + message + "</span>");
+								$('#myModal').modal('show');
+							});
+				}catch(e){
+					$('#myModal').find(".modal-body").html("<span>The Settings parameter must be in JSON format!</span>");
+					$('#myModal').modal('show');
+				}
 			}
 		});
 

assets/scripts/init.js

@@ -22,22 +22,15 @@
 	<link href="../../assets/css/common.css" rel="stylesheet">
 
 	<style>
+
 		.modal-header {
 			position: relative;
 			padding: 8px 20px;
 		}
 
-		.modal-header .layouts {
-			position: absolute;
-			right: 0;
-			background-color: #ffffff;
-			padding-left: 10px;
-		}
-
-		.modal-header .layouts a {
-			border-left: 1px solid lightgrey;
-			margin-left: 6px;
-			padding: 4px 0 0 10px;
+		.modal-dialog{
+			width: 340px;
+			margin-left: 170px;
 		}
 
 		#empty-printers {
@@ -71,14 +64,25 @@
 		}
 
 		.table tr.in-table:hover {
-			background-color: #F7F7F7;
+			background-color: transparent;
 			cursor: default;
 		}
 
 		.table tr.in-table .actions {
 			cursor: pointer;
 		}
 
+		.sub-title
+		{
+			margin-top: 7px;
+		}
+
+		.footer-action
+		{
+			border-top: 1px solid #e5e5e5;
+			padding: 18px 0;
+		}
+
 	</style>
 
 
@@ -91,7 +95,7 @@
 		<form id="manage-printers-form">
 			<div class="sample-title">Manage your 3D Printers</div>
 			<hr>
-			<div class="pull-left">Manage your existing printers, or register a new printer.</div>
+			<div class="sub-title pull-left">Manage your existing printers, or register a new printer.</div>
 			<a class="spark_btn empty pull-right" onclick="eventBroadCaster.broadcastEvent('manageIframe.addClick')">
 				<i class="spark_print_icon print-si-plus"></i>  Register Printer
 			</a>
@@ -120,8 +124,9 @@
 		</form>
 
 
-		<br>
+		<div class="footer-action">
 	    <a id="continue" class="spark_btn primary pull-right" onclick="eventBroadCaster.broadcastEvent('manageIframe.continueClick')">Print job</a>
+	    </div>
 	</div>
 
 <!-- /container -->