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

code/MoyaWeb/WebContent/resources/templates/custom_components.css

@@ -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) */
 .ui-widget {
-	font-size: 90% !important;
+	font-size: 95% !important;
 }
 
 
@@ -17,3 +17,43 @@
 	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,7 +71,7 @@
 		<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_left">
@@ -111,7 +111,8 @@
 				</div>
 
 			</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>
 					<p:panelMenu model="#{primeMenuView.menuModel}" />
 					<h:link style="font-size: 10px;" rendered="#{readerView.shopToOthers}" outcome="/shop/showReaderEvents" value="Readers" />
@@ -135,14 +136,17 @@
 				</div>
 
 
+				<!--  TODO: tyyleistys tähän, toisaalta tarttis tulla vaan teksti -->
 				<ui:insert name="title" />
+
 				<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:repeat var="cont1" value="#{menuView.getPagecontent('top')}">
 					<h:outputText value="#{cont1.content}" escape="false" />
@@ -160,7 +164,7 @@
 
 			</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 @@
 
 				<br />
 
-				<p:fieldset legend="Select Mode**" rendered="#{menuView.renderTopmenuChanger}">
+				<p:fieldset legend="#{i18n['mode.title']}" rendered="#{menuView.renderTopmenuChanger}">
 					<h:form>
-						<p:button outcome="/index" value="käyttäjänäkymä**" />
+						<p:button outcome="/index" value="#{i18n['mode.user']}" />
 						<br />
-						<p:button outcome="/useradmin/list" value="ylläpitonäkymä**" />
+						<p:button outcome="/useradmin/list" value="#{i18n['mode.admin']}" />
 					</h:form>
 				</p:fieldset>
 			</p:layoutUnit>
@@ -261,6 +265,16 @@
 				allDayText : 'Koko päivä'
 			};
 		</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>
 
 </f:view>

code/MoyaWeb/src/fi/codecrew/moya/resources/i18n.properties

@@ -267,6 +267,12 @@ manageparticipants.title   = Osallistujat
 
 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.loginerror = frontpage
 navi.auth.logout = frontpage
@@ -352,6 +358,7 @@ topnavi.userlectures  = Kurssit ja luennot
 
 user.cropImage = Crop
 user.imageUpload.imageNotFound = Select image to upload
+user.info      = K\u00E4ytt\u00E4j\u00E4
 user.saveUserSelectableRoles = Tallenna
 user.shirt.L   = Unisex 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
 
 mapedit.save = Save map changes
 
+menu = Menu
+
 menu.index = Index
 menu.item  = Item
 menu.name  = Name
@@ -698,6 +700,10 @@ menuitem.navigation.key = Product flag
 
 menulist.header = Menulist
 
+mode.admin = Adminmode
+mode.title = Select mode
+mode.user  = Usermode
+
 nasty.user = Go away!
 
 networkassociation.action = Action
@@ -1430,6 +1436,7 @@ user.imageCropRefresh = Refresh page
 user.imageTooBig    = Image is too big
 user.imagelist      = Saved images
 user.imagesubmit    = Send image
+user.info           = User
 user.insert         = Insert
 user.insertToken    = Insert token
 user.invalidLoginCredentials = Invalid user credentials

code/MoyaWeb/src/fi/codecrew/moya/resources/i18n_fi.properties

@@ -692,6 +692,8 @@ mapView.notEnoughCreditsToReserve = Sinulla ei ole riitt\u00E4v\u00E4sti suorite
 
 mapedit.save = Tallenna muutokset
 
+menu = Valikko
+
 menu.index = Etusivu
 menu.name  = Nimi
 menu.place.placemap = Paikkakartta
@@ -707,6 +709,10 @@ menuitem.key = Valikkolinkin avain
 
 menulist.header = Valikkolista
 
+mode.admin = Yll\u00E4piton\u00E4kym\u00E4
+mode.title = N\u00E4kym\u00E4
+mode.user  = K\u00E4ytt\u00E4j\u00E4n\u00E4kym\u00E4
+
 nasty.user = Mene pois!
 
 networkassociation.action = Toiminto
@@ -1408,13 +1414,14 @@ user.game.gameid_removed = Peli-ID poistettu
 user.game.manage    = Hallitse
 user.game.remove_gameid = Poista
 user.hasImage       = Kuva
+user.image          = Kuva
 user.imageCropRefresh = P\u00E4ivit\u00E4
 user.imageTooBig    = Kuva on liian suuri
 user.imageUpload.imageNotFound = Valitse ensin kuva jonka haluat l\u00E4hett\u00E4\u00E4
 user.imageUploaded  = Kuva l\u00E4hetetty.
 user.imagelist      = Tallennetut kuvat
 user.imagesubmit    = L\u00E4het\u00E4 kuva
-user.image = Kuva
+user.info           = K\u00E4ytt\u00E4j\u00E4
 user.insert         = Sy\u00F6t\u00E4 arvo
 user.invalidLoginCredentials = K\u00E4ytt\u00E4j\u00E4tunnus tai salasana v\u00E4\u00E4rin.
 user.invite         = Kutsu