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 3be232dd67..f5209f0620 100644 --- a/domain-server/src/DomainServer.cpp +++ b/domain-server/src/DomainServer.cpp @@ -1084,7 +1084,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; @@ -1123,7 +1123,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 diff --git a/examples/editModels.js b/examples/editModels.js index 5c426c9fb3..cbc215d0aa 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) {