Author: bpapez
Date: Thu Sep 20 11:12:03 2007
New Revision: 1242
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D1242&repname=
=3Dcorporate_portal_templates
Log:
issue JAHIA-2176: Sp3 Coprv2: Source action menu is displayed on pages whic=
h are not linked copies (http://www.jahia.net/jira/browse/JAHIA-2176)
- change the title
- added new icon
- added checks to not display link if workflow icon is displayed
Modified:
branches/JAHIA-5-0-SP-BRANCH/src/java/jahiatemplates/Corporate_portal_t=
emplates.properties
branches/JAHIA-5-0-SP-BRANCH/src/java/jahiatemplates/Corporate_portal_t=
emplates_de.properties
branches/JAHIA-5-0-SP-BRANCH/src/java/jahiatemplates/Corporate_portal_t=
emplates_en.properties
branches/JAHIA-5-0-SP-BRANCH/src/java/jahiatemplates/Corporate_portal_t=
emplates_es.properties
branches/JAHIA-5-0-SP-BRANCH/src/java/jahiatemplates/Corporate_portal_t=
emplates_fr.properties
branches/JAHIA-5-0-SP-BRANCH/src/java/jahiatemplates/Corporate_portal_t=
emplates_it.properties
branches/JAHIA-5-0-SP-BRANCH/src/java/jahiatemplates/Corporate_portal_t=
emplates_pt.properties
branches/JAHIA-5-0-SP-BRANCH/src/view/jsp/document_detail.jsp
branches/JAHIA-5-0-SP-BRANCH/src/view/jsp/include/doc.inc
Modified: branches/JAHIA-5-0-SP-BRANCH/src/java/jahiatemplates/Corporate_po=
rtal_templates.properties
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/src/java/jahiatemplates/Corporate_portal_templates.properties&rev=
=3D1242&repname=3Dcorporate_portal_templates
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-5-0-SP-BRANCH/src/java/jahiatemplates/Corporate_portal_t=
emplates.properties (original)
+++ branches/JAHIA-5-0-SP-BRANCH/src/java/jahiatemplates/Corporate_portal_t=
emplates.properties Thu Sep 20 11:12:03 2007
@@ -62,6 +62,7 @@
docLastModDate =3D Modified on
docListCatLabel =3D This document belongs to the =
followings categories
docModifLabel =3D Modified by
+docSource =3D Source
edit =3D Edit
email =3D Email
employee =3D Employee
@@ -187,7 +188,7 @@
skill =3D Skill
smallDescription =3D Small description
sortAndProperties =3D Sort & properties
-source =3D Source
+source =3D Go to residence page
start =3D Start
startDate =3D Start date
street =3D Street
Modified: branches/JAHIA-5-0-SP-BRANCH/src/java/jahiatemplates/Corporate_po=
rtal_templates_de.properties
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/src/java/jahiatemplates/Corporate_portal_templates_de.properties&re=
v=3D1242&repname=3Dcorporate_portal_templates
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-5-0-SP-BRANCH/src/java/jahiatemplates/Corporate_portal_t=
emplates_de.properties (original)
+++ branches/JAHIA-5-0-SP-BRANCH/src/java/jahiatemplates/Corporate_portal_t=
emplates_de.properties Thu Sep 20 11:12:03 2007
@@ -187,7 +187,7 @@
skill =3D Qualifikation
smallDescription =3D Kurzbeschreibung
sortAndProperties =3D Sortierung und Eigenschaften
-source =3D Quelle
+source =3D Gehe zur Inhalts-Stammseite
start =3D Beginn
startDate =3D Startdatum
street =3D Stra=C3=9Fe
Modified: branches/JAHIA-5-0-SP-BRANCH/src/java/jahiatemplates/Corporate_po=
rtal_templates_en.properties
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/src/java/jahiatemplates/Corporate_portal_templates_en.properties&re=
v=3D1242&repname=3Dcorporate_portal_templates
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-5-0-SP-BRANCH/src/java/jahiatemplates/Corporate_portal_t=
emplates_en.properties (original)
+++ branches/JAHIA-5-0-SP-BRANCH/src/java/jahiatemplates/Corporate_portal_t=
emplates_en.properties Thu Sep 20 11:12:03 2007
@@ -62,6 +62,7 @@
docLastModDate =3D Modified on
docListCatLabel =3D This document belongs to the =
followings categories
docModifLabel =3D Modified by
+docSource =3D Source
edit =3D Edit
email =3D Email
employee =3D Employee
@@ -187,7 +188,7 @@
skill =3D Skill
smallDescription =3D Small description
sortAndProperties =3D Sort & properties
-source =3D Source
+source =3D Go to residence page
start =3D Start
startDate =3D Start date
street =3D Street
Modified: branches/JAHIA-5-0-SP-BRANCH/src/java/jahiatemplates/Corporate_po=
rtal_templates_es.properties
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/src/java/jahiatemplates/Corporate_portal_templates_es.properties&re=
v=3D1242&repname=3Dcorporate_portal_templates
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-5-0-SP-BRANCH/src/java/jahiatemplates/Corporate_portal_t=
emplates_es.properties (original)
+++ branches/JAHIA-5-0-SP-BRANCH/src/java/jahiatemplates/Corporate_portal_t=
emplates_es.properties Thu Sep 20 11:12:03 2007
@@ -62,6 +62,7 @@
docLastModDate =3D Modificado el
docListCatLabel =3D Este documento pertenece a la=
s siguientes categor=C3=ADas
docModifLabel =3D Modificado por
+docSource =3D Origen
edit =3D Editar
email =3D Correo electr=C3=B3nico
employee =3D Empleado
Modified: branches/JAHIA-5-0-SP-BRANCH/src/java/jahiatemplates/Corporate_po=
rtal_templates_fr.properties
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/src/java/jahiatemplates/Corporate_portal_templates_fr.properties&re=
v=3D1242&repname=3Dcorporate_portal_templates
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-5-0-SP-BRANCH/src/java/jahiatemplates/Corporate_portal_t=
emplates_fr.properties (original)
+++ branches/JAHIA-5-0-SP-BRANCH/src/java/jahiatemplates/Corporate_portal_t=
emplates_fr.properties Thu Sep 20 11:12:03 2007
@@ -122,6 +122,7 @@
docLastModDate =3D Modifi=C3=A9 le
docListCatLabel =3D Ce document est r=C3=A9f=C3=A9r=
enc=C3=A9 dans les cat=C3=A9gories suivantes
docModifLabel =3D Modifi=C3=A9 par
+docSource =3D Source
edit =3D =C3=89dition
email =3D E-mail
employee =3D Employ=C3=A9
Modified: branches/JAHIA-5-0-SP-BRANCH/src/java/jahiatemplates/Corporate_po=
rtal_templates_it.properties
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/src/java/jahiatemplates/Corporate_portal_templates_it.properties&re=
v=3D1242&repname=3Dcorporate_portal_templates
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-5-0-SP-BRANCH/src/java/jahiatemplates/Corporate_portal_t=
emplates_it.properties (original)
+++ branches/JAHIA-5-0-SP-BRANCH/src/java/jahiatemplates/Corporate_portal_t=
emplates_it.properties Thu Sep 20 11:12:03 2007
@@ -62,6 +62,7 @@
docLastModDate =3D Data modifica
docListCatLabel =3D Questo documento rientra nell=
e categorie seguenti
docModifLabel =3D Autore modifica
+docSource =3D Origine
edit =3D Modifica
email =3D E-mail
employee =3D Dipendente
Modified: branches/JAHIA-5-0-SP-BRANCH/src/java/jahiatemplates/Corporate_po=
rtal_templates_pt.properties
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/src/java/jahiatemplates/Corporate_portal_templates_pt.properties&re=
v=3D1242&repname=3Dcorporate_portal_templates
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-5-0-SP-BRANCH/src/java/jahiatemplates/Corporate_portal_t=
emplates_pt.properties (original)
+++ branches/JAHIA-5-0-SP-BRANCH/src/java/jahiatemplates/Corporate_portal_t=
emplates_pt.properties Thu Sep 20 11:12:03 2007
@@ -62,6 +62,7 @@
docLastModDate =3D Modificado em
docListCatLabel =3D Este documento pertence =C3=
=A0s seguintes categorias
docModifLabel =3D Modificado por
+docSource =3D Origem
edit =3D Editar
email =3D E-mail
employee =3D Empregado
Modified: branches/JAHIA-5-0-SP-BRANCH/src/view/jsp/document_detail.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/src/view/jsp/document_detail.jsp&rev=3D1242&repname=3Dcorporate_por=
tal_templates
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-5-0-SP-BRANCH/src/view/jsp/document_detail.jsp (original)
+++ branches/JAHIA-5-0-SP-BRANCH/src/view/jsp/document_detail.jsp Thu Sep 2=
0 11:12:03 2007
@@ -89,7 +89,7 @@
<td class=3D"EPMetaDataValue"><bean:write name=3D"=
directoryDocType" filter=3D"false"/></td></tr>
</logic:notEmpty>
<logic:notEmpty name=3D"directoryDocSource">
- <tr><td class=3D"EPMetaDataTitle"><%=3DgetResource=
Bundle("source","source",jData)%></td>
+ <tr><td class=3D"EPMetaDataTitle"><%=3DgetResource=
Bundle("docSource","source",jData)%></td>
<td class=3D"EPMetaDataTitle">:</td>
<td class=3D"EPMetaDataValue"><bean:write name=3D"=
directoryDocSource" filter=3D"false"/></td></tr>
</logic:notEmpty>
Modified: branches/JAHIA-5-0-SP-BRANCH/src/view/jsp/include/doc.inc
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/src/view/jsp/include/doc.inc&rev=3D1242&repname=3Dcorporate_portal_=
templates
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-5-0-SP-BRANCH/src/view/jsp/include/doc.inc (original)
+++ branches/JAHIA-5-0-SP-BRANCH/src/view/jsp/include/doc.inc Thu Sep 20 11=
:12:03 2007
@@ -147,7 +147,7 @@
<tr>
<td valign=3D"top" class=3D"boxEPTitlecolor1"><b><content:reso=
urceBundle resourceBundle=3D"jahiatemplates.Corporate_portal_templates" res=
ourceName=3D"title"/></b></td>
<td valign=3D"top" class=3D"boxEPTitlecolor1"><content:resourc=
eBundle resourceBundle=3D"jahiatemplates.Corporate_portal_templates" resour=
ceName=3D"description"/></td>
- <td valign=3D"top" class=3D"boxEPTitlecolor1"><a class=3D"boxE=
PLinkcolor1" href=3D"javascript:submitNewSort('directoryDocSource', '<%=3Ds=
ortOrder%>')"><b><content:resourceBundle resourceBundle=3D"jahiatemplates.C=
orporate_portal_templates" resourceName=3D"source"/></b> <img src=3D"<=
%=3DtheURL%>/images/sort_desc_w.gif" alt=3D"sort" border=3D"0" width=3D"5" =
height=3D"7"/><img src=3D"<%=3DtheURL%>/images/sort_asc_w.gif" alt=3D"" bor=
der=3D"0" width=3D"5" height=3D"7"/></a></td>
+ <td valign=3D"top" class=3D"boxEPTitlecolor1"><a class=3D"boxE=
PLinkcolor1" href=3D"javascript:submitNewSort('directoryDocSource', '<%=3Ds=
ortOrder%>')"><b><content:resourceBundle resourceBundle=3D"jahiatemplates.C=
orporate_portal_templates" resourceName=3D"docSource"/></b> <img src=
=3D"<%=3DtheURL%>/images/sort_desc_w.gif" alt=3D"sort" border=3D"0" width=
=3D"5" height=3D"7"/><img src=3D"<%=3DtheURL%>/images/sort_asc_w.gif" alt=
=3D"" border=3D"0" width=3D"5" height=3D"7"/></a></td>
<td valign=3D"top" class=3D"boxEPTitlecolor1"><a class=3D"boxE=
PLinkcolor1" href=3D"javascript:submitNewSort('directoryDocType', '<%=3Dsor=
tOrder%>')"><b><content:resourceBundle resourceBundle=3D"jahiatemplates.Cor=
porate_portal_templates" resourceName=3D"type"/></b> <img src=3D"<%=3D=
theURL%>/images/sort_desc_w.gif" alt=3D"sort" border=3D"0" width=3D"5" heig=
ht=3D"7"/><img src=3D"<%=3DtheURL%>/images/sort_asc_w.gif" alt=3D"" border=
=3D"0" width=3D"5" height=3D"7"/></a></td>
<td valign=3D"top" class=3D"boxEPTitlecolor1"><a class=3D"boxE=
PLinkcolor1" href=3D"javascript:submitNewSort('metaDataLastModificationDate=
', '<%=3DsortOrder%>')"><b><content:resourceBundle resourceBundle=3D"jahiat=
emplates.Corporate_portal_templates" resourceName=3D"docLastModDate"/></b>&=
nbsp;<img src=3D"<%=3DtheURL%>/images/sort_desc_w.gif" alt=3D"sort" border=
=3D"0" width=3D"5" height=3D"7"/><img src=3D"<%=3DtheURL%>/images/sort_asc_=
w.gif" alt=3D"" border=3D"0" width=3D"5" height=3D"7"/></a></td>
<td valign=3D"top" class=3D"boxEPTitlecolor1"> </td>
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
