Author: xlawrence
Date: Tue Jul 31 09:44:59 2007
New Revision: 18075
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D18075&repname=
=3Djahia
Log:
Forward port (r 18017)
Modified:
trunk/core/src/conf/java/jahiatemplates/common.properties
trunk/core/src/conf/java/jahiatemplates/common_en.properties
trunk/core/src/conf/java/jahiatemplates/common_fr.properties
trunk/core/src/java/org/jahia/ajax/usersession/userSettings.java
trunk/core/src/java/org/jahia/gui/HTMLToolBox.java
trunk/core/src/java/org/jahia/services/workflow/NotifyAllJob.java
trunk/core/src/java/org/jahia/settings/SettingsBean.java
trunk/core/src/webapp/WEB-INF/etc/config/jahia.skeleton
trunk/core/src/webapp/jsp/jahia/topbar/aes.inc
trunk/core/src/webapp/jsp/jahia/topbar/chat.inc
Modified: trunk/core/src/conf/java/jahiatemplates/common.properties
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/conf/j=
ava/jahiatemplates/common.properties&rev=3D18075&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
--- trunk/core/src/conf/java/jahiatemplates/common.properties (original)
+++ trunk/core/src/conf/java/jahiatemplates/common.properties Tue Jul 31 09=
:44:59 2007
@@ -32,6 +32,7 @@
firesActivation =3D All Fires activation
wflowFire =3D Workflow display
tbpublishFire =3D Timebased display
+aclFire =3D ACL difference display
=
pickers.title =3D linked copies
pickers.table.title =3D list of linked copies
Modified: trunk/core/src/conf/java/jahiatemplates/common_en.properties
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/conf/j=
ava/jahiatemplates/common_en.properties&rev=3D18075&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
--- trunk/core/src/conf/java/jahiatemplates/common_en.properties (original)
+++ trunk/core/src/conf/java/jahiatemplates/common_en.properties Tue Jul 31=
09:44:59 2007
@@ -32,6 +32,7 @@
firesActivation=3DAll Fires activation
wflowFire=3DWorkflow display
tbpublishFire=3DTimebased display
+aclFire =3D ACL difference display
=
pickers.title=3Dlinked copies
pickers.table.title=3Dlist of linked copies
Modified: trunk/core/src/conf/java/jahiatemplates/common_fr.properties
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/conf/j=
ava/jahiatemplates/common_fr.properties&rev=3D18075&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
--- trunk/core/src/conf/java/jahiatemplates/common_fr.properties (original)
+++ trunk/core/src/conf/java/jahiatemplates/common_fr.properties Tue Jul 31=
09:44:59 2007
@@ -30,6 +30,7 @@
pdispModule =3D Moniteur des processus
tbpublishFire =3D Publication planifi=C3=A9
wflowFire =3D Affichage du workflow
+aclFire =3D Diff=C3=A9rence entre ACLs
pickers.table.title=3Dliste des copies li=C3=A9es
pickers.title=3Dcopies li=C3=A9es
pickers.type=3Dcontenu
Modified: trunk/core/src/java/org/jahia/ajax/usersession/userSettings.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/java/o=
rg/jahia/ajax/usersession/userSettings.java&rev=3D18075&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
--- trunk/core/src/java/org/jahia/ajax/usersession/userSettings.java (origi=
nal)
+++ trunk/core/src/java/org/jahia/ajax/usersession/userSettings.java Tue Ju=
l 31 09:44:59 2007
@@ -34,6 +34,7 @@
public final static String USER_SETTINGS_PATH =3D "/ajaxaction/userset=
tings";
public final static String WF_VISU_ENABLED =3D "wf_visu_enabled";
public final static String TBP_VISU_ENABLED =3D "tbp_visu_enabled";
+ public final static String ACL_VISU_ENABLED =3D "acl_visu_enabled";
public final static String CHAT_VISU_ENABLED =3D "chat_visu_enabled";
public final static String MONITOR_VISU_ENABLED =3D "pdisp_visu_enable=
d";
private HtmlCache htmlCache;
@@ -63,7 +64,11 @@
* @throws javax.servlet.ServletException
* @see org.apache.struts.action.Action#execute(org.apache.struts.acti=
on.ActionMapping, org.apache.struts.action.ActionForm, javax.servlet.http.H=
ttpServletRequest, javax.servlet.http.HttpServletResponse)
*/
- public ActionForward execute(final ActionMapping mapping, final Action=
Form form, final HttpServletRequest request, final HttpServletResponse resp=
onse) throws IOException, ServletException {
+ public ActionForward execute(final ActionMapping mapping,
+ final ActionForm form,
+ final HttpServletRequest request,
+ final HttpServletResponse response)
+ throws IOException, ServletException {
needToPurge=3Dfalse;
esi_active =3D Jahia.getSettings().isEsiCacheActivated();
final HttpSession mysession =3D request.getSession(false);
@@ -78,10 +83,11 @@
}
=
// we get the parameter from the request
- if (request.getParameter(WF_VISU_ENABLED) !=3D null) setParam("wor=
kflow", WF_VISU_ENABLED, request, mysession);
- if (request.getParameter(TBP_VISU_ENABLED) !=3D null) setParam("ti=
mebased publishing", TBP_VISU_ENABLED, request, mysession);
- if (request.getParameter(CHAT_VISU_ENABLED) !=3D null)setParam("ch=
at", CHAT_VISU_ENABLED, request, mysession);
- if (request.getParameter(MONITOR_VISU_ENABLED) !=3D null) setParam=
("monitor display", MONITOR_VISU_ENABLED, request, mysession);
+ setParam("workflow", WF_VISU_ENABLED, request, mysession);
+ setParam("timebased publishing", TBP_VISU_ENABLED, request, mysess=
ion);
+ setParam("chat", CHAT_VISU_ENABLED, request, mysession);
+ setParam("monitor display", MONITOR_VISU_ENABLED, request, mysessi=
on);
+ setParam("acl", ACL_VISU_ENABLED, request, mysession);
=
//purge the user entries in the cache html
=
@@ -99,19 +105,25 @@
return null;
}
=
- private void setParam(String name, String l, HttpServletRequest r, Htt=
pSession s) {
- String def=3D"false";
- if(name.equalsIgnoreCase("workflow")) def=3D Boolean.toString(Jahi=
a.getSettings().isWflowDisp());
- else if (name.equalsIgnoreCase("timebased publishing")) def=3DBool=
ean.toString(Jahia.getSettings().isTbpDisp());
- else if(name.equalsIgnoreCase("chat")) def=3DBoolean.toString(Jahi=
a.getSettings().isChatDisp());
- else if (name.equalsIgnoreCase("monitor display")) def=3DBoolean.t=
oString(Jahia.getSettings().isPdispDisp());
- String p =3D getParameter(r, l, def);
+ private void setParam(String paramName,
+ String sessionAttributeName,
+ HttpServletRequest request,
+ HttpSession session) {
+ if (paramName =3D=3D null || sessionAttributeName =3D=3D null) ret=
urn;
+ boolean value =3D false;
+ if (paramName.equalsIgnoreCase("workflow")) value =3D Jahia.getSet=
tings().isWflowDisp();
+ else if (paramName.equalsIgnoreCase("timebased publishing")) value=
=3D Jahia.getSettings().isTbpDisp();
+ else if (paramName.equalsIgnoreCase("chat")) value =3D Jahia.getSe=
ttings().isChatDisp();
+ else if (paramName.equalsIgnoreCase("monitor display")) value =3D =
Jahia.getSettings().isPdispDisp();
+ else if (paramName.equalsIgnoreCase("acl")) value =3D Jahia.getSet=
tings().isAclDisp();
+ boolean paramValue =3D getParameter(request, sessionAttributeName,=
String.valueOf(value)).equals("true");
// check if changing some(s) flag(s)
- if(s.getAttribute(l)!=3Dnull && !((String)s.getAttribute(l)).trim(=
).equalsIgnoreCase(p.trim())) needToPurge=3Dtrue;
-
-
- logger.debug("found " + name + " param: " + p + " ->setting the se=
ssion");
- s.setAttribute(l, p);
+ final Boolean currentSessionAttributeValue =3D (Boolean) session.g=
etAttribute(sessionAttributeName);
+ if (currentSessionAttributeValue !=3D null && currentSessionAttrib=
uteValue.booleanValue() !=3D paramValue) {
+ needToPurge =3D true;
+ session.setAttribute(sessionAttributeName, Boolean.valueOf(par=
amValue));
+ }
+ logger.debug("found " + paramName + " param: " + paramValue + " ->=
setting the session");
}
}
=
Modified: trunk/core/src/java/org/jahia/gui/HTMLToolBox.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/java/o=
rg/jahia/gui/HTMLToolBox.java&rev=3D18075&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
--- trunk/core/src/java/org/jahia/gui/HTMLToolBox.java (original)
+++ trunk/core/src/java/org/jahia/gui/HTMLToolBox.java Tue Jul 31 09:44:59 =
2007
@@ -1362,43 +1362,49 @@
final int parentID =3D (parent =3D=3D null) ? 0 : parent.getID();
final int definitionID =3D contentObject.getDefinitionID();
final int pageID =3D jParams.getPageID();
- final boolean hasWorkflow =3D contentObject.isIndependantWorkflow(=
);
final HttpServletRequest therequest =3D ((ParamBean) jParams).getR=
equest();
final String contextPath =3D Jahia.getContextPath();
=
// to get flags to enable workflow and tbpublishing visu and checks
// if dev mode is actived so all modules and semaphores are actived
- String devmode =3D Boolean.toString(Jahia.getSettings().isDevelopm=
entMode());
- String wff =3D devmode;//default
- String tbpf =3D devmode;//default
+ final boolean isDevMode =3D Jahia.getSettings().isDevelopmentMode(=
);
+ Boolean displayWorkflowStates =3D Boolean.valueOf(isDevMode); //de=
fault
+ Boolean displayTimeBasedPublishing =3D Boolean.valueOf(isDevMode);=
//default
+ Boolean aclDifferenceParam =3D Boolean.valueOf(isDevMode);
if (!Jahia.getSettings().isDevelopmentMode()) {
try {
- wff =3D (String) therequest.getSession().getAttribute(user=
Settings.WF_VISU_ENABLED);
- if (wff =3D=3D null) {
- wff =3D Boolean.toString(Jahia.getSettings().isWflowDi=
sp());
+ displayWorkflowStates =3D (Boolean) therequest.getSession(=
).getAttribute(userSettings.WF_VISU_ENABLED);
+ if (displayWorkflowStates =3D=3D null) {
+ displayWorkflowStates =3D Boolean.valueOf(Jahia.getSet=
tings().isWflowDisp());
}
- tbpf =3D (String) therequest.getSession().getAttribute(use=
rSettings.TBP_VISU_ENABLED);
- if (tbpf =3D=3D null) {
- tbpf =3D Boolean.toString(Jahia.getSettings().isTbpDis=
p());
+ displayTimeBasedPublishing =3D (Boolean) therequest.getSes=
sion().getAttribute(userSettings.TBP_VISU_ENABLED);
+ if (displayTimeBasedPublishing =3D=3D null) {
+ displayTimeBasedPublishing =3D Boolean.valueOf(Jahia.g=
etSettings().isTbpDisp());
}
- } catch (IllegalStateException e) {
- logger.error(e);
+ aclDifferenceParam =3D (Boolean) therequest.getSession().g=
etAttribute(userSettings.ACL_VISU_ENABLED);
+ if (aclDifferenceParam =3D=3D null) {
+ aclDifferenceParam =3D Boolean.valueOf(Jahia.getSettin=
gs().isAclDisp());
+ }
+ } catch (final IllegalStateException e) {
+ logger.error(e, e);
}
}
- final boolean flagWorkFlowVisibitlity =3D (wff !=3D null) && wff.t=
rim().equalsIgnoreCase("true");
- final boolean flagTBPVisibitlity =3D (tbpf !=3D null) && tbpf.trim=
().equalsIgnoreCase("true");
-
//logger.debug("flagWorkFlowVisibitlity:"+flagWorkFlowVisibitlity+=
" flagTBPVisibitlity:"+flagTBPVisibitlity);
=
-
final StringBuffer buff =3D new StringBuffer(100);
=
+ final String picto =3D actionIcon =3D=3D null ?
+ buff.append(getURLImageContext()).append("/action.gif").to=
String() :
+ actionIcon;
+ buff.delete(0, buff.length());
+
final String uniqueID =3D buildUniqueContentID(objectType, objectI=
D,
definitionID, parentID, pageID, lockIcon, useFieldSet, res=
ourceBundle, namePostFix);
=
+ final boolean showWorkflow =3D displayWorkflowStates.booleanValue(=
) && contentObject.isIndependantWorkflow();
if (useFieldSet) {
buff.append("<fieldset id=3D\"fieldset_").append(uniqueID);
- if (hasWorkflow) {
+ if (showWorkflow) {
buff.append("\" class=3D\"workflow\">");
} else {
buff.append("\" class=3D\"unlocked\">");
@@ -1411,7 +1417,7 @@
// compute workflow stuff
String objectKey =3D objectType + "_" + objectID;
String realObjectKey =3D objectKey;
- if (hasWorkflow && (! PageBean.TYPE.equals(objectType)) && flagWor=
kFlowVisibitlity) {
+ if (showWorkflow && (! PageBean.TYPE.equals(objectType))) {
logger.debug("displaying workflow state");
=
if (ContainerBean.TYPE.equals(objectType)) {
@@ -1470,7 +1476,8 @@
}
=
// time based publishing status
- if (flagTBPVisibitlity && (ContainerBean.TYPE.equals(objectType) |=
| PageBean.TYPE.equals(objectType))) {
+ if (displayTimeBasedPublishing.booleanValue() &&
+ (ContainerBean.TYPE.equals(objectType) || PageBean.TYPE.eq=
uals(objectType))) {
logger.debug("displaying TBP state");
//todo port the code in ajax action here
final String actionURL =3D contextPath + "/ajaxaction/GetTimeB=
asedPublishingState?params=3D/op/edit/pid/" +
@@ -1499,7 +1506,10 @@
out.print(uniqueID);
out.print("\" href=3D\"");
out.print(ajaxFunction);
- out.print("\"><span class=3D\"actionmenu ");
+ out.print("\"\n");
+ out.print(" onmouseover=3D\"buttonMouseover(event, '");
+ out.print(uniqueID);
+ out.print("')\"><img\n");
=
String resource =3D getResource(resourceBundle, objectType + "Oper=
ations");
=
@@ -1520,16 +1530,9 @@
if (cc !=3D null && pickerObjectsSize > 0) {
//this container is picked
resource =3D resource + " (" + getResource(resourceBundle,=
"numbercopies") + ":" + pickerObjectsSize + ")";
+ buff.append(" src=3D\"").append(picto).append("\" alt=3D\"=
").append(resource).
+ append("\"").append(" title=3D\"").append(resource=
).append("\" border=3D\"0\"/>");
=
- buff.append("actionIcon\""); =
- if (actionIcon !=3D null) { =
- buff.append(" style=3D\"background-image: url('").appe=
nd(actionIcon).
- append("');background-repeat: no-repeat;\">").appe=
nd("<img class=3D\"actionIcon\" style=3D\"visibility:hidden;\" src=3D\"").
- append(actionIcon).append("\" alt=3D\"").appen=
d(resource).append("\" border=3D\"0\"/>");
- } else {
- buff.append("><img class=3D\"actionIcon\" src=3D\"").a=
ppend(getURLImageContext()).append("/action.gif\" alt=3D\"").
- append(resource).append("\" border=3D\"0\"/>");
- } =
} else if (cc !=3D null && contentObject.isPicker() && cc.getP=
ickedObject() !=3D null) {
// picker status of object
pickedObject =3D cc.getPickedObject();
@@ -1540,43 +1543,37 @@
=
//pickedpageID=3D""+((ContentContainer)pickedObject).getPa=
geID();
=
- buff.append("pickerIcon\"");
- buff.append("><img class=3D\"pickerIcon\" src=3D\"").appen=
d(getURLImageContext()).append("/picker.gif\" alt=3D\"").
- append(resource).append("\" border=3D\"0\"/>");
-
+ buff.append(" src=3D\"").append(getURLImageContext()).appe=
nd("/picker.gif").append("\" alt=3D\"").append(resource).
+ append("\"").append(" title=3D\"").append(resource=
).append("\" border=3D\"0\"/>");
=
} else {
// standard objects
- buff.append("actionIcon\"");
- if (actionIcon !=3D null) { =
- buff.append(" style=3D\"background-image: url('").appe=
nd(actionIcon).
- append("');background-repeat: no-repeat;\">").appe=
nd("<img class=3D\"actionIcon\" style=3D\"visibility:hidden;\" src=3D\"").
- append(actionIcon).append("\" alt=3D\"").appen=
d(resource).append("\" border=3D\"0\"/>");
- } else {
- buff.append("><img class=3D\"actionIcon\" src=3D\"").a=
ppend(getURLImageContext()).append("/action.gif\" alt=3D\"").
- append(resource).append("\" border=3D\"0\"/>");
+ buff.append(" src=3D\"").append(picto).append("\" alt=3D\"=
").append(resource).
+ append("\"").append(" title=3D\"").append(resource=
).append("\" border=3D\"0\"/>");
+ }
+ final ContentObject obj =3D contentObject.getContentObject();
+ if (aclDifferenceParam.booleanValue() && !
+ obj.getObjectKey().toString().equals("ContentPage_" + =
jParams.getSite().getHomePageID()) &&
+ ! obj.isAclSameAsParent()) {
+ String title =3D getResource(resourceBundle, "differentACL=
Title");
+ if (title =3D=3D null || title.length() =3D=3D 0) {
+ title =3D "This object and its parent have different A=
CLs";
} =
+ buff.append("<div title=3D\"").append(title).append("\" cl=
ass=3D\"differentACL\"> </div>");
}
} catch (JahiaException e) {
logger.debug(e);
// standard objects
- buff.append("actionIcon\"");
- if (actionIcon !=3D null) { =
- buff.append(" style=3D\"background-image: url('").append(a=
ctionIcon).
- append("');background-repeat: no-repeat;\">").append("=
<img class=3D\"actionIcon\" style=3D\"visibility:hidden;\" src=3D\"").appen=
d(actionIcon).
- append("\" alt=3D\"").append(resource).append("\" bord=
er=3D\"0\"/>");
- } else {
- buff.append("><img class=3D\"actionIcon\" src=3D\"").appen=
d(getURLImageContext()).append("/action.gif\" alt=3D\"").
- append(resource).append("\" border=3D\"0\"/>");
- } =
+ buff.append(" src=3D\"").append(picto).append("\" alt=3D\"").a=
ppend(resource).
+ append("\"").append(" title=3D\"").append(resource).ap=
pend("\" border=3D\"0\"/>");
}
=
- buff.append("</span>"); =
out.println(buff.toString());
buff.delete(0, buff.length());
=
=
if (labelKey !=3D null) {
+ out.print(" ");
out.println(getResource(resourceBundle, labelKey));
}
out.println("</a>");
Modified: trunk/core/src/java/org/jahia/services/workflow/NotifyAllJob.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/java/o=
rg/jahia/services/workflow/NotifyAllJob.java&rev=3D18075&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
--- trunk/core/src/java/org/jahia/services/workflow/NotifyAllJob.java (orig=
inal)
+++ trunk/core/src/java/org/jahia/services/workflow/NotifyAllJob.java Tue J=
ul 31 09:44:59 2007
@@ -105,15 +105,15 @@
// #endif
final WorkflowHelper workflowHelper =3D AdvancedWorkflowEn=
gine.getWorkflowHelper(jParams, theObject);
final WorkflowHelperEntry entry =3D workflowHelper.getEntr=
y(objectKey);
- String actionName =3D null;
+ String actionName =3D AdvancedWorkflowEngine.NOTIFY_COMPLE=
TED_PAGES;
if (entry.getMode() =3D=3D WorkflowService.EXTERNAL) {
- if (! jParams.getUser().isAdminMember(jParams.getSiteI=
D())) {
- final ExternalWorkflow external =3D entry.getExter=
nalWorkflow();
- if (external.getClass() =3D=3D NStepWorkflow.class=
) {
- final NStepWorkflow nstep =3D (NStepWorkflow) =
external;
- final String processID =3D service.getInherite=
dExternalWorkflowProcessId(theObject);
- final ExternalWorkflowInstanceCurrentInfos inf=
os =3D nstep.getCurrentInfo(processID, key,
- jParams.getLocale().toString());
+ final ExternalWorkflow external =3D entry.getExternalW=
orkflow();
+ if (external.getClass() =3D=3D NStepWorkflow.class) {
+ final NStepWorkflow nstep =3D (NStepWorkflow) exte=
rnal;
+ final String processID =3D service.getInheritedExt=
ernalWorkflowProcessId(theObject);
+ final ExternalWorkflowInstanceCurrentInfos infos =
=3D nstep.getCurrentInfo(processID, key,
+ jParams.getLocale().toString());
+ if (! jParams.getUser().isAdminMember(jParams.getS=
iteID())) {
if (infos.isLastStep() || ! nstep.isUserAuthor=
izedForNextStep(processID, key,
jParams.getUser(), languageCodes)) {
if (logger.isDebugEnabled()) {
@@ -127,17 +127,12 @@
lockRegistry.release(lockKey, jParams.=
getUser(), jParams.getUser().getUserKey());
}
continue;
-
- } else {
- actionName =3D new StringBuffer().append(p=
rocessID).append(".").append(infos.getNextRole()).toString();
}
}
+ actionName =3D new StringBuffer().append(processID=
).append(".").append(infos.getNextRole()).toString();
}
- } else {
- actionName =3D AdvancedWorkflowEngine.NOTIFY_COMPLETED=
_PAGES;
}
=
-
final StateModificationContext stateModifContext =3D new S=
tateModificationContext(objectKey, languageCodes);
stateModifContext.addModifiedObjects(allKeys);
=
Modified: trunk/core/src/java/org/jahia/settings/SettingsBean.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/java/o=
rg/jahia/settings/SettingsBean.java&rev=3D18075&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
--- trunk/core/src/java/org/jahia/settings/SettingsBean.java (original)
+++ trunk/core/src/java/org/jahia/settings/SettingsBean.java Tue Jul 31 09:=
44:59 2007
@@ -343,6 +343,7 @@
private boolean tbpDisp;
private boolean wflowDisp;
private boolean chatDisp;
+ private boolean aclDisp;
private boolean pdispDisp=3Dtrue;
=
// edit in word
@@ -770,6 +771,7 @@
localAccessUri =3D getString("localAccessUri", "http://localho=
st:8080");
developmentMode =3D getBoolean("developmentMode",true);
tbpDisp =3D getBoolean("timebased_display",false);
+ aclDisp =3D getBoolean("aclDiff_display",false);
wflowDisp =3DgetBoolean("workflow_display",false);
chatDisp =3DgetBoolean("chat_display",false);
pdispDisp =3DgetBoolean("process_display",true);
@@ -1972,6 +1974,10 @@
return connectionTimeoutForProductionJob;
}
=
+ public boolean isAclDisp() {
+ return aclDisp;
+ }
+
public boolean isTbpDisp() {
return tbpDisp;
}
Modified: trunk/core/src/webapp/WEB-INF/etc/config/jahia.skeleton
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/webapp=
/WEB-INF/etc/config/jahia.skeleton&rev=3D18075&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
--- trunk/core/src/webapp/WEB-INF/etc/config/jahia.skeleton (original)
+++ trunk/core/src/webapp/WEB-INF/etc/config/jahia.skeleton Tue Jul 31 09:4=
4:59 2007
@@ -802,6 +802,7 @@
workflow_display =3D true
chat_display =3D true
process_display =3D true
+aclDiff_display
=3D false
######################################################################
### Deprecated settings ##############################################
######################################################################
Modified: trunk/core/src/webapp/jsp/jahia/topbar/aes.inc
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/webapp=
/jsp/jahia/topbar/aes.inc&rev=3D18075&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
--- trunk/core/src/webapp/jsp/jahia/topbar/aes.inc (original)
+++ trunk/core/src/webapp/jsp/jahia/topbar/aes.inc Tue Jul 31 09:44:59 2007
@@ -1,6 +1,6 @@
<%@ page import=3D"org.jahia.ajax.usersession.userSettings" %>
-<%@ page import=3D"org.jahia.services.pages.ContentPage" %>
<%@ page import=3D"org.jahia.security.license.LicenseActionChecker" %>
+<%@ page import=3D"org.jahia.settings.SettingsBean" %>
<%--
Copyright 2002-2006 Jahia Ltd
=
@@ -19,7 +19,6 @@
limitations under the License.
--%>
<%
-
//get the pagewidth(V1)
String thesize =3D (String) pageContext.findAttribute("pageWidth");
boolean ispercent =3D false;
@@ -30,90 +29,56 @@
thesize =3D "80%";//default for templates specific
}
=
+ final SettingsBean settingsBean =3D Jahia.getSettings();
+
// get the mode
- String mode =3D Boolean.toString(Jahia.getSettings().isDevelopmentMode=
());
+ final boolean isDevelopmentMode =3D settingsBean.isDevelopmentMode();
// get esi flag
- boolean esi_active =3D jData.getProcessingContext().settings().isEsiCa=
cheActivated();
+ final boolean esi_active =3D settingsBean.isEsiCacheActivated();
=
// get TBP check
//engines.timebasedpublishing.TimeBasedPublishingEngine
- boolean isTBPActivated =3D LicenseActionChecker.isAuthorizedByLicense(=
"org.jahia.actions.sites.*.engines.timebasedpublishing.TimeBasedPublishingE=
ngine", 0);
+ final boolean isTBPActivated =3D LicenseActionChecker.isAuthorizedByLi=
cense("org.jahia.actions.sites.*.engines.timebasedpublishing.TimeBasedPubli=
shingEngine", 0);
=
//flags default in props
- String wf_visu =3D Boolean.toString(jData.getProcessingContext().setti=
ngs().isWflowDisp());
- String tbp_visu =3D Boolean.toString(jData.getProcessingContext().sett=
ings().isTbpDisp());
- if(!isTBPActivated) tbp_visu=3D"false";
- String chat_visu =3D Boolean.toString(jData.getProcessingContext().set=
tings().isChatDisp());
- String pdisp_visu =3D Boolean.toString(jData.getProcessingContext().se=
ttings().isPdispDisp());
-
+ boolean displayWorkFlowStates =3D settingsBean.isWflowDisp();
+ boolean displayTimeBasedPublishingStates =3D isTBPActivated && setting=
sBean.isTbpDisp();
+ boolean displayChat =3D settingsBean.isChatDisp();
+ boolean displayProcessDisplay =3D settingsBean.isPdispDisp();
+ boolean displayACLDifferences =3D settingsBean.isAclDisp();
=
if (session.getAttribute(userSettings.WF_VISU_ENABLED) !=3D null)
- wf_visu =3D (String) session.getAttribute(userSettings.WF_VISU_ENA=
BLED);
+ displayWorkFlowStates =3D ((Boolean) session.getAttribute(userSett=
ings.WF_VISU_ENABLED)).booleanValue();
else
- session.setAttribute(userSettings.WF_VISU_ENABLED, wf_visu);
-
+ session.setAttribute(userSettings.WF_VISU_ENABLED, Boolean.valueOf=
(displayWorkFlowStates));
=
if (session.getAttribute(userSettings.TBP_VISU_ENABLED) !=3D null)
- tbp_visu =3D (String) session.getAttribute(userSettings.TBP_VISU_E=
NABLED);
+ displayTimeBasedPublishingStates =3D ((Boolean) session.getAttribu=
te(userSettings.TBP_VISU_ENABLED)).booleanValue();
else
- session.setAttribute(userSettings.TBP_VISU_ENABLED, tbp_visu);
-
+ session.setAttribute(userSettings.TBP_VISU_ENABLED, Boolean.valueO=
f(displayTimeBasedPublishingStates));
=
if (session.getAttribute(userSettings.CHAT_VISU_ENABLED) !=3D null)
- chat_visu =3D (String) session.getAttribute(userSettings.CHAT_VISU=
_ENABLED);
+ displayChat =3D ((Boolean) session.getAttribute(userSettings.CHAT_=
VISU_ENABLED)).booleanValue();
else
- session.setAttribute(userSettings.CHAT_VISU_ENABLED, chat_visu);
-
+ session.setAttribute(userSettings.CHAT_VISU_ENABLED, Boolean.value=
Of(displayChat));
=
if (session.getAttribute(userSettings.MONITOR_VISU_ENABLED) !=3D null)
- pdisp_visu =3D (String) session.getAttribute(userSettings.MONITOR_=
VISU_ENABLED);
+ displayProcessDisplay =3D ((Boolean) session.getAttribute(userSett=
ings.MONITOR_VISU_ENABLED)).booleanValue();
else
- session.setAttribute(userSettings.MONITOR_VISU_ENABLED, pdisp_visu=
);
+ session.setAttribute(userSettings.MONITOR_VISU_ENABLED, Boolean.va=
lueOf(displayProcessDisplay));
=
- /* removed to reduce dependencies from template sets
- //check for released templates sets
- int templateSetID =3D 0;
- if (resBundleID !=3D null && resBundleID.equalsIgnoreCase("CORPORATE_P=
ORTAL_TEMPLATES")) templateSetID =3D 1;
- else if (resBundleID !=3D null && resBundleID.equalsIgnoreCase("CORPOR=
ATE_PORTAL_TEMPLATES_V2")) templateSetID =3D 2;
-
- // here we set some specific vars depending of templates sets!!
- int menupos;
-
-
- switch (templateSetID) {
- case 1:
- if(thesize!=3Dnull && !thesize.equalsIgnoreCase("") && !thesiz=
e.equalsIgnoreCase("null")){
- if(thesize.indexOf("%")=3D=3D-1) menupos =3D Integer.parse=
Int(thesize);
- else {
- ispercent=3Dtrue;
- menupos=3D772;
- }
- } else
- menupos =3D 772;
- break;
- case 2:
- menupos =3D 630;
- break;
- default:
- if(thesize!=3Dnull && !thesize.equalsIgnoreCase("") && !thesiz=
e.equalsIgnoreCase("null")) {
- if(thesize.indexOf("%")=3D=3D-1)
- menupos =3D Integer.parseInt(thesize);
- else {
- ispercent=3Dtrue;
- menupos=3D772;
- }
- } else
- menupos =3D 772;
- }
- */
+ if (session.getAttribute(userSettings.ACL_VISU_ENABLED) !=3D null)
+ displayACLDifferences =3D ((Boolean) session.getAttribute(userSett=
ings.ACL_VISU_ENABLED)).booleanValue();
+ else
+ session.setAttribute(userSettings.ACL_VISU_ENABLED, Boolean.valueO=
f(displayACLDifferences));
=
//template information
String templateName =3D "";
- String templateSID =3D "";
- if (mode.equalsIgnoreCase("true")) {
+ int templateSID =3D -1;
+ if (isDevelopmentMode) {
// dev mode
- templateName =3D jData.page().getPageTemplate().getName();
- templateSID =3D "" + jData.page().getPageTemplate().getID();
+ templateName =3D jParams.getPage().getPageTemplate().getName();
+ templateSID =3D jParams.getPage().getPageTemplateID();
}
=
if (!esi_active) {
@@ -122,44 +87,53 @@
=
%>
=
-
-<style>
-#aesmenu{
-position:absolute;
-width:212px;
-top:0px;
-left:<%=3Dthesize%>;
-}
+<style type=3D"text/css">
+ #aesmenu {
+ position: absolute;
+ width: 212px;
+ top: 0px;
+ left:<%=3Dthesize%>;
+ }
=
</style>
-<script language=3D"javascript">
+<script type=3D"text/javascript">
// aes vars
var changedUS =3D false;
- var changedUS1 =3D false;
- var changedUS2 =3D false;
- var changedUS3 =3D false;
- var changedUS4 =3D false;
- var US1=3D<%=3Dwf_visu%>;
- var US2=3D<%=3Dtbp_visu%>;
- var US3=3D<%=3Dchat_visu%>;
- var US4=3D<%=3Dpdisp_visu%>;
+ var changedWorkflow =3D false;
+ var changedTBP =3D false;
+ var changedChat =3D false;
+ var changedPDisplay =3D false;
+ var changedACLDiff =3D false;
+ var displayWorkFlowStates =3D <%=3DdisplayWorkFlowStates%>;
+ var displayTimeBasedPublishingStates =3D <%=3DdisplayTimeBasedPublishi=
ngStates%>;
+ var displayACLDifferences =3D <%=3DdisplayACLDifferences%>;
+ var displayChat =3D <%=3DdisplayChat%>;
+ var displayProcessDisplay =3D <%=3DdisplayProcessDisplay%>;
//usersettings functions
function changeUSettings(setting) {
changedUS =3D true;
$('iconusersetting').src =3D "<content:serverHttpPath />/jsp/jahia=
/engines/images/icons/delete3.gif";
- if (setting =3D=3D "tbp") changedUS2 =3D !changedUS2;
- else if (setting =3D=3D "chat") changedUS3 =3D !changedUS3;
- else if (setting =3D=3D "wf") changedUS1 =3D !changedUS1;
- else if (setting =3D=3D "pdisp") changedUS4 =3D !changedUS4;
- //alert(changedUS1+" "+changedUS2+" "+changedUS3+" "+changedUS4);
- if($('truc1').checked =3D=3D true && $('truc2').checked =3D=3Dtrue=
) $('truc0').checked =3D true;
- else $('truc0').checked =3D false;
- if($('truc3').checked =3D=3D true && $('truc4').checked
=3D=3Dtrue) $('t=
ruc5').checked =3D true;
- else $('truc5').checked =3D false;
+ if (setting =3D=3D "tbp") changedTBP =3D !changedTBP;
+ else if (setting =3D=3D "chat") changedChat =3D !changedChat;
+ else if (setting =3D=3D "wf") changedWorkflow =3D !changedWorkflow;
+ else if (setting =3D=3D "pdisp") changedPDisplay =3D !changedPDisp=
lay;
+ else if (setting =3D=3D "acl") changedACLDiff =3D !changedACLDiff;
+
+ if ($('wflowFire').checked && $('tbpublishFire').checked && $('acl=
Fire').checked) {
+ $('allFires').checked =3D true;
+ } else {
+ $('allFires').checked =3D false;
+ }
+
+ if ($('chatModule').checked && $('pdispModule').checked) {
+ $('allModules').checked =3D true;
+ } else {
+ $('allModules').checked =3D false;
+ }
}
- function switchUsetting()
- {
- if (!changedUS1 && !changedUS2 && !changedUS3 && !changedUS4) {
+
+ function switchUsetting() {
+ if (!changedWorkflow && !changedTBP && !changedChat && !changedPDi=
splay && !changedACLDiff) {
changedUS =3D false;
showUserSettings();
return;
@@ -167,43 +141,43 @@
// the ajax request
var url =3D '<%=3Drequest.getContextPath()+userSettings.USER_SETTI=
NGS_PATH%>';
var param =3D "";
- if (changedUS2) param +=3D '<%=3DuserSettings.TBP_VISU_ENABLED%>=
=3D' + $('truc2').checked;
- if (changedUS1) param +=3D '&<%=3DuserSettings.WF_VISU_ENABLED%>=
=3D' + $('truc1').checked;
- if (changedUS3) param +=3D '&<%=3DuserSettings.CHAT_VISU_ENABLED%>=
=3D' + $('truc3').checked;
- if (changedUS4) param +=3D '&<%=3DuserSettings.MONITOR_VISU_ENABLE=
D%>=3D' + $('truc4').checked;
+ if (changedTBP) param +=3D '<%=3DuserSettings.TBP_VISU_ENABLED%>=
=3D' + $('tbpublishFire').checked;
+ if (changedWorkflow) param +=3D '&<%=3DuserSettings.WF_VISU_ENABLE=
D%>=3D' + $('wflowFire').checked;
+ if (changedACLDiff) param +=3D '&<%=3DuserSettings.ACL_VISU_ENABLE=
D%>=3D' + $('aclFire').checked;
+ if (changedChat) param +=3D '&<%=3DuserSettings.CHAT_VISU_ENABLED%=
>=3D' + $('chatModule').checked;
+ if (changedPDisplay) param +=3D '&<%=3DuserSettings.MONITOR_VISU_E=
NABLED%>=3D' + $('pdispModule').checked;
//alert(param);
switchSetting =3D new Ajax.Request(url, {parameters: param,onCompl=
ete: showResponseOK, onFailure: reportError});
return;
}
- function allModules(e) {
=
- if (e.checked =3D=3D true) {
- if ($('truc3').checked !=3D true) $('truc3').click();
- if ($('truc4').checked !=3D true) $('truc4').click();
+ function allModules(e) {
+ if (e.checked) {
+ if ($('chatModule').checked !=3D true) $('chatModule').click();
+ if ($('pdispModule').checked !=3D true) $('pdispModule').click=
();
} else {
- if ($('truc3').checked =3D=3D true) $('truc3').click();
- if ($('truc4').checked =3D=3D true) $('truc4').click();
+ if ($('chatModule').checked =3D=3D true) $('chatModule').click=
();
+ if ($('pdispModule').checked =3D=3D true) $('pdispModule').cli=
ck();
}
- //alert(value+" "+$('truc3').checked+" "+$('truc4').checked);
}
+
function allFires(e) {
- if (e.checked =3D=3D true) {
- if ($('truc1').checked !=3D true) $('truc1').click();
- if ($('truc2').checked !=3D true) $('truc2').click();
+ if (e.checked) {
+ if ($('tbpublishFire').checked !=3D true) $('tbpublishFire').c=
lick();
+ if ($('wflowFire').checked !=3D true) $('wflowFire').click();
+ if ($('aclFire').checked !=3D true) $('aclFire').click();
} else {
- if ($('truc1').checked =3D=3D true) $('truc1').click();
- if ($('truc2').checked =3D=3D true) $('truc2').click();
+ if ($('tbpublishFire').checked =3D=3D true) $('tbpublishFire')=
.click();
+ if ($('wflowFire').checked =3D=3D true) $('wflowFire').click();
+ if ($('aclFire').checked !=3D true) $('aclFire').click();
}
- //alert(value+" "+$('truc1').checked+" "+$('truc2').checked);
}
// errors
- function reportError(request)
- {
+ function reportError(request){
alert('Sorry. There was an error:' + request.responseTEXT);
}
// complete response
- function showResponseOK(request)
- {
+ function showResponseOK(request){
=
//reloadurl=3D"<!--%=3DactionURL%-->";//removed url unused
//alert(reloadurl);
@@ -220,110 +194,143 @@
$('iconusersetting').src =3D "<content:serverHttpPath />/jsp/j=
ahia/engines/images/icons/triangle_green_collapse2.gif";
Effect.Fade('setbox');
// cancel
- $('truc1').checked =3D US1;
- $('truc2').checked =3D US2;
- $('truc3').checked =3D US3;
- $('truc4').checked =3D US4;
+ $('wflowFire').checked =3D displayWorkFlowStates;
+ $('tbpublishFire').checked =3D displayTimeBasedPublishingState=
s;
+ $('aclFire').checked =3D displayACLDifferences;
+ $('chatModule').checked =3D displayChat;
+ $('pdispModule').checked =3D displayProcessDisplay;
}
}
-
</script>
<%
- if(jData.gui().isEditMode()){
+ if (jData.gui().isEditMode()) {
%>
<div id=3D"aesmenu">
<div id=3D"labelsettings" style=3D"background-color: #333; border:1px soli=
d #333;">
=
<table border=3D"0" cellspacing=3D"0" cellpadding=3D"0">
- <tr><td align=3D"center" width=3D212"><img id=3D"iconusersetting" =
src=3D"<content:serverHttpPath />/jsp/jahia/engines/images/icons/triangle_g=
reen_collapse2.gif" width=3D"12" height=3D"12" alt=3D"to see the advanced u=
ser settings" onClick=3D"showUserSettings()"><font
- color=3D"#FFFFFF" onClick=3D"showUserSettings()"><%=3DgetC=
ommonResource("advancedEditSettings", "Advanced Edit Settings", toploc)%></=
font>
- </td></tr>
+ <tr>
+ <td align=3D"center" width=3D"212">
+ <img id=3D"iconusersetting"
+ src=3D"<content:serverHttpPath />/jsp/jahia/engines/i=
mages/icons/triangle_green_collapse2.gif"
+ width=3D"12" height=3D"12" alt=3D"to see the advanced=
user settings" onClick=3D"showUserSettings()">
+ <font color=3D"#FFFFFF">
+ <%=3DgetCommonResource("advancedEditSettings", "Advanc=
ed Edit Settings", toploc)%>
+ </font>
+ </td>
+ </tr>
</table>
</div>
=
<div id=3D"settings">
- <div id=3D"setbox" class=3D"selectchat" style=3D"display: none; backgr=
ound-color: #eee; border-width: 1px; border-style: solid; border-color: whi=
te;">
- <%
- String all1_label =3D "<input type=3D\"checkbox\" id=3D\"truc0\" n=
ame=3D\"truc0\" value=3D\"\" checked onClick =3D \"allFires(this);\">";
- if (!wf_visu.trim().equalsIgnoreCase("true") || !tbp_visu.trim().e=
qualsIgnoreCase("true"))
- all1_label =3D "<input type=3D\"checkbox\" id=3D\"truc0\" name=
=3D\"truc0\" value=3D\"\" onClick =3D \"allFires(this);\">";
-
- String wf_label =3D "<input type=3D\"checkbox\" id=3D\"truc1\" nam=
e=3D\"truc1\" value=3D\"\" checked onClick =3D \"changeUSettings('wf');\">";
- if (!wf_visu.trim().equalsIgnoreCase("true"))
- wf_label =3D "<input type=3D\"checkbox\" id=3D\"truc1\" name=
=3D\"truc1\" value=3D\"\" onClick =3D \"changeUSettings('wf');\">";
-
- String tb_label =3D "<input type=3D\"checkbox\" id=3D\"truc2\" nam=
e=3D\"truc2\" value=3D\"\" checked onClick =3D \"changeUSettings('tbp');\">=
";
- if (!tbp_visu.trim().equalsIgnoreCase("true"))
- tb_label =3D "<input type=3D\"checkbox\" id=3D\"truc2\" name=
=3D\"truc2\" value=3D\" \" onClick =3D \"changeUSettings('tbp');\">";
-
-
- String chat_label =3D "<input type=3D\"checkbox\" id=3D\"truc3\" n=
ame=3D\"truc3\" value=3D\"\" checked onClick =3D \"changeUSettings('chat');=
\">";
- if (!chat_visu.trim().equalsIgnoreCase("true"))
- chat_label =3D "<input type=3D\"checkbox\" id=3D\"truc3\" name=
=3D\"truc3\" value=3D\" \" onClick =3D \"changeUSettings('chat');\">";
-
-
- String pdisp_label =3D "<input type=3D\"checkbox\" id=3D\"truc4\" =
name=3D\"truc4\" value=3D\"\" checked onClick =3D \"changeUSettings('pdisp'=
);\">";
- if (!pdisp_visu.trim().equalsIgnoreCase("true"))
- pdisp_label =3D "<input type=3D\"checkbox\" id=3D\"truc4\" nam=
e=3D\"truc4\" value=3D\" \" onClick =3D \"changeUSettings('pdisp');\">";
-
- String all2_label =3D "<input type=3D\"checkbox\" id=3D\"truc5\" n=
ame=3D\"truc5\" value=3D\"\" checked onClick =3D \"allModules(this);\">";
- if (!pdisp_visu.trim().equalsIgnoreCase("true") || !chat_visu.trim=
().equalsIgnoreCase("true"))
- all2_label =3D "<input type=3D\"checkbox\" id=3D\"truc5\" name=
=3D\"truc5\" value=3D\"\" onClick =3D \"allModules(this);\">";
- %>
- <table border=3D"0" width=3D"100%" cellspacing=3D"0" cellpadding=3D"2">
- <!--tr><td colspan=3D"2" bgcolor=3D"#333333" align=3D"center" onCl=
ick=3D"showUserSettings()">
- <font color=3D"#FFFFFF"><%=3DgetCommonResource("advancedEditSe=
ttings", "Advanced Edit Settings", toploc)%></font>
- </td></tr-->
- <%
- if (mode.equalsIgnoreCase("true")) {
- %>
- <tr><td colspan=3D"2" bgcolor=3D"#666666" align=3D"center">
+<div id=3D"setbox" class=3D"selectchat"
+ style=3D"display: none; background-color: #eee; border-width: 1px; bo=
rder-style: solid; border-color: white;">
+<table border=3D"0" width=3D"100%" cellspacing=3D"0" cellpadding=3D"2">
+ <% if (isDevelopmentMode) { %>
+ <tr>
+ <td colspan=3D"2" bgcolor=3D"#666666" align=3D"center">
<font color=3D"#FFFFFF">Template: <%=3DtemplateName%> (<%=3Dte=
mplateSID%>)</font>
- </td></tr>
- <%
- }
- %>
- <tr bgcolor=3D"#aaaaaa"><td><%=3DgetCommonResource("firesActivatio=
n", "All Fires activation", toploc)%></td>
- <td><%=3Dall1_label%></td></tr>
-
- <tr><td><%=3DgetCommonResource("wflowFire", "Workflow display", to=
ploc)%>:</td><td><%=3Dwf_label%></td></tr>
- <%
- if(isTBPActivated){
- %>
- <tr><td><%=3DgetCommonResource("tbpublishFire", "Timebased display=
", toploc)%>:</td><td><%=3Dtb_label%></td></tr>
- <%
- }
- %>
- <tr><td colspan=3D"2"><br/></td></tr>
- <tr bgcolor=3D"#aaaaaa"><td><%=3DgetCommonResource("modulesActivat=
ion", "All Modules activation", toploc)%></td>
- <td><%=3Dall2_label%></td></tr>
-
- <tr><td><%=3DgetCommonResource("chatModule", "Chat", toploc)%>:</t=
d><td><%=3Dchat_label%></td></tr>
- <tr><td><%=3DgetCommonResource("pdispModule", "Processing monitor"=
, toploc)%>:</td><td><%=3Dpdisp_label%></td></tr>
- <tr><td></td><td><a href=3D"javascript:switchUsetting();">OK</a></=
td></tr>
- </table>
+ </td>
+
+ </tr>
+ <% } %>
+ <tr bgcolor=3D"#aaaaaa"><td><%=3DgetCommonResource("firesActivation", =
"All Fires activation", toploc)%></td>
+ <td>
+ <input type=3D"checkbox" id=3D"allFires" name=3D"allFires"
+ <% if (displayWorkFlowStates && displayTimeBasedPublishingStat=
es && displayACLDifferences) { %>
+ checked=3D"checked"
+ <% } %> onClick=3D"allFires(this);">
+ </td>
+ </tr>
+ <tr>
+ <td><%=3DgetCommonResource("wflowFire", "Workflow display", toploc=
)%>:</td>
+ <td>
+ <input type=3D"checkbox" id=3D"wflowFire" name=3D"wflowFire"
+ <% if (displayWorkFlowStates) { %>
+ checked=3D"checked"
+ <% } %> onclick=3D"changeUSettings('wf');">
+ </td>
+ </tr>
+ <% if (isTBPActivated) { %>
+ <tr>
+ <td><%=3DgetCommonResource("tbpublishFire", "Timebased display", t=
oploc)%>:</td>
+ <td>
+ <input type=3D"checkbox" id=3D"tbpublishFire" name=3D"tbpublis=
hFire"
+ <% if (displayTimeBasedPublishingStates) { %>
+ checked=3D"checked"
+ <% } %> onclick=3D"changeUSettings('tbp');">
+ </td>
+ </tr>
+ <% } %>
+ <tr>
+ <td><%=3DgetCommonResource("aclFire", "ACL Difference display", to=
ploc)%>:</td>
+ <td>
+ <input type=3D"checkbox" id=3D"aclFire" name=3D"aclFire"
+ <% if (displayACLDifferences) { %>
+ checked=3D"checked"
+ <% } %> onclick=3D"changeUSettings('acl');">
+ </td>
+ </tr>
+ <tr>
+ <td colspan=3D"2"><br/></td>
+ </tr>
+ <tr bgcolor=3D"#aaaaaa">
+ <td><%=3DgetCommonResource("modulesActivation", "All Modules activ=
ation", toploc)%></td>
+ <td>
+ <input type=3D"checkbox" id=3D"allModules" name=3D"allModules"
+ <% if (displayChat && displayProcessDisplay) { %>
+ checked=3D"checked"
+ <% } %> onclick=3D"allModules(this);">
+ </td>
+ </tr>
+ <tr>
+ <td><%=3DgetCommonResource("chatModule", "Chat", toploc)%>:</td>
+ <td>
+ <input type=3D"checkbox" id=3D"chatModule" name=3D"chatModule"
+ <% if (displayChat) { %>
+ checked=3D"checked"
+ <% } %> onclick=3D"changeUSettings('chat');">
+ </td>
+ </tr>
+ <tr>
+ <td><%=3DgetCommonResource("pdispModule", "Processing monitor", to=
ploc)%>:</td>
+ <td>
+ <input type=3D"checkbox" id=3D"pdispModule" name=3D"pdispModul=
e"
+ <% if (displayProcessDisplay) { %>
+ checked=3D"checked"
+ <% } %> onclick=3D"changeUSettings('pdisp');">
+ </td>
+ </tr>
+ <tr>
+ <td> </td>
+ <td><a href=3D"javascript:switchUsetting();">OK</a></td>
+ </tr>
+</table>
</div>
</div>
=
<!--end of aesmenu-->
</div>
=
-<% }
- }
-%>
+<% }
+}
=
+%>
+<!--end of topmenu1-->
</div>
=
<div class=3D"topmenus" id=3D"mods">
<%
- // display processing
- if(pdisp_visu.trim().equalsIgnoreCase("true") && jData.gui().isEditMod=
e()){%>
+ // display processing
+ if (displayProcessDisplay) { %>
<span><%@ include file=3D"processing.inc" %></span>
- <% } %>
-
+<% }
+ // display chat
+ if (displayChat) { %>
<span><%@ include file=3D"chat.inc" %></span>
- <%
- // just an space
- if(chat_visu.trim().equalsIgnoreCase("true") || pdisp_visu.trim().equa=
lsIgnoreCase("true") ){ %>
- <span><img src=3D"<content:serverHttpPath />/jsp/jahia/engines/images/=
pix.gif" width=3D"110" height=3D"1" border=3D"0"/></span>
- <% } %>
+<% }
+
+// just a space to put filemanager link away
+if (displayChat || displayProcessDisplay) { %>
+ <span style=3D"display:block; height:1px;width:110px;overflow:hidden;"=
> </span>
+<% } %>
Modified: trunk/core/src/webapp/jsp/jahia/topbar/chat.inc
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/webapp=
/jsp/jahia/topbar/chat.inc&rev=3D18075&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
--- trunk/core/src/webapp/jsp/jahia/topbar/chat.inc (original)
+++ trunk/core/src/webapp/jsp/jahia/topbar/chat.inc Tue Jul 31 09:44:59 2007
@@ -173,10 +173,7 @@
// just simple error alert
function displayError(request) {
=
- if (!ConnectionChecked){
- // uncomment if you want warn the user
- //alert("AJAX error code http:" + request.status + " " + request.s=
tatusText);
- }
+ if (!ConnectionChecked)alert("AJAX error code http:" + request.status =
+ " " + request.statusText);
//document.write(request.responseText);
ConnectionOK =3D false;
ConnectionChecked =3D true;
@@ -355,7 +352,7 @@
}
}
<%
- if(chat_visu.trim().equalsIgnoreCase("true")){
+ if(displayChat){
%>
//start the IM notifier
notifywatch();
@@ -370,7 +367,7 @@
</script>
=
<%
- if(chat_visu.trim().equalsIgnoreCase("true")){
+ if(displayChat){
%>
=
<table border=3D"0" cellspacing=3D"0" cellpadding=3D"0">
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
