Sfoglia il codice sorgente

Fix anteprime documenti

master
Salvatore La Manna 4 anni fa
parent
commit
ef00ae7067
  1. 2
      liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/common/preview_file_entry.jsp
  2. 46
      liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/fascicolo/navigator/page_dettagli_principali.jsp
  3. 4
      liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/.settings/org.eclipse.wst.common.component
  4. 2
      liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/common/preview_file_entry.jsp

2
liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/common/preview_file_entry.jsp

@ -216,6 +216,8 @@ boolean enableCommentRatings = false;
<div class="alert alert-info">
<liferay-ui:message key="generating-preview-will-take-a-few-minutes" />
</div>
<div class="loading-animation"></div>
<script>setTimeout(function() { window.location.reload(1)}, 8000);</script>
</c:when>
<c:otherwise>
<div class="alert alert-info">

46
liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/fascicolo/navigator/page_dettagli_principali.jsp

@ -179,7 +179,7 @@
<div class="module-group">
<liferay-ui:panel extended="false" defaultState="open" collapsible="false" title="fascicolo_title_descrizione" >
<div class="prog-description">
<%=BeanPropertiesUtil.getString(dettPratica, "descLongIntervento") %>
<%= dettPratica.getDescLongIntervento() %>
</div>
</liferay-ui:panel>
</div>
@ -198,13 +198,13 @@
<%= LanguageUtil.get(pageContext, "dp-dc-prov") %>
</div>
<div class="col-sm-6 col-md-3">
<strong><%=BeanPropertiesUtil.getString(provincia, "provincia")%></strong>
<strong><%= provincia.getProvincia() %></strong>
</div>
<div class="col-sm-6 col-md-3">
<%= LanguageUtil.get(pageContext, "dp-dc-comune") %>
</div>
<div class="col-sm-6 col-md-3">
<strong><%=BeanPropertiesUtil.getString(comune, "denominazione")%></strong>
<strong><%= comune.getDenominazione() %></strong>
</div>
</div>
<div class="row">
@ -212,13 +212,13 @@
<%= LanguageUtil.get(pageContext, "dp-dc-loc") %>
</div>
<div class="col-sm-6 col-md-3">
<strong><%=BeanPropertiesUtil.getString(dettPratica, "localita") %></strong>
<strong><%= dettPratica.getLocalita() %></strong>
</div>
<div class="col-sm-6 col-md-3">
<%= LanguageUtil.get(pageContext, "dp-dc-via") %>
</div>
<div class="col-sm-6 col-md-3">
<strong><%=BeanPropertiesUtil.getString(dettPratica, "via") %></strong>
<strong><%= dettPratica.getVia() %></strong>
</div>
</div>
<div class="row">
@ -226,13 +226,13 @@
<%= LanguageUtil.get(pageContext, "dc-foglio") %>
</div>
<div class="col-sm-6 col-md-3">
<strong><%=BeanPropertiesUtil.getString(dettPratica, "dcFoglio") %></strong>
<strong><%= dettPratica.getDcFoglio() %></strong>
</div>
<div class="col-sm-6 col-md-3">
<%= LanguageUtil.get(pageContext, "dc-allegato") %>
</div>
<div class="col-sm-6 col-md-3">
<strong><%=BeanPropertiesUtil.getString(dettPratica, "dcAllegato") %></strong>
<strong><%= dettPratica.getDcAllegato() %></strong>
</div>
</div>
<div class="row">
@ -240,51 +240,44 @@
<%= LanguageUtil.get(pageContext, "dc-particelle") %>
</div>
<%
String[] particelle= BeanPropertiesUtil.getString(dettPratica, "dcParticelle").split(Pattern.quote("|"));
String[] particelle= dettPratica.getDcParticelle().split(Pattern.quote("|"));
%>
<div class="col-sm-6 col-md-3">
<div class="col-md-3 col-sm-3 col-xs-6 no-padding-left">
<span><strong><%=particelle.length>0?particelle[0]:StringPool.BLANK %></strong></span>
<span><strong><%= particelle.length > 0 ? particelle[0] : StringPool.BLANK %></strong></span>
</div>
<div class="col-md-3 col-sm-3 col-xs-6">
<span><strong><%=particelle.length>1?particelle[1]:StringPool.BLANK %></strong></span>
<span><strong><%= particelle.length > 1 ? particelle[1] : StringPool.BLANK %></strong></span>
</div>
<div class="col-md-3 col-sm-3 col-xs-6">
<span><strong><%=particelle.length>2?particelle[2]:StringPool.BLANK %></strong></span>
<span><strong><%= particelle.length > 2 ? particelle[2] : StringPool.BLANK %></strong></span>
</div>
<div class="col-md-3 col-sm-3 col-xs-6 no-padding-right">
<span><strong><%=particelle.length>3?particelle[3]:StringPool.BLANK %></strong></span>
<span><strong><%= particelle.length > 3 ? particelle[3] : StringPool.BLANK %></strong></span>
</div>
</div>
<div class="col-sm-6 col-md-3">
<%= LanguageUtil.get(pageContext, "estremi-prat-com") %>
</div>
<div class="col-sm-6 col-md-3">
<strong><%=BeanPropertiesUtil.getString(dettPratica, "estremiPratCom") %></strong>
</div>
</div>
<c:if test='<%= Validator.isNotNull(BeanPropertiesUtil.getString(dettPratica, "estremiCatastali")) %>'>
<c:if test='<%= Validator.isNotNull(dettPratica.getEstremiCatastali()) %>'>
<div class="row">
<div class="col-sm-6 col-md-3">
<%= LanguageUtil.get(pageContext, "estremi-catastali") %>
</div>
<div class="col-sm-6 col-md-3">
<strong><%=BeanPropertiesUtil.getString(dettPratica, "estremiCatastali") %></strong>
<strong><%= dettPratica.getEstremiCatastali() %></strong>
</div>
</div>
</c:if>
<div class="row">
<div class="col-md-12">
<%
String[] geolocalization = BeanPropertiesUtil.getString(dettPratica, "localizzazioneGeografica","").split(Pattern.quote("|"));
String[] geolocalization = dettPratica.getLocalizzazioneGeografica().split(Pattern.quote("|"));
%>
<aui:input name="lat" label="" type="hidden"
value='<%=geolocalization.length>0?geolocalization[0]:StringPool.BLANK %>' />
value='<%=geolocalization.length > 0 ? geolocalization[0] : StringPool.BLANK %>' />
<aui:input name="long" label="" type="hidden"
value='<%=geolocalization.length>1?geolocalization[1]:StringPool.BLANK %>'/>
value='<%=geolocalization.length > 1 ? geolocalization[1] : StringPool.BLANK %>'/>
<aui:input type="hidden" name="geoIsEditable" value='<%= false %>' label=""/>
<liferay-portlet:runtime portletName="5_WAR_trefmapitmapportlet" queryString='<%="mapitNamespace="+renderResponse.getNamespace()%>' />
</div>
</div>
@ -302,7 +295,7 @@
<div class="row">
<div class="col-sm-12 col-md-12">
<%
String label = BeanPropertiesUtil.getString(dettPratica, "destinazione");
String label = dettPratica.getDestinazione();
String uso = "";
String title = "";
@ -317,8 +310,7 @@
}
}
%>
<strong><%=LanguageUtil.get(pageContext,
"destinazione-"+BeanPropertiesUtil.getString(dettPratica, "destinazione"))%></strong>
<strong><%=LanguageUtil.get(pageContext, "destinazione-"+ label)%></strong>
</div>
</div>
</div>

4
liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/.settings/org.eclipse.wst.common.component

@ -2,10 +2,10 @@
<wb-module deploy-name="portos-fe-portlet">
<wb-resource deploy-path="/" source-path="/docroot" tag="defaultRootSource"/>
<wb-resource deploy-path="/WEB-INF/classes" source-path="/docroot/WEB-INF/src"/>
<dependent-module archiveName="hms-taglib-hook-service.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/lib/hms-taglib-hook/docroot/WEB-INF/lib/hms-taglib-hook-service.jar">
<dependent-module archiveName="portos-bo-portlet-service.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/lib/portos-bo-portlet/docroot/WEB-INF/lib/portos-bo-portlet-service.jar">
<dependency-type>uses</dependency-type>
</dependent-module>
<dependent-module archiveName="portos-bo-portlet-service.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/lib/portos-bo-portlet/docroot/WEB-INF/lib/portos-bo-portlet-service.jar">
<dependent-module archiveName="hms-taglib-hook-service.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/lib/hms-taglib-hook/docroot/WEB-INF/lib/hms-taglib-hook-service.jar">
<dependency-type>uses</dependency-type>
</dependent-module>
<property name="context-root" value="portos-fe-portlet"/>

2
liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/common/preview_file_entry.jsp

@ -215,6 +215,8 @@ boolean enableCommentRatings = false;
<div class="alert alert-info">
<liferay-ui:message key="generating-preview-will-take-a-few-minutes" />
</div>
<div class="loading-animation" />
<script>setTimeout(function() { window.location.reload(1)}, 8000);</script>
</c:when>
<c:otherwise>
<div class="alert alert-info">

Caricamento…
Annulla
Salva