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

Ui workflow new design #14

Merged
merged 3 commits into from
Jun 20, 2018
Merged

Ui workflow new design #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0260589
Merge pull request #3 from nhaagen/UI_Workflow_Rev1
pgeib Jun 20, 2018
aedf020
UI_Workflow new design
pgeib Jun 20, 2018
e906bb5
UI_Workflow design changes
pgeib Jun 20, 2018
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
133 changes: 128 additions & 5 deletions src/UI/templates/default/Listing/tpl.linear.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,129 @@
<style type="text/css" href="workflow.css">

@font-face {
font-family: 'Glyphicons Halflings';
src: url('../../libs/bower/bower_components/webui-popover/fonts/glyphicons-halflings-regular.eot');
src: url('../../libs/bower/bower_components/webui-popover/fonts/glyphicons-halflings-regular.eot?#iefix') format('embedded-opentype'),
url('../../libs/bower/bower_components/webui-popover/fonts/glyphicons-halflings-regular.woff2') format('woff2'),
url('../../libs/bower/bower_components/webui-popover/fonts/glyphicons-halflings-regular.woff') format('woff'),
url('../../libs/bower/bower_components/webui-popover/fonts/glyphicons-halflings-regular.ttf') format('truetype'),
url('../../libs/bower/bower_components/webui-popover/fonts/glyphicons-halflings-regular.svg#glyphicons_halflingsregular') format('svg');
}

ul.il-workflow-steps {
list-style: none;
padding: 0;
}

li.il-workflow-step:before {
background-color: #fff;
border: 1px solid #4c6586; /*@brand-primary*/
border-radius: 50%;
color: #fff;
content: "";
font-family: Glyphicons Halflings;
font-size: 12px;
height: 20px;
line-height: 1.6em;
margin-left: 5px;
padding-left: 1px;
position: absolute;
text-align: center;
width: 20px;
}

li.il-workflow-step.completed_successfully:before,
li.il-workflow-step.not_yet_available.completed_successfully:before {
content: "\e013";
background-color: #ddd; /*border-gray*/
color: #fff;
}

li.il-workflow-step.completed_unsuccessfully:before,
li.il-workflow-step.not_yet_available.completed_unsuccessfully:before {
content: "\e014";
background-color: #ddd; /*border-gray*/
color: #fff;
}

li.il-workflow-step.not_yet_available:before,
li.il-workflow-step.no_longer_available:before {
content: "\e033";
color: #ddd; /*@border-gray*/
background-color: #f5f5f5;
border: none;
}

li.il-workflow-step.no_longer_available:before {
content: "\e023"; /*2212*/
font-size: 1em;
line-height: 1.5em;
}

li.il-workflow-step.available.completed_successfully:before,
li.il-workflow-step.available.completed_unsuccessfully:before,
li.il-workflow-step.inprogress:before {
background-color: #4c6586; /*@brand-primary*/
}

li.il-workflow-step.inprogress.no_longer_available:before,
li.il-workflow-step.inprogress.not_yet_available:before {
background-color: #a5b2c2; /*50% @brand-primary*/
}

li.il-workflow-step.inprogress:before {
color: #fff;
}

li.il-workflow-step.active:before {
margin: 5px 0 0 0;
width: 30px;
height: 30px;
}

li.il-workflow-step .text {
border-left: 1px dashed #434343; /*@mid-gray*/
margin-left: 15px;
padding: 0 0 30px 20px;
}

li.il-workflow-step:last-child .text {
border-left: none;
}

li.il-workflow-step .text span.il-workflow-step-label {
font-weight: 600;
display: block;
}

li.il-workflow-step.active .text {
padding-left: 40px;
}

li.il-workflow-step.active .text span.il-workflow-step-label {
color: #4c6586; /*@brand-primary*/
font-size: 1.4em;
}

li.il-workflow-step.not_yet_available .text,
li.il-workflow-step.no_longer_available .text {
color: #ddd; /*@border-gray*/
}

li.il-workflow-step.inprogress.no_longer_available .text span,
li.il-workflow-step.inprogress.not_yet_available .text span {
color: #333;
opacity: .5;
}


</style>

<div class="il-workflow linear">
<div class="il-workflow-header">
<h3 class="il-workflow-title">{TITLE}</h3>
</div>
<ol class="il-workflow-steps">
<ul class="il-workflow-steps">
<!-- BEGIN step -->
<li class="il-workflow-step
<!-- BEGIN first --> first<!-- END first -->
Expand All @@ -19,11 +140,13 @@ <h3 class="il-workflow-title">{TITLE}</h3>
<!-- BEGIN status_completed_unsuccessfully --> completed_unsuccessfully<!-- END status_completed_unsuccessfully -->
">

<div class="text">
<span class="il-workflow-step-label">{LABEL}</span>
<span class="il-workflow-step-description">{DESCRIPTION}</span>
</div>

<span class="il-workflow-step-label">{LABEL}</span>
<span class="il-workflow-step-description">{DESCRIPTION}</span>

</li>
<!-- END step -->
</ol>
</div>
</ul>
</div>
121 changes: 116 additions & 5 deletions src/UI/templates/default/Listing/workflow.less
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,120 @@
.il-workflow-header {
margin-bottom: @padding-base-horizontal;
height: @il-top-bar-height;
}
@icon-size: 20px;

.il-workflow-step {
//.il-workflow-header {
//margin-bottom: @padding-base-horizontal;
//height: @il-top-bar-height;
//}

@font-face {
font-family: 'Glyphicons Halflings';
src: url('../../libs/bower/bower_components/webui-popover/fonts/glyphicons-halflings-regular.eot');
src: url('../../libs/bower/bower_components/webui-popover/fonts/glyphicons-halflings-regular.eot?#iefix') format('embedded-opentype'),
url('../../libs/bower/bower_components/webui-popover/fonts/glyphicons-halflings-regular.woff2') format('woff2'),
url('../../libs/bower/bower_components/webui-popover/fonts/glyphicons-halflings-regular.woff') format('woff'),
url('../../libs/bower/bower_components/webui-popover/fonts/glyphicons-halflings-regular.ttf') format('truetype'),
url('../../libs/bower/bower_components/webui-popover/fonts/glyphicons-halflings-regular.svg#glyphicons_halflingsregular') format('svg');
}

ul.il-workflow-steps {
list-style: none;
padding: 0;
li.il-workflow-step {

&:before {
background-color: #fff;
border: 1px solid @brand-primary;
border-radius: 50%;
color: #fff;
content: "";
font-family: Glyphicons Halflings;
font-size: @icon-size*0.6;
height: @icon-size;
line-height: 1.6em;
padding-left: @icon-size*0.05;
position: absolute;
text-align: center;
width: @icon-size;
}

.completed_successfully,
.not_yet_available.completed_successfully,
.completed_unsuccessfully,
.not_yet_available.completed_unsuccessfully {
&:before {
background-color: @border-gray;
color: #fff;
}
}
.completed_successfully,
.not_yet_available.completed_successfully {
&:before {
content: "\e013";
}
}
.completed_unsuccessfully,
.not_yet_available.completed_unsuccessfully {
&:before {
content: "\e014";
}
}

.not_yet_available,
.no_longer_available {
&:before {
color: @border-gray;
background-color: #f5f5f5; //Hintergrundfarbe vom umgebenden Container
border: none;
}
}
.not_yet_available {
&:before {
content: "\e033";
}
}
.no_longer_available {
&:before {
content: "\2212";
}
}

.available.completed_successfully:before,
.available.completed_unsuccessfully:before,
.inprogress:before {
background-color: @brand-primary;
}

.inprogress:before {
color: #fff;
}

.text {
border-left: 1px dashed @mid-gray;
margin-left: 10px;
padding: 0 0 30px 20px;
span.il-workflow-step-label {
display: block;
font-weight: 600;
}
}
:last-child .text {
border-left: none;
}
.active .text {
padding-left: 40px;
span.il-workflow-step-label {
color: @brand-primary;
font-size: 1.4em;
}
}
.not_yet_available .text,
.no_longer_available .text,
.inprogress.no_longer_available .text,
.inprogress.not_yet_available .text {
color: @border-gray;
}
.inprogress.no_longer_available .text span,
.inprogress.not_yet_available .text span {
opacity: .5;
}
}
}