SAK-19318 Split i18n strings in sections

applying patch from Juan José Meroño Sánchez ([email protected]) git-svn-id: https://source.sakaiproject.org/svn/sections/trunk@91334 66ffb92e-73f9-0310-93c1-f5514f145a0a
fuead · Apr 5, 2011 · 384982f · 384982f
1 parent 3334b8c
commit 384982f
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 7 deletions.
diff --git a/sections/sections-app/src/webapp/common/css/sections.css b/sections/sections-app/src/webapp/common/css/sections.css
@@ -29,7 +29,9 @@ tr.sectionRow td {padding-bottom:0em !important; vertical-align:top !important;}
 tr.paddedSectionRow td {padding-top:0em !important; padding-bottom:1em !important; vertical-align:top !important;}
 tr.paddedSectionRow td  table {padding-top:0 !important; padding-bottom:1em !important; vertical-align:top !important;}
 
-.paddedMeetingRow {padding-top:0 !important; padding-bottom:1em !important; }
+.paddedMeetingRow {padding-top:0 !important; padding-bottom:3px !important; }
+.meetingFirstCol  {padding-top:10px !important; }
+.meetingSecondCol {padding-top:3px !important;}
 
 
 /* Form labels should be bold */

diff --git a/sections/sections-app/src/webapp/common/inc/sectionEditor.jspf b/sections/sections-app/src/webapp/common/inc/sectionEditor.jspf
@@ -49,6 +49,20 @@
 					<h:panelGroup>
 						<h:dataTable id="meetingsTable" value="#{section.meetings}" var="meeting">					
 							<% // One column per meeting.  Use a div to add a line break in the form controls %>
+							<h:column>
+								<t:div>
+									<h:outputLabel value="#{msgs.student_view_header_day}"/>
+								</t:div>
+								<t:div styleClass="meetingFirstCol">
+									<h:outputLabel value="#{msgs.section_start_time}"/>
+								</t:div>
+								<t:div styleClass="meetingFirstCol">
+									<h:outputLabel value="#{msgs.section_end_time}"/>
+								</t:div>
+								<t:div styleClass="meetingFirstCol">
+									<h:outputLabel value="#{msgs.student_view_header_location}"/>
+								</t:div>
+							</h:column>
 							<h:column>
 								<h:panelGroup>
 									<t:div styleClass="paddedMeetingRow">
@@ -76,19 +90,18 @@
 
 									<t:div styleClass="indent">
 										<h:message for="startTime" styleClass="validationEmbedded"/>
-										<h:message for="endTime" styleClass="validationEmbedded"/>
-										<h:outputFormat value="#{msgs.section_start_time} "/>
+										<h:message for="endTime" styleClass="validationEmbedded"/>										
 										<h:inputText id="startTime" value="#{meeting.startTimeString}" size="18" onfocus="clearIfDefaultString(this, '#{msgs.section_start_time_default}')" />
-
 										<t:selectOneRadio id="startTimeAm" layout="spread" value="#{meeting.startTimeAmString}">
 											<f:selectItem itemValue="true" itemLabel="#{confBean.capAM}"/>
 											<f:selectItem itemValue="false" itemLabel="#{confBean.capPM}"/>
 										</t:selectOneRadio>
 										<t:radio for="startTimeAm" index="0" />
 										<t:radio for="startTimeAm" index="1" />
 										<h:outputText value=" &nbsp; &nbsp; " escape="false" />
-
-										<h:outputFormat value=" #{msgs.section_end_time} "/>
+									</t:div>
+
+									<t:div styleClass="indent meetingSecondCol" >
 										<h:inputText  id="endTime" value="#{meeting.endTimeString}"  size="18" onfocus="clearIfDefaultString(this, '#{msgs.section_end_time_default}')" />
 										<t:selectOneRadio id="endTimeAm" layout="spread" value="#{meeting.endTimeAmString}">
 											<f:selectItem itemValue="true" itemLabel="#{confBean.capAM}"/>
@@ -97,8 +110,9 @@
 										<t:radio for="endTimeAm" index="0" />
 										<t:radio for="endTimeAm" index="1" />
 										<h:outputText value=" &nbsp; &nbsp; " escape="false" />
+									</t:div>
 
-										<h:outputFormat value=" #{msgs.section_location} "/>
+									<t:div styleClass="indent meetingSecondCol">
 										<h:inputText id="location" value="#{meeting.location}" maxlength="20" />
 									</t:div>
 								</h:panelGroup>