LPS-39575 - Fix Google maps portlet after migration to Alloy 2.0

artman328 · Sep 6, 2013 · 48a8d7f · 48a8d7f
1 parent 247c6bd
commit 48a8d7f
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 3 deletions.
diff --git a/portlets/google-maps-portlet/docroot/WEB-INF/src/content/Language.properties b/portlets/google-maps-portlet/docroot/WEB-INF/src/content/Language.properties
@@ -10,4 +10,5 @@ map-address=Map Address
 open-in-google-maps=Open in Google Maps
 show-direction-steps=Show Direction Steps
 show-google-maps-link=Show Google Maps Link
+traveling-mode=Traveling mode
 walking=Walking
diff --git a/portlets/google-maps-portlet/docroot/css/main.css b/portlets/google-maps-portlet/docroot/css/main.css
@@ -9,6 +9,10 @@
 		}
 	}
 
+	.get-directions {
+		margin-top: -12px;
+	}
+
 	.google-maps-link {
 		padding-top: 1em;
 		text-align: right;

diff --git a/portlets/google-maps-portlet/docroot/js/main.js b/portlets/google-maps-portlet/docroot/js/main.js
@@ -454,6 +454,6 @@ AUI.add(
 	},
 	'',
 	{
-		requires: ['aui-dialog', 'aui-io-request', 'get', 'liferay-portlet-base']
+		requires: ['get', 'liferay-portlet-base']
 	}
 );
diff --git a/portlets/google-maps-portlet/docroot/view.jsp b/portlets/google-maps-portlet/docroot/view.jsp
@@ -55,7 +55,7 @@
 
 					<c:choose>
 						<c:when test="<%= enableChangingTravelingMode %>">
-							<aui:select inlineField="<%= true %>" label="" name="travelingMode">
+							<aui:select inlineField="<%= true %>" label="traveling-mode" name="travelingMode">
 								<aui:option label="driving" value="<%= GoogleMapsConstants.DRIVING %>" />
 								<aui:option label="walking" value="<%= GoogleMapsConstants.WALKING %>" />
 								<aui:option label="bicycling" value="<%= GoogleMapsConstants.BICYCLING %>" />
@@ -67,7 +67,7 @@
 					</c:choose>
 
 					<c:if test="<%= directionsInputEnabled || (mapInputEnabled && Validator.isNotNull(directionsAddress)) %>">
-						<aui:button name="getDirectionsButton" value="get-directions" />
+						<aui:button cssClass="get-directions" name="getDirectionsButton" value="get-directions" />
 					</c:if>
 				</aui:layout>
-Original file line number
+Diff line change
@@ Expand Up / @@ -454,6 +454,6 @@ AUI.add( @@
     	},
     	'',
     	{
-    		requires: ['aui-dialog', 'aui-io-request', 'get', 'liferay-portlet-base']
+    		requires: ['get', 'liferay-portlet-base']
     	}
     );