Author: xlawrence
Date: Wed May 16 15:05:07 2007
New Revision: 17322
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D17322&repname=
=3Djahia
Log:
Avoid NPE if you click on "delete selected sites" and selection is empty
Modified:
branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaAdministrationReso=
urces.properties
branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaAdministrationReso=
urces_en.properties
branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaAdministrationReso=
urces_fr.properties
branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/admin/sites/Manage=
Sites.java
branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/administration/c=
onfig_server.jsp
branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/administration/s=
ite_multiple_delete.jsp
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaAdministrati=
onResources.properties
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/conf/java/JahiaAdministrationResources.properties&rev=3D17=
322&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/JahiaAdministrationReso=
urces.properties (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaAdministrationReso=
urces.properties Wed May 16 15:05:07 2007
@@ -466,6 +466,7 @@
org.jahia.admin.site.ManageSites.exportall.label =3D Export all sites
org.jahia.admin.site.ManageSites.exportsites.label =3D Export selected sit=
es
org.jahia.admin.site.ManageSites.deletesites.label =3D Delete selected sit=
es
+org.jahia.admin.site.ManageSites.noSiteSpecified.label =3D Virtual site se=
lection is empty
org.jahia.admin.site.ManageSites.multipleimport.label =3D Import one or mo=
re virtual sites
org.jahia.admin.site.ManageSites.multipleimport.fileselect =3D Please sele=
ct the file to import
org.jahia.admin.site.ManageSites.multipleimport.fileinput =3D Or give the =
path of an import file on the server
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaAdministrati=
onResources_en.properties
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/conf/java/JahiaAdministrationResources_en.properties&rev=
=3D17322&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/JahiaAdministrationReso=
urces_en.properties (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaAdministrationReso=
urces_en.properties Wed May 16 15:05:07 2007
@@ -466,6 +466,7 @@
org.jahia.admin.site.ManageSites.exportall.label =3D Export all sites
org.jahia.admin.site.ManageSites.exportsites.label =3D Export selected sit=
es
org.jahia.admin.site.ManageSites.deletesites.label =3D Delete selected sit=
es
+org.jahia.admin.site.ManageSites.noSiteSpecified.label =3D Virtual site se=
lection is empty
org.jahia.admin.site.ManageSites.multipleimport.label =3D Import one or mo=
re virtual sites
org.jahia.admin.site.ManageSites.multipleimport.fileselect =3D Please sele=
ct the file to import
org.jahia.admin.site.ManageSites.multipleimport.fileinput =3D Or give the =
path of an import file on the server
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaAdministrati=
onResources_fr.properties
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/conf/java/JahiaAdministrationResources_fr.properties&rev=
=3D17322&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/JahiaAdministrationReso=
urces_fr.properties (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaAdministrationReso=
urces_fr.properties Wed May 16 15:05:07 2007
@@ -602,6 +602,7 @@
org.jahia.admin.site.ManageSites.multipleimport.fileselect =3D Veuillez s=
=C3=A9lectionner le fichier =C3=A0 importer
org.jahia.admin.site.ManageSites.multipleimport.label =3D Importation simu=
ltan=C3=A9e de plusieurs sites virtuels
org.jahia.admin.site.ManageSites.noImport.label =3D Site vide
+org.jahia.admin.site.ManageSites.noSiteSpecified.label =3D Aucun site virt=
uel sp=C3=A9cifi=C3=A9
org.jahia.admin.site.ManageSites.noTemplatesHasbeenFound.label =3D Aucun =
mod=C3=A8le n'a =C3=A9t=C3=A9 trouv=C3=A9.
org.jahia.admin.site.ManageSites.numberSiteForLicense.label =3D Le nombre=
de sites pour cette licence est limit=C3=A9 =C3=A0
org.jahia.admin.site.ManageSites.or.label =3D ou
@@ -923,7 +924,6 @@
org.jahia.admin.users.ManageGroups.removeSelectedGroup.label =3D Supprime=
r le groupe s=C3=A9lectionn=C3=A9
org.jahia.admin.users.ManageGroups.viewSelectedGroup.label =3D Voir les a=
dh=C3=A9sions du groupe s=C3=A9lectionn=C3=A9
org.jahia.admin.users.ManageGroups.validCharacter.label =3D seuls les cara=
ct\u00e8res (a..z, A..Z, _, 0..9) sont valides.
-org.jahia.admin.users.ManageGroups.viewSelectedGroup.label =3D Voir les in=
scriptions du groupe s\u00e9lectionn\u00e9
org.jahia.admin.users.ManageUsers.allProp.label =3D Toutes les propri=C3=
=A9t=C3=A9s
org.jahia.admin.users.ManageUsers.applyModif.label =3D Appliquer les modi=
fications et revenir =C3=A0 la liste des utilisateurs.
org.jahia.admin.users.ManageUsers.areYouSure.label =3D =C3=8Ates-vous s=
=C3=BBr ?
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/admin/sites/=
ManageSites.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/admin/sites/ManageSites.java&rev=3D17322&re=
pname=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/admin/sites/Manage=
Sites.java (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/admin/sites/Manage=
Sites.java Wed May 16 15:05:07 2007
@@ -99,7 +99,7 @@
public class ManageSites {
// ------------------------------ FIELDS ------------------------------
=
- private static org.apache.log4j.Logger logger =3D
+ private static final org.apache.log4j.Logger logger =3D
org.apache.log4j.Logger.getLogger(ManageSites.class);
=
private static final String CLASS_NAME =3D JahiaAdministration.CLASS_N=
AME;
@@ -1850,13 +1850,15 @@
=
List sites =3D new ArrayList();
String[] sitekeys =3D request.getParameterValues("sitebox");
- for (int i =3D 0; i < sitekeys.length; i++) {
- String sitekey =3D sitekeys[i];
- try {
- JahiaSite site =3D ServicesRegistry.getInstance().getJahia=
SitesService().getSiteByKey(sitekey);
- sites.add(site);
- } catch (JahiaException e) {
-
+ if (sitekeys !=3D null) {
+ for (int i =3D 0; i < sitekeys.length; i++) {
+ final String sitekey =3D sitekeys[i];
+ try {
+ final JahiaSite site =3D ServicesRegistry.getInstance(=
).getJahiaSitesService().getSiteByKey(sitekey);
+ sites.add(site);
+ } catch (JahiaException e) {
+ logger.error("Error getting site: " + sitekey);
+ }
}
}
request.setAttribute("sites",sites);
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/administra=
tion/config_server.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/webapp/jsp/jahia/administration/config_server.jsp&rev=3D17=
322&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/administration/c=
onfig_server.jsp (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/administration/c=
onfig_server.jsp Wed May 16 15:05:07 2007
@@ -16,8 +16,6 @@
limitations under the License.
--%><[EMAIL PROTECTED] import=3D"org.jahia.bin.*"%>
<%
- String jahiaServerHomeDiskPath =3D (String) request.getAttribute=
("jahiaServerHomeDiskPath");
- String jahiaServerHostURL =3D (String) request.getAttribute=
("jahiaServerHostURL");
String jahiaServerMailServer =3D (String) request.getAttribute=
("jahiaServerMailServer");
String jahiaServerMailAdministrator =3D (String) request.getAttribute=
("jahiaServerMailAdministrator");
String jahiaServerMailFrom =3D (String) request.getAttribute=
("jahiaServerMailFrom");
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/administra=
tion/site_multiple_delete.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/webapp/jsp/jahia/administration/site_multiple_delete.jsp&r=
ev=3D17322&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/administration/s=
ite_multiple_delete.jsp (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/administration/s=
ite_multiple_delete.jsp Wed May 16 15:05:07 2007
@@ -14,16 +14,15 @@
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. =
See the License for the specific language governing permissions and =
limitations under the License.
---%><[EMAIL PROTECTED] import=3D"org.jahia.bin.*"%>
-<[EMAIL PROTECTED] file=3D"/jsp/jahia/administration/include/header.inc"%>
-<[EMAIL PROTECTED] import =3D "org.jahia.services.usermanager.*"%>
+--%>
+<%@ page import=3D"org.jahia.services.usermanager.JahiaUserManagerProvider=
" %>
+<%@ include file=3D"/jsp/jahia/administration/include/header.inc" %>
+<%@ page import=3D"java.util.Iterator" %>
<%@ page import=3D"java.util.List" %>
<%@ page import=3D"java.util.Vector" %>
-<%@ page import=3D"java.util.Iterator" %>
-<%@ page import=3D"org.jahia.services.sites.JahiaSite" %>
<%@ taglib uri=3D"JahiaLib" prefix=3D"jahia" %>
<%
- List sites =3D (List) request.getAttribute("sites");
+ final List sites =3D (List) request.getAttribute("sites");
=
Vector usrProviders =3D (Vector) request.getAttribute("usrProviders");
if (usrProviders =3D=3D null) {
@@ -32,22 +31,31 @@
%>
=
<div id=3D"topTitle">
- <div id=3D"topTitleLogo">
- <img name=3D"virtual_sites" src=3D"<%=3DURL%>images/icons/admin/envi=
ronment.gif" width=3D"48" height=3D"48" border=3D"0" />
- </div>
- <h1 id=3D"topTitleLabel"><jahia:adminResourceBundle resourceName=3D"org.=
jahia.admin.site.ManageSites.manageVirtualSites.label"/></h1>
+ <div id=3D"topTitleLogo">
+ <img alt=3D"" name=3D"virtual_sites" src=3D"<%=3DURL%>images/icons=
/admin/environment.gif" width=3D"48" height=3D"48" border=3D"0"/>
+ </div>
+
+ <h1 id=3D"topTitleLabel"><jahia:adminResourceBundle
+ resourceName=3D"org.jahia.admin.site.ManageSites.manageVirtual=
Sites.label"/></h1>
</div>
=
<div id=3D"adminMainContent">
=
- <form method=3D"POST" action=3D'<%=3DJahiaAdministration.composeActionUR=
L(request,response,"sites","")%>' name=3D"mainForm">
- <input type=3D"hidden" name=3D"sub" value=3D"processmultipledelete" =
/>
+<% if (sites =3D=3D null || sites.size() =3D=3D 0) { %>
+<div class=3D"error">
+ <jahia:adminResourceBundle resourceName=3D"org.jahia.admin.site.Manage=
Sites.noSiteSpecified.label"/>
+</div>
+<% } else { %>
+
+<form method=3D"POST" action=3D'<%=3DJahiaAdministration.composeActionURL(=
request,response,"sites","")%>' name=3D"mainForm">
+<input type=3D"hidden" name=3D"sub" value=3D"processmultipledelete"/>
+
+<p class=3D"errorbold"><jahia:adminResourceBundle
+ resourceName=3D"org.jahia.admin.site.ManageSites.pleaseBeCareful.l=
abel"/></p>
=
- <p class=3D"errorbold"><jahia:adminResourceBundle resourceName=3D"org.=
jahia.admin.site.ManageSites.pleaseBeCareful.label"/></p>
- =
- <h2><jahia:adminResourceBundle resourceName=3D"org.jahia.admin.site.Ma=
nageSites.doYouWantToContinue.label"/></h2>
+<h2><jahia:adminResourceBundle resourceName=3D"org.jahia.admin.site.Manage=
Sites.doYouWantToContinue.label"/></h2>
=
- <table border=3D"1" cellpadding=3D"10" cellspacing=3D"0" style=3D"widt=
h:100%" class=3D"topAlignedTable">
+<table border=3D"1" cellpadding=3D"10" cellspacing=3D"0" style=3D"width:10=
0%" class=3D"topAlignedTable">
<tr>
<th>
<jahia:adminResourceBundle resourceName=3D"org.jahia.admin.sit=
e.ManageSites.siteTitle.label"/>
@@ -63,31 +71,31 @@
</th>
</tr>
=
- <%
- for (Iterator iterator =3D sites.iterator(); iterator.hasNext(=
);) {
- JahiaSite site =3D (JahiaSite) iterator.next();
- %>
- <input type=3D"hidden" name=3D"sitebox" value=3D"<%=3D site.getSit=
eKey() %>" />
- <tr>
- <td>
- <%=3Dsite.getTitle()%>
- </td>
- <td>
- <%=3Dsite.getServerName()%>
- </td>
- <td>
- <%=3Dsite.getSiteKey()%>
- </td>
- <td>
- <%=3Dsite.getDescr()%>
- </td>
- </tr>
- <%
- }
- %>
- </table>
- <table>
- <tr>
+ <%
+ for (Iterator iterator =3D sites.iterator(); iterator.hasNext();) {
+ JahiaSite site =3D (JahiaSite) iterator.next();
+ %>
+ <input type=3D"hidden" name=3D"sitebox" value=3D"<%=3D site.getSiteKey=
() %>"/>
+ <tr>
+ <td>
+ <%=3Dsite.getTitle()%>
+ </td>
+ <td>
+ <%=3Dsite.getServerName()%>
+ </td>
+ <td>
+ <%=3Dsite.getSiteKey()%>
+ </td>
+ <td>
+ <%=3Dsite.getDescr()%>
+ </td>
+ </tr>
+ <%
+ }
+ %>
+</table>
+<table>
+ <tr>
<td>
<jahia:adminResourceBundle resourceName=3D"org.jahia.admin.sit=
e.ManageSites.purgeOptions.label"/> :
</td>
@@ -95,30 +103,35 @@
<table border=3D"0" cellpadding=3D"0" cellspacing=3D"0">
<tr>
<td>
- <input name=3D"deleteTemplates" type=3D"checkbox" =
value=3D"1" checked > <jahia:adminResourceBundle resourceName=3D"org.j=
ahia.admin.site.ManageSites.deleteSiteTemplates.label"/>
+ <input name=3D"deleteTemplates" type=3D"checkbox" =
value=3D"1" checked> <jahia:adminResourceBundle
+ resourceName=3D"org.jahia.admin.site.ManageSit=
es.deleteSiteTemplates.label"/>
</td>
</tr>
<tr>
<td>
- <input name=3D"deleteFileRepository" type=3D"check=
box" value=3D"1" checked > <jahia:adminResourceBundle resourceName=3D"=
org.jahia.admin.site.ManageSites.deleteSiteFileRepository.label"/>
+ <input name=3D"deleteFileRepository" type=3D"check=
box" value=3D"1" checked>
+ <jahia:adminResourceBundle
+ resourceName=3D"org.jahia.admin.site.Manag=
eSites.deleteSiteFileRepository.label"/>
</td>
</tr>
<tr>
<td>
<br><br>
<%
- if ( usrProviders.size()>0 )
- {
+ if (usrProviders.size() > 0) {
%>
- <jahia:adminResourceBundle resourceName=3D"org.jah=
ia.admin.site.ManageSites.deleteSiteUsersAndGroups.label"/> :<br>
+ <jahia:adminResourceBundle
+ resourceName=3D"org.jahia.admin.site.Manag=
eSites.deleteSiteUsersAndGroups.label"/> :
+ <br>
<%
- JahiaUserManagerProvider usrProviderBean;
- int size =3D usrProviders.size();
- for ( int i=3D0 ; i<size ; i++ )
- {
- usrProviderBean =3D (JahiaUserManagerP=
rovider)usrProviders.get(i);
+ JahiaUserManagerProvider usrProviderBean;
+ int size =3D usrProviders.size();
+ for (int i =3D 0; i < size; i++) {
+ usrProviderBean =3D (JahiaUserManagerProvi=
der) usrProviders.get(i);
%>
- &n=
bsp; <input name=
=3D"usrProviders" type=3D"checkbox" value=3D"<%=3DusrProviderBean.getKey()%=
>" checked> <%=3DusrProviderBean.getKey()%>
+ &n=
bsp;
+ <input name=3D"usrProviders" type=3D"checkbox" val=
ue=3D"<%=3DusrProviderBean.getKey()%>" checked>
+ <%=3DusrProviderBean.getKey()%>
<%
}
}
@@ -128,37 +141,45 @@
</table>
</td>
</tr>
- </table>
- =
- <div class=3D"buttonList" style=3D"text-align: right; padding-top: 30p=
x; padding-bottom: 10px">
- <div class=3D"button">
+</table>
+
+<div class=3D"buttonList" style=3D"text-align: right; padding-top: 30px; p=
adding-bottom: 10px">
+ <div class=3D"button">
<a href=3D'<%=3DJahiaAdministration.composeActionURL(request,respo=
nse,"sites","&sub=3Dlist")%>'>
- <jahia:adminResourceBundle resourceName=3D"org.jahia.admin.cance=
l.label"/>
+ <jahia:adminResourceBundle resourceName=3D"org.jahia.admin.can=
cel.label"/>
</a>
- </div>
- <div class=3D"button">
- <a href=3D"javascript:document.mainForm.submit()" onclick=3D"openW=
orkInProgressWindow('<%=3Drequest.getContextPath()%>')">
- <jahia:adminResourceBundle resourceName=3D"org.jahia.admin.delet=
e.label"/>
+ </div>
+
+ <div class=3D"button">
+ <a href=3D"javascript:document.mainForm.submit()"
+ onclick=3D"openWorkInProgressWindow('<%=3Drequest.getContextPat=
h()%>')">
+ <jahia:adminResourceBundle resourceName=3D"org.jahia.admin.del=
ete.label"/>
</a>
- </div>
</div>
- =
- </form>
+</div>
+
+</form>
=
- <div id=3D"operationMenu">
- <div id=3D"operationMenuLabel">
- <jahia:adminResourceBundle
resourceName=3D"org.jahia.admin.otherOperati=
ons.label"/> :
- </div>
- <ul id=3D"operationList">
- <li class=3D"operationEntry">
- <a class=3D"operationLink" href=3D'<%=3DJahiaAdministration.compose=
ActionURL(request,response,"sites","&sub=3Dlist")%>'><jahia:adminResourceBu=
ndle resourceName=3D"org.jahia.admin.site.ManageSites.backToSitesList.label=
"/></a>
- </li>
- <li class=3D"operationEntry">
- <a class=3D"operationLink" href=3D'<%=3DJahiaAdministration.compose=
ActionURL(request,response,"displaymenu","")%>'><jahia:adminResourceBundle =
resourceName=3D"org.jahia.admin.backToMenu.label"/></a>
- </li>
+<% } %>
+
+<div id=3D"operationMenu">
+ <div id=3D"operationMenuLabel">
+ <jahia:adminResourceBundle resourceName=3D"org.jahia.admin.otherOp=
erations.label"/> :
+ </div>
+ <ul id=3D"operationList">
+ <li class=3D"operationEntry">
+ <a class=3D"operationLink"
+ href=3D'<%=3DJahiaAdministration.composeActionURL(request,r=
esponse,"sites","&sub=3Dlist")%>'>
+ <jahia:adminResourceBundle resourceName=3D"org.jahia.admin=
.site.ManageSites.backToSitesList.label"/></a>
+ </li>
+ <li class=3D"operationEntry">
+ <a class=3D"operationLink"
+ href=3D'<%=3DJahiaAdministration.composeActionURL(request,r=
esponse,"displaymenu","")%>'>
+ <jahia:adminResourceBundle resourceName=3D"org.jahia.admin=
.backToMenu.label"/></a>
+ </li>
</ul>
- </div>
+</div>
=
</div>
=
-<[EMAIL PROTECTED] file=3D"/jsp/jahia/administration/include/footer.inc"%>
\ No newline at end of file
+<%@ include file=3D"/jsp/jahia/administration/include/footer.inc" %>
\ No newline at end of file
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
