SAK-30012 - QA Testing Calendar Tool in Mobile Display

jpbennett · May 3, 2016 · 475db17 · 475db17
1 parent 4028bd4
commit 475db17
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 14 deletions.
diff --git a/calendar/calendar-summary-tool/tool/src/webapp/summary-calendar/prefs.jsp b/calendar/calendar-summary-tool/tool/src/webapp/summary-calendar/prefs.jsp
@@ -29,15 +29,15 @@
 		<%/* Calendar display */%>
 		<h4><h:outputText value="#{msgs.prefs_section_display}"/></h4>
 		<sakai:instruction_message value="#{msgs.instructions_display}" />
-		<h:panelGrid styleClass="indnt2" columns="2">
-            	<h:outputLabel for="selectViewMode" value="#{msgs.prefs_view_mode}: "/>
-                <h:selectOneMenu
-                	id="selectViewMode"
-                    immediate="false"
-                    value="#{PrefsBean.selectedViewMode}">
-                   	<f:selectItems value="#{PrefsBean.viewModes}"/>
-				</h:selectOneMenu>
-		</h:panelGrid>
+		<div class="form-group">
+        	<h:outputLabel for="selectViewMode" value="#{msgs.prefs_view_mode}: "/>
+            <h:selectOneMenu
+            	id="selectViewMode"
+                immediate="false"
+                value="#{PrefsBean.selectedViewMode}">
+               	<f:selectItems value="#{PrefsBean.viewModes}"/>
+			</h:selectOneMenu>
+		</div>
 
 
 		<%/* Event priorities */%>
@@ -46,8 +46,8 @@
 
 		<%/* Event priorities: event types */%>
 		<h5><h:outputText value="#{msgs.prefs_section_priority_eventypes}" styleClass="indnt1"/></h5>
-		<h:panelGrid styleClass="indnt2" columns="2">
-	        	<h:outputLabel for="highPriorityEvents" value="#{msgs.prefs_high_priority}: "/>
+		<h:panelGrid columns="2">
+	        	<h:outputLabel styleClass="panelGridLabel" for="highPriorityEvents" value="#{msgs.prefs_high_priority}: "/>
 	            <h:selectManyListbox id="highPriorityEvents" size="200" style="height:50px; width: 200px;"
 	            	value="#{PrefsBean.selectedHighPriorityEvents}">
 	            	<%--<f:selectItems value="#{PrefsBean.highPriorityEvents}" var="mapEntry" itemValue="#{mapEntry.value}" itemLabel="#{mapEntry.key}"/>--%>
@@ -62,7 +62,7 @@
                     	            action="" immediate="true" value="#{msgs.prefs_move_down}" />   
 		        </h:panelGrid>
 
-				<h:outputLabel for="mediumPriorityEvents" value="#{msgs.prefs_medium_priority}: "/>	            
+				<h:outputLabel styleClass="panelGridLabel" for="mediumPriorityEvents" value="#{msgs.prefs_medium_priority}: "/>	            
 	            <h:selectManyListbox id="mediumPriorityEvents" size="200" style="height:50px; width: 200px;"
 	            	value="#{PrefsBean.selectedMediumPriorityEvents}">
 	            	<%--<f:selectItems value="#{PrefsBean.mediumPriorityEvents}" var="mapEntry" itemValue="#{mapEntry.value}" itemLabel="#{mapEntry.key}"/>--%>
@@ -77,7 +77,7 @@
 	                                action="" immediate="true" value="#{msgs.prefs_move_down}" />
 		        </h:panelGrid>
 
-	        	<h:outputLabel for="lowPriorityEvents" value="#{msgs.prefs_low_priority}: "/>	            
+	        	<h:outputLabel styleClass="panelGridLabel" for="lowPriorityEvents" value="#{msgs.prefs_low_priority}: "/>	            
 	            <h:selectManyListbox id="lowPriorityEvents" size="200" style="height:50px; width: 200px;"
 	            	value="#{PrefsBean.selectedLowPriorityEvents}">
 	            	<%--<f:selectItems value="#{PrefsBean.lowPriorityEvents}" var="mapEntry" itemValue="#{mapEntry.value}" itemLabel="#{mapEntry.key}"/>--%>
@@ -87,7 +87,7 @@
 
 		<%/* Event priorities: colors */%>
 		<h5><h:outputText value="#{msgs.prefs_section_priority_color}" styleClass="indnt1"/></h5>
-		<h:panelGrid styleClass="indnt2" columns="2">
+		<h:panelGrid styleClass="inputColorContainer" columns="2">
             	<h:outputLabel for="highPriorityColor" value="#{msgs.prefs_high_priority}: "/>
                 <sakai:inputColor 
                 	id="highPriorityColor"

diff --git a/jsf/jsf-resource/src/webapp/inputColor/pixel.gif b/jsf/jsf-resource/src/webapp/inputColor/pixel.gif
diff --git a/reference/library/src/morpheus-master/sass/base/_extendables.scss b/reference/library/src/morpheus-master/sass/base/_extendables.scss
@@ -283,4 +283,20 @@ a.noPointers, input.noPointers {
 		width: 95% !important; 
 		left: 2.5% !important;
 	}
+}
+
+label.panelGridLabel{
+	margin-right: 0.5em;
+}
+
+.inputColorContainer{
+	input{
+		@media #{$phone}{
+			display: inline-block;
+			max-width: calc( 100% - 20px);
+		}
+	}
+	td{
+		vertical-align: baseline;
+	}
 }