Author: sshyrkov Date: Fri Sep 7 14:34:01 2007 New Revision: 18395 URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D18395&repname= =3Djahia Log: JAHIA-2147: N-Step Workflow Enhancements =
http://www.jahia.net/jira/browse/JAHIA-2147 Resolution: added suuport for displaying special object workflow state icon= s (with a number, indicating next workflow step) for N-Step workflow Added: branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/images/i= cons/workflow/state_edit_1.gif (with props) branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/images/i= cons/workflow/state_edit_2.gif (with props) branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/images/i= cons/workflow/state_edit_3.gif (with props) branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/images/i= cons/workflow/state_edit_4.gif (with props) branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/images/i= cons/workflow/state_waiting_2.gif (with props) branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/images/i= cons/workflow/state_waiting_3.gif (with props) branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/images/i= cons/workflow/state_waiting_4.gif (with props) 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/ajax/actionmenus/G= etWorkflowState.java branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/ajax/sitemap/SiteM= apAbstractAction.java branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/workflow/= WorkflowService.java branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/javascript/zimbr= a/complexTree/ComplexTreeProperties.js 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=3D18395&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 Fri Sep 7 14:34:01 2007 @@ -471,8 +471,15 @@ # Workflow icons = workflowEditState =3D /jsp/jahia/engines/images/icons/workflow/state_edit.= gif +workflowEditStateStep1 =3D /jsp/jahia/engines/images/icons/workflow/state_= edit_1.gif +workflowEditStateStep2 =3D /jsp/jahia/engines/images/icons/workflow/state_= edit_2.gif +workflowEditStateStep3 =3D /jsp/jahia/engines/images/icons/workflow/state_= edit_3.gif +workflowEditStateStep4 =3D /jsp/jahia/engines/images/icons/workflow/state_= edit_4.gif workflowEditAnimState =3D /jsp/jahia/engines/images/icons/workflow/state_e= dit_anim.gif workflowWaitingState =3D /jsp/jahia/engines/images/icons/workflow/state_wa= iting.gif +workflowWaitingStateStep2 =3D /jsp/jahia/engines/images/icons/workflow/sta= te_waiting_2.gif +workflowWaitingStateStep3 =3D /jsp/jahia/engines/images/icons/workflow/sta= te_waiting_3.gif +workflowWaitingStateStep4 =3D /jsp/jahia/engines/images/icons/workflow/sta= te_waiting_4.gif workflowWaitingAnimState =3D /jsp/jahia/engines/images/icons/workflow/stat= e_waiting_anim.gif workflowActiveState =3D /jsp/jahia/engines/images/icons/workflow/state_act= ive.gif workflowDeletedState =3D /jsp/jahia/engines/images/icons/workflow/state_de= leted.gif @@ -1499,8 +1506,6 @@ org.jahia.engines.importexport.contentpick.resultmessage.label =3D please = specify one or more keywords org.jahia.engines.importexport.contentpick.postfix.author.label =3D is org.jahia.engines.importexport.contentpick.postfix.keywords.label =3D are = the following -org.jahia.engines.importexport.contentpick.today.at =3D today at -org.jahia.engines.importexport.contentpick.yesterday.at =3D yesterday at org.jahia.engines.importexport.contentpick.welcome.label1 =3D I search a c= ontent object of type org.jahia.engines.importexport.contentpick.welcome.label2 =3D with = 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=3D18395&= 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 Fri Sep 7 14:34:01 2007 @@ -471,8 +471,15 @@ # Workflow icons = workflowEditState =3D /jsp/jahia/engines/images/icons/workflow/state_edit.= gif +workflowEditStateStep1 =3D /jsp/jahia/engines/images/icons/workflow/state_= edit_1.gif +workflowEditStateStep2 =3D /jsp/jahia/engines/images/icons/workflow/state_= edit_2.gif +workflowEditStateStep3 =3D /jsp/jahia/engines/images/icons/workflow/state_= edit_3.gif +workflowEditStateStep4 =3D /jsp/jahia/engines/images/icons/workflow/state_= edit_4.gif workflowEditAnimState =3D /jsp/jahia/engines/images/icons/workflow/state_e= dit_anim.gif workflowWaitingState =3D /jsp/jahia/engines/images/icons/workflow/state_wa= iting.gif +workflowWaitingStateStep2 =3D /jsp/jahia/engines/images/icons/workflow/sta= te_waiting_2.gif +workflowWaitingStateStep3 =3D /jsp/jahia/engines/images/icons/workflow/sta= te_waiting_3.gif +workflowWaitingStateStep4 =3D /jsp/jahia/engines/images/icons/workflow/sta= te_waiting_4.gif workflowWaitingAnimState =3D /jsp/jahia/engines/images/icons/workflow/stat= e_waiting_anim.gif workflowActiveState =3D /jsp/jahia/engines/images/icons/workflow/state_act= ive.gif workflowDeletedState =3D /jsp/jahia/engines/images/icons/workflow/state_de= leted.gif @@ -1409,8 +1416,6 @@ org.jahia.engines.importexport.contentpick.resultmessage.label =3D Geben S= ie mindestens ein Schl\u00FCsselwort ein. org.jahia.engines.importexport.contentpick.postfix.author.label =3D ist org.jahia.engines.importexport.contentpick.postfix.keywords.label =3D sind= die folgenden -org.jahia.engines.importexport.contentpick.today.at =3D Heute um -org.jahia.engines.importexport.contentpick.yesterday.at =3D Gestern um org.jahia.engines.importexport.contentpick.welcome.label1 =3D Ich suche na= ch einem Content Objekt vom Typ org.jahia.engines.importexport.contentpick.welcome.label2 =3D mit = 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=3D18395&= 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 Fri Sep 7 14:34:01 2007 @@ -471,8 +471,15 @@ # Workflow icons = workflowEditState =3D /jsp/jahia/engines/images/icons/workflow/state_edit.= gif +workflowEditStateStep1 =3D /jsp/jahia/engines/images/icons/workflow/state_= edit_1.gif +workflowEditStateStep2 =3D /jsp/jahia/engines/images/icons/workflow/state_= edit_2.gif +workflowEditStateStep3 =3D /jsp/jahia/engines/images/icons/workflow/state_= edit_3.gif +workflowEditStateStep4 =3D /jsp/jahia/engines/images/icons/workflow/state_= edit_4.gif workflowEditAnimState =3D /jsp/jahia/engines/images/icons/workflow/state_e= dit_anim.gif workflowWaitingState =3D /jsp/jahia/engines/images/icons/workflow/state_wa= iting.gif +workflowWaitingStateStep2 =3D /jsp/jahia/engines/images/icons/workflow/sta= te_waiting_2.gif +workflowWaitingStateStep3 =3D /jsp/jahia/engines/images/icons/workflow/sta= te_waiting_3.gif +workflowWaitingStateStep4 =3D /jsp/jahia/engines/images/icons/workflow/sta= te_waiting_4.gif workflowWaitingAnimState =3D /jsp/jahia/engines/images/icons/workflow/stat= e_waiting_anim.gif workflowActiveState =3D /jsp/jahia/engines/images/icons/workflow/state_act= ive.gif workflowDeletedState =3D /jsp/jahia/engines/images/icons/workflow/state_de= leted.gif @@ -1499,8 +1506,6 @@ org.jahia.engines.importexport.contentpick.resultmessage.label =3D please = specify one or more keywords org.jahia.engines.importexport.contentpick.postfix.author.label =3D is org.jahia.engines.importexport.contentpick.postfix.keywords.label =3D are = the following -org.jahia.engines.importexport.contentpick.today.at =3D today at -org.jahia.engines.importexport.contentpick.yesterday.at =3D yesterday at org.jahia.engines.importexport.contentpick.welcome.label1 =3D I search a c= ontent object of type org.jahia.engines.importexport.contentpick.welcome.label2 =3D with = 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=3D18395&= 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 Fri Sep 7 14:34:01 2007 @@ -471,8 +471,15 @@ # Workflow icons = workflowEditState =3D /jsp/jahia/engines/images/icons/workflow/state_edit.= gif +workflowEditStateStep1 =3D /jsp/jahia/engines/images/icons/workflow/state_= edit_1.gif +workflowEditStateStep2 =3D /jsp/jahia/engines/images/icons/workflow/state_= edit_2.gif +workflowEditStateStep3 =3D /jsp/jahia/engines/images/icons/workflow/state_= edit_3.gif +workflowEditStateStep4 =3D /jsp/jahia/engines/images/icons/workflow/state_= edit_4.gif workflowEditAnimState =3D /jsp/jahia/engines/images/icons/workflow/state_e= dit_anim.gif workflowWaitingState =3D /jsp/jahia/engines/images/icons/workflow/state_wa= iting.gif +workflowWaitingStateStep2 =3D /jsp/jahia/engines/images/icons/workflow/sta= te_waiting_2.gif +workflowWaitingStateStep3 =3D /jsp/jahia/engines/images/icons/workflow/sta= te_waiting_3.gif +workflowWaitingStateStep4 =3D /jsp/jahia/engines/images/icons/workflow/sta= te_waiting_4.gif workflowWaitingAnimState =3D /jsp/jahia/engines/images/icons/workflow/stat= e_waiting_anim.gif workflowActiveState =3D /jsp/jahia/engines/images/icons/workflow/state_act= ive.gif workflowDeletedState =3D /jsp/jahia/engines/images/icons/workflow/state_de= leted.gif 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=3D18395&= 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 Fri Sep 7 14:34:01 2007 @@ -438,8 +438,6 @@ org.jahia.engines.importexport.contentpick.searchsite.all.label =3D sur to= us les sites org.jahia.engines.importexport.contentpick.searchsite.allpos.label =3D sur org.jahia.engines.importexport.contentpick.searchsite.onesite.label =3D su= r le site -org.jahia.engines.importexport.contentpick.today.at =3D aujourd'hui =C3=A0 -org.jahia.engines.importexport.contentpick.yesterday.at =3D hier =C3=A0 org.jahia.engines.importexport.contentpick.welcome.label1 =3D Je cherche u= n objet de contenu de type org.jahia.engines.importexport.contentpick.welcome.label2 =3D avec org.jahia.engines.importexport.export.Differential.label =3D Diff=C3=A9ren= tiel @@ -1173,4 +1171,27 @@ org.jahia.engines.processDisplay.error.errors=3Dtraces d'erreurs org.jahia.engines.processDisplay.error.see=3DVoir les org.jahia.engines.processDisplay.warning.warnings=3Dtraces d'avertissements -org.jahia.engines.processDisplay.allmessages.message=3DVoir tous les logs \ No newline at end of file +org.jahia.engines.processDisplay.allmessages.message=3DVoir tous les logs + +# Workflow icons + +workflowEditState =3D /jsp/jahia/engines/images/icons/workflow/state_edit.= gif +workflowEditStateStep1 =3D /jsp/jahia/engines/images/icons/workflow/state_= edit_1.gif +workflowEditStateStep2 =3D /jsp/jahia/engines/images/icons/workflow/state_= edit_2.gif +workflowEditStateStep3 =3D /jsp/jahia/engines/images/icons/workflow/state_= edit_3.gif +workflowEditStateStep4 =3D /jsp/jahia/engines/images/icons/workflow/state_= edit_4.gif +workflowEditAnimState =3D /jsp/jahia/engines/images/icons/workflow/state_e= dit_anim.gif +workflowWaitingState =3D /jsp/jahia/engines/images/icons/workflow/state_wa= iting.gif +workflowWaitingStateStep2 =3D /jsp/jahia/engines/images/icons/workflow/sta= te_waiting_2.gif +workflowWaitingStateStep3 =3D /jsp/jahia/engines/images/icons/workflow/sta= te_waiting_3.gif +workflowWaitingStateStep4 =3D /jsp/jahia/engines/images/icons/workflow/sta= te_waiting_4.gif +workflowWaitingAnimState =3D /jsp/jahia/engines/images/icons/workflow/stat= e_waiting_anim.gif +workflowActiveState =3D /jsp/jahia/engines/images/icons/workflow/state_act= ive.gif +workflowDeletedState =3D /jsp/jahia/engines/images/icons/workflow/state_de= leted.gif +workflowdefault =3D /jsp/jahia/engines/images/icons/workflow/accept.gif +workflowreject =3D /jsp/jahia/engines/images/icons/workflow/refuse.gif +workflowWarnings =3D /jsp/jahia/engines/images/icons/workflow/warnings.gif +workflowWarningsActive =3D /jsp/jahia/engines/images/icons/workflow/warnin= gs_active.gif +workflowErrors =3D /jsp/jahia/engines/images/icons/workflow/errors.gif +workflowErrorsActive =3D /jsp/jahia/engines/images/icons/workflow/errors_a= ctive.gif +workflowEvents =3D /jsp/jahia/engines/images/icons/workflow/events.gif 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=3D18395&= 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 Fri Sep 7 14:34:01 2007 @@ -471,8 +471,15 @@ # Workflow icons = workflowEditState =3D /jsp/jahia/engines/images/icons/workflow/state_edit.= gif +workflowEditStateStep1 =3D /jsp/jahia/engines/images/icons/workflow/state_= edit_1.gif +workflowEditStateStep2 =3D /jsp/jahia/engines/images/icons/workflow/state_= edit_2.gif +workflowEditStateStep3 =3D /jsp/jahia/engines/images/icons/workflow/state_= edit_3.gif +workflowEditStateStep4 =3D /jsp/jahia/engines/images/icons/workflow/state_= edit_4.gif workflowEditAnimState =3D /jsp/jahia/engines/images/icons/workflow/state_e= dit_anim.gif workflowWaitingState =3D /jsp/jahia/engines/images/icons/workflow/state_wa= iting.gif +workflowWaitingStateStep2 =3D /jsp/jahia/engines/images/icons/workflow/sta= te_waiting_2.gif +workflowWaitingStateStep3 =3D /jsp/jahia/engines/images/icons/workflow/sta= te_waiting_3.gif +workflowWaitingStateStep4 =3D /jsp/jahia/engines/images/icons/workflow/sta= te_waiting_4.gif workflowWaitingAnimState =3D /jsp/jahia/engines/images/icons/workflow/stat= e_waiting_anim.gif workflowActiveState =3D /jsp/jahia/engines/images/icons/workflow/state_act= ive.gif workflowDeletedState =3D /jsp/jahia/engines/images/icons/workflow/state_de= leted.gif 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=3D18395&= 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 Fri Sep 7 14:34:01 2007 @@ -471,8 +471,15 @@ # Workflow icons = workflowEditState =3D /jsp/jahia/engines/images/icons/workflow/state_edit.= gif +workflowEditStateStep1 =3D /jsp/jahia/engines/images/icons/workflow/state_= edit_1.gif +workflowEditStateStep2 =3D /jsp/jahia/engines/images/icons/workflow/state_= edit_2.gif +workflowEditStateStep3 =3D /jsp/jahia/engines/images/icons/workflow/state_= edit_3.gif +workflowEditStateStep4 =3D /jsp/jahia/engines/images/icons/workflow/state_= edit_4.gif workflowEditAnimState =3D /jsp/jahia/engines/images/icons/workflow/state_e= dit_anim.gif workflowWaitingState =3D /jsp/jahia/engines/images/icons/workflow/state_wa= iting.gif +workflowWaitingStateStep2 =3D /jsp/jahia/engines/images/icons/workflow/sta= te_waiting_2.gif +workflowWaitingStateStep3 =3D /jsp/jahia/engines/images/icons/workflow/sta= te_waiting_3.gif +workflowWaitingStateStep4 =3D /jsp/jahia/engines/images/icons/workflow/sta= te_waiting_4.gif workflowWaitingAnimState =3D /jsp/jahia/engines/images/icons/workflow/stat= e_waiting_anim.gif workflowActiveState =3D /jsp/jahia/engines/images/icons/workflow/state_act= ive.gif workflowDeletedState =3D /jsp/jahia/engines/images/icons/workflow/state_de= leted.gif Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/ajax/actionm= enus/GetWorkflowState.java URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP= -BRANCH/core/src/java/org/jahia/ajax/actionmenus/GetWorkflowState.java&rev= =3D18395&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/ajax/actionmenus/G= etWorkflowState.java (original) +++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/ajax/actionmenus/G= etWorkflowState.java Fri Sep 7 14:34:01 2007 @@ -17,23 +17,29 @@ */ package org.jahia.ajax.actionmenus; = +import java.io.BufferedInputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; +import java.util.HashMap; +import java.util.Map; + +import javax.servlet.ServletContext; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import org.apache.commons.collections.FastHashMap; import org.apache.struts.action.ActionForm; import org.apache.struts.action.ActionForward; import org.apache.struts.action.ActionMapping; -import org.apache.commons.collections.FastHashMap; import org.jahia.ajax.AjaxAction; import org.jahia.content.ContentObject; import org.jahia.params.ProcessingContext; import org.jahia.resourcebundle.JahiaResourceBundle; +import org.jahia.services.version.EntryLoadRequest; import org.jahia.services.workflow.WorkflowService; = -import javax.servlet.ServletContext; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import java.io.*; -import java.util.Map; - /** * Retrieves the workflow state of a ContentObject * @@ -46,6 +52,52 @@ = protected static final WorkflowService workflowService =3D servicesReg= istry.getWorkflowService(); private static final Map imageMap =3D new FastHashMap(4); + = + public static final Map WORKFLOW_STATE_ICON_KEYS; + static { + WORKFLOW_STATE_ICON_KEYS =3D new HashMap(); + WORKFLOW_STATE_ICON_KEYS.put(new Integer( + EntryLoadRequest.DELETED_WORKFLOW_STATE), + "workflowArchivedState"); + WORKFLOW_STATE_ICON_KEYS.put(new Integer( + EntryLoadRequest.VERSIONED_WORKFLOW_STATE), + "workflowArchivedState"); + WORKFLOW_STATE_ICON_KEYS.put(new Integer( + EntryLoadRequest.ACTIVE_WORKFLOW_STATE), "workflowActiveSt= ate"); + WORKFLOW_STATE_ICON_KEYS.put(new Integer( + EntryLoadRequest.STAGING_WORKFLOW_STATE), "workflowEditSta= te"); + WORKFLOW_STATE_ICON_KEYS.put(new Integer(WorkflowService + .getLanguageStateWithExternalWorkflowStep( + EntryLoadRequest.STAGING_WORKFLOW_STATE, 1)), + "workflowEditStateStep1"); + WORKFLOW_STATE_ICON_KEYS.put(new Integer(WorkflowService + .getLanguageStateWithExternalWorkflowStep( + EntryLoadRequest.STAGING_WORKFLOW_STATE, 2)), + "workflowEditStateStep2"); + WORKFLOW_STATE_ICON_KEYS.put(new Integer(WorkflowService + .getLanguageStateWithExternalWorkflowStep( + EntryLoadRequest.STAGING_WORKFLOW_STATE, 3)), + "workflowEditStateStep3"); + WORKFLOW_STATE_ICON_KEYS.put(new Integer(WorkflowService + .getLanguageStateWithExternalWorkflowStep( + EntryLoadRequest.STAGING_WORKFLOW_STATE, 4)), + "workflowEditStateStep4"); + WORKFLOW_STATE_ICON_KEYS.put(new Integer( + EntryLoadRequest.WAITING_WORKFLOW_STATE), + "workflowWaitingState"); + WORKFLOW_STATE_ICON_KEYS.put(new Integer(WorkflowService + .getLanguageStateWithExternalWorkflowStep( + EntryLoadRequest.WAITING_WORKFLOW_STATE, 2)), + "workflowWaitingStateStep2"); + WORKFLOW_STATE_ICON_KEYS.put(new Integer(WorkflowService + .getLanguageStateWithExternalWorkflowStep( + EntryLoadRequest.WAITING_WORKFLOW_STATE, 3)), + "workflowWaitingStateStep3"); + WORKFLOW_STATE_ICON_KEYS.put(new Integer(WorkflowService + .getLanguageStateWithExternalWorkflowStep( + EntryLoadRequest.WAITING_WORKFLOW_STATE, 4)), + "workflowWaitingStateStep4"); + } = public ActionForward execute(final ActionMapping mapping, final ActionForm form, @@ -82,39 +134,16 @@ } // Set groupWorkflowState variable final int groupWorkflowState =3D (languageState !=3D null) ? l= anguageState.intValue() : 1; - - final String imagePath; - switch (groupWorkflowState) { - case -1: - imagePath =3D JahiaResourceBundle.getUrlPathCommonReso= urce( - "workflowArchivedState", jParams); - break; - - case 0: - imagePath =3D JahiaResourceBundle.getUrlPathCommonReso= urce( - "workflowArchivedState", jParams); - break; - - case 1: - imagePath =3D JahiaResourceBundle.getUrlPathCommonReso= urce( - "workflowActiveState", jParams); - break; - - case 2: - imagePath =3D JahiaResourceBundle.getUrlPathCommonReso= urce( - "workflowEditState", jParams); - break; - - case 3: - imagePath =3D JahiaResourceBundle.getUrlPathCommonReso= urce( - "workflowWaitingState", jParams); - break; - - default: - imagePath =3D ""; - break; + = + int extWorkflowStep =3D 0; + if (groupWorkflowState >=3D EntryLoadRequest.STAGING_WORKFLOW_= STATE) { + extWorkflowStep =3D workflowService.getExternalWorkflowNex= tStep( + currentObject, language); } = + final String imagePath =3D getImagePath(groupWorkflowState, + extWorkflowStep, jParams); + if (logger.isDebugEnabled()) { logger.debug("imagePath: " + imagePath); } @@ -148,4 +177,16 @@ } return null; } -} + + private String getImagePath(int groupWorkflowState, int extWorkflowSte= p, + ProcessingContext jParams) { + + Integer key =3D new Integer(WorkflowService + .getLanguageStateWithExternalWorkflowStep(groupWorkflowSta= te, + extWorkflowStep)); + + return WORKFLOW_STATE_ICON_KEYS.containsKey(key) ? JahiaResourceBu= ndle + .getUrlPathCommonResource((String) WORKFLOW_STATE_ICON_KEYS + .get(key), jParams) : ""; + } +} \ No newline at end of file Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/ajax/sitemap= /SiteMapAbstractAction.java URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP= -BRANCH/core/src/java/org/jahia/ajax/sitemap/SiteMapAbstractAction.java&rev= =3D18395&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/ajax/sitemap/SiteM= apAbstractAction.java (original) +++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/ajax/sitemap/SiteM= apAbstractAction.java Fri Sep 7 14:34:01 2007 @@ -628,7 +628,7 @@ boolean accessAuthorized =3D object.checkWriteAccess(currentUser); if (!accessAuthorized) { // test the linked childs - final List list =3D WorkflowService.getInstance().getLinkedCon= tentObjects(object, false); + final List list =3D workflowService.getLinkedContentObjects(ob= ject, false); for (int i =3D 0; i < list.size() && !accessAuthorized; i++) { ContentObject contentObject =3D (ContentObject) list.get(i= ); accessAuthorized =3D contentObject.checkWriteAccess(curren= tUser); @@ -664,7 +664,6 @@ final Iterator optionsIter =3D additionalOptions.iterator(= ); int i =3D 0; Integer sharedLanguageState =3D (Integer) languagesStates.= get(ContentObject.SHARED_LANGUAGE); - final String title =3D getAPageTitleAnyway(object, languag= eCode, jParams, parentID); = if (languageState =3D=3D null || languageState.intValue() = =3D=3D -1) { lang.appendChild(resp.createTextNode("-1")); @@ -673,7 +672,20 @@ languageState =3D sharedLanguageState; } doLock |=3D (languageState.intValue() !=3D EntryLoadRe= quest.ACTIVE_WORKFLOW_STATE); - lang.appendChild(resp.createTextNode(languageState.toS= tring())); + = + int extWorkflowStep =3D 0; + if (languageState.intValue() >=3D EntryLoadRequest.STA= GING_WORKFLOW_STATE) { + extWorkflowStep =3D workflowService + .getExternalWorkflowNextStep(object, + languageCode); + } + = + int state =3D WorkflowService + .getLanguageStateWithExternalWorkflowStep( + languageState.intValue(), extWorkflowS= tep); + lang + .appendChild(resp.createTextNode(String + .valueOf(state))); } if (languageState !=3D null) { while (optionsIter.hasNext()) { Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/wor= kflow/WorkflowService.java URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP= -BRANCH/core/src/java/org/jahia/services/workflow/WorkflowService.java&rev= =3D18395&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/services/workflow/= WorkflowService.java (original) +++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/workflow/= WorkflowService.java Fri Sep 7 14:34:01 2007 @@ -1390,4 +1390,59 @@ } flushCacheForObjectChanged(key); } + = + /** + * Returns the next workflow step number if the object has the external + * workflow; otherwise returns <code>0</code>. + * = + * @param contentObject + * the content object + * @param language + * current languge code + * @return the next workflow step number if the object has the external + * workflow; otherwise returns <code>0</code> + */ + public int getExternalWorkflowNextStep(ContentObject contentObject, + String language) { + int extWorkflowStep =3D 0; + try { + int workflowMode =3D getInheritedMode(contentObject); + if (WorkflowService.EXTERNAL =3D=3D workflowMode) { + String processName =3D getInheritedExternalWorkflowName(co= ntentObject); + ExternalWorkflow workflow =3D getExternalWorkflow(processN= ame); + if (workflow !=3D null) { + ExternalWorkflowInstanceCurrentInfos info =3D workflow + .getCurrentInfo(processName, contentObject + .getObjectKey().getKey(), language); + if (info !=3D null) { + extWorkflowStep =3D info.getNextStep(); + } + } + } + } catch (JahiaException ex) { + logger + .error( + "Unable to retrieve additional information abo= ut external workflow state for object: " + + contentObject.getObjectKey(), ex); + } + return extWorkflowStep; + } + + /** + * Computes the artificial language state code considering also the ex= tenrla + * workflow next step number. This is required to distinguish, which + * workflow icon to show. + * = + * @param languageState + * workflow state for the current language + * @param externalWorkflowStep + * next workflow step number + * @return the artificial language state code considering also the ext= enrla + * workflow next step number + */ + public static int getLanguageStateWithExternalWorkflowStep(int languag= eState, + int externalWorkflowStep) { + return externalWorkflowStep > 0 ? languageState * 100 + + externalWorkflowStep : languageState; + } } Added: branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/image= s/icons/workflow/state_edit_1.gif URL: https://svndev.jahia.net/websvn/filedetails.php?path=3D/branches/JAHIA= -5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/images/icons/workflow/stat= e_edit_1.gif&rev=3D18395&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 Binary file - no diff available. Added: branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/image= s/icons/workflow/state_edit_2.gif URL: https://svndev.jahia.net/websvn/filedetails.php?path=3D/branches/JAHIA= -5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/images/icons/workflow/stat= e_edit_2.gif&rev=3D18395&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 Binary file - no diff available. Added: branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/image= s/icons/workflow/state_edit_3.gif URL: https://svndev.jahia.net/websvn/filedetails.php?path=3D/branches/JAHIA= -5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/images/icons/workflow/stat= e_edit_3.gif&rev=3D18395&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 Binary file - no diff available. Added: branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/image= s/icons/workflow/state_edit_4.gif URL: https://svndev.jahia.net/websvn/filedetails.php?path=3D/branches/JAHIA= -5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/images/icons/workflow/stat= e_edit_4.gif&rev=3D18395&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 Binary file - no diff available. Added: branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/image= s/icons/workflow/state_waiting_2.gif URL: https://svndev.jahia.net/websvn/filedetails.php?path=3D/branches/JAHIA= -5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/images/icons/workflow/stat= e_waiting_2.gif&rev=3D18395&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 Binary file - no diff available. Added: branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/image= s/icons/workflow/state_waiting_3.gif URL: https://svndev.jahia.net/websvn/filedetails.php?path=3D/branches/JAHIA= -5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/images/icons/workflow/stat= e_waiting_3.gif&rev=3D18395&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 Binary file - no diff available. Added: branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/image= s/icons/workflow/state_waiting_4.gif URL: https://svndev.jahia.net/websvn/filedetails.php?path=3D/branches/JAHIA= -5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/images/icons/workflow/stat= e_waiting_4.gif&rev=3D18395&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 Binary file - no diff available. Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/javascript= /zimbra/complexTree/ComplexTreeProperties.js URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP= -BRANCH/core/src/webapp/jsp/jahia/javascript/zimbra/complexTree/ComplexTree= Properties.js&rev=3D18395&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/javascript/zimbr= a/complexTree/ComplexTreeProperties.js (original) +++ branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/javascript/zimbr= a/complexTree/ComplexTreeProperties.js Fri Sep 7 14:34:01 2007 @@ -91,10 +91,26 @@ ComplexTreeProperties.NOT_VALID_BUT_WILL_BECOME_VALID =3D 24; ComplexTreeProperties.UNKNOWN =3D 25; = +// N-Step additional workflow states +ComplexTreeProperties.STAGING_WORKFLOW_STATE_1 =3D 201; +ComplexTreeProperties.STAGING_WORKFLOW_STATE_2 =3D 202; +ComplexTreeProperties.STAGING_WORKFLOW_STATE_3 =3D 203; +ComplexTreeProperties.STAGING_WORKFLOW_STATE_3 =3D 204; +ComplexTreeProperties.WAITING_WORKFLOW_STATE_2 =3D 302; +ComplexTreeProperties.WAITING_WORKFLOW_STATE_3 =3D 303; +ComplexTreeProperties.WAITING_WORKFLOW_STATE_4 =3D 304; + // Define the state images. Don't forget to append the contextPath to the = icone source paths ComplexTreeProperties.ACTIVE_ICONE_SRC =3D "/jsp/jahia/engines/images/icon= s/workflow/state_active.gif"; ComplexTreeProperties.WAITING_ICONE_SRC =3D "/jsp/jahia/engines/images/ico= ns/workflow/state_waiting.gif"; +ComplexTreeProperties.WAITING_ICONE_SRC_2 =3D "/jsp/jahia/engines/images/i= cons/workflow/state_waiting_2.gif"; +ComplexTreeProperties.WAITING_ICONE_SRC_3 =3D "/jsp/jahia/engines/images/i= cons/workflow/state_waiting_3.gif"; +ComplexTreeProperties.WAITING_ICONE_SRC_4 =3D "/jsp/jahia/engines/images/i= cons/workflow/state_waiting_4.gif"; ComplexTreeProperties.EDIT_ICONE_SRC =3D "/jsp/jahia/engines/images/icons/= workflow/state_edit.gif"; +ComplexTreeProperties.EDIT_ICONE_SRC_1 =3D "/jsp/jahia/engines/images/icon= s/workflow/state_edit_1.gif"; +ComplexTreeProperties.EDIT_ICONE_SRC_2 =3D "/jsp/jahia/engines/images/icon= s/workflow/state_edit_2.gif"; +ComplexTreeProperties.EDIT_ICONE_SRC_3 =3D "/jsp/jahia/engines/images/icon= s/workflow/state_edit_3.gif"; +ComplexTreeProperties.EDIT_ICONE_SRC_3 =3D "/jsp/jahia/engines/images/icon= s/workflow/state_edit_4.gif"; ComplexTreeProperties.DELETED_ICONE_SRC =3D "/jsp/jahia/engines/images/ico= ns/workflow/state_deleted.gif"; ComplexTreeProperties.ACCEPT_ICONE_SRC =3D "/jsp/jahia/engines/images/icon= s/workflow/accept.gif"; ComplexTreeProperties.REFUSE_ICONE_SRC =3D "/jsp/jahia/engines/images/icon= s/workflow/refuse.gif"; @@ -293,11 +309,39 @@ case ComplexTreeProperties.STAGING_WORKFLOW_STATE: ComplexTreeProperties.DOUBLE_BUTTONS =3D false; return ComplexTreeProperties.CONTEXT + ComplexTreeProperties.E= DIT_ICONE_SRC; + = + case ComplexTreeProperties.STAGING_WORKFLOW_STATE_1: + ComplexTreeProperties.DOUBLE_BUTTONS =3D false; + return ComplexTreeProperties.CONTEXT + ComplexTreeProperties.E= DIT_ICONE_SRC_1; + + case ComplexTreeProperties.STAGING_WORKFLOW_STATE_2: + ComplexTreeProperties.DOUBLE_BUTTONS =3D false; + return ComplexTreeProperties.CONTEXT + ComplexTreeProperties.E= DIT_ICONE_SRC_2; + + case ComplexTreeProperties.STAGING_WORKFLOW_STATE_3: + ComplexTreeProperties.DOUBLE_BUTTONS =3D false; + return ComplexTreeProperties.CONTEXT + ComplexTreeProperties.E= DIT_ICONE_SRC_3; + + case ComplexTreeProperties.STAGING_WORKFLOW_STATE_4: + ComplexTreeProperties.DOUBLE_BUTTONS =3D false; + return ComplexTreeProperties.CONTEXT + ComplexTreeProperties.E= DIT_ICONE_SRC_4; = case ComplexTreeProperties.WAITING_WORKFLOW_STATE: ComplexTreeProperties.DOUBLE_BUTTONS =3D true; return ComplexTreeProperties.CONTEXT + ComplexTreeProperties.W= AITING_ICONE_SRC; = + case ComplexTreeProperties.WAITING_WORKFLOW_STATE_2: + ComplexTreeProperties.DOUBLE_BUTTONS =3D true; + return ComplexTreeProperties.CONTEXT + ComplexTreeProperties.W= AITING_ICONE_SRC_2; + + case ComplexTreeProperties.WAITING_WORKFLOW_STATE_3: + ComplexTreeProperties.DOUBLE_BUTTONS =3D true; + return ComplexTreeProperties.CONTEXT + ComplexTreeProperties.W= AITING_ICONE_SRC_3; + + case ComplexTreeProperties.WAITING_WORKFLOW_STATE_4: + ComplexTreeProperties.DOUBLE_BUTTONS =3D true; + return ComplexTreeProperties.CONTEXT + ComplexTreeProperties.W= AITING_ICONE_SRC_4; + case ComplexTreeProperties.DELETED_WORKFLOW_STATE: return ComplexTreeProperties.CONTEXT + ComplexTreeProperties.D= ELETED_ICONE_SRC; = _______________________________________________ cvs_list mailing list [email protected] http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
