Skip to content

Commit

Permalink
Enhance view design # 1093
Browse files Browse the repository at this point in the history
  • Loading branch information
syntrydy authored and yurem committed Aug 23, 2018
1 parent 47aa285 commit d0cc1de
Showing 1 changed file with 77 additions and 22 deletions.
99 changes: 77 additions & 22 deletions server/src/main/webapp/WEB-INF/incl/layout/newtemplate.xhtml
Original file line number Diff line number Diff line change
Expand Up @@ -33,16 +33,14 @@
<ui:param name="themeColor"
value="#{organizationService.organization.themeColor}" />
<ui:fragment rendered="#{not empty themeColor}">
<style type="text/css">

.rf-tb-itm, .rf-tb-emp {
height: 33px;
background-color: #{gluufn:getColor(themeColor, "00ff00")
}

</style>
<style type="text/css">
.rf-tb-itm, .rf-tb-emp {
height: 33px;
background-color: #{gluufn:getColor(themeColor, "00ff00")
}
</style>
</ui:fragment>

<!-- Stylesheets new theme -->
<link
href="#{oxTrustConfigurationService.cssLocation}/../theme/bootstrap/css/bootstrap.min.css"
Expand All @@ -62,28 +60,86 @@
<link
href="#{oxTrustConfigurationService.cssLocation}/../theme/dist/css/skins/_all-skins-purple.min.css"
rel="alternate stylesheet" title="purple" type="text/css" />

<link
href="#{oxTrustConfigurationService.cssLocation}/../theme/dist/css/skins/_all-skins-red.min.css"
rel="alternate stylesheet" title="red" type="text/css" />

<link
href="#{oxTrustConfigurationService.cssLocation}/../theme/plugins/iCheck/square/blue.css"
rel="stylesheet" type="text/css" />
<link
href="#{oxTrustConfigurationService.cssLocation}/../theme/plugins/morris/morris.css"
rel="stylesheet" type="text/css" />
<!-- <link -->
<!-- href="#{oxTrustConfigurationService.cssLocation}/../theme/plugins/datepicker/datepicker3.css" -->
<!-- rel="stylesheet" type="text/css" /> -->
<!-- <link -->
<!-- href="#{oxTrustConfigurationService.cssLocation}/../theme/plugins/datepicker/datepicker3.css" -->
<!-- rel="stylesheet" type="text/css" /> -->
<link
href="#{oxTrustConfigurationService.cssLocation}/../theme/dist/css/custom.css"
rel="stylesheet" type="text/css" />
<link
href="#{oxTrustConfigurationService.cssLocation}/../theme/dist/css/rf-override.css"
rel="stylesheet" type="text/css" />
<ui:insert name="head" />
<h:outputStylesheet>
input[type=text], input[type=email], input[type=password],input[autocomplete=off], input[type=url]{
padding:5px;
border: 2px solid #ccc;
margin-left:2px !important;
border-radius: 5px !important;
}

input[type=text]:focus, input[type=email]:focus, input[type=password]:focus, input[autocomplete=off]:focus, input[type=url]{
border-radius: 5px !important;
border: 2px solid #ccc;
}

input[type=checkbox]{
border-radius: 5O% !important;
border: 1px solid #337ab7 !important
}

input[type=checkbox]:focus{
border-radius: 5O% !important;
border: 1px solid #337ab7 !important
}

textarea:focus{
border-radius: 5px !important;
margin-left:2px !important;
border: 2px solid #ccc;
}

textarea{
padding:5px;
margin-left:2px !important;
border-radius: 5px !important;
}

input[type=submit] {
padding:5px 15px;
cursor:pointer;
border-radius: 5px !important;
}
.btn-primary, .btn-success , .btn-danger{
border:0 none;
cursor:pointer;
border-radius: 5px !important;
}
.icheckbox_square-blue{
border-radius: 50% !important;
}

select{
border-radius: 5px !important;
}

.roundedSelectBox{
border: 2px solid #ccc;
border-radius: 5px !important;
}

</h:outputStylesheet>
</h:head>
<h:body styleClass="skin-green">
<div class="wrapper">
Expand All @@ -92,13 +148,13 @@
<ui:param name="projectName" value="oxTrust" />
</ui:include>
</h:panelGroup>

<ui:include src="leftmenu.xhtml">
<ui:param name="projectName" value="oxTrust" />
<ui:param name="projectName" value="oxTrust" />
</ui:include>

<div class="#{not isLogin?'body':'loginBody'}">

<div class="content-wrapper">
<a:status startText="Loading..."
startStyle="background-color: #006699; color: white; font-weight: bold; position: fixed; left: 0px; top: 0px; padding: 5px 5px 5px 5px;" />
Expand All @@ -107,7 +163,7 @@
warnClass="warnmsg" rendered="#{showGlobalMessages != 'false'}" />
<ui:insert name="body" />
</div>
</div>
</div>
</div>

<!-- Scripts -->
Expand All @@ -120,14 +176,13 @@
<script
src="#{oxTrustConfigurationService.cssLocation}/../theme/plugins/iCheck/icheck.min.js"
type="text/javascript"></script>
<script
<script
src='#{oxTrustConfigurationService.cssLocation}/../theme/dist/js/jquery-ui-1.12.1.min.js'
type="text/javascript"></script>

<rich:notifyMessages stayTime="5000" nonblocking="true" />

<div class="footer">
</div>
<div class="footer"></div>
</h:body>
</f:view>

Expand Down

0 comments on commit d0cc1de

Please sign in to comment.