Skip to content
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

Jump to bottom

AP-1145 AP-998 Reskin and test CE #284

Merged
merged 1 commit into from
Apr 24, 2020
Merged

AP-1145 AP-998 Reskin and test CE #284

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
10 changes: 10 additions & 0 deletions ...more-Core-Components/Apromore-Portal/src/main/webapp/themes/ap/common/img/icons/icons.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -338,6 +338,11 @@
width: 26px !important;
}

.ap-icon-measure {
background-image: url('measure.svg') !important;
width: 28.5px !important;
}

.ap-icon-meta-edit {
background-image: url('meta-edit.svg') !important;
width: 28.5px !important;
Expand Down Expand Up @@ -468,6 +473,11 @@
width: 26px !important;
}

.ap-icon-simulate-model {
background-image: url('simulate-model.svg') !important;
width: 26px !important;
}

.ap-icon-speed {
background-image: url('speed.svg') !important;
width: 28.5px !important;
Expand Down
1 change: 1 addition & 0 deletions ...mponents/Apromore-Portal/src/main/webapp/themes/ap/common/img/icons/measure.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions ...s/Apromore-Portal/src/main/webapp/themes/ap/common/img/icons/simulate-model.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
10 changes: 10 additions & 0 deletions Apromore-Core-Components/Apromore-Portal/src/main/webapp/themes/ap/editor/css/icons.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,3 +70,13 @@
background-image: url('../../common/img/icons/export-pdf.svg') !important;
width: 26px !important;
}

.x-panel-editor-north .x-toolbar button[title='Calculate BPMN process model metrics'] {
background-image: url('../../common/img/icons/measure.svg') !important;
width: 26px !important;
}

.x-panel-editor-north .x-toolbar button[title='Simulate in BIMP'] {
background-image: url('../../common/img/icons/simulate-model.svg') !important;
width: 26px !important;
}
4 changes: 3 additions & 1 deletion .../src/main/java/org/apromore/service/bpmndiagramimporter/impl/BPMNDiagramImporterImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@

import java.io.File;
import java.io.StringReader;
import java.net.URL;
import java.util.HashMap;
import java.util.HashSet;
import java.util.LinkedList;
Expand Down Expand Up @@ -177,7 +178,8 @@ public BPMNDiagram importBPMNDiagram(String xmlProcess) throws Exception {

SchemaFactory sf = SchemaFactory.newInstance(W3C_XML_SCHEMA_NS_URI);

File schemaFile = new File(classLoader.getResource("./xsd/BPMN20.xsd").getFile());
// File schemaFile = new File(classLoader.getResource("xsd/BPMN20.xsd").getFile());
URL schemaFile = getClass().getClassLoader().getResource("xsd/BPMN20.xsd");
Schema schema = sf.newSchema(schemaFile);
unmarshaller.setSchema(schema);

Expand Down
12 changes: 12 additions & 0 deletions Apromore-Custom-Plugins/Log-Animation-Portal-Plugin/src/main/webapp/css/ap/animator.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,18 @@
) !important;
}

.x-panel-editor-north .x-toolbar .ytb-sep {
background-image: none !important;
box-sizing: border-box;
display: inline-block;
margin: 0 3px;
width: 2px;
height: 22px;
border-right: 1px solid var(--ap-c-grey-minor);
border-left: 1px solid white;
vertical-align: middle;
}

body > .x-panel-noborder {
top: calc(var(--ap-menu-height) + var(--ap-header-height)) !important;
}
Expand Down