Please cherry-pick:

[jjobs-war.git] / web / WEB-INF / templates / base.tpl

diff --git a/web/WEB-INF/templates/base.tpl b/web/WEB-INF/templates/base.tpl
index f92b4409edf0f2b0c1e1c8c682df5f3fae8552ea..633ca093e7332fb1a92a924c3273f34774ca5b6b 100644 (file)
--- a/web/WEB-INF/templates/base.tpl
+++ b/web/WEB-INF/templates/base.tpl
@@ -15,7 +15,7 @@
                                <f:loadBundle var="msg" basename="org.mxchange.localization.bundle" />
 
                                <h:outputStylesheet name="/css/default.css" />
-                               <h:outputStylesheet name="/css/cssLayout.css" />
+                               <h:outputStylesheet name="/css/layout.css" />
 
                                <title>
                                        <h:outputText value="JJobs" />
@@ -27,30 +27,29 @@
                        </h:head>
 
                        <h:body>
-                               <div id="top">
-                                       <div id="page_header">
-                                               <div id="page_title">
-                                                       <h1>
-                                                               <h:outputText value="JJobs" />
-                                                               <h:outputText value=" - " />
-                                                               <ui:insert name="title">
-                                                                       <h:outputText value="Default title" />
-                                                               </ui:insert>
-                                                       </h1>
-                                               </div>
+                               <h:panelGroup id="page-header-container" layout="block">
+                                       <div id="page-header">
+                                               <h1>
+                                                       <h:outputText value="JJobs" />
+                                                       <h:outputText value=" - " />
+                                                       <ui:insert name="title">
+                                                               <h:outputText value="Default title" />
+                                                       </ui:insert>
+                                               </h1>
                                        </div>
-                               </div>
+                               </h:panelGroup>
 
-                               <h:panelGroup id="menu_content" layout="block">
-                                       <div id="left">
+                               <h:panelGroup id="menu-content-wrapper" layout="block">
+                                       <div id="left-menu-container">
                                                <ui:insert name="menu">
                                                        <h:outputText value="Default menu" />
                                                </ui:insert>
-                                               <ui:include src="/WEB-INF/templates/generic/locale_selection_box.tpl" />
+
+                                               <ui:include src="/WEB-INF/templates/widgets/locale_change_widget.tpl" />
                                        </div>
 
-                                       <h:panelGroup id="content_outer" class="left_content" layout="block">
-                                               <div id="content_header">
+                                       <h:panelGroup id="content_outer" class="content-container" layout="block">
+                                               <div id="content-header">
                                                        <ui:insert name="content_header">
                                                                <h:outputText value="Default content header" />
                                                        </ui:insert>
@@ -62,18 +61,16 @@
                                                        </ui:insert>
                                                </div>
                                        </h:panelGroup>
-
-                                       <div class="clear"></div>
                                </h:panelGroup>
 
-                               <h:panelGroup id="page_footer" layout="block">
+                               <h:panelGroup id="page-footer" layout="block">
                                        <ui:insert name="footer">
                                                <h:outputText value="Default footer" />
                                        </ui:insert>
                                </h:panelGroup>
 
                                <h:panelGroup styleClass="error_container" layout="block">
-                                       <h:messages showDetail="true" errorClass="errors" fatalClass="errors" warnClass="errors" />
+                                       <h:messages showDetail="true" errorClass="alert-danger" fatalClass="alert-danger" warnClass="alert-warning" />
                                </h:panelGroup>
                        </h:body>
                </f:view>