Skip to content

Commit

Permalink
Role request styling finished
Browse files Browse the repository at this point in the history
  • Loading branch information
@semancik
semancik committed Apr 21, 2016
1 parent 88b48a4 commit 8b581c7
Show file tree
Hide file tree
Showing 6 changed files with 53 additions and 14 deletions.
2 changes: 1 addition & 1 deletion .../main/java/com/evolveum/midpoint/web/component/assignment/MultipleAssignmentSelector.html
View file
Expand Up @@ -30,7 +30,7 @@
</form>
</div>
<div class="multiple-assignment-selector-section">
<div wicket:id="table" class=""/>
<div wicket:id="table" class="multiple-assignment-selector-section-table"/>
</div>
</div>
</wicket:panel>
Expand Down
7 changes: 3 additions & 4 deletions .../main/java/com/evolveum/midpoint/web/component/assignment/MultipleAssignmentSelector.java
View file
Expand Up @@ -227,10 +227,9 @@ public void populateItem(Item<ICellPopulator<SelectableBean<AssignmentEditorDto>
}

private void updateBoxedTablePanelStyles(BoxedTablePanel panel) {
panel.getDataTable().add(new AttributeModifier("class", ""));
panel.getDataTable().add(new AttributeAppender("style", "width: 100%;"));
panel.getDataTableContainer().add(new AttributeAppender("style", "min-height: 415px;"));
panel.getFooterPaging().getParent().add(new AttributeModifier("class", "col-md-10"));
panel.getDataTableContainer().add(new AttributeAppender("class", " multiple-assignment-selector-table-container"));
panel.getDataTable().add(new AttributeModifier("class", "multiple-assignment-selector-table"));
panel.getFooterPaging().getParent().add(new AttributeModifier("class", "multiple-assignment-selector-table-footer"));
}

public BaseSortableDataProvider getProvider() {
Expand Down
10 changes: 5 additions & 5 deletions .../java/com/evolveum/midpoint/web/component/assignment/MultipleAssignmentSelectorPanel.html
View file
Expand Up @@ -25,7 +25,7 @@


<div class="col-md-4 request-role-col-available">
<div class="box object-role-box box-solid">
<div class="box object-role-box box-solid request-role-box">
<div class="box-header with-border">
<h3 class="box-title">
<wicket:message key="MultipleAssignmentSelectorPanel.availableRoles"/>
Expand Down Expand Up @@ -58,20 +58,20 @@ <h3 class="box-title">
</div>
</div>
<div class="centre" style="width: 80%;">
<button wicket:id="add" type="button" class="btn btn-default btn-sm" style="width: 100%;"><i class="fa fa-long-arrow-right"></i></button>
<button wicket:id="add" type="button" class="btn request-role-control-button btn-primary btn-lg" style="width: 100%;"><i class="fa fa-long-arrow-right"></i></button>
</div>
<div class="centre" style="width: 80%;">
<button wicket:id="remove" type="button" class="btn btn-default btn-sm" style="width: 100%;"><i class="fa fa-long-arrow-left"></i></button>
<button wicket:id="remove" type="button" class="btn request-role-control-button btn-primary btn-lg" style="width: 100%;"><i class="fa fa-long-arrow-left"></i></button>
</div>
<div class="centre" style="width: 80%;">
<a wicket:id="buttonReset" class="btn btn-default btn-sm" style="width: 100%;"/>
<a wicket:id="buttonReset" class="btn request-role-control-button btn-default btn-sm" style="width: 100%;"/>
</div>

</div>


<div class="col-md-4 request-role-col-current">
<div class="box object-user-box box-solid">
<div class="box object-user-box box-solid request-role-box">
<div class="box-header with-border">
<h3 class="box-title">
<wicket:message key="MultipleAssignmentSelectorPanel.currentRoles"/>
Expand Down
2 changes: 1 addition & 1 deletion .../java/com/evolveum/midpoint/web/component/assignment/MultipleAssignmentSelectorPanel.java
View file
Expand Up @@ -58,7 +58,7 @@
* the list of assigned items of the same type with the
* possibility of editing the list of assignments.
*
* @author Kate Honchar.
* @author Kate Honchar
*/
public class MultipleAssignmentSelectorPanel<F extends FocusType, H extends FocusType, G extends FocusType>
extends BasePanel<List<AssignmentEditorDto>> { //G - type of the object which is to be assigned (a.g. assign a role (RoleType))
Expand Down
1 change: 1 addition & 0 deletions gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/BoxedTablePanel.java
View file
Expand Up @@ -44,6 +44,7 @@
* @author Viliam Repan (lazyman)
*/
public class BoxedTablePanel<T> extends BasePanel implements Table {
private static final long serialVersionUID = 1L;

private static final String ID_BOX = "box";
private static final String ID_HEADER = "header";
Expand Down
45 changes: 42 additions & 3 deletions gui/admin-gui/src/main/webapp/less/midpoint-theme.less
View file
Expand Up @@ -766,13 +766,52 @@ div.dashAssignmentHeader {
padding-left: 0px;
}

.request-role-box {
.box-body {
padding-bottom: 0px;
}
}

.multiple-assignment-selector {

.multiple-assignment-selector-section:first-child {
border-top-width: 0px;
padding-top: 0px;
min-height: 36px;
}

.multiple-assignment-selector-section:last-child {
padding-bottom: 0px;
}
}

.multiple-assignment-selector-section {
min-height: 42px;
padding-top: 5px;
padding-bottom: 5px;
min-height: 48px;
padding-top: 8px;
padding-bottom: 8px;
border-top: 2px solid @table-divider-color;
}

.multiple-assignment-selector-section-table {
.box {
border-width: 0px;
}
}

.multiple-assignment-selector-table-container {
min-height: 415px;
}

.multiple-assignment-selector-table {
width: 100%;
}

.multiple-assignment-selector-table-footer {
float: left;
}

.request-role-control-button {
&.btn-primary > i {
font-size: 32px;
}
}

0 comments on commit 8b581c7

Please sign in to comment.