Author: ktlili
Date: Wed Jun 20 15:02:42 2007
New Revision: 17669
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D17669&repname=
=3Djahia
Log:
- No JIRA,only sp, Stephan spec: update select portlet engine =
Modified:
branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaEnginesResources.p=
roperties
branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaEnginesResources_d=
e.properties
branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaEnginesResources_e=
n.properties
branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaEnginesResources_e=
s.properties
branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaEnginesResources_f=
r.properties
branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaEnginesResources_i=
t.properties
branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaEnginesResources_p=
t.properties
branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/engines/shared/App=
lication_Field.java
branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/css/styl=
es.css
branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/shared/a=
pplication_field.jsp
branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/shared/a=
pplication_field_displayTag.inc
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaEnginesResou=
rces.properties
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/conf/java/JahiaEnginesResources.properties&rev=3D17669&rep=
name=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=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/core/src/conf/java/JahiaEnginesResources.p=
roperties (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaEnginesResources.p=
roperties Wed Jun 20 15:02:42 2007
@@ -928,6 +928,9 @@
org.jahia.engines.shared.Application_Field_displyTag.all.label =3D All
org.jahia.engines.shared.Application_Field_displyTag.selectedPortlet.label=
=3D Selected portlet is:
org.jahia.engines.shared.Application_Field_displyTag.unselectedPortlet.lab=
el =3D unselect
+org.jahia.engines.shared.Application_Field_displyTag.selectedTab =3D Selec=
tion
+org.jahia.engines.shared.Application_Field_displyTag.rolesTab =3D Roles
+org.jahia.engines.shared.Application_Field_displyTag.noselectedPortlet =3D=
There is no selected portlet
=
org.jahia.engines.shared.BigText_Field.alignCenter.label =3D Align Center
org.jahia.engines.shared.BigText_Field.alignJustify.label =3D Align Justify
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaEnginesResou=
rces_de.properties
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/conf/java/JahiaEnginesResources_de.properties&rev=3D17669&=
repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=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/core/src/conf/java/JahiaEnginesResources_d=
e.properties (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaEnginesResources_d=
e.properties Wed Jun 20 15:02:42 2007
@@ -904,6 +904,9 @@
org.jahia.engines.shared.Application_Field_displyTag.all.label =3D Alle
org.jahia.engines.shared.Application_Field_displyTag.selectedPortlet.label=
=3D Das ausgew\u00E4hlte Portlet ist:
org.jahia.engines.shared.Application_Field_displyTag.unselectedPortlet.lab=
el =3D unselect
+org.jahia.engines.shared.Application_Field_displyTag.selectedTab =3D Selec=
tion
+org.jahia.engines.shared.Application_Field_displyTag.rolesTab =3D Roles
+org.jahia.engines.shared.Application_Field_displyTag.noselectedPortlet =3D=
There is no selected portlet
=
=
org.jahia.engines.shared.BigText_Field.alignCenter.label =3D Zentriert
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaEnginesResou=
rces_en.properties
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/conf/java/JahiaEnginesResources_en.properties&rev=3D17669&=
repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=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/core/src/conf/java/JahiaEnginesResources_e=
n.properties (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaEnginesResources_e=
n.properties Wed Jun 20 15:02:42 2007
@@ -928,6 +928,9 @@
org.jahia.engines.shared.Application_Field_displyTag.all.label =3D All
org.jahia.engines.shared.Application_Field_displyTag.selectedPortlet.label=
=3D Selected portlet is:
org.jahia.engines.shared.Application_Field_displyTag.unselectedPortlet.lab=
el =3D unselect
+org.jahia.engines.shared.Application_Field_displyTag.selectedTab =3D Selec=
tion
+org.jahia.engines.shared.Application_Field_displyTag.rolesTab =3D Roles
+org.jahia.engines.shared.Application_Field_displyTag.noselectedPortlet =3D=
There is no selected portlet
=
org.jahia.engines.shared.BigText_Field.alignCenter.label =3D Align Center
org.jahia.engines.shared.BigText_Field.alignJustify.label =3D Align Justify
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaEnginesResou=
rces_es.properties
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/conf/java/JahiaEnginesResources_es.properties&rev=3D17669&=
repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=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/core/src/conf/java/JahiaEnginesResources_e=
s.properties (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaEnginesResources_e=
s.properties Wed Jun 20 15:02:42 2007
@@ -901,6 +901,9 @@
org.jahia.engines.shared.Application_Field_displyTag.all.label =3D Todos
org.jahia.engines.shared.Application_Field_displyTag.selectedPortlet.label=
=3D El portlet seleccionado es:
org.jahia.engines.shared.Application_Field_displyTag.unselectedPortlet.lab=
el =3D unselect
+org.jahia.engines.shared.Application_Field_displyTag.selectedTab =3D Selec=
tion
+org.jahia.engines.shared.Application_Field_displyTag.rolesTab =3D Roles
+org.jahia.engines.shared.Application_Field_displyTag.noselectedPortlet =3D=
There is no selected portlet
=
org.jahia.engines.shared.BigText_Field.alignCenter.label =3D Centrar
org.jahia.engines.shared.BigText_Field.alignJustify.label =3D Justificar
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaEnginesResou=
rces_fr.properties
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/conf/java/JahiaEnginesResources_fr.properties&rev=3D17669&=
repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=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/core/src/conf/java/JahiaEnginesResources_f=
r.properties (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaEnginesResources_f=
r.properties Wed Jun 20 15:02:42 2007
@@ -689,6 +689,9 @@
org.jahia.engines.shared.Application_Field_displyTag.searchBy.label =3D par
org.jahia.engines.shared.Application_Field_displyTag.selectedPortlet.label=
=3D La portlet s=C3=A9lectionn=C3=A9e est:
org.jahia.engines.shared.Application_Field_displyTag.unselectedPortlet.lab=
el =3D d=C3=A9s=C3=A9lectionner
+org.jahia.engines.shared.Application_Field_displyTag.selectedTab =3D S=C3=
=A9lection
+org.jahia.engines.shared.Application_Field_displyTag.rolesTab =3D Roles
+org.jahia.engines.shared.Application_Field_displyTag.noselectedPortlet =3D=
Aucune portlet n'est s=C3=A9lectionn=C3=A9e
=
org.jahia.engines.shared.BigText_Field.WAIwarning.label =3D Avertissement(=
s) WAI
org.jahia.engines.shared.BigText_Field.alignCenter.label =3D Alignement au=
centre
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaEnginesResou=
rces_it.properties
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/conf/java/JahiaEnginesResources_it.properties&rev=3D17669&=
repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=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/core/src/conf/java/JahiaEnginesResources_i=
t.properties (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaEnginesResources_i=
t.properties Wed Jun 20 15:02:42 2007
@@ -899,6 +899,9 @@
org.jahia.engines.shared.Application_Field_displyTag.all.label =3D Tutto
org.jahia.engines.shared.Application_Field_displyTag.selectedPortlet.label=
=3D La portlet selezionata \u00E8:
org.jahia.engines.shared.Application_Field_displyTag.unselectedPortlet.lab=
el =3D unselect
+org.jahia.engines.shared.Application_Field_displyTag.selectedTab =3D Selec=
tion
+org.jahia.engines.shared.Application_Field_displyTag.rolesTab =3D Roles
+org.jahia.engines.shared.Application_Field_displyTag.noselectedPortlet =3D=
There is no selected portlet
=
org.jahia.engines.shared.BigText_Field.alignCenter.label =3D Centra
org.jahia.engines.shared.BigText_Field.alignJustify.label =3D Giustifica
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaEnginesResou=
rces_pt.properties
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/conf/java/JahiaEnginesResources_pt.properties&rev=3D17669&=
repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=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/core/src/conf/java/JahiaEnginesResources_p=
t.properties (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaEnginesResources_p=
t.properties Wed Jun 20 15:02:42 2007
@@ -899,6 +899,9 @@
org.jahia.engines.shared.Application_Field_displyTag.all.label =3D Tudo
org.jahia.engines.shared.Application_Field_displyTag.selectedPortlet.label=
=3D Portlet selecionado \u00E9:
org.jahia.engines.shared.Application_Field_displyTag.unselectedPortlet.lab=
el =3D unselect
+org.jahia.engines.shared.Application_Field_displyTag.selectedTab =3D Selec=
tion
+org.jahia.engines.shared.Application_Field_displyTag.rolesTab =3D Roles
+org.jahia.engines.shared.Application_Field_displyTag.noselectedPortlet =3D=
There is no selected portlet
=
=
org.jahia.engines.shared.BigText_Field.alignCenter.label =3D Alinhamento C=
entral
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/engines/shar=
ed/Application_Field.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/engines/shared/Application_Field.java&rev=
=3D17669&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=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/core/src/java/org/jahia/engines/shared/App=
lication_Field.java (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/engines/shared/App=
lication_Field.java Wed Jun 20 15:02:42 2007
@@ -503,7 +503,7 @@
}
=
// set auth flag
- if (authAppList!=3Dnull && authAppList.size() > 0 && appBean !=3D =
null && !authAppList.contains(appBean)) {
+ if (authAppList!=3Dnull && authAppList.size() > 0 && appBean !=3D =
null && !authAppList.contains(appBean) && appID !=3D -1) {
engineMap.put(theField.getDefinition().getName() + "_unAut=
horized", Boolean.TRUE);
}
=
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/cs=
s/styles.css
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/webapp/jsp/jahia/engines/css/styles.css&rev=3D17669&repnam=
e=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=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/core/src/webapp/jsp/jahia/engines/css/styl=
es.css (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/css/styl=
es.css Wed Jun 20 15:02:42 2007
@@ -787,4 +787,42 @@
}
=
.exportlinks .export {
-}
\ No newline at end of file
+}
+
+/* ------------------------------------------------ */
+/* Select Portlet engine */
+/* ------------------------------------------------ */
+
+#portlettabnav {
+ margin: 0;
+ padding: 0 0 20px 10px;
+ border-bottom: 1px solid #336699;
+}
+
+#portlettabnav li {
+ margin: 0;
+ padding: 0;
+ display: inline;
+ list-style-type: none;
+}
+
+#portlettabnav a:link, #portlettabnav a:visited {
+ float: left;
+ font-size: 11px;
+ line-height: 14px;
+ font-weight: bold;
+ margin: 0 10px 4px 10px;
+ text-decoration: none;
+ color: #398EC3;
+}
+
+#portlettabnav li.active a:link, #portlettabnav li.active a:visited, #port=
lettabnav a:hover {
+ border-bottom: 4px solid #336699;
+ padding-bottom: 2px;
+ background: #fff;
+ color:#336699;
+}
+
+#portlettabnav a:hover {
+ color: #336699;
+}
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/sh=
ared/application_field.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/webapp/jsp/jahia/engines/shared/application_field.jsp&rev=
=3D17669&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=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/core/src/webapp/jsp/jahia/engines/shared/a=
pplication_field.jsp (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/shared/a=
pplication_field.jsp Wed Jun 20 15:02:42 2007
@@ -125,29 +125,49 @@
closeTheWindow();
}
=
+ function selectStep(step){
+ //un-select tab
+ var active_tab =3D getElementsByClassName(document,"active");
+ active_tab[0].className =3D "";
+
+ // un-select panel
+ var active_panel =3D getElementsByClassName(document,"activePanel"=
);
+ active_panel[0].className =3D "";
+ active_panel[0].style.display=3D "none";
+
+ // select tab
+ var tab =3D document.getElementById('tab_'+step);
+ tab.className =3D "active";
+
+ //select panel
+ var panel =3D document.getElementById('panel_'+step);
+ panel.style.display=3D "block";
+ panel.className=3D "activePanel";
+
+ }
+
</script>
+<ul id=3D"portlettabnav">
+ <li id=3D"tab_searchportlet" class=3D"active"><a href=3D"javascript:se=
lectStep('searchportlet')">1- <jahia:engineResourceBundle resourceName=3D"=
org.jahia.engines.shared.Application_Field_displyTag.selectedTab"/></a></li>
+ <%
+ if (!appListIsEmpty && appID!=3D-1) {
=
-<table class=3D"evenOddTable" border=3D"0" cellpadding=3D"5" cellspacing=
=3D"0" width=3D"100%">
- <thead>
- <th title=3D"portlet">
- <a href=3D"#portlet">
- <jahia:engineResourceBundle
- resourceName=3D"org.jahia.engines.shared.Applicati=
on_Field.browseByCategories.AllPortlets"
- defaultValue=3D"Portlets"/>
+%>
+ <li id=3D"tab_roles"><a href=3D"javascript:selectStep('roles')">2- <ja=
hia:engineResourceBundle resourceName=3D"org.jahia.engines.shared.Applicati=
on_Field_displyTag.rolesTab"/></a></li>
+ <%}%>
+</ul>
+<br/>
+<% if (unAuthorizedOnCurrentlySelectedWebapp) {%>
=
- </a>
- </th>
- </thead>
- <tbody>
- <% if (unAuthorizedOnCurrentlySelectedWebapp) {%>
- <tr width=3D"100%">
- <td>
+ <div class=3D"errorbold">
<jahia:engineResourceBundle
resourceName=3D"org.jahia.engines.shared.Applicati=
on_Field.unauthorized.label"/>
- : <%=3DselectedEntryPointDefName%>
- </td>
- </tr>
+ </div>
+
<%}%>
+<table id=3D"panel_searchportlet" class=3D"activePanel" border=3D"0" cellp=
adding=3D"5" cellspacing=3D"0" width=3D"100%">
+ <tbody>
+
<tr>
<% if (appListIsEmpty) { %>
<td width=3D"100%">
@@ -194,22 +214,23 @@
</table>
=
<%
- if (!unAuthorizedOnCurrentlySelectedWebapp && !appListIsEmpty) {
+ if (!appListIsEmpty && appID!=3D-1) {
=
%>
-<table class=3D"evenOddTable" border=3D"0" cellpadding=3D"5" cellspacing=
=3D"0" width=3D"100%">
-<thead>
- <th title=3D"roles">
- <a href=3D"#roles">
- <jahia:engineResourceBundle resourceName=3D"org.jahia.engines.=
shared.Application_Field.Roles"
- defaultValue=3D"Roles"/>
-
- </a>
- </th>
-</thead>
+
+<table style=3D"display:none" id=3D"panel_roles" border=3D"0" cellpadding=
=3D"5" cellspacing=3D"0" width=3D"100%">
+
<tbody>
- <tr class=3D"even">
+ <tr>
<td>
+ <b>
+ <%if(selectedEntryPointDefName!=3Dnull && !selectedEntryPo=
intDefName.equalsIgnoreCase("")){%>
+ <jahia:engineResourceBundle resourceName=3D"org.jahia.=
engines.shared.Application_Field_displyTag.selectedPortlet.label"/>
+ <a href=3D"javascript:searchSelectedWebapp();"><%=3Dse=
lectedEntryPointDefName%> </a> .
+ <%}else{%>
+ <jahia:engineResourceBundle resourceName=3D"org.jahia.=
engines.shared.Application_Field_displyTag.noselectedPortlet"/>
+ <%}%>
+ </b>
<table>
<%
Vector roles =3D (Vector) engineMap.get("roles");
@@ -272,20 +293,22 @@
<td> </td>
=
<td>
- <% if (jParams.userIsAdmin() ||
+ <% if(!unAuthorizedOnCurrentlySelectedWebapp){%>
+ <% if (jParams.userIsAdmin() ||
theField.checkAdminAccess(jParams.getUser()) ||
theField.checkWriteAccess(jParams.getUser()) ||
theField.getID() < 0) { %>
- <a href=3D"javascript:puselectUsrGrp('<%=3DselectUsrGr=
p%>', 'authMembers<%=3Di%>');">
- <jahia:engineResourceBundle
- resourceName=3D"org.jahia.engines.shared.A=
pplication_Field.setUsersAndGroups.label"/>
- </a>
- <br><br>
- <a href=3D"javascript:removeSelectBox(document.mainFor=
m.authMembers<%=3Di%>, '-- - - - - <jahia:engineResourceBun=
dle resourceName=3D"org.jahia.engines.shared.Application_Field.noMoreMember=
s.label"/> - - - - --');">
- <jahia:engineResourceBundle
- resourceName=3D"org.jahia.engines.shared.A=
pplication_Field.removeUsersOrGroups.label"/>
- </a>
- <% } %>
+ <a href=3D"javascript:puselectUsrGrp('<%=3DselectU=
srGrp%>', 'authMembers<%=3Di%>');">
+ <jahia:engineResourceBundle
+ resourceName=3D"org.jahia.engines.shar=
ed.Application_Field.setUsersAndGroups.label"/>
+ </a>
+ <br><br>
+ <a href=3D"javascript:removeSelectBox(document.mai=
nForm.authMembers<%=3Di%>, '-- - - - - <jahia:engineResourc=
eBundle resourceName=3D"org.jahia.engines.shared.Application_Field.noMoreMe=
mbers.label"/> - - - - --');">
+ <jahia:engineResourceBundle
+ resourceName=3D"org.jahia.engines.shar=
ed.Application_Field.removeUsersOrGroups.label"/>
+ </a>
+ <% } %>
+ <% } %>
</td>
</tr>
<%
@@ -304,8 +327,8 @@
<% } %>
</td>
</tr>
+ </table>
<tbody>
- </table>
</table>
<%
}
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/sh=
ared/application_field_displayTag.inc
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/webapp/jsp/jahia/engines/shared/application_field_displayT=
ag.inc&rev=3D17669&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=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/core/src/webapp/jsp/jahia/engines/shared/a=
pplication_field_displayTag.inc (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/shared/a=
pplication_field_displayTag.inc Wed Jun 20 15:02:42 2007
@@ -150,7 +150,7 @@
// set counter value
counter =3D resultRows.size();
=
- // get parameter for display tag
+
request.setAttribute( "resultRows",resultRows);
ParamEncoder encoder =3D new ParamEncoder(tableId);
String paramPageName =3D encoder.encodeParameterName(TableTagParameter=
s.PARAMETER_PAGE);
@@ -162,23 +162,34 @@
String paramOrder =3D encoder.encodeParameterName(TableTagParameters.PA=
RAMETER_ORDER);
String paramOrderValue =3D request.getParameter(paramOrder);
=
- // get selected field id
String selectedFieldId =3D null;
if(jParams !=3Dnull){
selectedFieldId =3D jParams.getParameter("_" + Integer.toString(th=
eField.getID()));
}
- if(selectedFieldId =3D=3D null || selectedFieldId.equalsIgnoreCase("")=
){
- if(appID!=3D -1 && selectedEntryPointDefName!=3D null && !selected=
EntryPointDefName.equalsIgnoreCase("") ){
- selectedFieldId =3D appID+"_"+selectedEntryPointDefName;
- }
- }
if(selectedFieldId =3D=3D null){
- selectedFieldId =3D "";
+ selectedFieldId =3D appID+"_"+selectedEntryPointDefName;
}
=
=
%>
=
+<b>
+ <%if(selectedEntryPointDefName!=3Dnull && !selectedEntryPointDefName.e=
qualsIgnoreCase("")){%>
+ <jahia:engineResourceBundle resourceName=3D"org.jahia.engines.shar=
ed.Application_Field_displyTag.selectedPortlet.label"/>
+ <a href=3D"javascript:searchSelectedWebapp();"><%=3DselectedEntryP=
ointDefName%> </a> .
+ <a title=3D"<jahia:engineResourceBundle resourceName=3D"org.jahia.=
engines.shared.Application_Field_displyTag.unselectedPortlet.label"/>" href=
=3D"javascript:changeSelectedWebapp('no_webapp');">
+ <img src=3D"<jahia:serverHttpPath/>/jsp/jahia/engines/images/i=
cons/delete3.gif" alt=3D"search" border=3D"0"/>
+ </a>
+ <%}else{%>
+ <jahia:engineResourceBundle resourceName=3D"org.jahia.engines.shar=
ed.Application_Field_displyTag.noselectedPortlet"/>
+ <%}%>
+
+ <input style=3D"display:none;" id=3D"no_webapp" name=3D"_<%=3DtheField=
.getID()%>" value=3D"-1" type=3D"radio" onchange=3D"javascript:check();jav=
ascript:handleActionChange('edit');" <%if(appID =3D=3D -1){%> checked <%}%>=
/>
+
+</b>
+
+<br/><br/>
+
<%/* hidden */%>
<input type=3D"hidden" name=3D"<%=3DparamPageName%>" value=3D"<%=3DparamPa=
geValue%>"/>
<input type=3D"hidden" name=3D"<%=3DparamSort%>" value=3D"<%=3DparamSortVa=
lue%>"/>
@@ -264,17 +275,7 @@
</display:table>
<%}%>
<br/>
-<b>
- <%if(selectedEntryPointDefName!=3Dnull && !selectedEntryPointDefName.e=
qualsIgnoreCase("")){%>
- <jahia:engineResourceBundle resourceName=3D"org.jahia.engines.shar=
ed.Application_Field_displyTag.selectedPortlet.label"/>
- <a href=3D"javascript:searchSelectedWebapp();"><%=3DselectedEntryP=
ointDefName%> </a> .
- <a title=3D"<jahia:engineResourceBundle resourceName=3D"org.jahia.=
engines.shared.Application_Field_displyTag.unselectedPortlet.label"/>" href=
=3D"javascript:changeSelectedWebapp('no_webapp');">
- <img src=3D"<jahia:serverHttpPath/>/jsp/jahia/engines/images/i=
cons/delete3.gif" alt=3D"search" border=3D"0"/>
- </a>
- <%}%>
- <input style=3D"display:none;" id=3D"no_webapp" name=3D"_<%=3DtheField=
.getID()%>" value=3D"-1" type=3D"radio" onchange=3D"javascript:check();jav=
ascript:handleActionChange('edit');" <%if(appID =3D=3D -1){%> checked <%}%>=
/>
=
-</b>
<script type=3D"text/javascript">
<!--
function changeSelectedWebapp(fieldId) {
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
