Skip to content

Codecrew / Moya

Go to a project
Commit 4df85bf7 by Tuukka Kivilahti
Options

moar layout, looks good

1 parent 1a8dc855
Inline Side-by-side
Showing with 83 additions and 38 deletions
code/MoyaWeb/WebContent/resources/templates/template2014/css/print.css
@media print {
header,#menu,.flex1,#header_left,#header_center,#header_right,nav,#menu,.languageSelector,#leftpanel, #rightpanel
header,#menu,.flex1,#header_left,#header_center,#header_right,nav,#menu,.languageSelector,#leftpanel, #rightpanel, #leftpanel, #rightpanel, #toppanel
{
display: none;
}
......
code/MoyaWeb/WebContent/resources/templates/template2014/css/style.css → code/MoyaWeb/WebContent/resources/templates/template2014/css/skinning.css
/* This is file for styling (colors and font-sizes) */
.ui-widget {
font-size: 90% !important;
}
.bgColor1.ui-layout-unit {
}
.bgColor1 .ui-layout-unit-content {
background-image: none;
}
.bgColor1 .ui-layout-unit-header {
background-image: none;
}
code/MoyaWeb/WebContent/resources/templates/template2014/css/structual.css 0 → 100644
/* Structual stuff, like sizes, margins etc.*/
.bgColor1.ui-layout-unit {
margin: 0px;
padding: 0px;
}
.bgColor1 .ui-layout-unit-content {
margin: 0px;
padding: 0px;
}
.bgColor1 .ui-layout-unit-header {
margin: 0px;
padding: 0px;
}
code/MoyaWeb/WebContent/resources/templates/template2014/template.xhtml
......@@ -16,12 +16,23 @@
<link rel="icon" href="#{request.contextPath}/favicon.ico" type="image/x-icon" />
<link rel="stylesheet" type="text/css" href="#{request.contextPath}/resources/templates/template2014/css/print.css" />
<link rel="stylesheet" type="text/css" href="#{request.contextPath}/resources/templates/template2014/css/style.css" />
<link rel="stylesheet" type="text/css" href="#{request.contextPath}/resources/templates/template2014/css/skinning.css" />
<link rel="stylesheet" type="text/css" href="#{request.contextPath}/resources/templates/template2014/css/structual.css" />
<link rel="stylesheet" type="text/css" href="#{request.contextPath}/resources/templates/custom_components.css" />
<ui:insert name="headerdata" />
<h:outputStylesheet>
.bgColor1 .ui-layout-unit-content {
background-color: #{layoutView.getLayoutProperty1('#68A3C2')};
}
.bgColor1 .ui-layout-unit-header {
background-color: #{layoutView.getLayoutProperty1('#68A3C2')};
}
</h:outputStylesheet>
</h:head>
......@@ -49,10 +60,20 @@
<p class="chromeframe">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> or <a href="http://www.google.com/chromeframe/?redirect=true">activate Google Chrome Frame</a> to improve your experience.</p>
<![endif]-->
<header class="bgColor1 box">
<div id="header_left">
<h:link outcome="/index">
<p:layout fullPage="true">
<p:layoutUnit id="toppanel" collapsible="true" position="north" styleClass="bgColor1" minSize="55">
<f:facet name="header">
<h:link outcome="/index">
<c:choose>
<c:when test="#{sessionHandler.isInDevelopmentMode()}">
<img src="#{request.contextPath}/resources/templates/insomnia2/img/devel_logo.png" />
......@@ -67,8 +88,6 @@
</c:otherwise>
</c:choose>
</h:link>
</div>
<div id="header_center" class="flex1">
<ui:fragment rendered="#{layoutView.canManageContent}">
<div>
......@@ -79,18 +98,12 @@
</div>
</ui:fragment>
</div>
<div id="header_right">
<a href="http://www.codecrew.fi"><img src="#{request.contextPath}/resources/templates/template1/img/moya_logo.png" /> </a>
</div>
</header>
<a href="http://www.codecrew.fi"><img src="#{request.contextPath}/resources/templates/template1/img/moya_logo.png" /> </a>
<p:layout style="min-width:400px;min-height:80%;">
<p:layoutUnit id="leftpanel" position="west" resizable="true" size="160" minSize="40" maxSize="250">
</f:facet>
</p:layoutUnit>
<p:layoutUnit header="Menu**" collapsible="true" id="leftpanel" position="west" resizable="true">
<nav>
<p:panelMenu model="#{primeMenuView.menuModel}" />
<h:link style="font-size: 10px;" rendered="#{readerView.shopToOthers}" outcome="/shop/showReaderEvents" value="Readers" />
......@@ -112,30 +125,37 @@
<f:param name="pagename" value="#{layoutView.pagepath}:top" />
</h:link>
</div>
<ui:insert name="title" />
<p:menubar rendered="#{primeMenuView.hasSecondaryMenu}" model="#{primeMenuView.secondaryMenuModel}" />
<p:messages severity="info" />
<!-- TODO -->
<ui:insert name="edittab" />
<!-- <h:messages /> -->
<!-- ??? -->
<ui:repeat var="cont1" value="#{menuView.getPagecontent('top')}">
<h:outputText value="#{cont1.content}" escape="false" />
</ui:repeat>
<ui:insert name="content" />
<ui:repeat var="cont1" value="#{menuView.getPagecontent('bottom')}">
<h:outputText value="#{cont1.content}" escape="false" />
</ui:repeat>
<h:link rendered="#{layoutView.manageContent}" styleClass="editorlink" value="#{i18n['layout.editBottom']}" outcome="/pages/manage">
<f:param name="pagename" value="#{layoutView.pagepath}:bottom" />
</h:link>
</p:layoutUnit>
<p:layoutUnit id="rightpanel" position="east">
<div id="aside">
<div class="ui-widget-header">Login</div>
<div class="ui-widget-content" style="text-align: center;">
<p:layoutUnit header="User**" resizable="true" collapsible="true" id="rightpanel" position="east" >
<ui:fragment rendered="#{sessionHandler.loggedIn}">
<p:fieldset rendered="#{sessionHandler.loggedIn}">
<h:outputText value="#{i18n['template.loggedInAs']}" />
<br />
<b><h:outputText value="#{sessionHandler.currentUser.nick}" /></b>
......@@ -143,8 +163,8 @@
<h:link outcome="/auth/logout">
<h:outputText value="#{i18n['login.logout']}" />
</h:link>
</ui:fragment>
<ui:fragment rendered="#{!sessionHandler.loggedIn}">
</p:fieldset>
<p:fieldset rendered="#{!sessionHandler.loggedIn}">
<div style="text-align: left; padding: 0.7em;">
<h:form>
<p:inputText styleClass="form" id="linelogin" value="#{authView.login}" />
......@@ -160,22 +180,17 @@
<h:link value="#{i18n['submenu.auth.sendResetMail']}" outcome="/auth/sendResetMail" />
</div>
</ui:fragment>
</div>
</p:fieldset>
<br />
<ui:fragment rendered="#{menuView.renderTopmenuChanger}">
<div class="ui-widget-header">Select Mode</div>
<div class="ui-widget-content" style="text-align: center">
<p:fieldset legend="Select Mode**" rendered="#{menuView.renderTopmenuChanger}">
<h:form>
<p:selectOneMenu value="#{menuView.menuChange}" valueChangeListener="#{menuView.menuChangeEvent}" onchange="this.form.submit()">
<!-- <p:ajax listener="#{menuView.menuChangeEvent}" /> -->
<f:selectItems var="menuitem" value="#{menuView.viewChangeTopmenu}" itemLabel="#{i18n[menuitem.navigation.key]}" itemValue="#{menuitem.outcome}" />
</p:selectOneMenu>
<p:button outcome="/index" value="käyttäjänäkymä**" />
<br />
<p:button outcome="/useradmin/list" value="ylläpitonäkymä**" />
</h:form>
</div>
</ui:fragment>
</div>
</p:fieldset>
</p:layoutUnit>
</p:layout>
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!