Skip to content

Commit

Permalink
Orgtree styles
Browse files Browse the repository at this point in the history
  • Loading branch information
@semancik
semancik committed Apr 28, 2016
1 parent 373ec40 commit 58edf35
Show file tree
Hide file tree
Showing 6 changed files with 99 additions and 76 deletions.
28 changes: 12 additions & 16 deletions gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/orgs/OrgTreePanel.html
View file
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?>

<!--
~ Copyright (c) 2010-2015 Evolveum
~ Copyright (c) 2010-2016 Evolveum
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
Expand All @@ -17,20 +17,16 @@
-->
<wicket:panel xmlns:wicket="http://wicket.apache.org">

<div >
<div wicket:id="treeHeader" class="row" style="margin: 0; border-bottom: 1px solid #ddd;">
<div class="col-xs-9" style="padding-left: 5px;"> <!-- class="col-xs-9" style="padding-left: 5px;" -->
<div class="tree-table-header">
<wicket:message key="TreeTablePanel.hierarchy"/>
</div>
</div>
<div class="col-xs-3 cog" style="padding-right: 5px; margin-top: 2px;" wicket:id="treeMenu" about="treeMenu"/>
</div>

<div wicket:id="treeContainer" class="org-tree-container">
<div wicket:id="tree"/>
</div>

</div>
<div class="box box-solid object-org-box">
<div class="box-header with-border" wicket:id="treeHeader">
<h3 class="box-title"><wicket:message key="TreeTablePanel.hierarchy"/></h3>
<div class="box-tools pull-right">
<div class="cog" wicket:id="treeMenu" about="treeMenu"/>
</div>
</div>
<div wicket:id="treeContainer" class="box-body org-tree-container">
<div wicket:id="tree"/>
</div>
</div>

</wicket:panel>
15 changes: 15 additions & 0 deletions gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/orgs/OrgTreePanel.java
View file
@@ -1,3 +1,18 @@
/**
* Copyright (c) 2015-2016 Evolveum
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.evolveum.midpoint.web.page.admin.orgs;

import java.io.Serializable;
Expand Down
69 changes: 32 additions & 37 deletions ...ui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/OrgMemberPanel.html
View file
Expand Up @@ -17,46 +17,41 @@
-->
<wicket:panel xmlns:wicket="http://wicket.apache.org">

<div>
<div class="box box-success">
<div class="box-body">
<form class="clearfix form-horizontal" wicket:id="form">
<div wicket:id="managerContainer">
<div class="tree-table-header">
<wicket:message key="TreeTablePanel.managers"/>
<div class="pull-right" wicket:id="managerMenu" />
</div>




<div class="col-md-12" wicket:id="managerTable">
<div class="pull-right">
<div wicket:id="editManager" class="fa fa-edit"></div>
<div wicket:id="removeManager" class="fa fa-trash-o"></div>
</div>
<div wicket:id="managerSummary" ></div>

</div>
</div>
<div>
<div class="form-group form-inline pull-right search-form">
<form class="clearfix form-horizontal" wicket:id="form">

<div class="box box-solid object-user-box" wicket:id="managerContainer">
<div class="box-header with-border">
<h3 class="box-title"><wicket:message key="TreeTablePanel.managers"/></h3>
<div class="box-tools pull-right">
<div class="cog" wicket:id="managerMenu"/>
</div>
</div>
<div class="box-body">
<div class="col-md-12" wicket:id="managerTable">
<div class="manager-tools">
<div wicket:id="editManager" class="manager-btn fa fa-edit"></div>
<div wicket:id="removeManager" class="manager-btn fa fa-times"></div>
</div>
<div wicket:id="managerSummary" />
</div>
</div>
</div>

<div class="box box-solid box-primary">
<div class="box-header with-border">
<h3 class="box-title"><wicket:message key="TreeTablePanel.members"/></h3>
</div>
<div class="box-body">
<div class="form-group form-inline search-form org-members-additional-search">
<select class="form-control input-sm" wicket:id="searchScope"/>
<select class="form-control input-sm" wicket:id="searchByType"/>
</div>
</div>


<div wicket:id="memberContainer">
<div class="tree-table-header">
<wicket:message key="TreeTablePanel.members"/>
</div>
<div wicket:id="memberTable"/>
</div>
<div wicket:id="memberContainer">
<div wicket:id="memberTable"/>
</div>
</div>
</div>

</form>
</div>
</div>
</div>
</form>

</wicket:panel>
17 changes: 4 additions & 13 deletions ...ui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/TreeTablePanel.html
View file
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?>

<!--
~ Copyright (c) 2010-2015 Evolveum
~ Copyright (c) 2010-2016 Evolveum
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
Expand All @@ -16,26 +16,17 @@
~ limitations under the License.
-->
<wicket:panel xmlns:wicket="http://wicket.apache.org">
<!-- <div wicket:id="confirmDeletePopup" /> -->
<!-- <div wicket:id="movePopup" /> -->
<!-- <div wicket:id="addDeletePopup" /> -->

<!-- todo fix styles for all header with cog, it must be unified somehow !!!! [lazyman] -->
<div class="row">
<div class="col-md-12 clearfix">

</div>
<div class="col-md-4">
<div class="box box-default">
<div class="box-body">
<div wicket:id="treePanel"/>

</div>
</div>
<div wicket:id="treePanel"/>
</div>
<div class="col-md-8">
<div wicket:id="memberPanel"></div>
</div>

</div>
</div>

</wicket:panel>
36 changes: 36 additions & 0 deletions gui/admin-gui/src/main/webapp/less/midpoint-theme.less
View file
Expand Up @@ -856,6 +856,42 @@ div.dashAssignmentHeader {
}
}

// Orgtree (OrgMemberPanel)

.org-tree-container {
overflow-y: auto;
margin-bottom: 20px;
}

.org-members-additional-search {
text-align: right;
margin-right: 20px !important;
}

.manager-tools { // org tree manager buttons: HACK, need to figure out something better
float: right;
width: 42px;
padding-left: 10px;
padding-top: 7px;
}

.manager-btn { // org tree manager buttons: HACK, need to figure out something better
margin: 3px;
border-style: solid;
border-width: 1px;
border-color: #adadad;
border-radius: 3px;
padding: 3px;
width: 23px;
text-align: center;
background-color: #e7e7e7;
}

.box-solid > .box-header > .box-tools > .cog > ul > li > a > i {
color: #fff;
}


// Request role page

.request-role-col-available {
Expand Down
10 changes: 0 additions & 10 deletions gui/admin-gui/src/main/webapp/less/midpoint/midpoint.less
View file
Expand Up @@ -191,16 +191,6 @@ span.yui-skin-sam {
width: auto;
}

//div.org-tree-header {
// padding: 8px @padding-small-vertical @padding-small-vertical;
// font-weight: bold;
// border-bottom: 1px solid @table-border-color;
//}

div.org-tree-container {
overflow-y: auto;
margin-bottom: 20px;
}

/*
* fix for wicket dialog
Expand Down

0 comments on commit 58edf35

Please sign in to comment.