Skip to content

Linnea Samila / Moya

Go to a project
Commit deb714e4 by Tuukka Kivilahti
Options

now my job here is done, next we need some ui-designer etc

1 parent 94761edb
Expand all
Inline Side-by-side
Showing with 116 additions and 51 deletions
code/MoyaWeb/WebContent/resources/templates/custom_components.css
...@@ -224,6 +224,3 @@ a.shopItem:active { ...@@ -224,6 +224,3 @@ a.shopItem:active {
} }
code/MoyaWeb/WebContent/resources/templates/template2014/css/skinning.css
/* This is file for styling (colors and font-sizes) */ /* This is file for styling (colors and font-sizes) */
.ui-widget { .ui-widget {
font-size: 90% !important; font-size: 95% !important;
} }
...@@ -17,3 +17,43 @@ ...@@ -17,3 +17,43 @@
background-image: none; background-image: none;
} }
.missing_i18n {
color: red;
-webkit-animation-name: blinker;
-webkit-animation-duration: 1s;
-webkit-animation-timing-function: linear;
-webkit-animation-iteration-count: infinite;
-moz-animation-name: blinker;
-moz-animation-duration: 1s;
-moz-animation-timing-function: linear;
-moz-animation-iteration-count: infinite;
animation-name: blinker;
animation-duration: 1s;
animation-timing-function: linear;
animation-iteration-count: infinite;
}
@-moz-keyframes blinker {
0% { opacity: 1.0; }
50% { opacity: 0.0; }
100% { opacity: 1.0; }
}
@-webkit-keyframes blinker {
0% { opacity: 1.0; }
50% { opacity: 0.0; }
100% { opacity: 1.0; }
}
@keyframes blinker {
0% { opacity: 1.0; }
50% { opacity: 0.0; }
100% { opacity: 1.0; }
}
code/MoyaWeb/WebContent/resources/templates/template2014/template.xhtml
...@@ -71,47 +71,48 @@ ...@@ -71,47 +71,48 @@
<p:layout fullPage="true" id="mainlayoutpanel"> <p:layout fullPage="true" id="mainlayoutpanel">
<p:layoutUnit id="toppanel" position="north" styleClass="bgColor1" size="60" > <p:layoutUnit id="toppanel" position="north" styleClass="bgColor1" size="60">
<div id="header_box"> <div id="header_box">
<div id="header_left"> <div id="header_left">
<h:link outcome="/index"> <h:link outcome="/index">
<c:choose> <c:choose>
<c:when test="#{sessionHandler.isInDevelopmentMode()}"> <c:when test="#{sessionHandler.isInDevelopmentMode()}">
<img src="#{request.contextPath}/resources/templates/insomnia2/img/devel_logo.png" /> <img src="#{request.contextPath}/resources/templates/insomnia2/img/devel_logo.png" />
</c:when> </c:when>
<c:otherwise> <c:otherwise>
<p:graphicImage rendered="#{layoutView.headerIsImage}" value="#{layoutView.headerimage}" /> <p:graphicImage rendered="#{layoutView.headerIsImage}" value="#{layoutView.headerimage}" />
<ui:fragment rendered="#{!layoutView.headerIsImage}"> <ui:fragment rendered="#{!layoutView.headerIsImage}">
<h1> <h1>
<h:outputText value="#{layoutView.headertext}" /> <h:outputText value="#{layoutView.headertext}" />
</h1> </h1>
</ui:fragment> </ui:fragment>
</c:otherwise> </c:otherwise>
</c:choose> </c:choose>
</h:link> </h:link>
</div> </div>
<div id="header_center"> <div id="header_center">
<ui:fragment rendered="#{layoutView.canManageContent}"> <ui:fragment rendered="#{layoutView.canManageContent}">
<div> <div>
<h:form> <h:form>
<h:outputLabel for="manageBtn" value="#{i18n['content.showContentEditLinks']}" /> <h:outputLabel for="manageBtn" value="#{i18n['content.showContentEditLinks']}" />
<h:selectBooleanCheckbox value="#{sessionStore.manageContentLinks}" onclick="this.form.submit()" /> <h:selectBooleanCheckbox value="#{sessionStore.manageContentLinks}" onclick="this.form.submit()" />
</h:form> </h:form>
</div> </div>
</ui:fragment> </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>
</div> </div>
<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="#{i18n['menu']}" collapsible="true" id="leftpanel" position="west" resizable="true" size="190">
<nav> <nav>
<p:panelMenu model="#{primeMenuView.menuModel}" /> <p:panelMenu model="#{primeMenuView.menuModel}" />
<h:link style="font-size: 10px;" rendered="#{readerView.shopToOthers}" outcome="/shop/showReaderEvents" value="Readers" /> <h:link style="font-size: 10px;" rendered="#{readerView.shopToOthers}" outcome="/shop/showReaderEvents" value="Readers" />
...@@ -134,15 +135,18 @@ ...@@ -134,15 +135,18 @@
</h:link> </h:link>
</div> </div>
<!-- TODO: tyyleistys tähän, toisaalta tarttis tulla vaan teksti -->
<ui:insert name="title" /> <ui:insert name="title" />
<p:menubar rendered="#{primeMenuView.hasSecondaryMenu}" model="#{primeMenuView.secondaryMenuModel}" /> <p:menubar rendered="#{primeMenuView.hasSecondaryMenu}" model="#{primeMenuView.secondaryMenuModel}" />
<h:form id="messages">
<p:growl id="growl" showDetail="true" sticky="true" />
</h:form>
<p:messages severity="info" />
<!-- TODO -->
<ui:insert name="edittab" /> <ui:insert name="edittab" />
<!-- ??? -->
<ui:repeat var="cont1" value="#{menuView.getPagecontent('top')}"> <ui:repeat var="cont1" value="#{menuView.getPagecontent('top')}">
<h:outputText value="#{cont1.content}" escape="false" /> <h:outputText value="#{cont1.content}" escape="false" />
...@@ -160,7 +164,7 @@ ...@@ -160,7 +164,7 @@
</p:layoutUnit> </p:layoutUnit>
<p:layoutUnit header="User**" resizable="true" collapsible="true" id="rightpanel" position="east"> <p:layoutUnit header="#{i18n['user.info']}" resizable="true" collapsible="true" id="rightpanel" position="east">
...@@ -193,11 +197,11 @@ ...@@ -193,11 +197,11 @@
<br /> <br />
<p:fieldset legend="Select Mode**" rendered="#{menuView.renderTopmenuChanger}"> <p:fieldset legend="#{i18n['mode.title']}" rendered="#{menuView.renderTopmenuChanger}">
<h:form> <h:form>
<p:button outcome="/index" value="käyttäjänäkymä**" /> <p:button outcome="/index" value="#{i18n['mode.user']}" />
<br /> <br />
<p:button outcome="/useradmin/list" value="ylläpitonäkymä**" /> <p:button outcome="/useradmin/list" value="#{i18n['mode.admin']}" />
</h:form> </h:form>
</p:fieldset> </p:fieldset>
</p:layoutUnit> </p:layoutUnit>
...@@ -261,6 +265,16 @@ ...@@ -261,6 +265,16 @@
allDayText : 'Koko päivä' allDayText : 'Koko päivä'
}; };
</script> </script>
<c:if test="#{sessionHandler.isInDevelopmentMode()}">
<script type="text/javascript">
$('*:contains("???"):not(:has(*))').filter(
function() {
return (this.textContent || this.innerText)
.indexOf("???") === 0;
}).addClass("missing_i18n");
</script>
</c:if>
</h:body> </h:body>
</f:view> </f:view>
......
code/MoyaWeb/src/fi/codecrew/moya/resources/i18n.properties
...@@ -267,6 +267,12 @@ manageparticipants.title = Osallistujat ...@@ -267,6 +267,12 @@ manageparticipants.title = Osallistujat
map.id = # map.id = #
menu = Valikko
mode.admin = Yll\u00E4piton\u00E4kym\u00E4
mode.title = N\u00E4kym\u00E4
mode.user = K\u00E4ytt\u00E4j\u00E4n\u00E4kym\u00E4
navi.auth.login = frontpage navi.auth.login = frontpage
navi.auth.loginerror = frontpage navi.auth.loginerror = frontpage
navi.auth.logout = frontpage navi.auth.logout = frontpage
...@@ -352,6 +358,7 @@ topnavi.userlectures = Kurssit ja luennot ...@@ -352,6 +358,7 @@ topnavi.userlectures = Kurssit ja luennot
user.cropImage = Crop user.cropImage = Crop
user.imageUpload.imageNotFound = Select image to upload user.imageUpload.imageNotFound = Select image to upload
user.info = K\u00E4ytt\u00E4j\u00E4
user.saveUserSelectableRoles = Tallenna user.saveUserSelectableRoles = Tallenna
user.shirt.L = Unisex L user.shirt.L = Unisex L
user.shirt.LadyL = Ladyfit L user.shirt.LadyL = Ladyfit L
......
code/MoyaWeb/src/fi/codecrew/moya/resources/i18n_en.properties
...@@ -683,6 +683,8 @@ mapView.notEnoughCreditsToReserve = You don't have enough credits to reserve thi ...@@ -683,6 +683,8 @@ mapView.notEnoughCreditsToReserve = You don't have enough credits to reserve thi
mapedit.save = Save map changes mapedit.save = Save map changes
menu = Menu
menu.index = Index menu.index = Index
menu.item = Item menu.item = Item
menu.name = Name menu.name = Name
...@@ -698,6 +700,10 @@ menuitem.navigation.key = Product flag ...@@ -698,6 +700,10 @@ menuitem.navigation.key = Product flag
menulist.header = Menulist menulist.header = Menulist
mode.admin = Adminmode
mode.title = Select mode
mode.user = Usermode
nasty.user = Go away! nasty.user = Go away!
networkassociation.action = Action networkassociation.action = Action
...@@ -1430,6 +1436,7 @@ user.imageCropRefresh = Refresh page ...@@ -1430,6 +1436,7 @@ user.imageCropRefresh = Refresh page
user.imageTooBig = Image is too big user.imageTooBig = Image is too big
user.imagelist = Saved images user.imagelist = Saved images
user.imagesubmit = Send image user.imagesubmit = Send image
user.info = User
user.insert = Insert user.insert = Insert
user.insertToken = Insert token user.insertToken = Insert token
user.invalidLoginCredentials = Invalid user credentials user.invalidLoginCredentials = Invalid user credentials
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!