Please cherry-pick:

[jjobs-war.git] / web / WEB-INF / templates / admin / opening_time / admin_form_opening_time.tpl

diff --git a/web/WEB-INF/templates/admin/opening_time/admin_form_opening_time.tpl b/web/WEB-INF/templates/admin/opening_time/admin_form_opening_time.tpl
index 36242a1910d17af68501ae376a91ee6c146715a0..767ee3e03131b90038d489da01a015c91f3cc0f8 100644 (file)
--- a/web/WEB-INF/templates/admin/opening_time/admin_form_opening_time.tpl
+++ b/web/WEB-INF/templates/admin/opening_time/admin_form_opening_time.tpl
@@ -1,17 +1,21 @@
 <?xml version="1.0" encoding="UTF-8" ?>
+<!--
+@TODO: title="#{msg.ADMIN_OPENING_TIME_LEGEND_TITLE}"
+-->
 <ui:composition
        xmlns="http://www.w3.org/1999/xhtml"
-       xmlns:widgets="http://mxchange.org/jsf/core/widgets"
        xmlns:f="http://xmlns.jcp.org/jsf/core"
-       xmlns:h="http://xmlns.jcp.org/jsf/html"
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-       xmlns:p="http://primefaces.org/ui">
+       xmlns:p="http://primefaces.org/ui"
+       >
 
-       <!--
-       @TODO: title="#{msg.ADMIN_OPENING_TIME_LEGEND_TITLE}"
-       -->
        <p:fieldset legend="#{msg.ADMIN_OPENING_TIME_LEGEND}">
-               <p:panelGrid layout="grid" columns="4" columnClasses="ui-grid-col-4, ui-grid-col-8" styleClass="table table-full ui-noborder">
+               <p:panelGrid
+                       layout="grid"
+                       columns="4"
+                       columnClasses="ui-grid-col-4,ui-grid-col-8"
+                       styleClass="ui-noborder"
+                       >
                        <p:outputLabel for="openingStartDay" value="#{msg.ADMIN_START_WEEK_DAY}" />
                        <p:outputLabel for="openingEndDay" value="#{msg.ADMIN_END_WEEK_DAY}" />
                        <p:outputLabel for="openingStartTime" value="#{msg.ADMIN_START_TIME}" />
@@ -25,9 +29,17 @@
                                required="true"
                                requiredMessage="#{msg.ADMIN_START_WEEK_DAY_REQUIRED}"
                                >
+
                                <f:converter converterId="DayOfTheWeekConverter" />
+
                                <f:selectItem itemValue="#{null}" itemLabel="#{msg.PLEASE_SELECT}" noSelectionOption="true" itemDisabled="true" />
-                               <f:selectItems value="#{dataController.dayOfTheWeek}" var="dayOfWeek" itemValue="#{dayOfWeek}" itemLabel="#{dayOfWeek.toString()}" />
+
+                               <f:selectItems
+                                       value="#{dataController.dayOfTheWeek}"
+                                       var="dayOfWeek"
+                                       itemValue="#{dayOfWeek}"
+                                       itemLabel="#{dayOfWeek.toString()}"
+                                       />
                        </p:selectOneMenu>
 
                        <p:selectOneMenu
@@ -38,9 +50,17 @@
                                required="true"
                                requiredMessage="#{msg.ADMIN_END_WEEK_DAY_REQUIRED}"
                                >
+
                                <f:converter converterId="DayOfTheWeekConverter" />
+
                                <f:selectItem itemValue="#{null}" itemLabel="#{msg.PLEASE_SELECT}" noSelectionOption="true" itemDisabled="true" />
-                               <f:selectItems value="#{dataController.dayOfTheWeek}" var="dayOfWeek" itemValue="#{dayOfWeek}" itemLabel="#{dayOfWeek.toString()}" />
+
+                               <f:selectItems
+                                       value="#{dataController.dayOfTheWeek}"
+                                       var="dayOfWeek"
+                                       itemValue="#{dayOfWeek}"
+                                       itemLabel="#{dayOfWeek.toString()}"
+                                       />
                        </p:selectOneMenu>
 
                        <p:calendar
@@ -48,8 +68,9 @@
                                value="#{adminOpeningTimeController.openingStartTime}"
                                pattern="HH:mm"
                                timeOnly="true"
-                               required="true"
                                stepMinute="5"
+                               navigator="true"
+                               required="true"
                                requiredMessage="#{msg.ADMIN_START_TIME_REQUIRED}"
                                />
 
@@ -58,8 +79,9 @@
                                value="#{adminOpeningTimeController.openingEndTime}"
                                pattern="HH:mm"
                                timeOnly="true"
-                               required="true"
                                stepMinute="5"
+                               navigator="true"
+                               required="true"
                                requiredMessage="#{msg.ADMIN_END_TIME_REQUIRED}"
                                />
                </p:panelGrid>