diff --git a/liferay-plugins-sdk-6.2/dist/tref-mapit-shared-6.2.0.1.jar b/liferay-plugins-sdk-6.2/dist/tref-mapit-shared-6.2.0.1.jar index 1cb78e81..39c715bb 100644 Binary files a/liferay-plugins-sdk-6.2/dist/tref-mapit-shared-6.2.0.1.jar and b/liferay-plugins-sdk-6.2/dist/tref-mapit-shared-6.2.0.1.jar differ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/ricerca-posizione/view.jsp b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/ricerca-posizione/view.jsp index 98234abd..3fba5569 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/ricerca-posizione/view.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/ricerca-posizione/view.jsp @@ -18,6 +18,8 @@ String via = ParamUtil.getString(request, "via", StringPool.BLANK); String lat = ParamUtil.getString(request, "lat", StringPool.BLANK); String lng = ParamUtil.getString(request, "long", StringPool.BLANK); String raggio = ParamUtil.getString(request, "raggio", StringPool.BLANK); +boolean targetBlank = ParamUtil.getBoolean(request, "blank", true); +String target = (targetBlank ? "_blank" : StringPool.BLANK); PortletURL iteratorURL = liferayPortletResponse.createRenderURL(); if (Validator.isNotNull(codiceProvincia)) { @@ -38,9 +40,11 @@ if (Validator.isNotNull(lng)) { if (Validator.isNotNull(raggio)) { iteratorURL.setParameter("raggio", raggio); } +iteratorURL.setParameter("blank", String.valueOf(targetBlank)); + DecimalFormat fmt = (DecimalFormat) NumberFormat.getInstance(Locale.ITALY); boolean showNotes = false; -int[] raggi = { 1, 2, 3, 5, 10 }; +int[] raggi = { 500, 1000, 2000, 3000, 5000, 10000 }; %>
@@ -84,7 +88,7 @@ int[] raggi = { 1, 2, 3, 5, 10 };
<% for (int i = 0; i < raggi.length; i++) { %> - <%= raggi[i] %> Km + <%= fmt.format(raggi[i] / 1000.0) %> Km <% } %>
@@ -186,21 +190,21 @@ int[] raggi = { 1, 2, 3, 5, 10 }; <%= fmt.format(pratica.getDistanzaOrtodromica()) %> - + <%= pratica.getTitle(locale, true) %> - + <%= titolare.getTitle() %>
<%= titolare.getCodiceFiscale() %>
- + <%= committenti %> - + <%= LanguageUtil.get(pageContext, PraticaUtil.getStatoPraticaLabel(pratica.getStatoPratica(), intPraticaId)) %> <% @@ -221,7 +225,7 @@ int[] raggi = { 1, 2, 3, 5, 10 }; "> + + "_tab=_" + PortletKeys.FASCICOLO + "_page_avvisi" %>" target="<%= target %>"> <%= avvisi.size() %> @@ -280,7 +284,7 @@ int[] raggi = { 1, 2, 3, 5, 10 }; - + Territorio: <%= comune.getDenominazione() %> <%= (dettaglio == null || dettaglio.getLocalita().isEmpty()) ? "" : diff --git a/liferay-plugins-sdk-6.2/portlets/portos-mapit-plugin-portlet/docroot/WEB-INF/lib/tref-mapit-shared.jar b/liferay-plugins-sdk-6.2/portlets/portos-mapit-plugin-portlet/docroot/WEB-INF/lib/tref-mapit-shared.jar index 1cb78e81..39c715bb 100644 Binary files a/liferay-plugins-sdk-6.2/portlets/portos-mapit-plugin-portlet/docroot/WEB-INF/lib/tref-mapit-shared.jar and b/liferay-plugins-sdk-6.2/portlets/portos-mapit-plugin-portlet/docroot/WEB-INF/lib/tref-mapit-shared.jar differ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-mapit-plugin-portlet/docroot/html/plugin/top.jsp b/liferay-plugins-sdk-6.2/portlets/portos-mapit-plugin-portlet/docroot/html/plugin/top.jsp index b58347cc..aa1f367c 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-mapit-plugin-portlet/docroot/html/plugin/top.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-mapit-plugin-portlet/docroot/html/plugin/top.jsp @@ -93,8 +93,9 @@ Liferay.on('<%= "mapItMapReady" + StringPool.PERIOD + getServletContext().getSer mapItMap = Liferay.MapItMap.get(portletId); var latitude = AUI().one("#"+portletNamespace+"lat"), - longitude = AUI().one("#"+portletNamespace+"long"), - isEditable = AUI().one("#"+portletNamespace+"geoIsEditable").val() == "true"; + longitude = AUI().one("#"+portletNamespace+"long"); + var isEditable = AUI().one("#"+portletNamespace+"geoIsEditable"); + isEditable = (undefined == isEditable) || (isEditable.val() == "true"); var editableLatitude = AUI().one("#"+portletNamespace+"lat_hidden"), editableLongitude = AUI().one("#"+portletNamespace+"long_hidden"), diff --git a/liferay-plugins-sdk-6.2/portlets/portos-mapit-plugin-portlet/docroot/images/marker.png b/liferay-plugins-sdk-6.2/portlets/portos-mapit-plugin-portlet/docroot/images/marker.png index cc9a4211..2f3946a6 100644 Binary files a/liferay-plugins-sdk-6.2/portlets/portos-mapit-plugin-portlet/docroot/images/marker.png and b/liferay-plugins-sdk-6.2/portlets/portos-mapit-plugin-portlet/docroot/images/marker.png differ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-mapit-plugin-portlet/docroot/images/result.png b/liferay-plugins-sdk-6.2/portlets/portos-mapit-plugin-portlet/docroot/images/result.png new file mode 100644 index 00000000..4101f2bd Binary files /dev/null and b/liferay-plugins-sdk-6.2/portlets/portos-mapit-plugin-portlet/docroot/images/result.png differ