leiskmuutoksia

code/MoyaWeb/WebContent/resources/templates/template1/css/style.css

@@ -148,6 +148,9 @@ h1 {
 	width: 200px;
 }
 
+
+
+
 nav {
 	min-width: 200px;
 	background: white;
@@ -193,3 +196,13 @@ aside {
 th, td {
 	padding: 5px;
 }
+
+#header_center {
+	position: relative;
+	text-align: right;
+}
+
+#selectLanguage {
+	padding-left: 10px;
+	padding-top: 10px;
+}

code/MoyaWeb/WebContent/resources/templates/template1/template.xhtml

@@ -79,21 +79,15 @@
 				</h:link>
 			</div>
 			<div id="header_center" class="flex1">
-				<div>
-					<h:form id="selectLanguage">
-						<p:selectOneButton id="langselect" styleClass="languageSelector" value="#{sessionStore.locale}" onchange="this.form.submit()" converter="#{localeConverter}">
-							<f:selectItems value="#{localeSelectorView.availableLocales}" var="loc" itemValue="#{loc.locale}" itemLabel="#{loc.locale.displayName}" />
-						</p:selectOneButton>
-					</h:form>
-				</div>
+				
 				<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>
+							<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 id="header_right">
@@ -115,6 +109,14 @@
 			</nav>
 			<section id="main" class="flex2">
 				<div class="container top">
+					<h:form id="selectLanguage">
+						<p:selectOneButton id="langselect" styleClass="languageSelector" value="#{sessionStore.locale}" onchange="this.form.submit()" converter="#{localeConverter}">
+							<f:selectItems value="#{localeSelectorView.availableLocales}" var="loc" itemValue="#{loc.locale}" itemLabel="#{loc.locale.displayName}" />
+						</p:selectOneButton>
+					</h:form>
+					
+					
+					
 					<h:link rendered="#{layoutView.manageContent}" styleClass="editorlink" value="#{i18n['layout.editTop']}" outcome="/pages/manage">
 						<f:param name="pagename" value="#{layoutView.pagepath}:top" />
 					</h:link>