Skip to content

fix: minor UI polish #435

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
brightyorcerf wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: minor UI polish #435

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions WebAPP/App/Controller/AddCase.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,7 +211,7 @@ export default class AddCase {
event.preventDefault();
event.stopImmediatePropagation();

Message.loaderStart('Saving model data')
Message.loaderStart('Saving model data...')
var casename = $("#osy-casename").val().trim();
var desc = $("#osy-desc").val().trim();

Expand Down Expand Up @@ -964,7 +964,7 @@ export default class AddCase {
if(model.caserunByScenario[model.scenarios[id]['ScenarioId']].length != 0){
Message.bigBoxDanger('Alert',
`You cannot delete this scenario. It is used in ${model.caserunByScenario[model.scenarios[id]['ScenarioId']]} caserun(s)!
Plese reomve these scenario from caseruns before deletion.`, null)
Please remove this scenario from caseruns before deletion.`, null)
}
else{
let scId = model.scenarios[id]['ScenarioId'];
Expand Down
14 changes: 7 additions & 7 deletions WebAPP/App/Controller/DataFile.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ export default class DataFile {

$("#osy-logFile").off('click');
$("#osy-logFile").on('click', function (event) {
Message.loaderStart('Generating log file!')
Message.loaderStart('Generating log file...')
Osemosys.readLogFile()
.then(response => {
Message.loaderEnd();
Expand Down Expand Up @@ -435,7 +435,7 @@ export default class DataFile {
$("#osy-generateDataFile").off('click');
$("#osy-generateDataFile").on('click', function (event) {
Pace.restart();
Message.loaderStart('Generating data file!')
Message.loaderStart('Generating data file...')
Osemosys.generateDataFile(model.casename, model.cs)
.then(response => {
if (response.status_code == "success") {
Expand Down Expand Up @@ -480,7 +480,7 @@ export default class DataFile {
$("#osy-run").off('click');
$("#osy-run").on('click', function (event) {
Pace.restart();
Message.loaderStart('Optimization in process!')
Message.loaderStart('Optimization in process...')


// const logBox = document.getElementById("logBox");
Expand Down Expand Up @@ -690,7 +690,7 @@ export default class DataFile {
buttons: '[No][Yes]'
}, function (ButtonPressed) {
if (ButtonPressed === "Yes") {
Message.loaderStart('Deleteing case data...');
Message.loaderStart('Deleting case data...');
Base.deleteCaseRun(model.casename, caserunname, false)
.then(response => {
Message.clearMessages();
Expand Down Expand Up @@ -780,7 +780,7 @@ export default class DataFile {
buttons: '[No][Yes]'
}, function (ButtonPressed) {
if (ButtonPressed === "Yes") {
Message.loaderStart('Deleteing case results...');
Message.loaderStart('Deleting case results...');
Base.deleteCaseRun(model.casename, caserunname, true)
.then(response => {
Message.clearMessages();
Expand Down Expand Up @@ -872,7 +872,7 @@ export default class DataFile {
$("#osy-batchRun").on('click', function (event) {
//console.log('BATCH RUN')
Pace.restart();
Message.loaderStart('BATCH RUN! Plese wait...');
Message.loaderStart('BATCH RUN! Please wait...');

let batchRunCases = [];
$("input:checkbox[name=type]:checked").each(function(){
Expand Down Expand Up @@ -919,7 +919,7 @@ export default class DataFile {
$("#osy-cleanUp").on('click', function (event) {
//console.log('BATCH RUN')
Pace.restart();
Message.loaderStart('Recycle all results! Plese wait...');
Message.loaderStart('Recycle all results! Please wait...');

Osemosys.cleanUp(model.casename)
.then(response => {
Expand Down
2 changes: 1 addition & 1 deletion WebAPP/App/Controller/ModelFile.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ export default class ModelFile {
<div class="mb-3" style="text-align:left;">
<div class="text-secondary small mb-1">${eq.name}</div>

<div class="math-wrapper">
<div class="math-wrapper" style="overflow-x: auto;">
$$

\\begin{align}
Expand Down
8 changes: 4 additions & 4 deletions WebAPP/App/Controller/Settings.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Model } from "../Model/Settings.Model.js";
import { Model } from "../Model/Settings.Model.js";
import { Html } from "../../Classes/Html.Class.js";
import { JqxSources } from "../../Classes/JqxSources.Class.js";
import { Message } from "../../Classes/Message.Class.js";
Expand Down Expand Up @@ -218,7 +218,7 @@ export default class Settings {
});
}

Message.smallBoxInfo("Info!", "MUIO settings have been saved successfully!", 5000);
Message.smallBoxInfo("Info!", "MUIOGO settings have been saved successfully!", 5000);
$(".demo").toggleClass("activate");
// Message.loaderStart();
// location.reload();
Expand All @@ -232,7 +232,7 @@ export default class Settings {
$("#dllSettingUnits").jqxDropDownList('uncheckAll');
//$("#ddlGridPageSize").jqxDropDownList('clearSelection');
$("#ddlPivotDecimalPoints").jqxDropDownList('clearSelection');
Message.smallBoxInfo("Info!", "You have reset MUIO settings!", 5000);
Message.smallBoxInfo("Info!", "You have reset MUIOGO settings!", 5000);
$(".demo").toggleClass("activate");

// Message.loaderStart();
Expand Down Expand Up @@ -268,4 +268,4 @@ export default class Settings {

});
}
}
}
2 changes: 1 addition & 1 deletion WebAPP/App/Model/Config.Model.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { DataModel } from "../../Classes/DataModel.Class.js";
import { DataModel } from "../../Classes/DataModel.Class.js";
import { DataModelResult} from "../../Classes/DataModelResult.Class.js"
import { GROUPNAMES, PARAMORDER, UNITDEFINITION, RESULTGROUPNAMES } from "../../Classes/Const.Class.js";

Expand Down
24 changes: 12 additions & 12 deletions WebAPP/App/View/AddCase.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<div class="row">
<div class="row">
<div class="col-xs-12 col-sm-7 col-md-7 col-lg-4">
<h2 class="page-title txt-color-blueDark" id="osy-title"><i class="fa-fw fa fa-home"></i> Model configuration
<span>
Expand All @@ -22,13 +22,13 @@ <h5> Selected model: <span class="txt-color-blue" id="osy-case"></span></h5>
<div class="form-inline">
<div class="btn-toolbar">
<div class="btn-group ">
<button id="osy-save" class="btn btn btn-white btn-default" style="display: none;">
<button id="osy-save" class="btn btn-white btn-default" style="display: none;">
<i class="fa fa-save fa-lg success"></i> Save new model
</button>
<button id="osy-update" class="btn btn btn-white btn-default" style="display: none;">
<button id="osy-update" class="btn btn-white btn-default" style="display: none;">
<i class="fa fa-save fa-lg info"></i> Update model
</button>
<button id="osy-new" class="btn btn btn-white btn-default" style="display: none;">
<button id="osy-new" class="btn btn-white btn-default" style="display: none;">
<i class="fa fa-plus-square fa-lg success"></i> Configure new model
</button>
</div>
Expand All @@ -52,13 +52,13 @@ <h5> Selected model: <span class="txt-color-blue" id="osy-case"></span></h5>
<!-- <header role="heading">
<h2></h2>
<span class="jarviswidget-loader"><i class="fa fa-refresh fa-spin"></i></span>
<button id="osy-save" class="btn btn btn-white btn-default" style="display: none;">
<button id="osy-save" class="btn btn-white btn-default" style="display: none;">
<i class="fa fa-save fa-lg success"></i> Save new model
</button>
<button id="osy-update" class="btn btn btn-white btn-default" style="display: none;">
<button id="osy-update" class="btn btn-white btn-default" style="display: none;">
<i class="fa fa-save fa-lg info"></i> Update model
</button>
<button id="osy-new" class="btn btn btn-white btn-default" style="display: none;">
<button id="osy-new" class="btn btn-white btn-default" style="display: none;">
<i class="fa fa-plus-square fa-lg success"></i> Configure new model
</button>
<button type="button" class="btn btn-default" id="showLog" data-toggle="tooltip" data-placement="top"
Expand Down Expand Up @@ -236,18 +236,18 @@ <h2></h2>
<div class="tab-pane fade active in" id="tabYears">
<article class="col-sm-12 col-md-12 col-lg-12 well" style=" margin-bottom: 20px; margin-top: 15px;">
<div class="row" style="padding: 10px; ">
<button id="osy-checkAll" class="btn btn btn-white btn-default pull-right" style="display: none;">
<button id="osy-checkAll" class="btn btn-white btn-default pull-right" style="display: none;">
<i class="fa fa-calendar-check-o"></i> Check all
</button>
<button id="osy-uncheckAll" class="btn btn btn-white btn-default pull-right" style="display: none;">
<button id="osy-uncheckAll" class="btn btn-white btn-default pull-right" style="display: none;">
<i class="fa fa-calendar-check-o"></i> Uncheck all
</button>

<button id="osy-x2" class="btn btn btn-white btn-default pull-right" style="display: none;">
<button id="osy-x2" class="btn btn-white btn-default pull-right" style="display: none;">
<i class="fa fa-calendar-check-o"></i> X2
</button>

<button id="osy-x5" class="btn btn btn-white btn-default pull-right" style="display: none;">
<button id="osy-x5" class="btn btn-white btn-default pull-right" style="display: none;">
<i class="fa fa-calendar-check-o"></i> X5
</button>
</div>
Expand Down Expand Up @@ -318,4 +318,4 @@ <h2></h2>
<hr class="simple">
</div>
</div>
</div>
</div>
2 changes: 1 addition & 1 deletion WebAPP/App/View/Config.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@


<div class="row">
<div class="col-xs-12 col-sm-7 col-md-7 col-lg-6">
<h2 class="page-title txt-color-blueDark" id="osy-title"><i class="fa-fw fa fa-home"></i> Parameters <small>[Year, Technology]</small> <span></span></h2>
Expand Down
10 changes: 6 additions & 4 deletions WebAPP/App/View/DataFile.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
<div class="row">
<div class="row">
<div class="col-xs-12 col-sm-7 col-md-7 col-lg-4">
<h2 class="page-title txt-color-blueDark" id="osy-title"><i class="fa-fw fa fa-home"></i> Data File <span>>
<h2 class="page-title txt-color-blueDark" id="osy-title">
<a href="#/home" class="btn btn-default pull-left" style="margin-right: 15px;"><i class="fa fa-arrow-left"></i> Back</a>
<i class="fa-fw fa fa-home"></i> Data File <span>
create & edit</span></h2>
</div>
<div class="col-xs-12 col-sm-5 col-md-5 col-lg-8">
Expand Down Expand Up @@ -424,7 +426,7 @@ <h4 class="modal-title">
&times;
</button>
<h4 class="modal-title">
<i class="fa fa-info-circle fa-lg osy-second-color" aria-hidden="true"></i> MUIO Model File
<i class="fa fa-info-circle fa-lg osy-second-color" aria-hidden="true"></i> MUIOGO Model File
</h4>
</div>
<div class="modal-body" style="padding-top: 0px;">
Expand All @@ -449,7 +451,7 @@ <h4 class="modal-title">
&times;
</button>
<h4 class="modal-title">
<i class="fa fa-info-circle fa-lg text-info" aria-hidden="true"></i> MUIO Log File
<i class="fa fa-info-circle fa-lg text-info" aria-hidden="true"></i> MUIOGO Log File
</h4>
</div>
<div class="modal-body" style="padding-top: 0px;">
Expand Down
8 changes: 4 additions & 4 deletions WebAPP/App/View/Home.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<div class=" text-left" style="padding-top:25px; color: #3a3f51; font-weight:bold; ">
<div class=" text-left" style="padding-top:25px; color: #3a3f51; font-weight:bold; ">
<div class="row vertical-align">
<!-- <div class="col-md-11 col-md-offset-1">
<h1 lang="en" data-lang-token="else" >OS<small>E</small>MOSYS<span class="hidden-xs"> - Open source modelling system</span> </h1>
Expand All @@ -19,7 +19,7 @@ <h1 lang="en" data-lang-token="else" >OS<small>E</small>MOSYS<span class="hidden
</i>
</div>
<div class="col-md-4">
<h1 lang="en" data-lang-token="else" style="margin-bottom: 0px;">MUIO </h1>
<h1 lang="en" data-lang-token="else" style="margin-bottom: 0px;">MUIOGO </h1>
<h3 span class="hidden-md hidden-sm hidden-xs" style="margin-top: 0px;">Modelling User Interface for Osemosys</span> </h3>
<!-- <h3 lang="en">Sustainable Development </h3>
<h5 lang="en">Department of Economic and Social Affairs</h5>
Expand Down Expand Up @@ -47,7 +47,7 @@ <h5 lang="en">United Nations</h5> -->
data-widget-editbutton="false" data-widget-togglebutton="false" data-widget-deletebutton="false"
data-widget-fullscreenbutton="false" data-widget-custombutton="false" data-widget-sortable="false">
<header>
<h2> <i id="icon" class="fa fa-cubes fa-lg osy-second-color"></i> MUIO models</h2>
<h2> <i id="icon" class="fa fa-cubes fa-lg osy-second-color"></i> MUIOGO models</h2>
<div class="widget-toolbar pull-right">
<div class="btn btn-white" id="showLog" data-toggle="tooltip" data-placement="top" title="Introduction to OSeMOSYS">
<i class="fa fa-question-circle fa-lg warning "></i>
Expand Down Expand Up @@ -126,4 +126,4 @@ <h4 class="modal-title">Restore model</h4>
</div> -->
</div>
</div>
</div>
</div>
4 changes: 2 additions & 2 deletions WebAPP/App/View/LegacyImport.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<div class="row">
<div class="row">
<div class="col-xs-12 col-sm-7 col-md-7 col-lg-6">
<h2 class="page-title txt-color-blueDark" id="osy-title"><i class="fa-fw fa fa-home"></i> Parameters
<small>[Technology]</small> <span></span>
Expand Down Expand Up @@ -179,4 +179,4 @@ <h4 class="modal-title">Import legacy model via .xls template</h4>
</div>
</div>
</div>
</div>
</div>
4 changes: 3 additions & 1 deletion WebAPP/App/View/ModelFile.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
<div class="row">
<div class="col-xs-12 col-sm-7 col-md-7 col-lg-4">
<h2 class="page-title txt-color-blueDark" id="osy-title"><i class="fa-fw fa fa-home"></i> Model File <span>>
<h2 class="page-title txt-color-blueDark" id="osy-title">
<a href="#/home" class="btn btn-default pull-left" style="margin-right: 15px;"><i class="fa fa-arrow-left"></i> Back</a>
<i class="fa-fw fa fa-home"></i> Model File <span>
view equations</span></h2>
</div>
<div class="col-xs-12 col-sm-5 col-md-5 col-lg-8">
Expand Down
4 changes: 2 additions & 2 deletions WebAPP/App/View/Navbar.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<div class="navbar-brand ">
<i class="fa fa-cubes fa-lg"></i><span style="font-weight: bold;"> MUIO <sub>ver.5.5</sub></span><br>
<div class="navbar-brand ">
<i class="fa fa-cubes fa-lg"></i><span style="font-weight: bold;"> MUIOGO <sub>ver.5.5</sub></span><br>
<!-- <i class="fa fa-cubes bigger-150 "></i><span style="font-weight: bold;"> PROTOTYPE <sub>ver.2.0</sub></span><br> -->
<!-- <span style="font-size:10px; margin-top:0px" class="hidden-xs "><i>Electricity Simulation Environment ver.2.0</i></span> -->
</div>
Expand Down
4 changes: 2 additions & 2 deletions WebAPP/App/View/R.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<div class="row">
<div class="row">
<div class="col-xs-12 col-sm-7 col-md-7 col-lg-6">
<h2 class="page-title txt-color-blueDark" id="osy-title"><i class="fa-fw fa fa-home"></i> Parameters <small>[Technology]</small> <span></span></h2>
</div>
Expand Down Expand Up @@ -117,7 +117,7 @@ <h5> Selected model: <span class="txt-color-blue" id="osy-case"></span></h5>
<select id="osy-scenarios" name="osy-scenarios" class="form-control pull-left"></select>
<button id="osy-openScData" class="btn btn-white btn-default" data-toggle="tooltip" data-placement="top" title="Open scenario data!"> <i class="fa fa-folder-open-o fa-lg"></i></button>
<button id="osy-hideScData" class="btn btn-white btn-default" data-toggle="tooltip" data-placement="top" title="Hide scenario!"> <i class="fa fa-chain-broken fa-lg"></i></button>
<button id="osy-removeScData" class="btn tn-white btn-default" title="Remove scenario and data!"> <i class="fa fa-trash fa-lg danger"></i></button>
<button id="osy-removeScData" class="btn btn-white btn-default" title="Remove scenario and data!"> <i class="fa fa-trash fa-lg danger"></i></button>
</div>
</ul>
</div>
Expand Down
4 changes: 2 additions & 2 deletions WebAPP/App/View/RE.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<div class="row">
<div class="row">
<div class="col-xs-12 col-sm-7 col-md-7 col-lg-6">
<h2 class="page-title txt-color-blueDark" id="osy-title"><i class="fa-fw fa fa-home"></i> Parameters <small>[Technology]</small> <span></span></h2>
</div>
Expand Down Expand Up @@ -111,7 +111,7 @@ <h5> Selected model: <span class="txt-color-blue" id="osy-case"></span></h5>
<select id="osy-scenarios" name="osy-scenarios" class="form-control pull-left"></select>
<button id="osy-openScData" class="btn btn-white btn-default" data-toggle="tooltip" data-placement="top" title="Open scenario data!"> <i class="fa fa-folder-open-o fa-lg"></i></button>
<button id="osy-hideScData" class="btn btn-white btn-default" data-toggle="tooltip" data-placement="top" title="Hide scenario!"> <i class="fa fa-chain-broken fa-lg"></i></button>
<button id="osy-removeScData" class="btn tn-white btn-default" title="Remove scenario and data!"> <i class="fa fa-trash fa-lg danger"></i></button>
<button id="osy-removeScData" class="btn btn-white btn-default" title="Remove scenario and data!"> <i class="fa fa-trash fa-lg danger"></i></button>
</div>
</ul>
</div>
Expand Down
2 changes: 1 addition & 1 deletion WebAPP/App/View/RESViewer.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<div class="row">
<div class="row">
<div class="col-xs-12 col-sm-7 col-md-7 col-lg-6">
<h2 class="page-title txt-color-blueDark" id="osy-title"><i class="fa-fw fa fa-home"></i> Parameters <small>[Year, Technology]</small> <span></span></h2>
</div>
Expand Down
4 changes: 2 additions & 2 deletions WebAPP/App/View/RS.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<div class="row">
<div class="row">
<div class="col-xs-12 col-sm-7 col-md-7 col-lg-6">
<h2 class="page-title txt-color-blueDark" id="osy-title"><i class="fa-fw fa fa-home"></i> Parameters <small>[Storage]</small> <span></span></h2>
</div>
Expand Down Expand Up @@ -119,7 +119,7 @@ <h5> Selected model: <span class="txt-color-blue" id="osy-case"></span></h5>
<select id="osy-scenarios" name="osy-scenarios" class="form-control pull-left"></select>
<button id="osy-openScData" class="btn btn-white btn-default" data-toggle="tooltip" data-placement="top" title="Open scenario data!"> <i class="fa fa-folder-open-o fa-lg "></i></button>
<button id="osy-hideScData" class="btn btn-white btn-default" data-toggle="tooltip" data-placement="top" title="Hide scenario!"> <i class="fa fa-chain-broken fa-lg "></i></button>
<button id="osy-removeScData" class="btn tn-white btn-default" title="Remove scenario and data!"> <i class="fa fa-trash fa-lg danger"></i></button>
<button id="osy-removeScData" class="btn btn-white btn-default" title="Remove scenario and data!"> <i class="fa fa-trash fa-lg danger"></i></button>
</div>
</ul>
</div>
Expand Down
Loading
Loading