From 2ab38ace1bccdb4ae83d269728c9143c81573364 Mon Sep 17 00:00:00 2001
From: Adrianl3d <adrian@lets3d.com>
Date: Tue, 30 Sep 2014 16:34:47 +1000
Subject: [PATCH 1/3] Improved contrast to textOverlay and resize

Increased background alpha, increased text color, and resize to allow
for new properties.
---
 examples/editModels.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/examples/editModels.js b/examples/editModels.js
index c47c497a78..036a0c3834 100644
--- a/examples/editModels.js
+++ b/examples/editModels.js
@@ -2395,7 +2395,7 @@ function Tooltip() {
     this.x = 285;
     this.y = 115;
     this.width = 500;
-    this.height = 180; // 145;
+    this.height = 300; // 145;
     this.margin = 5;
     this.decimals = 3;
 
@@ -2406,8 +2406,8 @@ function Tooltip() {
         height: this.height,
         margin: this.margin,
         text: "",
-        color: { red: 128, green: 128, blue: 128 },
-        alpha: 0.2,
+        color: { red: 228, green: 228, blue: 228 },
+        alpha: 0.5,
         visible: false
     });
     this.show = function (doShow) {

From 0174a985ee1a078fb5c45f5d17d096155f8086c1 Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Wed, 1 Oct 2014 09:56:13 -0700
Subject: [PATCH 2/3] add a domain-server scripts folder that is ignored for
 clean symlink

---
 domain-server/resources/web/assignment/scripts/.gitignore | 4 ++++
 domain-server/src/DomainServer.cpp                        | 4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)
 create mode 100644 domain-server/resources/web/assignment/scripts/.gitignore

diff --git a/domain-server/resources/web/assignment/scripts/.gitignore b/domain-server/resources/web/assignment/scripts/.gitignore
new file mode 100644
index 0000000000..86d0cb2726
--- /dev/null
+++ b/domain-server/resources/web/assignment/scripts/.gitignore
@@ -0,0 +1,4 @@
+# Ignore everything in this directory
+*
+# Except this file
+!.gitignore
\ No newline at end of file
diff --git a/domain-server/src/DomainServer.cpp b/domain-server/src/DomainServer.cpp
index fb475f681d..639d32c823 100644
--- a/domain-server/src/DomainServer.cpp
+++ b/domain-server/src/DomainServer.cpp
@@ -1047,7 +1047,7 @@ const char ASSIGNMENT_SCRIPT_HOST_LOCATION[] = "resources/web/assignment";
 
 QString pathForAssignmentScript(const QUuid& assignmentUUID) {
     QString newPath(ASSIGNMENT_SCRIPT_HOST_LOCATION);
-    newPath += "/";
+    newPath += "/scripts/";
     // append the UUID for this script as the new filename, remove the curly braces
     newPath += uuidStringWithoutCurlyBraces(assignmentUUID);
     return newPath;
@@ -1086,7 +1086,7 @@ bool DomainServer::handleHTTPRequest(HTTPConnection* connection, const QUrl& url
                     // via correct URL for the script so the client can download
                     
                     QUrl scriptURL = url;
-                    scriptURL.setPath(URI_ASSIGNMENT + "/"
+                    scriptURL.setPath(URI_ASSIGNMENT + "/scripts/"
                                       + uuidStringWithoutCurlyBraces(pendingData->getAssignmentUUID()));
                     
                     // have the HTTPManager serve the appropriate script file

From a4b4fc52b6d45cd1a8ea2efb36be6e836b1760fc Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Wed, 1 Oct 2014 11:57:44 -0700
Subject: [PATCH 3/3] handle select inputs in domain server settings creation

---
 domain-server/resources/web/js/settings.js | 26 +++++++++++++++++++---
 1 file changed, 23 insertions(+), 3 deletions(-)

diff --git a/domain-server/resources/web/js/settings.js b/domain-server/resources/web/js/settings.js
index fa05b1cce9..48b3b15e8f 100644
--- a/domain-server/resources/web/js/settings.js
+++ b/domain-server/resources/web/js/settings.js
@@ -33,9 +33,24 @@ var viewHelpers = {
       input_type = _.has(setting, 'type') ? setting.type : "text"
       
       form_group += "<label for='" + setting_name + "' class='" + label_class + "'>" + setting.label + "</label>";
-      form_group += "<input type='" + input_type + "' class='form-control' name='" + setting_name + 
-        "' placeholder='" + (_.has(setting, 'placeholder') ? setting.placeholder : "") + 
-        "' value='" + setting_value + "'" + (isLocked ? " disabled" : "") + "/>"
+      
+      if (setting.type === 'select') {
+        form_group += "<select class='form-control' data-hidden-input='" + setting_name + "'>'"
+        
+        _.each(setting.options, function(option) {
+          form_group += "<option value='" + option.value + "'" + 
+            (option.value == setting_value ? 'selected' : '') + ">" + option.label + "</option>"
+        })
+        
+        form_group += "</select>"
+        
+        form_group += "<input type='hidden' name='" + setting_name + "' value='" + setting_value + "'>"
+      } else {
+        form_group += "<input type='" + input_type + "' class='form-control' name='" + setting_name + 
+          "' placeholder='" + (_.has(setting, 'placeholder') ? setting.placeholder : "") + 
+          "' value='" + setting_value + "'" + (isLocked ? " disabled" : "") + "/>"
+      }
+      
       form_group += "<span class='help-block'>" + setting.help + "</span>" 
     }
     
@@ -90,6 +105,11 @@ $(document).ready(function(){
   $('#settings-form').on('click', '#choose-domain-btn', function(){
     chooseFromHighFidelityDomains($(this))
   })
+  
+  $('#settings-form').on('change', 'select', function(){
+    console.log("Changed" + $(this))
+    $("input[name='" +  $(this).attr('data-hidden-input') + "']").val($(this).val()).change()
+  })
 
   var panelsSource = $('#panels-template').html()
   Settings.panelsTemplate = _.template(panelsSource)