diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/AllegatoManualePersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/AllegatoManualePersistenceImpl.java index b040f227..5c96356f 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/AllegatoManualePersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/AllegatoManualePersistenceImpl.java @@ -45,6 +45,7 @@ import it.tref.liferay.portos.bo.NoSuchAllegatoManualeException; import it.tref.liferay.portos.bo.model.AllegatoManuale; import it.tref.liferay.portos.bo.model.impl.AllegatoManualeImpl; import it.tref.liferay.portos.bo.model.impl.AllegatoManualeModelImpl; +import it.tref.liferay.portos.bo.service.persistence.AllegatoManualePersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/AsseverazionePersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/AsseverazionePersistenceImpl.java index 63caa01d..15633d6f 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/AsseverazionePersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/AsseverazionePersistenceImpl.java @@ -46,6 +46,7 @@ import it.tref.liferay.portos.bo.NoSuchAsseverazioneException; import it.tref.liferay.portos.bo.model.Asseverazione; import it.tref.liferay.portos.bo.model.impl.AsseverazioneImpl; import it.tref.liferay.portos.bo.model.impl.AsseverazioneModelImpl; +import it.tref.liferay.portos.bo.service.persistence.AsseverazionePersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/AvvisoPersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/AvvisoPersistenceImpl.java index b95c271d..38e33edc 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/AvvisoPersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/AvvisoPersistenceImpl.java @@ -46,6 +46,7 @@ import it.tref.liferay.portos.bo.NoSuchAvvisoException; import it.tref.liferay.portos.bo.model.Avviso; import it.tref.liferay.portos.bo.model.impl.AvvisoImpl; import it.tref.liferay.portos.bo.model.impl.AvvisoModelImpl; +import it.tref.liferay.portos.bo.service.persistence.AvvisoPersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/CollaudoPersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/CollaudoPersistenceImpl.java index 0b546e1a..02dcaba3 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/CollaudoPersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/CollaudoPersistenceImpl.java @@ -45,6 +45,7 @@ import it.tref.liferay.portos.bo.NoSuchCollaudoException; import it.tref.liferay.portos.bo.model.Collaudo; import it.tref.liferay.portos.bo.model.impl.CollaudoImpl; import it.tref.liferay.portos.bo.model.impl.CollaudoModelImpl; +import it.tref.liferay.portos.bo.service.persistence.CollaudoPersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/ComunePersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/ComunePersistenceImpl.java index b0b64b21..4a23bffd 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/ComunePersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/ComunePersistenceImpl.java @@ -46,6 +46,7 @@ import it.tref.liferay.portos.bo.NoSuchComuneException; import it.tref.liferay.portos.bo.model.Comune; import it.tref.liferay.portos.bo.model.impl.ComuneImpl; import it.tref.liferay.portos.bo.model.impl.ComuneModelImpl; +import it.tref.liferay.portos.bo.service.persistence.ComunePersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/ComunicazionePersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/ComunicazionePersistenceImpl.java index 0b7f9ee2..f5b8166f 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/ComunicazionePersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/ComunicazionePersistenceImpl.java @@ -45,6 +45,7 @@ import it.tref.liferay.portos.bo.NoSuchComunicazioneException; import it.tref.liferay.portos.bo.model.Comunicazione; import it.tref.liferay.portos.bo.model.impl.ComunicazioneImpl; import it.tref.liferay.portos.bo.model.impl.ComunicazioneModelImpl; +import it.tref.liferay.portos.bo.service.persistence.ComunicazionePersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/ConfigurazionePersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/ConfigurazionePersistenceImpl.java index 66507dd0..32809343 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/ConfigurazionePersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/ConfigurazionePersistenceImpl.java @@ -45,6 +45,7 @@ import it.tref.liferay.portos.bo.NoSuchConfigurazioneException; import it.tref.liferay.portos.bo.model.Configurazione; import it.tref.liferay.portos.bo.model.impl.ConfigurazioneImpl; import it.tref.liferay.portos.bo.model.impl.ConfigurazioneModelImpl; +import it.tref.liferay.portos.bo.service.persistence.ConfigurazionePersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/ControlloPraticaPersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/ControlloPraticaPersistenceImpl.java index 48cf51eb..a4fa6f91 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/ControlloPraticaPersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/ControlloPraticaPersistenceImpl.java @@ -45,6 +45,7 @@ import it.tref.liferay.portos.bo.NoSuchControlloPraticaException; import it.tref.liferay.portos.bo.model.ControlloPratica; import it.tref.liferay.portos.bo.model.impl.ControlloPraticaImpl; import it.tref.liferay.portos.bo.model.impl.ControlloPraticaModelImpl; +import it.tref.liferay.portos.bo.service.persistence.ControlloPraticaPersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/DelegaPersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/DelegaPersistenceImpl.java index 402cecd0..8c56fb32 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/DelegaPersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/DelegaPersistenceImpl.java @@ -46,6 +46,7 @@ import it.tref.liferay.portos.bo.NoSuchDelegaException; import it.tref.liferay.portos.bo.model.Delega; import it.tref.liferay.portos.bo.model.impl.DelegaImpl; import it.tref.liferay.portos.bo.model.impl.DelegaModelImpl; +import it.tref.liferay.portos.bo.service.persistence.DelegaPersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/DettPraticaPersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/DettPraticaPersistenceImpl.java index bf34f897..f35bff1b 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/DettPraticaPersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/DettPraticaPersistenceImpl.java @@ -45,6 +45,7 @@ import it.tref.liferay.portos.bo.NoSuchDettPraticaException; import it.tref.liferay.portos.bo.model.DettPratica; import it.tref.liferay.portos.bo.model.impl.DettPraticaImpl; import it.tref.liferay.portos.bo.model.impl.DettPraticaModelImpl; +import it.tref.liferay.portos.bo.service.persistence.DettPraticaPersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/DocAggiuntivaPersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/DocAggiuntivaPersistenceImpl.java index 649a5476..c25ae1dc 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/DocAggiuntivaPersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/DocAggiuntivaPersistenceImpl.java @@ -45,6 +45,7 @@ import it.tref.liferay.portos.bo.NoSuchDocAggiuntivaException; import it.tref.liferay.portos.bo.model.DocAggiuntiva; import it.tref.liferay.portos.bo.model.impl.DocAggiuntivaImpl; import it.tref.liferay.portos.bo.model.impl.DocAggiuntivaModelImpl; +import it.tref.liferay.portos.bo.service.persistence.DocAggiuntivaPersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/DocPraticaPersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/DocPraticaPersistenceImpl.java index 42630357..255330f7 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/DocPraticaPersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/DocPraticaPersistenceImpl.java @@ -46,6 +46,7 @@ import it.tref.liferay.portos.bo.NoSuchDocPraticaException; import it.tref.liferay.portos.bo.model.DocPratica; import it.tref.liferay.portos.bo.model.impl.DocPraticaImpl; import it.tref.liferay.portos.bo.model.impl.DocPraticaModelImpl; +import it.tref.liferay.portos.bo.service.persistence.DocPraticaPersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/FineLavoriPersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/FineLavoriPersistenceImpl.java index 41c1b2be..15f0504f 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/FineLavoriPersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/FineLavoriPersistenceImpl.java @@ -45,6 +45,7 @@ import it.tref.liferay.portos.bo.NoSuchFineLavoriException; import it.tref.liferay.portos.bo.model.FineLavori; import it.tref.liferay.portos.bo.model.impl.FineLavoriImpl; import it.tref.liferay.portos.bo.model.impl.FineLavoriModelImpl; +import it.tref.liferay.portos.bo.service.persistence.FineLavoriPersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/HistoryWorkflowActionPersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/HistoryWorkflowActionPersistenceImpl.java index ad50d7ea..f80406ab 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/HistoryWorkflowActionPersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/HistoryWorkflowActionPersistenceImpl.java @@ -42,6 +42,7 @@ import it.tref.liferay.portos.bo.NoSuchHistoryWorkflowActionException; import it.tref.liferay.portos.bo.model.HistoryWorkflowAction; import it.tref.liferay.portos.bo.model.impl.HistoryWorkflowActionImpl; import it.tref.liferay.portos.bo.model.impl.HistoryWorkflowActionModelImpl; +import it.tref.liferay.portos.bo.service.persistence.HistoryWorkflowActionPersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/IntPraticaPersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/IntPraticaPersistenceImpl.java index 0105606e..80bc6adf 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/IntPraticaPersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/IntPraticaPersistenceImpl.java @@ -48,6 +48,7 @@ import it.tref.liferay.portos.bo.NoSuchIntPraticaException; import it.tref.liferay.portos.bo.model.IntPratica; import it.tref.liferay.portos.bo.model.impl.IntPraticaImpl; import it.tref.liferay.portos.bo.model.impl.IntPraticaModelImpl; +import it.tref.liferay.portos.bo.service.persistence.IntPraticaPersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/PagamentoPersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/PagamentoPersistenceImpl.java index 8dbf29df..ee3b3b9b 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/PagamentoPersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/PagamentoPersistenceImpl.java @@ -46,6 +46,7 @@ import it.tref.liferay.portos.bo.NoSuchPagamentoException; import it.tref.liferay.portos.bo.model.Pagamento; import it.tref.liferay.portos.bo.model.impl.PagamentoImpl; import it.tref.liferay.portos.bo.model.impl.PagamentoModelImpl; +import it.tref.liferay.portos.bo.service.persistence.PagamentoPersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/ParereGeologoPersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/ParereGeologoPersistenceImpl.java index c6ce3907..e4133c60 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/ParereGeologoPersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/ParereGeologoPersistenceImpl.java @@ -45,6 +45,7 @@ import it.tref.liferay.portos.bo.NoSuchParereGeologoException; import it.tref.liferay.portos.bo.model.ParereGeologo; import it.tref.liferay.portos.bo.model.impl.ParereGeologoImpl; import it.tref.liferay.portos.bo.model.impl.ParereGeologoModelImpl; +import it.tref.liferay.portos.bo.service.persistence.ParereGeologoPersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/ProvinciaPersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/ProvinciaPersistenceImpl.java index daa33e1b..2c7a846f 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/ProvinciaPersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/ProvinciaPersistenceImpl.java @@ -43,6 +43,7 @@ import it.tref.liferay.portos.bo.NoSuchProvinciaException; import it.tref.liferay.portos.bo.model.Provincia; import it.tref.liferay.portos.bo.model.impl.ProvinciaImpl; import it.tref.liferay.portos.bo.model.impl.ProvinciaModelImpl; +import it.tref.liferay.portos.bo.service.persistence.ProvinciaPersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/SoggettoPersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/SoggettoPersistenceImpl.java index 29c4a390..ef2db5f2 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/SoggettoPersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/SoggettoPersistenceImpl.java @@ -45,6 +45,7 @@ import it.tref.liferay.portos.bo.NoSuchSoggettoException; import it.tref.liferay.portos.bo.model.Soggetto; import it.tref.liferay.portos.bo.model.impl.SoggettoImpl; import it.tref.liferay.portos.bo.model.impl.SoggettoModelImpl; +import it.tref.liferay.portos.bo.service.persistence.SoggettoPersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/SorteggioPersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/SorteggioPersistenceImpl.java index ec8a983f..fc566b28 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/SorteggioPersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/SorteggioPersistenceImpl.java @@ -45,6 +45,7 @@ import it.tref.liferay.portos.bo.NoSuchSorteggioException; import it.tref.liferay.portos.bo.model.Sorteggio; import it.tref.liferay.portos.bo.model.impl.SorteggioImpl; import it.tref.liferay.portos.bo.model.impl.SorteggioModelImpl; +import it.tref.liferay.portos.bo.service.persistence.SorteggioPersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/StoricoSoggettoPraticaPersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/StoricoSoggettoPraticaPersistenceImpl.java index 78333501..0c095d3d 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/StoricoSoggettoPraticaPersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/StoricoSoggettoPraticaPersistenceImpl.java @@ -42,6 +42,7 @@ import it.tref.liferay.portos.bo.NoSuchStoricoSoggettoPraticaException; import it.tref.liferay.portos.bo.model.StoricoSoggettoPratica; import it.tref.liferay.portos.bo.model.impl.StoricoSoggettoPraticaImpl; import it.tref.liferay.portos.bo.model.impl.StoricoSoggettoPraticaModelImpl; +import it.tref.liferay.portos.bo.service.persistence.StoricoSoggettoPraticaPersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/TempisticaPersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/TempisticaPersistenceImpl.java index 720078c4..252fc452 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/TempisticaPersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/TempisticaPersistenceImpl.java @@ -45,6 +45,7 @@ import it.tref.liferay.portos.bo.NoSuchTempisticaException; import it.tref.liferay.portos.bo.model.Tempistica; import it.tref.liferay.portos.bo.model.impl.TempisticaImpl; import it.tref.liferay.portos.bo.model.impl.TempisticaModelImpl; +import it.tref.liferay.portos.bo.service.persistence.TempisticaPersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/TerritorioPersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/TerritorioPersistenceImpl.java index a9c7f7d5..c8e0dee9 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/TerritorioPersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/TerritorioPersistenceImpl.java @@ -44,6 +44,7 @@ import it.tref.liferay.portos.bo.NoSuchTerritorioException; import it.tref.liferay.portos.bo.model.Territorio; import it.tref.liferay.portos.bo.model.impl.TerritorioImpl; import it.tref.liferay.portos.bo.model.impl.TerritorioModelImpl; +import it.tref.liferay.portos.bo.service.persistence.TerritorioPersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/service.properties b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/service.properties index 620b65bd..da3a7ec6 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/service.properties +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/service.properties @@ -13,8 +13,8 @@ ## build.namespace=portos_bo - build.number=2673 - build.date=1625561203551 + build.number=2674 + build.date=1625582377691 build.auto.upgrade=true ## diff --git a/liferay-plugins-sdk-6.2/themes/portos-private-fe-theme/docroot/_diffs/templates/header.ftl b/liferay-plugins-sdk-6.2/themes/portos-private-fe-theme/docroot/_diffs/templates/header.ftl index f7b0e1c9..47789e66 100644 --- a/liferay-plugins-sdk-6.2/themes/portos-private-fe-theme/docroot/_diffs/templates/header.ftl +++ b/liferay-plugins-sdk-6.2/themes/portos-private-fe-theme/docroot/_diffs/templates/header.ftl @@ -1,45 +1,49 @@
+
+

+ + <#assign logo_url = "${images_folder}/logo-rt.png" /> + + ${logo_description} + +

-
-

- - <#assign logo_url = "${images_folder}/logo-rt.png" /> - - ${logo_description} - -

+ <#assign ddmTemplate_news = theme.getSetting("ddmTemplate-news") /> + <#if ddmTemplate_news!= ""> +
- <#assign ddmTemplate_news = theme.getSetting("ddmTemplate-news") /> - <#if ddmTemplate_news!= ""> -
+ <#assign portlet_id = "101" /> + <#assign instance_id = "carosello_header"+plid /> - <#assign portlet_id = "101" /> - <#assign instance_id = "carosello_header"+plid /> + <#assign VOID = freeMarkerPortletPreferences.setValue("displayStyle", "${ddmTemplate_news}")> + <#assign my_portlet_id = "${portlet_id}_INSTANCE_${instance_id}" /> - <#assign VOID = freeMarkerPortletPreferences.setValue("displayStyle", "${ddmTemplate_news}")> - <#assign my_portlet_id = "${portlet_id}_INSTANCE_${instance_id}" /> + ${theme.runtime(my_portlet_id, "",freeMarkerPortletPreferences)} + <#assign VOID = freeMarkerPortletPreferences.reset()> - ${theme.runtime(my_portlet_id, "",freeMarkerPortletPreferences)} - <#assign VOID = freeMarkerPortletPreferences.reset()> +
+ -
- - -

- - ${logo_description} - -

-
-
- <#if has_navigation> - <#include "${full_templates_path}/navigation.ftl" /> - -
+

+ + <#if propsUtil.get("mwg.test.display")?has_content > + <#assign test_display = propsUtil.get("mwg.test.display") /> +

${test_display}

+ <#else> + ${logo_description} + + +

+
+
+ <#if has_navigation> + <#include "${full_templates_path}/navigation.ftl" /> + +
\ No newline at end of file diff --git a/liferay-plugins-sdk-6.2/themes/portos-private-fe-theme/docroot/css/_aui_variables.scss b/liferay-plugins-sdk-6.2/themes/portos-private-fe-theme/docroot/css/_aui_variables.scss index e69de29b..32580d94 100644 --- a/liferay-plugins-sdk-6.2/themes/portos-private-fe-theme/docroot/css/_aui_variables.scss +++ b/liferay-plugins-sdk-6.2/themes/portos-private-fe-theme/docroot/css/_aui_variables.scss @@ -0,0 +1,48 @@ +$gray: #555; +$white: #FFF; + +$linkColor: #0AF; +$linkColorHover: darken($linkColor, 15%); + +$baseBorderRadius: 2px; +$borderRadiusLarge: 3px; +$borderRadiusSmall: 2px; + +$btnBackground: #F6F6F6; +$btnBackgroundHighlight: #EAEAEA; +$btnBorder: #CFCFCF; +$btnDangerBackground: #F53924; +$btnDangerBackgroundHighlight: #ED2C17; +$btnInfoBackground: #00CFFF; +$btnInfoBackgroundHighlight: darken($btnInfoBackground, 4%); +$btnPrimaryBackground: #54AAFF; +$btnPrimaryBackgroundHighlight: #4A96E8; +$btnSuccessBackground: #0ECD27; +$btnSuccessBackgroundHighlight: #0ABA1D; +$btnWarningBackground: #FFA658; +$btnWarningBackgroundHighlight: #F49645; + +$dropdownLinkBackgroundActive: lighten($linkColor, 5%); +$dropdownLinkBackgroundHover: darken(#3ECAF4, 10%); +$dropdownLinkColorActive: $white; + +$navbarBackground: #F3F3F3; +$navbarBackgroundHighlight: #F9F9F9; +$navbarBorder: #DDDDDD; +$navbarLinkBackgroundActive: lighten($navbarBackground, 25%); +$navbarLinkColor: $gray; +$navbarLinkColorHover: $linkColorHover; +$navbarText: $navbarLinkColor; + +$errorBackground: #FEE5E2; +$errorBorder: #FCACA5; +$errorText: #B50303; +$infoBackground: #CEF1FC; +$infoBorder: darken($infoBackground, 10%); +$infoText: #12718F; +$successBackground: #F1FBD1; +$successBorder: #BCE830; +$successText: #488F06; +$warningBackground: #FFFBDC; +$warningBorder: #F1D875; +$warningText: #BF7900; \ No newline at end of file diff --git a/liferay-plugins-sdk-6.2/themes/portos-private-fe-theme/docroot/css/_liferay_custom.scss b/liferay-plugins-sdk-6.2/themes/portos-private-fe-theme/docroot/css/_liferay_custom.scss index e69de29b..69637aae 100644 --- a/liferay-plugins-sdk-6.2/themes/portos-private-fe-theme/docroot/css/_liferay_custom.scss +++ b/liferay-plugins-sdk-6.2/themes/portos-private-fe-theme/docroot/css/_liferay_custom.scss @@ -0,0 +1,36 @@ +@import "compass"; + +/* ---------- Help messages, general additional information, etc. ---------- */ + +.portlet-msg-alert, .portlet-msg-error, .portlet-msg-help, .portlet-msg-info, .portlet-msg-progress, .portlet-msg-success { + @extend .alert; +} + +.portlet-msg-help, .portlet-msg-info, .portlet-msg-progress { + @extend .alert-info; +} + +.portlet-msg-progress { + background-image: url(../images/aui/loading_indicator.gif); + background-repeat: no-repeat; + background-position: 6px 50%; + padding-left: 30px; +} + +/* ---------- Error messages ---------- */ + +.portlet-msg-error { + @extend .alert-error; +} + +/* ---------- Success messages ---------- */ + +.portlet-msg-success { + @extend .alert-success; +} + +/* ---------- Misc ---------- */ + +.navbar .nav li > a { + @include word-break(break-all); +} \ No newline at end of file diff --git a/liferay-plugins-sdk-6.2/themes/portos-private-fe-theme/docroot/css/application.css b/liferay-plugins-sdk-6.2/themes/portos-private-fe-theme/docroot/css/application.css index e5d689a8..5c7b56ed 100644 --- a/liferay-plugins-sdk-6.2/themes/portos-private-fe-theme/docroot/css/application.css +++ b/liferay-plugins-sdk-6.2/themes/portos-private-fe-theme/docroot/css/application.css @@ -1,104 +1,187 @@ +@import "aui/alloy-font-awesome/scss/variables"; @import "compass"; /* ---------- Dragging/sorting indicators ---------- */ .portlet-layout.dragging { + border-collapse: separate; } .drop-area { + background-color: #D3DADD; } .active-area { + background: #FFC; } .portlet-boundary.yui3-dd-dragging { + @include opacity(0.6); .portlet { + border: 2px dashed #CCC; } } .sortable-layout-proxy { + @include opacity(1); .portlet-topper { + background-image: none; } } .proxy { + cursor: move; + + @include opacity(0.65); + + position: absolute; + &.generic-portlet { + height: 200px; + width: 300px; .portlet-title { + padding: 10px; } } &.not-intersecting .forbidden-action { + background: url(../images/application/forbidden_action.png) no-repeat; + display: block; + height: 32px; + position: absolute; + right: -15px; + top: -15px; + width: 32px; } } .resizable-proxy { + border: 1px dashed #828F95; + position: absolute; + visibility: hidden; } .sortable-proxy { + background: #727C81; + margin-top: 1px; } .lfr-freeform-layout-drag-indicator { + visibility: hidden; } .sortable-layout-drag-target-indicator { + margin: 2px 0; +} + +.yui3-dd-proxy { + z-index: 1110 !important; } /* ---------- Portal tool tips ---------- */ .tooltip { + max-width: 200px; } /* ---------- Tags ---------- */ .tagselector-content { + border-width: 0; + margin-bottom: 15px; + overflow: visible; + padding: 0; .textboxlistentry-holder { + background: #FFF; + border: 1px solid #CCC; + margin-bottom: 5px; + overflow: visible; + padding: 5px; + position: relative; + + li { + line-height: 1; + } .lfr-tag-selector-input { + border-width: 0; + margin-bottom: 0; } } + + .textboxlistentry-remove { + padding: 0 3px 1px; + } } .tagselector { + .lfr-tags-selector-content { + border-width: 0; + } + .lfr-tag-selector-input { + background: none; + padding: 0; + width: auto; } .field .field-content { + margin: 0; } .textboxlist-input-container { + margin: 0; } } .tagselector-focused .textboxlistentry-holder { + background: #FFF none; + border: 1px solid #CCC; } .categoriesselector-content .textboxlistentry-holder { + background-color: transparent; + border-width: 0; + padding: 0; } /* ---------- Tag cloud and tag list ---------- */ .tag-items { + list-style: none; + margin: 0 1em 0 0; + padding: 0 1em 0.5em 1em; + white-space: normal; li { + display: inline; + float: left; + margin: 0 1em 0 0; } a { + white-space: nowrap; } } .tag-selected { + color: #000; + font-weight: bold; + text-decoration: none; } .tag-cloud { + line-height: 2.5em; + $tag-popularity-font-size: 0.7em; @for $i from 1 through 6 { .tag-popularity-#{$i} { - /*font-size: $tag-popularity-font-size + ($i * 0.3);*/ + font-size: $tag-popularity-font-size + ($i * 0.3); } } } @@ -106,214 +189,587 @@ /* ---------- Underlay ---------- */ .underlay { + clear: both; + top: 100%; .yui3-widget-hd { + height: 38px; } .lfr-portlet-item { + border-width: 0; } } .underlay-hidden { + display: none; } .underlay-content { + background: #F4F3F3 url(../images/common/message_panel_shadow.png) repeat-x 0 0; + border: 0 solid #AEAFB1; + border-width: 0 1px 1px; } .underlay-close { + position: absolute; + right: 5px; + top: 5px; } /* ---------- Tabs ---------- */ .tab-active strong { + font-weight: normal; } .tab-back { + float: right; } .tab-back-content { + border-width: 0; + padding: 1px; } /* ---------- Miscellaneous ---------- */ .lfr-panel-container { + background: #FFF; } .lfr-panel-content { + padding: 5px 10px; } .lfr-panel-basic .lfr-panel-content { + padding-left: 15px; } .dialog-bd { + min-height: 30px; } .dialog-content { + border: 1px solid #C8C9CA; + padding: 5px; } .panel-hd { + background: #C0C2C5 url(../images/application/panel_header_bg.png) repeat-x 0 0; + border: 1px solid; + border-color: #C8C9CA #AEB2B8 #AEB2B8 #C8C9CA; + padding-left: 10px; + text-shadow: 1px 1px #FFF; } .app-view-drop-active { + background-color: #00A2EA; + font-weight: bold; + + .category-portlets & { + color: #FFF; + } } -/* ---------- Menus ---------- */ +.basecelleditor [class~="form-validator-message"] { + clip: rect(auto auto auto auto); + width: auto; +} -.lfr-menu-list { +.document-library-file-entry-cell-editor-hidden { + display: none; } +.previous-level { + display: inline-block; + font-size: 21px; + line-height: 21px; + margin-right: 5px; + text-decoration: none; + vertical-align: middle; +} + +/* ---------- Menus ---------- */ + .lfr-page-templates li { a { + padding: 0; label { + cursor: pointer; + display: block; + padding: 5px 0 5px 5px; } } } .menu { + position: absolute; + width: auto; .notice-message { + background-image: none; + margin: 3px; + padding: 6px; } } .menu-content { + background: #FFF; + list-style: none; + min-width: 150px; li { + margin: 0; + padding: 0; .disabled { + color: #999; } } } .menu-content { + background: #CCC9C9 url(../images/application/menu_bg.png) repeat-x 0 0; + border: 1px solid; + border-color: #AEAFB1 #777879 #777879 #AEAFB1; + padding: 2px 0; } .menugroup-content .menu-label { + background: #D2D6DE; + color: #5B677D; + display: block; + padding: 5px 3px; + text-shadow: 1px 1px #FFF; } .menugroup-content ul { + display: block; + min-width: 0; } .menu-content li { + border-bottom: 1px solid #BCBBBB; + border-top: 1px solid #EEE; + display: block; + margin: 0; + padding: 0; &.first { + border-top-width: 0; } &.last { + border-bottom-width: 0; } } .menu-content li a, .menu-content li .disabled { + color: #2C2F34; + display: block; + padding: 4px 5px; + text-decoration: none; } .menu-content li a.focus, .lfr-menu-expanded li a:focus { + background-color: #5B677D; + color: #FFF; + text-shadow: -1px -1px #2C2F34; } /* ---------- Loading mask ---------- */ .loadingmask-content { + background: #CCC; } .loadingmask-message { + background: #D4D4D4 url(../images/portlet/header_bg.png) repeat-x 0 0; } /* ---------- Tree view ---------- */ +.tree-node { + .icon-check { + padding-right: 2px; + + &:before { + content: $check-empty; + } + } + + .tree-node-checked { + .icon-check { + padding-right: 0; + + &:before { + content: $check; + } + } + } + + .tree-node-over .tree-label { + text-decoration: underline; + } + + [class ^="icon-"] { + margin-right: 5px; + } + + .tree-node-checkbox-container { + margin-right: 0; + } + + .tree-node-selected .tree-label { + background: none; + } +} + +.tree-node-content { + .tree-hitarea { + color: #999; + font-size: 10px; + padding-right: 6px; + } + + .tree-label { + margin-left: 3px; + } + + .tree-node-hidden-hitarea { + visibility: hidden; + } +} + .tree-node-selected .tree-label { + background-color: transparent; } /* ---------- Page customization ---------- */ .dragging .portlet-column.customizable { + background-color: #CFFCCF; + outline: 3px solid #9CC97B; } .customizable-layout-column-content { + background-color: #C92C3C; &.yui3-widget-content-expanded { + border: 3px solid #333; + margin: 0.2em; } } .customizable .customizable-layout-column-content { + background-color: #9CC97B; } .layout-customizable-controls { + background-color: #FFF; + font-size: 1.5em; + margin: 1em; + @include opacity(0.9); + padding: 1em; + position: absolute; + z-index: 15; } /* ---------- Pagination ---------- */ .paginator-link { + background: #EEE url() no-repeat scroll 50% 1px; + border: 1px solid #F0F1F2; + border-color: #F0F1F2 #B2B2B2 #949494 #F0F1F1; + color: #1F1E1E; + display: inline-block; + height: 20px; + padding: 0; + text-indent: -9999px; + width: 20px; } .paginator-page-link { + height: auto; + text-indent: 0; } .paginator-current-page { + background: #0083BD url(../images/application/paginator_link_current_bg.png) 0 0 repeat-x; + border-color: #38B6EF #006D9E #006D9E #46B4E6; + color: #FFF; + text-shadow: -1px -1px #003C57; } .paginator-first-link { + background-image: url(../images/arrows/paging_first.png); } .paginator-prev-link { + background-image: url(../images/arrows/paging_previous.png); } .paginator-last-link { + background-image: url(../images/arrows/paging_last.png); } .paginator-next-link { + background-image: url(../images/arrows/paging_next.png); } .paginator-current-page-report, .paginator-total { + color: #555; + font-size: 0.9em; } .paginator-current-page-report { + margin-left: 2em; } .taglib-page-iterator .search-pages .page-links { + padding: 0; +} + +/* ---------- CKEditor contents ---------- */ + +.aui { + .cke_editable [class*="span"] { + float: none; + } +} + +/* ---------- CKEditor menu ---------- */ + +.aui { + .cke_dialog .cke_dialog_ui_input_text { + height: auto; + } + + .cke_editable_inline a { + cursor: pointer; + } +} + +/* ---------- CKEditor panel menu ---------- */ + +.cke_panel.cke_combopanel { + width: 220px; +} + +.cke_panel_block { + .cke_panel_grouptitle { + font-size: 20px; + line-height: 20px; + margin-top: 0; + } + + .cke_panel_list { + margin-left: 0; + + .cke_panel_listItem { + line-height: initial; + + a:hover { + text-decoration: none; + } + } + } +} + +/* ---------- CKEditor source ---------- */ + +.aui { + .cke_source { + @include box-sizing(border-box); + } +} + +/* ---------- CKEditor table ---------- */ + +.cke_show_border { + width: 500px; + + td { + height: 15px; + } +} + +/* ---------- HTML editor ---------- */ + +body.html-editor { + background: #FFF; + color: #000; + padding: 1em; +} + +.html-editor.portlet-message-boards { + @include hyphenation; + + word-wrap: break-word; + + blockquote { + background: #EEF0F2 url(../images/message_boards/quoteleft.png) no-repeat 5px 5px; + border: 1px solid #777; + padding: 5px 45px; + + &:after { + background: url(../images/message_boards/quoteright.png) no-repeat 50%; + content: ''; + display: block; + float: right; + height: 24px; + margin-right: -35px; + margin-top: -25px; + width: 31px; + z-index: 999; + } + + cite { + display: block; + font-weight: bold; + } + } + + pre { + background: #F9F9F9; + border: 1px solid #777; + padding: 0.5em; + } } /* ---------- Inline editing ---------- */ .lfr-editable { + $edit-color: #68BB30; + $edit-color-hover: darken(#68BB30, 10); + outline: 1px dashed $edit-color; + outline-offset: 2px; + position: relative; &:after { + background: $edit-color url(../images/common/edit_white.png) no-repeat 50%; + content: ''; + display: block; + height: 20px; + position: absolute; + right: 5px; + top: 5px; + width: 30px; } &:focus { &:after { + display: none; } &:hover { + background-color: transparent; } } &:hover { + background-color: rgba(255, 255, 255, 0.3); + outline-color: $edit-color-hover; &:after { + background-color: $edit-color-hover; } } } .lfr-editable-notice-close { + margin-left: 1em; +} + +.lfr-portlet-title-editable { + margin-top: 0; + z-index: 9999; + + .lfr-portlet-title-editable-content { + padding: 0; + + .combobox-content { + .field-content .field-input-text { + display: block; + margin-bottom: 0; + } + + .field-label.textfield-label { + display: none; + } + + .toolbar-content { + margin-top: 0; + vertical-align: top; + + .btn-group { + margin-top: 0; + } + } + } + } +} + +.lfr-page-layouts .lfr-layout-template .layout-template-entry { + height: 25px; + width: 25px; } .ie { + & input.cke_dialog_ui_input_text { + height: auto; + } + .proxy.not-intersecting .forbidden-action { + right: 2px; + top: 2px; } } .ie7 { .menu-content li { + z-index: 10; } .paginator-link { + color: transparent; + font-size: 0; + overflow: hidden; + text-indent: 0; + vertical-align: middle; } .paginator-page-link { + color: #1F1E1E; + font-size: 1em; + height: auto; + line-height: 1.4; + overflow: visible; + text-indent: 0; } .paginator-current-page { + color: #FFF; + } +} + +.ie8 { + .row-fluid { + input[class*=span].search-query { + line-height: 20px; + min-height: 20px; + } + } +} + +.ios.mobile { + .modal-content .dialog-iframe-bd { + overflow: auto; + -webkit-overflow-scrolling: touch; } } \ No newline at end of file diff --git a/liferay-plugins-sdk-6.2/themes/portos-private-fe-theme/docroot/css/aui.css b/liferay-plugins-sdk-6.2/themes/portos-private-fe-theme/docroot/css/aui.css index c6dc1281..cdfa6439 100644 --- a/liferay-plugins-sdk-6.2/themes/portos-private-fe-theme/docroot/css/aui.css +++ b/liferay-plugins-sdk-6.2/themes/portos-private-fe-theme/docroot/css/aui.css @@ -1,3 +1,37 @@ +$FontAwesomePath: "aui/alloy-font-awesome/font" !default; + +@import "aui/alloy-font-awesome/scss/variables"; +@import "aui/alloy-font-awesome/scss/mixins-alloy"; +@import "aui/alloy-font-awesome/scss/path-alloy"; + .aui { + @import "aui_variables"; + + $iconSpritePath: '../images/aui/glyphicons-halflings.png' !default; + $iconWhiteSpritePath: '../images/aui/glyphicons-halflings-white.png' !default; + + //@import "aui/bootstrap"; // Remove >> Bootstrap 2.3.2 + @import "aui/variables-alloy"; + @import "aui/variables"; + @import "aui/bs3/bootstrap"; // Add >> Bootstrap 3.5 + @import "aui/bs3/bs2_extender"; // Bootstrap Extender by: Marcos Castro + @import "aui/bs3/bs_liferay_fixes"; // Bootstrap 3 fixes for Liferay components by: Marcos Castro + + @import "aui_custom"; + //@import "aui/responsive"; // Remove >> Bootstrap 2.3.2 responsive + @import "liferay_custom"; + @import "aui/alloy-font-awesome/scss/core"; + @import "aui/alloy-font-awesome/scss/bootstrap"; + @import "aui/alloy-font-awesome/scss/extras"; + @import "aui/alloy-font-awesome/scss/icons-alloy"; + @import "aui/alloy-font-awesome/scss/icons-alloy-extra"; + + background-color: $bodyBackground; + color: $textColor; + font-family: $baseFontFamily; + font-size: $baseFontSize; + line-height: $baseLineHeight; + margin: 0; + } \ No newline at end of file diff --git a/liferay-plugins-sdk-6.2/themes/portos-private-fe-theme/docroot/css/aui/_alerts.scss b/liferay-plugins-sdk-6.2/themes/portos-private-fe-theme/docroot/css/aui/_alerts.scss index 65335110..669c4de5 100644 --- a/liferay-plugins-sdk-6.2/themes/portos-private-fe-theme/docroot/css/aui/_alerts.scss +++ b/liferay-plugins-sdk-6.2/themes/portos-private-fe-theme/docroot/css/aui/_alerts.scss @@ -36,9 +36,9 @@ // ------------------------- .alert-success { - background-color: $successBackground; - border-color: $successBorder; - color: $successText; + background-color: $successBackground!important; + border-color: $successBorder!important; + color: $successText!important; } .alert-success h4 { color: $successText; @@ -54,9 +54,9 @@ color: $errorText; } .alert-info { - background-color: $infoBackground; - border-color: $infoBorder; - color: $infoText; + background-color: $infoBackground!important; + border-color: $infoBorder!important; + color: $infoText!important; } .alert-info h4 { color: $infoText; diff --git a/liferay-plugins-sdk-6.2/themes/portos-private-fe-theme/docroot/css/aui/_forms.scss b/liferay-plugins-sdk-6.2/themes/portos-private-fe-theme/docroot/css/aui/_forms.scss index 4ba97655..6b05636c 100644 --- a/liferay-plugins-sdk-6.2/themes/portos-private-fe-theme/docroot/css/aui/_forms.scss +++ b/liferay-plugins-sdk-6.2/themes/portos-private-fe-theme/docroot/css/aui/_forms.scss @@ -15,7 +15,6 @@ fieldset { padding: 0; margin: 0; border: 0; - min-width: 0; } // Groups of fields with labels on top (legends) diff --git a/liferay-plugins-sdk-6.2/themes/portos-private-fe-theme/docroot/css/aui/_tooltip-alloy.scss b/liferay-plugins-sdk-6.2/themes/portos-private-fe-theme/docroot/css/aui/_tooltip-alloy.scss index a4b6c430..acef49bb 100644 --- a/liferay-plugins-sdk-6.2/themes/portos-private-fe-theme/docroot/css/aui/_tooltip-alloy.scss +++ b/liferay-plugins-sdk-6.2/themes/portos-private-fe-theme/docroot/css/aui/_tooltip-alloy.scss @@ -12,9 +12,7 @@ background-color: $helpTooltipBackground; border: 1px solid $helpTooltipBorderColor; max-width: 400px; - overflow-wrap: break-word; text-align: left; - word-wrap: break-word; } // Arrows diff --git a/liferay-plugins-sdk-6.2/themes/portos-private-fe-theme/docroot/css/aui/alloy-font-awesome/font/fontawesome-alloy.eot b/liferay-plugins-sdk-6.2/themes/portos-private-fe-theme/docroot/css/aui/alloy-font-awesome/font/fontawesome-alloy.eot index 2f032049..4e7d43a4 100644 Binary files a/liferay-plugins-sdk-6.2/themes/portos-private-fe-theme/docroot/css/aui/alloy-font-awesome/font/fontawesome-alloy.eot and b/liferay-plugins-sdk-6.2/themes/portos-private-fe-theme/docroot/css/aui/alloy-font-awesome/font/fontawesome-alloy.eot differ diff --git a/liferay-plugins-sdk-6.2/themes/portos-private-fe-theme/docroot/css/aui/alloy-font-awesome/font/fontawesome-alloy.ttf b/liferay-plugins-sdk-6.2/themes/portos-private-fe-theme/docroot/css/aui/alloy-font-awesome/font/fontawesome-alloy.ttf index 09e39974..4b5b96a6 100644 Binary files a/liferay-plugins-sdk-6.2/themes/portos-private-fe-theme/docroot/css/aui/alloy-font-awesome/font/fontawesome-alloy.ttf and b/liferay-plugins-sdk-6.2/themes/portos-private-fe-theme/docroot/css/aui/alloy-font-awesome/font/fontawesome-alloy.ttf differ diff --git a/liferay-plugins-sdk-6.2/themes/portos-private-fe-theme/docroot/css/aui/alloy-font-awesome/font/fontawesome-alloy.woff b/liferay-plugins-sdk-6.2/themes/portos-private-fe-theme/docroot/css/aui/alloy-font-awesome/font/fontawesome-alloy.woff index 4be83025..92a38a65 100644 Binary files a/liferay-plugins-sdk-6.2/themes/portos-private-fe-theme/docroot/css/aui/alloy-font-awesome/font/fontawesome-alloy.woff and b/liferay-plugins-sdk-6.2/themes/portos-private-fe-theme/docroot/css/aui/alloy-font-awesome/font/fontawesome-alloy.woff differ diff --git a/liferay-plugins-sdk-6.2/themes/portos-private-fe-theme/docroot/css/aui/alloy-font-awesome/scss/_icons-alloy.scss b/liferay-plugins-sdk-6.2/themes/portos-private-fe-theme/docroot/css/aui/alloy-font-awesome/scss/_icons-alloy.scss index 7dc94a62..ac81a37f 100644 --- a/liferay-plugins-sdk-6.2/themes/portos-private-fe-theme/docroot/css/aui/alloy-font-awesome/scss/_icons-alloy.scss +++ b/liferay-plugins-sdk-6.2/themes/portos-private-fe-theme/docroot/css/aui/alloy-font-awesome/scss/_icons-alloy.scss @@ -1,3 +1,14 @@ +@font-face { + font-family: 'fontawesome-alloy'; + src:url('fonts/fontawesome-alloy.eot'); + src:url('fonts/fontawesome-alloy.eot?#iefix') format('embedded-opentype'), + url('fonts/fontawesome-alloy.woff') format('woff'), + url('fonts/fontawesome-alloy.ttf') format('truetype'), + url('fonts/fontawesome-alloy.svg#fontawesome-alloy') format('svg'); + font-weight: normal; + font-style: normal; +} + /* Use the following CSS code if you want to use data attributes for inserting your icons */ [data-icon]:before { font-family: 'fontawesome-alloy'; diff --git a/liferay-plugins-sdk-6.2/themes/portos-private-fe-theme/docroot/css/base.css b/liferay-plugins-sdk-6.2/themes/portos-private-fe-theme/docroot/css/base.css index 9e11fee8..bec4fd59 100644 --- a/liferay-plugins-sdk-6.2/themes/portos-private-fe-theme/docroot/css/base.css +++ b/liferay-plugins-sdk-6.2/themes/portos-private-fe-theme/docroot/css/base.css @@ -1,55 +1,136 @@ @import "compass"; +@import "mixins"; /* ---------- Logo ---------- */ .logo { + display: inline-block; + line-height: 1; + vertical-align: middle; } -/* ---------- HTML editor ---------- */ +/* ---------- Table styles ---------- */ -body.html-editor { -} - -.html-editor.portlet-message-boards { - blockquote { +@include respond-to(phone, tablet) { + .responsive-table-horizontal { + display: block; + position: relative; + width: 100%; &:after { + clear: both; + content: ''; + display: block; + font-size: 0; + height: 0; + visibility: hidden; } - cite { + tbody { + display: block; + overflow-x: auto; + position: relative; + white-space: nowrap; + width: auto; + + tr { + display: inline-block; + vertical-align: top; + + td { + display: block; + margin-bottom: 20px; + + &:first-child { + text-align: left; + } + } + } + } + + thead { + display: block; + float: left; + margin-right: 10px; + + &:after { + clear: both; + content: ""; + display: block; + font-size: 0; + height: 0; + visibility: hidden; + } + + th { + display: block; + margin-bottom: 20px; + text-align: right; + + &:first-child { + text-align: right; + } + } } } - pre { + .ie9 { + .responsive-table-horizontal thead { + float: none; + } } } /* ---------- Text formatting ---------- */ .important { + font-weight: bold; } /* ---------- Main content body ---------- */ .portal-iframe #main-content { + width: 100%; } /* ---------- Loading animation ---------- */ .loading-animation { + background: url(../images/progress_bar/loading_animation.gif) no-repeat top center; + margin-top: 10px; + padding-top: 40px; + text-align: left; } /* ---------- Separator ---------- */ .separator { + border-top: 1px dotted #BFBFBF; } /* ---------- Update manager ---------- */ .update-available { + margin-top: 10px; + padding: 2px; + text-align: left; } /* ---------- Text highlighting ---------- */ .highlight { + background: #FFC; + font-weight: bold; + margin: 0 1px; +} + +/* ---------- Miscellaneous ---------- */ + +span.alert { + display: inline-block; +} + +#skip-to-content { + clip: rect(0 0 0 0); + position: absolute; } \ No newline at end of file diff --git a/liferay-plugins-sdk-6.2/themes/portos-private-fe-theme/docroot/css/dockbar.css b/liferay-plugins-sdk-6.2/themes/portos-private-fe-theme/docroot/css/dockbar.css index fd7ba690..b356315d 100644 --- a/liferay-plugins-sdk-6.2/themes/portos-private-fe-theme/docroot/css/dockbar.css +++ b/liferay-plugins-sdk-6.2/themes/portos-private-fe-theme/docroot/css/dockbar.css @@ -1,309 +1,777 @@ -.portlet-dockbar, .portlet-staging-bar { -} +@import "compass"; +@import "mixins"; + +$addContentPanelWidth: 350px; +$devicePreviewPanelWidth: 220px; +$diamondSize: 12px; +$editLayoutPanelWidth: 460px; + +.aui { + .dockbar { + left: 0; + right: 0; + top: 0; + + .staging-controls { + .staging-bar { + li.dropdown .dropdown-menu { + left: auto; + margin-left: 10px; + width: auto; + } + } + } -.portlet-dockbar { -} + &.navbar-static-top { + position: relative; -.dockbar, .staging-bar { -} + .collapse { + position: static; -.dockbar-ready .dockbar, .live-view .staging-bar, .staging .staging-bar { -} + .nav-account-controls { + position: static; + } + } + } -.dockbar-ready .portlet-dockbar, .portal-popup .portlet-dockbar, .portal-popup .portlet-staging-bar, .staging-ready .portlet-staging-bar { -} + .btn-link { + color: #FFF; + } -.dockbar { - &:after { - } -} + .diamond { + border: $diamondSize solid transparent; + border-bottom-color: #1485EB; + height: 0; + position: relative; + top: -$diamondSize; + width: 0; + + &:after { + border: $diamondSize solid transparent; + border-top-color: #1485EB; + content: ''; + height: 0; + left: -$diamondSize; + position: absolute; + top: $diamondSize; + width: 0; + } + } -.ie7 .dockbar { -} + .impersonating-user { + .alert-icon{ + margin-right: 9px; + } -.ie6 { - .dockbar, .lfr-dockbar-pinned .dockbar { - } -} + .alert-info { + border-width: 0; + margin-bottom: 6px; + } + } -.dockbar { - a { - } + .info-button { + top: 9px; + } - .menu-button-active { - a { + .info-items { + left: 0; + position: absolute; + top: 100%; + width: 100%; + z-index: 1; } - } - .user-avatar .sign-out { - } + .navbar-inner { + padding-left: 20px; + padding-right: 20px; + + .brand { + h1 { + display: inline-block; + font-size: inherit; + line-height: 1; + margin-bottom: 0; + margin-top: 0; + } + } + + .container { + margin-left: 0; + margin-right: 0; + width: 100%; + + .nav-account-controls { + float: right; + } + } + + .site-administration-menu li { + list-style: none; + + a { + color: #000; + display: block; + padding: 3px 5px 3px 40px; + + &:focus, &:hover { + background: #0DB5E7; + color: #FFF; + text-decoration: none; + } + + i { + font-size: 0.8em; + } + } + } + } - ul { - } + .nav.staging-nav-items { + margin: 0; + position: static; - li li { - } -} + li.dropdown.active > .dropdown-toggle { + background-color: transparent; + display: block; -html > .lfr-dockbar-pinned { -} + &:hover { + color: #0077B3; + } + } -.lfr-dockbar-pinned .dockbar { -} + .staging-link { + position: static; + } + } -.dockbar .pin-dockbar { -} + .user-avatar img { + margin-top: -2px; + text-decoration: none; + vertical-align: middle; + width: 20px; + } + } -.ie6 .dockbar .pin-dockbar { -} + .dockbar-split { + .dockbar { + height: 0; + position: absolute; + + .staging-controls { + .staging-bar { + li.dropdown .dropdown-menu { + left: 0; + margin-left: 0; + width: 100%; + } + } + } + + &.navbar-static-top { + .collapse { + position: relative; + + .nav-account-controls { + position: fixed; + } + } + } + + .divider-vertical { + display: none; + } + + .info-button { + top: $diamondSize; + } + + .info-items { + left: auto; + position: static; + } + + .navbar-inner { + background-color: transparent; + border-width: 0; + padding: 0; + width: 0; + + .nav { + border-bottom-width: 0; + + > li { + background-color: #333; + + > a { + color: #FFF; + line-height: 31px; + + &:focus, &:hover { + color: #FFF; + } + + [class^="icon-"], [class*=" icon-"] { + margin-top: 3px; + } + } + + &.active > a { + color: #FFF; + } + } + + li { + &.dropdown { + &.active > .dropdown-toggle { + color: #FFF; + } + + &.open > .dropdown-toggle { + background-color: #555; + color: #FFF; + } + } + + &.info-items { + background-color: transparent; + } + + &.staging-toggle { + > a { + background-color: #2496E5; + padding-bottom: 0; + padding-top: 0; + + &:hover { + background-color: #2FA4F5; + } + } + + span.nav-item-label { + padding: 5px 10px; + } + } + } + } + + .nav-account-controls { + left: auto; + margin-right: 0; + padding: 0; + position: fixed; + right: 5em; + z-index: 325; + } + + .nav-add-controls { + background: transparent; + position: fixed; + top: 10%; + z-index: 350; + + > li { + float: none; + margin: 10px; + position: relative; + + &.toggle-controls a { + clip: rect(0 0 0 0); + position: absolute; + + &:focus { + clip: rect(auto auto auto auto); + position: static; + } + } + + &.page-preview-controls { + @include respond-to(phone, tablet) { + display: none; + } + } + + > a { + background: #333; + color: #FFF; + padding: 6px 8px; + text-align: center; + + &:hover { + background: #555; + } + + [class^="icon-"], [class^="icon-"], [class*=" icon-"] { + font-size: 25px; + position: relative; + vertical-align: middle; + } + + &.toggle-controls-link { + background: #92F545; + + [class^="icon-"], [class^="icon-"], [class*=" icon-"] { + color: #000; + } + } + + .nav-item-label { + background: #333; + display: none; + left: 100%; + margin-left: 0.5em; + margin-top: -1em; + padding: 0 20px; + position: absolute; + top: 50%; + white-space: nowrap; + } + + &:hover .nav-item-label { + display: block; + } + + .icon-caret-down { + display: none; + } + } + } + + &:hover > li.toggle-controls a { + clip: rect(auto auto auto auto); + position: static; + } + } + } + + .staging-nav-items { + li > span { + color: #FFF; + display: block; + padding: 10px 15px; + line-height: 31px; + } + } + } -.pin-dockbar img { -} + .info-link-container { + width: 0; + } -.lfr-dockbar-pinned .pin-dockbar img { -} + .info-items { + height: 1px; + width: 715px; -.dockbar { - .user-portrait { - } + a, .btn-link { + color: #FFF; + text-decoration: underline; - .user-avatar img { - } + &:hover { + text-decoration: none; - .impersonating-user { - .user-links a { - } - } -} + .taglib-text { + text-decoration: none; + } + } + } -/* ---------- Staging dockbar ---------- */ + .btn-link { + border-width: 0; + font-size: 14px; + font-weight: 300; + margin: 0 0 0 6px; + padding: 0; -.variation-selector { -} + @include text-shadow(none); + } + } -.layout-revision-container { - .aproximate-date { - } + .staging-bar { + margin: 10px 0; + } - .current-version { - } + &.controls-hidden .dockbar .navbar-inner .nav-add-controls > li.toggle-controls > .toggle-controls-link { + background: #F5AF45; + } - .current-version-pointer { - img { + &.lfr-has-add-content .nav-add-controls { + left: $addContentPanelWidth; } - } - .layout-variation-name { - } + &.lfr-has-device-preview .nav-add-controls { + left: $devicePreviewPanelWidth; + } - .layout-revision-current { + &.lfr-has-edit-layout .nav-add-controls { + left: $editLayoutPanelWidth; + } } - .real-date { + &.dialog-iframe-root-node .dockbar .nav-add-controls .page-preview-controls { + display: none; } - .taglib-workflow-status .workflow-status { - .workflow-status-ready-for-publication { + .touch .dockbar-split, .controls-hidden.dockbar-split { + .dockbar .navbar-inner .nav-add-controls > li.toggle-controls > .toggle-controls-link { + clip: rect(auto auto auto auto); + position: static; } } -} -.layout-revision-container-root { -} + /* ---------- Staging dockbar ---------- */ + + .variation-selector { + display: block; + font-size: 1.2em; + font-weight: bold; + margin: 1em; + } -.staging-details { -} + .layout-revision-container { + margin: 1em 0 0 1em; + padding: 0; -.staging .staging-details { -} + .approximate-date { + color: #999; + font-weight: bold; + } -.live-view .staging-details { -} + .current-version { + color: #41801d; + display: block; + } -.staging .staging-tabview-list { -} + .current-version-pointer { + display: inline-block; + width: 0; -.live-view .staging-tabview-list { -} + img { + left: -25px; + position: relative; + } + } -/* ---------- Menus ---------- */ + .layout-variation-name { + color: #666; + font-size: 1.15em; + margin-bottom: 0.1em; + text-transform: uppercase; + } -.dockbarmenu-hidden { -} + .layout-revision-current { + color: #666; + } -.dockbar { - .toolbar { - } + .real-date { + color: #999; + display: block; + text-align: right; + } - .user-toolbar { - } -} + .taglib-workflow-status .workflow-status { + background: none; + padding-left: 0; -.underlay { - .portal-add-content { + .workflow-status-ready-for-publication { + color: #41801d; + font-weight: bold; + } + } } - .portal-add-content .portlet-dd-placeholder { + .layout-revision-container-root { + margin: 0; } -} - -.add-application .yui3-widget-bd, .dockbar-messages .yui3-widget-bd { -} - -.add-application { -} -.lfr-has-sidebar #main-content { -} + .staging-controls { + padding-left: 5px; + padding-right: 50px; -.manage-layouts { -} + select { + width: 100%; + } -.my-sites-menu { - ul { + .staging-bar { + .dropdown-menu { + font-size: 13px; + min-width: 520px; + width: 100%; + + .btn-link { + float: left; + font-size: 11px; + margin: 0 5px 0 0; + padding: 0; + text-decoration: underline; + + @include text-shadow(none); + + &:hover { + text-decoration: none; + } + + &.history { + float: right; + } + } + } + } } - li, ul { + /* ---------- Add content ---------- */ + + .lfr-admin-panel { + background-color: #FFF; + bottom: 0; + left: 0; + overflow: auto; + padding: 10px; + position: fixed; + top: 0; + z-index: 1100; + + @include respond-to(phone) { + margin: 0 -20px; + position: static; + width: auto; + + &.lfr-add-panel .add-content-menu .lfr-add-page-toolbar, &.lfr-edit-layout-panel .taglib-form-navigator .button-holder { + margin-top: 0; + position: static; + width: auto; + } + + &.lfr-edit-layout-panel { + .taglib-form-navigator .accordion { + margin-bottom: 20px; + } + + .site-admin-link { + padding: 0; + position: static; + } + } + } } - a { + .lfr-has-add-content { + padding-left: $addContentPanelWidth; } - .control-panel a { + .lfr-has-device-preview { + padding-left: $devicePreviewPanelWidth; } - .site-name { + .lfr-has-edit-layout { + padding-left: $editLayoutPanelWidth; } - .site-type { + @include respond-to(phone) { + .lfr-has-add-content, .lfr-has-device-preview, .lfr-has-edit-layout { + padding-left: 20px; + } } -} -.ie7 .my-sites-menu .site-type { -} + /* ---------- Menus ---------- */ -.my-sites-menu a:hover .site-type { -} + .dropdown-menu > li > a:focus > [class^="icon-"] { + background-image: none; + } -.ie7 { .my-sites-menu { - a { - } - - .site-name { + .site-type { + color: #FFF; + display: none; + float: right; + font-size: 0.8em; + font-weight: normal; + margin-right: 10px; + position: absolute; + right: 100%; } - .site-type { + a:hover .site-type { + color: #FFFFFF; + display: inline-block; } } -} -.ie6 { - .my-sites-menu { - a { - } + .ie.rtl .dockbar .menu-button span { + background-position-x: -25px; } - .menu-scroll { + &.ie6, &.ie7, &.ie8 { + .dockbar-split .dockbar .navbar-inner .nav-add-controls li.page-preview-controls { + display: none; + } } -} -.dockbar .toggle-controls a { -} + .ie7 { + .dockbar { + zoom: 1; + } -.controls-hidden .toggle-controls a { -} + .my-sites-menu { + a { + overflow: visible; + text-align: left; + } -.toggle-controls a { -} + .site-name { + float: none; + } -.dockbar { - .menu-button { - span { + .site-type { + float: none; + } } } - .add-content .menu-button span { - } + .ie6 { + .dockbar, .lfr-dockbar-pinned .dockbar { + height: 10px; + left: 0; + position: relative; + top: 0; + } - .manage-content .menu-button span { - } + .dockbar .pin-dockbar { + display: none; + } - .my-sites .menu-button span { - } -} + .my-sites-menu { + width: 200px; -.dockbar-messages-container { -} + a { + zoom: 1; + } + } -.dockbar-messages { -} + .menu-scroll { + height: 300px; + overflow-y: auto; + } + } -.showing-messages .dockbar-messages { -} + /* ---------- Customization bar ---------- */ -.multiple-messages { - .dockbar-message { + .controls-hidden { + .info-button, .page-customization-bar { + display: none; + } } - .first { - } -} + .info-button { + cursor: pointer; + display: inline-block; + position: relative; + right: $diamondSize; + z-index: 1; -.add-content-menu { - .add-page a { - } + a { + color: #FFF; + padding: 2px 10px; + position: absolute; + text-decoration: none; + z-index: 1; + } - .add-application a { + .icon-stop { + color: #1485EB; + font-size: 20px; + } } - a.lfr-portlet-used { - } -} + .page-customization-bar { + background-color: #555; + background-color: rgba(0, 0, 0, 0.5); -.manage-content-menu { - li a, li .disabled { - } + @include box-sizing(border-box); - .manage-page a { - } + color: #FFF; + display: table; + font-size: 14px; + font-weight: 300; + padding: 0 15px; + width: 100%; - .manage-site-content a { - } + .customized-icon { + margin: 5px; + vertical-align: middle; + } - .manage-site-memberships a { - } + .page-customization-actions { + padding-left: 5em; + } - .manage-page-customization a, .manage-page-customization .disabled { - } + .page-customization-actions a { + color: #EEE; + font-size: 0.8em; + padding: 0 1em; + } - .page-layout a { - } + .page-customization-bar-form { + display: table-cell; + text-align: center; + vertical-align: middle; + width: 25%; + + a { + color: #FFF; + + &:focus, &:hover { + color: #FFF; + text-decoration: none; + } + } + + span { + display: block; + line-height: 20px; + } + } - .sitemap a { - } + .page-customization-bar-text { + display: table-cell; + height: 51px; + vertical-align: middle; + width: 75%; + } + + .page-customization-bar-container { + position: absolute; + } - .settings a { + .reset-prototype { + display: inline; + } } -} -/* ---------- Customization bar ---------- */ + @media (max-width: 1140px) { + .dockbar-split .dockbar .info-items { + width: 515px; + } + } -.page-customization-bar { -} + @include respond-to(phone, tablet) { + #navigation { + display: none; -.controls-hidden .page-customization-bar { -} + &.open { + display: block; + } + } -.page-customization-bar { - .customized-icon { - } + .dockbar-split .dockbar { + height: auto; + position: relative; - .page-customization-actions { - a { + .navbar-inner { + width: auto; + } } - } - .reset-prototype { + .user-avatar-image { + width: 18px; + } } } \ No newline at end of file diff --git a/liferay-plugins-sdk-6.2/themes/portos-private-fe-theme/docroot/css/layout.css b/liferay-plugins-sdk-6.2/themes/portos-private-fe-theme/docroot/css/layout.css index 15aa65c2..9c78add8 100644 --- a/liferay-plugins-sdk-6.2/themes/portos-private-fe-theme/docroot/css/layout.css +++ b/liferay-plugins-sdk-6.2/themes/portos-private-fe-theme/docroot/css/layout.css @@ -1,4 +1,24 @@ +@import "mixins"; + /* ---------- Column widths ---------- */ .portlet-column-content.empty { + padding: 50px; +} + +/* ---------- Wrapper ---------- */ + +#wrapper { + padding: 2em 5em 0; + position: relative; + + @include respond-to(phone) { + padding-left: 0.5em; + padding-right: 0.5em; + } + + @include respond-to(tablet) { + padding-left: 2em; + padding-right: 2em; + } } \ No newline at end of file diff --git a/liferay-plugins-sdk-6.2/themes/portos-private-fe-theme/docroot/css/main.css b/liferay-plugins-sdk-6.2/themes/portos-private-fe-theme/docroot/css/main.css index ea5ebca7..7549e94f 100644 --- a/liferay-plugins-sdk-6.2/themes/portos-private-fe-theme/docroot/css/main.css +++ b/liferay-plugins-sdk-6.2/themes/portos-private-fe-theme/docroot/css/main.css @@ -10,4 +10,8 @@ @import url(portlet.css); -@import url(custom.css); \ No newline at end of file +@import url(extras.css); + +@import url(font-awesome.min.css); + +@import url(component/index.css); \ No newline at end of file diff --git a/liferay-plugins-sdk-6.2/themes/portos-private-fe-theme/docroot/css/navigation.css b/liferay-plugins-sdk-6.2/themes/portos-private-fe-theme/docroot/css/navigation.css index 63582a69..e79409c7 100644 --- a/liferay-plugins-sdk-6.2/themes/portos-private-fe-theme/docroot/css/navigation.css +++ b/liferay-plugins-sdk-6.2/themes/portos-private-fe-theme/docroot/css/navigation.css @@ -1,10 +1,97 @@ +@import "compass"; +@import "mixins"; + /* ---------- Add/remove page ---------- */ .modify-pages { li { + position: relative; + + &.lfr-nav-hover { + .delete-tab { + @include opacity(1); + } + } + } + + .add-page-editor-input { + width: 150px; } .delete-tab { + color: #444; + cursor: pointer; + display: block; + font-size: 20px; + font-weight: bold; + height: 10px; + line-height: 6px; + margin-top: -8px; + overflow: hidden; + + @include opacity(0); + + padding: 3px 0; + position: absolute; + right: 1px; + text-shadow: 0 1px #FFF; + top: 50%; + + &:hover { + color: #B50303; + } + } + + .lfr-nav-sortable > a > span { + padding-left: 28px; + } + + .drag-handle { + background-color: #555; + + @include border-radius(50%); + + color: #FFF; + cursor: pointer; + font-size: 16px; + left: 3px; + line-height: 1em; + margin: 8px; + padding: 4px; + position: absolute; + text-align: center; + top: 2px; + width: 1em; + } + + @include respond-to(desktop) { + .lfr-nav-sortable > a > span { + padding-left: 0; + } + + .drag-handle { + display: none; + } + } + + .lfr-nav-updateable.selected a:hover span { + cursor: text; + } +} + +.controls-hidden .modify-pages { + .lfr-nav-sortable > a > span { + padding-left: 0; + } + + .drag-handle { + display: none; + } +} + +.nav { + li .toolbar { + margin-top: 5px; } } @@ -12,44 +99,78 @@ .nav-menu { ul { + padding-left: 10px; } - li { - a { - &.ancestor { - } + li a { + &.ancestor { + font-weight: bold; + } - &.selected { - } + &.selected { + color: #000; + font-weight: bold; + text-decoration: none; } } } +.nav-menu-style-arrows ul { + list-style-image: url(../images/arrows/04_right.png); +} + /* ---------- Page template selector ---------- */ .form-options { + border: 1px solid #AAA; + display: inline-block; + vertical-align: middle; + input { + border-width: 0; + display: inline; + float: left; } } .form-triggers { + float: left; } .form-trigger { + background: #C4C4C4 url(../images/application/button_bg.png) repeat-x 0 0; + border-left: 1px solid #BBB; + display: inline-block; + float: left; + img { + background: url() no-repeat 50% 40%; + height: 25px; + padding: 0 3px; + vertical-align: middle; + width: 16px; } &:focus, &:hover { + background-color: #83B0CA; + background-image: url(../images/application/button_bg_over.png); } } .trigger-selected { + background-color: #EBEBEB; + background-image: url(../images/application/button_bg_selected.png); + &:focus, &:hover { + background-color: #B7DEF4; + background-image: url(../images/application/button_bg_selected_over.png); } } .options-trigger img { + background-image: url(../images/common/configuration.png); } .save-trigger img { + background-image: url(../images/common/check.png); } \ No newline at end of file diff --git a/liferay-plugins-sdk-6.2/themes/portos-private-fe-theme/docroot/css/portlet.css b/liferay-plugins-sdk-6.2/themes/portos-private-fe-theme/docroot/css/portlet.css index 70a787e3..0cf8679b 100644 --- a/liferay-plugins-sdk-6.2/themes/portos-private-fe-theme/docroot/css/portlet.css +++ b/liferay-plugins-sdk-6.2/themes/portos-private-fe-theme/docroot/css/portlet.css @@ -1,131 +1,349 @@ +@import "aui/variables"; +@import "aui_variables"; +@import "aui/mixins"; +@import "compass"; + /* ---------- Portlet wrapper and icons ---------- */ .freeform .portlet { + margin-bottom: 0; } body.portlet { + border-width: 0; } .portlet-topper { + position: relative; + + .portlet-topper-toolbar { + margin: 0; + padding: 2px; + position: absolute; + right: 3px; + text-align: right; + top: 3px; + z-index: 300; + + a { + color: inherit; + + &, &:hover { + text-decoration: none; + } + + i { + font-size: 19px; + } + } + + .nobr { + display: block; + float: left; + padding: 1px; + } + + .portlet-icon-back { + background: url(../images/arrows/12_left.png) no-repeat 0 50%; + color: #FFF; + font-weight: bold; + padding: 5px 5px 5px 18px; + + &:hover { + color: #FFF; + } + } + + .portlet-options .lfr-icon-menu-text { + color: transparent; + font-size: 0; + } + } } .portlet-title { + display: block; + img { + vertical-align: middle; } } .portlet-title-editable { + cursor: pointer; } .portlet-title-text { + display: inline-block; + + @include ellipsis; + + max-width: 95%; + vertical-align: top; } .panel-page-content, .panel-page-body { .portlet-title-text { - } -} - -.portlet-topper-toolbar { - .nobr { + cursor: auto; } } .portlet-content, .portlet-minimized .portlet-content-container { + padding: 12px 10px 10px; } .portlet-minimized .portlet-content { -} - -.portlet-icon-back { + padding: 0; } .portlet-nested-portlets .portlet-boundary { + left: 0 !important; + position: relative !important; + top: 0 !important; } -.portlet-borderless-bar, .portlet-journal-content .lfr-icon-actions { +%portlet-action-bar { + background: #333; + color: #FFF; + + @include text-shadow(-1px -1px #000); + a { + color: #3AF; } } -.portlet-journal-content .lfr-icon-actions { - .taglib-text { - } +%portlet-action-bar-hover { + @include opacity(1); +} - .lfr-icon-action a { - .icon { +%portlet-action-bar-hover-text { + display: inline-block; +} + +.portlet-borderless-bar { + @extend %portlet-action-bar; + + .portlet-options, .portlet-options.open { + .dropdown-toggle { + background-image: url(../images/portlet/options_borderless.png); } } +} - .lfr-icon-action-add a { +.portlet-content { + .lfr-icon-actions { + @extend %portlet-action-bar; } +} - .lfr-icon-action-edit a { - } +.portlet-content { + .lfr-icon-actions { + float: left; + margin: 1px 10px 1px 1px; + + @include opacity(0.5); + + padding: 2px 7px; + + .taglib-text { + color: #FFF; + display: none; + font-weight: bold; + margin-right: 1em; + text-decoration: none; + vertical-align: middle; + } + + .lfr-icon-action a { + background: url() no-repeat 0 50%; + display: inline-block; + margin-left: 5px; + vertical-align: top; + + &:hover { + text-decoration: none; + + span { + text-decoration: underline; + } + } + + img { + visibility: hidden; + } + } + + .lfr-icon-action-add a { + background-image: url(../images/common/add_white.png); + } + + .lfr-icon-action-edit a { + background-image: url(../images/common/edit_white.png); + } + + .lfr-icon-action-edit-template a { + background-image: url(../images/common/edit_template_white.png); + } - .lfr-icon-action-edit-template a { + .lfr-icon-action-configuration a { + background-image: url(../images/common/configuration_white.png); + } } - .lfr-icon-action-configuration a { + .lfr-url-error { + display: inline-block; + white-space: normal; } } /* ---------- Borderless portlet ---------- */ .portlet-borderless-container { + min-height: 2.5em; + position: relative; } .portlet-borderless-bar { + background-color: transparent; + font-size: 10px; + + @include opacity(0.3); + + height: 0; + padding: 0; + position: absolute; + right: 0; + top: 0; + + width: 100%; + z-index: 200; + a { + background: url() no-repeat 0 50%; + display: inline-block; + height: 20px; + margin-left: 5px; + text-indent: -9999px; + width: 16px; } .portlet-actions { + float: right; + overflow: hidden; + padding: 0 5px; + + .portlet-action, .portlet-options { + display: inline-block; + } } - .portlet-title-default, .portlet-actions { + .portlet-actions, .portlet-title-default { + background-color: #333; + min-height: 21px; } .portlet-action-separator { + display: none; } .portlet-back a { + height: auto; + text-indent: 0; + width: auto; + } + + .portlet-close { + display: inline-block; + vertical-align: middle; + + a { + background-image: url(../images/portlet/close_borderless.png); + } } - .portlet-close a { + .portlet-options li.lfr-trigger strong a { + background-image: url(../images/portlet/options_borderless.png); } } .lfr-configurator-visibility { .portlet-borderless-bar { + @include opacity(0.6); } - &.portlet-journal-content .lfr-icon-actions { + .portlet-content { + .lfr-icon-actions { + @include opacity(1); + } } } -.portlet-borderless-container:hover .portlet-borderless-bar, .portlet-journal-content:hover .lfr-icon-actions { +.portlet-borderless-container:hover .portlet-borderless-bar { + @extend %portlet-action-bar-hover; + + .portlet-actions { + @extend %portlet-action-bar-hover-text; + } } -.portlet-borderless-container:hover .portlet-borderless-bar .portlet-actions, .portlet-journal-content:hover .lfr-icon-actions .taglib-text { +.portlet-content { + &:hover { + .lfr-icon-actions { + @extend %portlet-action-bar-hover; + + .taglib-text { + @extend %portlet-action-bar-hover-text; + } + } + } + + .icons-container { + clear: both; + height: auto; + margin-top: 1em; + overflow: hidden; + width: auto; + } } .portlet-title-default { + display: block; + + @include ellipsis; + + float: right; + font-weight: bold; + height: 0; + line-height: 19px; + max-width: 50%; + padding: 0 10px; + text-transform: uppercase; } .portlet-draggable { .portlet-topper { + cursor: move; } .portlet-title-default { + background: #333 url(../images/portlet/draggable_borderless.png) no-repeat 0 50%; + cursor: move; + padding-left: 20px; } } /* ---------- Panel page ---------- */ .lfr-panel-page { + width: 100%; + .portlet-title { + font-size: 13px; } .lfr-add-content h2 span { + background-color: #D3DADD; } } @@ -146,34 +364,104 @@ body.portlet { /* ---------- Messages ---------- */ .portlet-msg { + background: #EEE none no-repeat 6px 50%; + border: 1px solid #555; + color: #34404F; + font-weight: bold; + margin: 2px auto 14px; + padding: 6px 6px 6px 30px; + text-align: left; } /* ---------- Status labels ---------- */ .lfr-status-alert-label, .lfr-status-error-label, .lfr-status-info-label, .lfr-status-progress-label, .lfr-status-success-label { + background: none no-repeat 0 50%; + padding: 3px 3px 3px 20px; } .lfr-status-alert-label { + background-image: url(../images/messages/alert.png); + color: #663; } .lfr-status-error-label { + background-image: url(../images/messages/error.png); + color: #900; } .lfr-status-help-label, .lfr-status-info-label, .lfr-status-progress-label { + background-image: url(../images/messages/info.png); + color: #34404F; } .lfr-status-help-label { + background-image: url(../images/portlet/help.png); } .lfr-status-progress-label { + background-image: url(../images/aui/loading_indicator.gif); } .lfr-status-success-label { + background-image: url(../images/messages/success.png); + color: #384F34; } /* ---------- Liferay messages ---------- */ -.lfr-message-content { +.lfr-message { + position: relative; + + .lfr-message-control { + background-color: #333; + display: inline-block; + } + + .lfr-message-controls { + display: none; + left: 3px; + margin: -8px 8px 0 3px; + position: absolute; + top: 50%; + z-index: 10; + } + + .lfr-message-close { + background-image: url(../images/portlet/close_borderless.png); + background-position: 0 0; + background-repeat: no-repeat; + } + + .lfr-message-close-all { + color: #FFF; + display: none; + font-size: 0.8em; + margin-left: 10px; + padding: 1px 10px; + text-shadow: 1px 1px 0 #000; + vertical-align: top; + + a { + color: #FFF; + } + } + + .lfr-message-controls-hover .lfr-message-close-all { + display: inline-block; + } + + &.pending { + background-image: url(../images/common/time.png); + } +} + +.lfr-message-content.alert { + margin-bottom: 0; +} + +.lfr-message-close { + cursor: pointer; } /* ---------- Sections ---------- */ @@ -182,9 +470,14 @@ body.portlet { .portlet-section-selected { &, a { + background: #727C81; + color: #FFF; + font-weight: bold; + text-decoration: none; } a:hover, a:focus { + background-color: #727C81; } } @@ -205,6 +498,10 @@ body.portlet { /* ---------- Forms ---------- */ +.alert .form { + margin: 0; +} + /* ---------- Text used for the descriptive label of the whole form (not the labels for fields) ---------- */ .portlet-form-label { @@ -291,51 +588,151 @@ body.portlet { .restricted { &, & td { + background: #FDD; + border-width: 0; } * { + color: #727C81; } } .alt.restricted td { + background-color: #FFC0C0; } .hover.restricted td { + background-color: #D3BDC0; } -.restricted, .alt.restricted { +.alt.restricted, .restricted { td.first { + background-image: url(../images/messages/error.png); + background-position: 5px 50%; + background-repeat: no-repeat; + padding-left: 28px; } } /* ---------- Permissions ---------- */ -.results-row, .results-row.hover { +.table-data tr { &.lfr-role .first { + background-image: url(); + background-position: 5px 50%; + background-repeat: no-repeat; + padding-left: 30px; + vertical-align: middle; } &.lfr-role-guest .first { + background-image: url(../images/common/guest_icon.png); } &.lfr-role-regular .first { + background-image: url(../images/common/user_icon.png); } &.lfr-role-site .first { + background-image: url(../images/common/site_icon.png); } &.lfr-role-organization .first { + background-image: url(../images/common/organization_icon.png); } &.lfr-role-team .first { + background-image: url(../images/common/team_icon.png); } } /* ---------- Miscellaneous component styles ---------- */ +.lfr-ddm-container { + .control-group { + &.error { + @include formFieldState(); + } + + &.info { + @include formFieldState(); + } + + &.success { + @include formFieldState(); + } + + &.warning { + @include formFieldState(); + } + + &.error > { + @include formFieldState($errorText, $errorText, $errorBackground); + } + + &.info > { + @include formFieldState($infoText, $infoText, $infoBackground); + } + + &.success > { + @include formFieldState($successText, $successText, $successBackground); + } + + &.warning > { + @include formFieldState($warningText, $warningText, $warningBackground); + } + } +} + +/* ---------- Dynamic data list display/Journal portlet ---------- */ + +.portlet-dynamic-data-list-display, .portlet-dynamic-data-lists, .portlet-journal .journal-article-container { + .lfr-ddm-container .field-wrapper { + &[data-repeatable="true"], .field-wrapper { + border: 1px solid #D0D0D0; + border-left-width: 10px; + padding: 7px 10px 10px; + + &[data-repeatable="true"]:nth-of-type(even) { + background-color: #F5F5F5; + } + + &, .field-wrapper { + margin: 15px 0 0; + } + } + } +} + /* ---------- Add content dialog ---------- */ .lfr-portlet-item { &, & p a { + font-size: 1em; + } +} + +/* ---------- Breadcrumb taglib ---------- */ + +.breadcrumb.breadcrumb-vertical { + display: inline-block; + text-align: center; + + li { + display: block; + + &.last, &.only { + background: none; + } + } + + .divider { + background: url(@theme_image_path@/arrows/07_down.png) no-repeat 50% 100%; + display: block; + + @include hide-text(right); + + height: 10px; } } @@ -344,86 +741,132 @@ body.portlet { .taglib-calendar { tr { &.portlet-section-header th, & td { + border-width: 0; } td { a { + background-color: #F0F5F7; + border: 1px solid #FFF; + border-bottom-width: 0; + border-left-width: 0; + display: block; + height: 15px; + padding: 5px 0; + &:hover { + background-color: #727C81; + color: #FFF; } } &.calendar-inactive { + background-color: #FFF; + color: #B5BFC4; } } th { + border-bottom-color: #D7D7D7; } } table td { + border-width: 0; } .calendar-current-day { &, & a { + background-color: #FFF; } a { + border: 1px solid #727C81; + color: #369; + text-decoration: underline; } } } -.ie { - .portlet-borderless-bar, .portlet-journal-content .lfr-icon-actions { - } +/* ---------- navbar form search ---------- */ - .portlet-borderless-container:hover .portlet-borderless-bar, .portlet-journal-content .lfr-icon-actions:hover { - } +.navbar form { + margin: 0; +} - .taglib-calendar tr td.first a { +.ie { + .portlet-borderless-bar { + @include opacity(0.5); } -} -/* ---------- navbar form search ---------- */ + .portlet-content { + .lfr-icon-actions { + @include opacity(0.5); + } + } -.navbar .navbar-inner .form-search { - form { + .portlet-borderless-container:hover .portlet-borderless-bar, .portlet-journal-content .lfr-icon-actions:hover { + @include opacity(1); } - .input-append .control-group { + .taglib-calendar tr td.first a { + border-right-width: 0; } } .ie6, .ie7 { - .portlet-journal-content { + .portlet-content { .icons-container { + overflow: visible; } .lfr-icon-actions .taglib-text { + display: inline-block; } } .portlet-borderless-bar .portlet-actions { + margin-left: 20px; + margin-right: 0; } .portlet-title-default { + float: left; } .lfr-message .lfr-message-close { + float: left; } } .ie6 { .portlet-topper-toolbar .icon { + height: 16px; + width: 16px; } .portlet-borderless-container { + height: 2.5em; } .portlet-borderless-bar { + filter: alpha(opacity=90); + .portlet-actions { + display: inline; + filter: alpha(opacity=90); } } .breadcrumbs { + zoom: 1; + } +} + +.ie8 { + .dockbar, .lfr-icon-action, .logo { + img { + max-width: none; + } } } \ No newline at end of file diff --git a/liferay-plugins-sdk-6.2/themes/portos-private-fe-theme/docroot/templates/header.ftl b/liferay-plugins-sdk-6.2/themes/portos-private-fe-theme/docroot/templates/header.ftl index f7b0e1c9..47789e66 100644 --- a/liferay-plugins-sdk-6.2/themes/portos-private-fe-theme/docroot/templates/header.ftl +++ b/liferay-plugins-sdk-6.2/themes/portos-private-fe-theme/docroot/templates/header.ftl @@ -1,45 +1,49 @@
+
+

+ + <#assign logo_url = "${images_folder}/logo-rt.png" /> + + ${logo_description} + +

-
-

- - <#assign logo_url = "${images_folder}/logo-rt.png" /> - - ${logo_description} - -

+ <#assign ddmTemplate_news = theme.getSetting("ddmTemplate-news") /> + <#if ddmTemplate_news!= ""> +
- <#assign ddmTemplate_news = theme.getSetting("ddmTemplate-news") /> - <#if ddmTemplate_news!= ""> -
+ <#assign portlet_id = "101" /> + <#assign instance_id = "carosello_header"+plid /> - <#assign portlet_id = "101" /> - <#assign instance_id = "carosello_header"+plid /> + <#assign VOID = freeMarkerPortletPreferences.setValue("displayStyle", "${ddmTemplate_news}")> + <#assign my_portlet_id = "${portlet_id}_INSTANCE_${instance_id}" /> - <#assign VOID = freeMarkerPortletPreferences.setValue("displayStyle", "${ddmTemplate_news}")> - <#assign my_portlet_id = "${portlet_id}_INSTANCE_${instance_id}" /> + ${theme.runtime(my_portlet_id, "",freeMarkerPortletPreferences)} + <#assign VOID = freeMarkerPortletPreferences.reset()> - ${theme.runtime(my_portlet_id, "",freeMarkerPortletPreferences)} - <#assign VOID = freeMarkerPortletPreferences.reset()> +
+ -
- - -

- - ${logo_description} - -

-
-
- <#if has_navigation> - <#include "${full_templates_path}/navigation.ftl" /> - -
+

+ + <#if propsUtil.get("mwg.test.display")?has_content > + <#assign test_display = propsUtil.get("mwg.test.display") /> +

${test_display}

+ <#else> + ${logo_description} + + +

+
+
+ <#if has_navigation> + <#include "${full_templates_path}/navigation.ftl" /> + +
\ No newline at end of file diff --git a/liferay-plugins-sdk-6.2/themes/portos-private-theme/docroot/_diffs/templates/navigation.ftl b/liferay-plugins-sdk-6.2/themes/portos-private-theme/docroot/_diffs/templates/navigation.ftl index 2a68fb3e..99b66c16 100644 --- a/liferay-plugins-sdk-6.2/themes/portos-private-theme/docroot/_diffs/templates/navigation.ftl +++ b/liferay-plugins-sdk-6.2/themes/portos-private-theme/docroot/_diffs/templates/navigation.ftl @@ -1,89 +1,87 @@ -

- - ${logo_description} - + + <#if propsUtil.get("mwg.test.display")?has_content > + <#assign test_display = propsUtil.get("mwg.test.display") /> +

${test_display}

+ <#else> + ${logo_description} + +

- -
- <#if user_name != "" > -
- - ${user_name} -
-
- <#assign organizationservice = serviceLocator.findService('com.liferay.portal.service.OrganizationLocalService') /> - <#assign organizations = organizationservice.getUserOrganizations(user_id) > - <#assign org_names = ""> - <#if organizations?has_content> - <#list organizations as org> - <#assign org_names = org_names+" - ${org.getName()}"> - - - <#if org_names?has_content> -

${org_names?substring(3)}

- - - <#assign userGroupRoleService = serviceLocator.findService('com.liferay.portal.service.UserGroupRoleLocalService') /> - <#assign roles = userGroupRoleService.getUserGroupRoles(user_id) > - <#assign role_names = ""> - <#if roles?has_content> - <#list roles as role> - <#assign roleName = role.getRole().getName()> - <#if !roleName?matches('.*Owner') > - <#assign roleName = roleName?replace('portos_', '')?replace('_',' ')?capitalize> - <#if !role_names?contains(roleName) > - <#assign role_names = role_names+", ${roleName}"> - - - - - <#if role_names?has_content> -

${role_names?substring(2)}

- -
-
- + <#if user_name != "" > +
+ + ${user_name} +
+
+ <#assign organizationservice = serviceLocator.findService('com.liferay.portal.service.OrganizationLocalService') /> + <#assign organizations = organizationservice.getUserOrganizations(user_id) > + <#assign org_names = ""> + <#if organizations?has_content> + <#list organizations as org> + <#assign org_names = org_names+" - ${org.getName()}"> + + + <#if org_names?has_content> +

${org_names?substring(3)}

+ + + <#assign userGroupRoleService = serviceLocator.findService('com.liferay.portal.service.UserGroupRoleLocalService') /> + <#assign roles = userGroupRoleService.getUserGroupRoles(user_id) > + <#assign role_names = ""> + <#if roles?has_content> + <#list roles as role> + <#assign roleName = role.getRole().getName()> + <#if !roleName?matches('.*Owner') > + <#assign roleName = roleName?replace('portos_', '')?replace('_',' ')?capitalize> + <#if !role_names?contains(roleName) > + <#assign role_names = role_names+", ${roleName}"> + + + + + <#if role_names?has_content> +

${role_names?substring(2)}

+ +
+
+ -
- - <#assign liferay_portlet = PortalJspTagLibs["/WEB-INF/tld/liferay-portlet-ext.tld"] /> +
+ + <#assign liferay_portlet = PortalJspTagLibs["/WEB-INF/tld/liferay-portlet-ext.tld"] /> - <#assign portlet_id = "2_WAR_notificationsportlet" /> - ${theme.runtime(portlet_id)} + <#assign portlet_id = "2_WAR_notificationsportlet" /> + ${theme.runtime(portlet_id)} -
+
- + - +
\ No newline at end of file diff --git a/liferay-plugins-sdk-6.2/themes/portos-private-theme/docroot/templates/navigation.ftl b/liferay-plugins-sdk-6.2/themes/portos-private-theme/docroot/templates/navigation.ftl index 2a68fb3e..99b66c16 100644 --- a/liferay-plugins-sdk-6.2/themes/portos-private-theme/docroot/templates/navigation.ftl +++ b/liferay-plugins-sdk-6.2/themes/portos-private-theme/docroot/templates/navigation.ftl @@ -1,89 +1,87 @@ -

- - ${logo_description} - + + <#if propsUtil.get("mwg.test.display")?has_content > + <#assign test_display = propsUtil.get("mwg.test.display") /> +

${test_display}

+ <#else> + ${logo_description} + +

- -
- <#if user_name != "" > -
- - ${user_name} -
-
- <#assign organizationservice = serviceLocator.findService('com.liferay.portal.service.OrganizationLocalService') /> - <#assign organizations = organizationservice.getUserOrganizations(user_id) > - <#assign org_names = ""> - <#if organizations?has_content> - <#list organizations as org> - <#assign org_names = org_names+" - ${org.getName()}"> - - - <#if org_names?has_content> -

${org_names?substring(3)}

- - - <#assign userGroupRoleService = serviceLocator.findService('com.liferay.portal.service.UserGroupRoleLocalService') /> - <#assign roles = userGroupRoleService.getUserGroupRoles(user_id) > - <#assign role_names = ""> - <#if roles?has_content> - <#list roles as role> - <#assign roleName = role.getRole().getName()> - <#if !roleName?matches('.*Owner') > - <#assign roleName = roleName?replace('portos_', '')?replace('_',' ')?capitalize> - <#if !role_names?contains(roleName) > - <#assign role_names = role_names+", ${roleName}"> - - - - - <#if role_names?has_content> -

${role_names?substring(2)}

- -
-
- + <#if user_name != "" > +
+ + ${user_name} +
+
+ <#assign organizationservice = serviceLocator.findService('com.liferay.portal.service.OrganizationLocalService') /> + <#assign organizations = organizationservice.getUserOrganizations(user_id) > + <#assign org_names = ""> + <#if organizations?has_content> + <#list organizations as org> + <#assign org_names = org_names+" - ${org.getName()}"> + + + <#if org_names?has_content> +

${org_names?substring(3)}

+ + + <#assign userGroupRoleService = serviceLocator.findService('com.liferay.portal.service.UserGroupRoleLocalService') /> + <#assign roles = userGroupRoleService.getUserGroupRoles(user_id) > + <#assign role_names = ""> + <#if roles?has_content> + <#list roles as role> + <#assign roleName = role.getRole().getName()> + <#if !roleName?matches('.*Owner') > + <#assign roleName = roleName?replace('portos_', '')?replace('_',' ')?capitalize> + <#if !role_names?contains(roleName) > + <#assign role_names = role_names+", ${roleName}"> + + + + + <#if role_names?has_content> +

${role_names?substring(2)}

+ +
+
+ -
- - <#assign liferay_portlet = PortalJspTagLibs["/WEB-INF/tld/liferay-portlet-ext.tld"] /> +
+ + <#assign liferay_portlet = PortalJspTagLibs["/WEB-INF/tld/liferay-portlet-ext.tld"] /> - <#assign portlet_id = "2_WAR_notificationsportlet" /> - ${theme.runtime(portlet_id)} + <#assign portlet_id = "2_WAR_notificationsportlet" /> + ${theme.runtime(portlet_id)} -
+
- + - +
\ No newline at end of file diff --git a/liferay-plugins-sdk-6.2/themes/portos-public-theme/docroot/_diffs/templates/header.ftl b/liferay-plugins-sdk-6.2/themes/portos-public-theme/docroot/_diffs/templates/header.ftl index a47f1530..f70e5e2f 100644 --- a/liferay-plugins-sdk-6.2/themes/portos-public-theme/docroot/_diffs/templates/header.ftl +++ b/liferay-plugins-sdk-6.2/themes/portos-public-theme/docroot/_diffs/templates/header.ftl @@ -1,26 +1,31 @@
-

- - <#assign logo_url = "${images_folder}/logo-rs-testo.png" /> - - ${logo_description} - -

+

+ + <#assign logo_url = "${images_folder}/logo-rs-testo.png" /> + + ${logo_description} + +

-

- - ${logo_description} - -

+

+ + <#if propsUtil.get("mwg.test.display")?has_content > + <#assign test_display = propsUtil.get("mwg.test.display") /> +

${test_display}

+ <#else> + ${logo_description} + + +

-
+
- <#if has_navigation> - <#include "${full_templates_path}/navigation.ftl" /> - + <#if has_navigation> + <#include "${full_templates_path}/navigation.ftl" /> + -
+
\ No newline at end of file diff --git a/liferay-plugins-sdk-6.2/themes/portos-public-theme/docroot/templates/header.ftl b/liferay-plugins-sdk-6.2/themes/portos-public-theme/docroot/templates/header.ftl index a47f1530..f70e5e2f 100644 --- a/liferay-plugins-sdk-6.2/themes/portos-public-theme/docroot/templates/header.ftl +++ b/liferay-plugins-sdk-6.2/themes/portos-public-theme/docroot/templates/header.ftl @@ -1,26 +1,31 @@
-

- - <#assign logo_url = "${images_folder}/logo-rs-testo.png" /> - - ${logo_description} - -

+

+ + <#assign logo_url = "${images_folder}/logo-rs-testo.png" /> + + ${logo_description} + +

-

- - ${logo_description} - -

+

+ + <#if propsUtil.get("mwg.test.display")?has_content > + <#assign test_display = propsUtil.get("mwg.test.display") /> +

${test_display}

+ <#else> + ${logo_description} + + +

-
+
- <#if has_navigation> - <#include "${full_templates_path}/navigation.ftl" /> - + <#if has_navigation> + <#include "${full_templates_path}/navigation.ftl" /> + -
+
\ No newline at end of file diff --git a/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/service.properties b/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/service.properties index fce00d4f..08883ff1 100644 --- a/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/service.properties +++ b/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/service.properties @@ -13,8 +13,8 @@ ## build.namespace=Kaleo - build.number=31 - build.date=1619792508895 + build.number=33 + build.date=1625582467525 build.auto.upgrade=true ##