Skip to content

Riina Antikainen / Moya

Go to a project
Commit e02b4071 by Tuukka Kivilahti
Options

moar

1 parent 4df85bf7
Inline Side-by-side
Showing with 71 additions and 36 deletions
code/MoyaWeb/WebContent/resources/templates/template2014/css/skinning.css
...@@ -16,3 +16,4 @@ ...@@ -16,3 +16,4 @@
.bgColor1 .ui-layout-unit-header { .bgColor1 .ui-layout-unit-header {
background-image: none; background-image: none;
} }
code/MoyaWeb/WebContent/resources/templates/template2014/css/structual.css
/* Structual stuff, like sizes, margins etc.*/ /* Structual stuff, like sizes, margins etc.*/
.bgColor1.ui-layout-unit { .bgColor1.ui-layout-unit {
margin: 0px; margin: 0px;
padding: 0px; padding: 0px;
} }
.bgColor1 .ui-layout-unit-content { .bgColor1 .ui-layout-unit-content {
margin: 0px; margin: 0px;
padding: 0px; padding: 0px;
} }
.bgColor1 .ui-layout-unit-header { .bgColor1 .ui-layout-unit-header {
margin: 0px; margin: 0px;
padding: 0px; padding: 0px;
} }
#header_right {
text-align: right;
}
#header_box {
display: flex;
display: -ms-flexbox;
display: -webkit-flex;
}
#mainlayoutpanel {
margin: 10px;
padding: 10px;
}
#header_center {
position: relative;
text-align: right;
-webkit-box-flex: 1; /* OLD - iOS 6-, Safari 3.1-6 */
-moz-box-flex: 1; /* OLD - Firefox 19- */
width: 20%; /* For old syntax, otherwise collapses. */
-webkit-flex: 1; /* Chrome */
-ms-flex: 1; /* IE 10 */
flex: 1; /* NEW, Spec - Opera 12.1, Firefox 20+ */
}
\ No newline at end of file
code/MoyaWeb/WebContent/resources/templates/template2014/template.xhtml
...@@ -68,40 +68,48 @@ ...@@ -68,40 +68,48 @@
<p:layout fullPage="true"> <p:layout fullPage="true" id="mainlayoutpanel">
<p:layoutUnit id="toppanel" collapsible="true" position="north" styleClass="bgColor1" minSize="55"> <p:layoutUnit id="toppanel" position="north" styleClass="bgColor1" size="60" >
<f:facet name="header">
<h:link outcome="/index"> <div id="header_box">
<c:choose> <div id="header_left">
<c:when test="#{sessionHandler.isInDevelopmentMode()}">
<img src="#{request.contextPath}/resources/templates/insomnia2/img/devel_logo.png" />
</c:when> <h:link outcome="/index">
<c:otherwise> <c:choose>
<p:graphicImage rendered="#{layoutView.headerIsImage}" value="#{layoutView.headerimage}" /> <c:when test="#{sessionHandler.isInDevelopmentMode()}">
<ui:fragment rendered="#{!layoutView.headerIsImage}"> <img src="#{request.contextPath}/resources/templates/insomnia2/img/devel_logo.png" />
<h1> </c:when>
<h:outputText value="#{layoutView.headertext}" /> <c:otherwise>
</h1> <p:graphicImage rendered="#{layoutView.headerIsImage}" value="#{layoutView.headerimage}" />
</ui:fragment> <ui:fragment rendered="#{!layoutView.headerIsImage}">
</c:otherwise> <h1>
</c:choose> <h:outputText value="#{layoutView.headertext}" />
</h:link> </h1>
</ui:fragment>
<ui:fragment rendered="#{layoutView.canManageContent}"> </c:otherwise>
<div> </c:choose>
<h:form> </h:link>
<h:outputLabel for="manageBtn" value="#{i18n['content.showContentEditLinks']}" />
<h:selectBooleanCheckbox value="#{sessionStore.manageContentLinks}" onclick="this.form.submit()" /> </div>
</h:form> <div id="header_center">
<ui:fragment rendered="#{layoutView.canManageContent}">
<div>
<h:form>
<h:outputLabel for="manageBtn" value="#{i18n['content.showContentEditLinks']}" />
<h:selectBooleanCheckbox value="#{sessionStore.manageContentLinks}" onclick="this.form.submit()" />
</h:form>
</div>
</ui:fragment>
</div> </div>
</ui:fragment>
<a href="http://www.codecrew.fi"><img src="#{request.contextPath}/resources/templates/template1/img/moya_logo.png" /> </a>
</f:facet> <div id="header_right">
<a href="http://www.codecrew.fi"><img src="#{request.contextPath}/resources/templates/template1/img/moya_logo.png" /> </a>
</div>
</div>
</p:layoutUnit> </p:layoutUnit>
<p:layoutUnit header="Menu**" collapsible="true" id="leftpanel" position="west" resizable="true"> <p:layoutUnit header="Menu**" collapsible="true" id="leftpanel" position="west" resizable="true">
<nav> <nav>
...@@ -126,6 +134,7 @@ ...@@ -126,6 +134,7 @@
</h:link> </h:link>
</div> </div>
<ui:insert name="title" /> <ui:insert name="title" />
<p:menubar rendered="#{primeMenuView.hasSecondaryMenu}" model="#{primeMenuView.secondaryMenuModel}" /> <p:menubar rendered="#{primeMenuView.hasSecondaryMenu}" model="#{primeMenuView.secondaryMenuModel}" />
...@@ -151,7 +160,7 @@ ...@@ -151,7 +160,7 @@
</p:layoutUnit> </p:layoutUnit>
<p:layoutUnit header="User**" resizable="true" collapsible="true" id="rightpanel" position="east" > <p:layoutUnit header="User**" resizable="true" collapsible="true" id="rightpanel" position="east">
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!