diff --git a/Client/Browser_Tools/BrowserJSObject.cs b/Client/Browser_Tools/BrowserJSObject.cs index 6958aa55..c1319cce 100644 --- a/Client/Browser_Tools/BrowserJSObject.cs +++ b/Client/Browser_Tools/BrowserJSObject.cs @@ -38,7 +38,7 @@ namespace Active_Client.Browser_Tools private static readonly string[] _validExtensions = {".json", ".rcp", ".tpl" }; //private static readonly string[] _validExtensions = { "", ".txt", ".cnc", ".cn", ".cno", ".ini", ".mpf", ".spf", ".tap", ".anc", ".iso" }; - private static readonly string[] _validImages = { ".jpg", ".jpeg", ".png", ".svg" }; + private static readonly string[] _validImages = { ".svg" }; private static string jobPath = ""; private static Dictionary _editorOpened = new Dictionary(); private static EditorVar _currentEditorObject = new EditorVar(); @@ -516,6 +516,11 @@ namespace Active_Client.Browser_Tools try { File.Delete(p); + string images = Path.ChangeExtension(p, "svg"); + if(File.Exists(images)) + { + File.Delete(images); + } } catch(Exception ex) { @@ -810,7 +815,10 @@ namespace Active_Client.Browser_Tools { if (File.Exists(imageDirectory + "/" + imagePath + ext)) { - file.PreviewBase64 = "data:image/" + ext + ";base64," + Convert.ToBase64String(File.ReadAllBytes(imageDirectory + "/" + imagePath + ext)); + if (ext.ToLower().Equals(".svg")) + file.PreviewBase64 = File.ReadAllText(imageDirectory + "/" + imagePath + ext); + else + file.PreviewBase64 = "data:image/" + ext + ";base64," + Convert.ToBase64String(File.ReadAllBytes(imageDirectory + "/" + imagePath + ext)); break; } } diff --git a/Thermo.Active/wwwroot/assets/styles/base/modals.less b/Thermo.Active/wwwroot/assets/styles/base/modals.less index 6e8dc649..dbe60af8 100644 --- a/Thermo.Active/wwwroot/assets/styles/base/modals.less +++ b/Thermo.Active/wwwroot/assets/styles/base/modals.less @@ -1504,7 +1504,6 @@ .title_lbl, .description_lbl { margin-top: 22px; - margin-left: 24px; font-size: 14px; color: @color-warm-grey; margin-bottom: 4px; @@ -2447,6 +2446,9 @@ overflow: visible; position: relative; cursor: pointer; + width: 100%; + height: 100%; + overflow: hidden; img { display: block; @@ -2486,6 +2488,11 @@ overflow-x: hidden; height: calc(~"100% - 360px"); flex-flow: column; + + .key { + width: 200px; + font-weight: 800; + } .row { width: 99%; @@ -3438,7 +3445,7 @@ position: absolute; width: 100%; height: 100%; - background: #cccccc; + background: #ffffff; top: 0; display: block; overflow: hidden; @@ -4129,8 +4136,7 @@ display: flex; flex-flow: column; - .title_lbl, - .description_lbl { + .title_lbl { margin-top: 22px; margin-left: 24px; font-size: 14px; diff --git a/Thermo.Active/wwwroot/assets/styles/base/saveas.less b/Thermo.Active/wwwroot/assets/styles/base/saveas.less index c04b3e97..67791f7c 100644 --- a/Thermo.Active/wwwroot/assets/styles/base/saveas.less +++ b/Thermo.Active/wwwroot/assets/styles/base/saveas.less @@ -6,13 +6,6 @@ article { - label { - color: #002680; - font-size: 24px; - font-weight: 500; - overflow: hidden; - margin-bottom: 10px; - } input { padding: 5px; diff --git a/Thermo.Active/wwwroot/assets/styles/base/setup.less b/Thermo.Active/wwwroot/assets/styles/base/setup.less index 46592804..e73133e5 100644 --- a/Thermo.Active/wwwroot/assets/styles/base/setup.less +++ b/Thermo.Active/wwwroot/assets/styles/base/setup.less @@ -12,6 +12,23 @@ width: 100vw; height: 100vh; + .notes_textarea{ + border-radius: 2px; + height: 97px; + box-shadow: inset 0 1px 3px 0 rgba(0, 0, 0, 0.5); + border: solid 1px #bbbcbc; + padding: 10px; + box-sizing: border-box; + resize: none; + } + + .description_lbl{ + margin-top: 22px; + font-size: 14px; + color: #878787; + margin-bottom: 4px; + } + .tab-header { display: flex; flex-flow: row; @@ -173,7 +190,7 @@ } footer { - height: 82px; + height: 64px; display: flex; justify-content: flex-end; align-items: center; diff --git a/Thermo.Active/wwwroot/assets/styles/style.css b/Thermo.Active/wwwroot/assets/styles/style.css index 0a5efedb..fe0485a6 100644 --- a/Thermo.Active/wwwroot/assets/styles/style.css +++ b/Thermo.Active/wwwroot/assets/styles/style.css @@ -10,6 +10,21 @@ width: 100vw; height: 100vh; } +.setup .notes_textarea { + border-radius: 2px; + height: 97px; + box-shadow: inset 0 1px 3px 0 rgba(0, 0, 0, 0.5); + border: solid 1px #bbbcbc; + padding: 10px; + box-sizing: border-box; + resize: none; +} +.setup .description_lbl { + margin-top: 22px; + font-size: 14px; + color: #878787; + margin-bottom: 4px; +} .setup .tab-header { display: flex; flex-flow: row; @@ -144,7 +159,7 @@ width: 100%; } .setup .modal section.body footer { - height: 82px; + height: 64px; display: flex; justify-content: flex-end; align-items: center; @@ -1648,7 +1663,6 @@ article .box .body { .modal.create-maintenance .title .description_lbl, .modal.create-maintenance .description .description_lbl { margin-top: 22px; - margin-left: 24px; font-size: 14px; color: #878787; margin-bottom: 4px; @@ -2602,6 +2616,9 @@ article .box .body { overflow: visible; position: relative; cursor: pointer; + width: 100%; + height: 100%; + overflow: hidden; } .modal.modal-load-program .modal-load-program-body .selected-item .selected-item-body .selected-item-body-image .container img, .modal.modal-add-element-queue .modal-load-program-body .selected-item .selected-item-body .selected-item-body-image .container img, @@ -2648,6 +2665,13 @@ article .box .body { height: calc(100% - 360px); flex-flow: column; } +.modal.modal-load-program .modal-load-program-body .selected-item .selected-item-body .selected-item-body-description .key, +.modal.modal-add-element-queue .modal-load-program-body .selected-item .selected-item-body .selected-item-body-description .key, +.modal.modal-load-program .modal-add-element-queue-body .selected-item .selected-item-body .selected-item-body-description .key, +.modal.modal-add-element-queue .modal-add-element-queue-body .selected-item .selected-item-body .selected-item-body-description .key { + width: 200px; + font-weight: 800; +} .modal.modal-load-program .modal-load-program-body .selected-item .selected-item-body .selected-item-body-description .row, .modal.modal-add-element-queue .modal-load-program-body .selected-item .selected-item-body .selected-item-body-description .row, .modal.modal-load-program .modal-add-element-queue-body .selected-item .selected-item-body .selected-item-body-description .row, @@ -3467,7 +3491,7 @@ article .box .body { position: absolute; width: 100%; height: 100%; - background: #cccccc; + background: #ffffff; top: 0; display: block; overflow: hidden; @@ -4060,9 +4084,7 @@ article .box .body { flex-flow: column; } .modal.create-user .title .title_lbl, -.modal.create-user .description .title_lbl, -.modal.create-user .title .description_lbl, -.modal.create-user .description .description_lbl { +.modal.create-user .description .title_lbl { margin-top: 22px; margin-left: 24px; font-size: 14px; @@ -5074,7 +5096,9 @@ article .box .body { border: none; border-radius: 2px; background-image: linear-gradient(to bottom, #f1f1f1 0%, #bbbcbc 98%); - height: 48px; + display: grid; + grid-template-columns: 48px 101px; + grid-template-rows: 48px; } .modal.processo-info header .tab-header button span { margin: auto; @@ -23831,13 +23855,6 @@ footer .container button.big:before { height: 300px; top: calc(50% - 200px); } -.modal.save-as article label { - color: #002680; - font-size: 24px; - font-weight: 500; - overflow: hidden; - margin-bottom: 10px; -} .modal.save-as article input { padding: 5px; font-size: 18px; diff --git a/Thermo.Active/wwwroot/config.development.json b/Thermo.Active/wwwroot/config.development.json index f8091c43..58460cb5 100644 --- a/Thermo.Active/wwwroot/config.development.json +++ b/Thermo.Active/wwwroot/config.development.json @@ -2,7 +2,7 @@ "env": "development", "api": { "enabled": true, - "apiServerUrl": "http://localhost:9000/" + "apiServerUrl": "http://seriate.steamware.net:9000/" }, "allUIVisible": false } \ No newline at end of file diff --git a/Thermo.Active/wwwroot/config.production.json b/Thermo.Active/wwwroot/config.production.json index 34bce964..3f9529d8 100644 --- a/Thermo.Active/wwwroot/config.production.json +++ b/Thermo.Active/wwwroot/config.production.json @@ -2,6 +2,6 @@ "env": "development", "api": { "enabled": true, - "apiServerUrl": "http://localhost:9000/" + "apiServerUrl": "http://seriate.steamware.net:9000/" } } \ No newline at end of file diff --git a/Thermo.Active/wwwroot/index.html b/Thermo.Active/wwwroot/index.html index 06c2fb9c..f52c1422 100644 --- a/Thermo.Active/wwwroot/index.html +++ b/Thermo.Active/wwwroot/index.html @@ -13,7 +13,7 @@ - + diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/save/changeNotes.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/save/changeNotes.vue index aa982bc3..a04ecdd4 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/save/changeNotes.vue +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/save/changeNotes.vue @@ -1,6 +1,6 @@