fixed template, and old moya component

code/moya-angular/src/app/old-moya/old-moya.component.ts

@@ -23,8 +23,9 @@ export class OldMoyaComponent implements OnInit {
   constructor(private location: Location, private route: ActivatedRoute) {
 
     route.queryParamMap.map(a => a.get('p')).subscribe(x => {
+      console.log(x);
       if (x) {
-        this.frameUrl = '/MoyaWeb/' + x;
+        this.frameUrl = '/MoyaWeb/' + x.replace("::", "?");
       }
     });
   }
@@ -36,7 +37,7 @@ export class OldMoyaComponent implements OnInit {
     let tmpFrameUrl = this.iframe.nativeElement.contentWindow.location.href.split('/MoyaWeb/', 2);
 
     if (tmpFrameUrl.length > 1) {
-      this.location.replaceState(this.location.path(false).split('?', 1)[0] + '?p=' + tmpFrameUrl[1]);
+      this.location.replaceState(this.location.path(false).split('?', 1)[0] + '?p=' + tmpFrameUrl[1].replace("?", "::") );
     }
 
 

code/moya-web/WebContent/resources/templates/nglayout/template.xhtml

@@ -56,61 +56,16 @@
 			</h:form>
 		</p:dialog>
 
-		<script type="text/javascript">
-
-            window.CONTEXTPATH = "#{request.contextPath}";
-
-			$(document)
-					.ready(
-							function() {
-								setInterval(function() {
-									cdiKeepalive();
-								}, 20000);
-
-								<ui:repeat value="#{localeSelectorView.availableLocales}" var="loc" varStatus="idx">
-								$(
-										".languageSelector .ui-button:eq(#{idx.index})")
-										.css(
-												"background",
-												"url('#{request.contextPath}/resources/icons/flags/#{loc.locale.language}.png') no-repeat")
-										.css("width", "16px").css("height",
-												"11px").css("padding", "0")
-										.css("margin-right", "5px").css(
-												"border-radius", "0")
-								</ui:repeat>
-								$(".languageSelector .ui-button-text").text("");
-							});
-			var apina = null;
-		</script>
 		<!--[if lt IE 7]>
             <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]-->
 
 
 
-				<div class="container top">
-					<div style="float: left;">
-						<h:form id="selectLanguage">
-							<p:selectOneButton id="langselect" styleClass="languageSelector" value="#{sessionStore.locale}" immediate="true" converter="#{localeConverter}">
-								<f:selectItems value="#{localeSelectorView.availableLocales}" var="loc" itemValue="#{loc.locale}" itemLabel="#{loc.locale.displayName}" />
-								<p:ajax update="@all" event="change" />
-							</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>
-					</div>
-					<div style="float: right;">
-						<help:helptool />
-					</div>
-					<div style="clear: both;"> </div>
-				</div>
-
-				<!--  TODO: tyyleistys tähän, toisaalta tarttis tulla vaan teksti -->
-				<ui:insert name="title" />
+		<ui:insert name="title" />
 
 				<p:fieldset id="leftuserinfo" rendered="#{!sessionHandler.loggedIn}">
 					<div style="text-align: left; padding: 0.7em;">