Author: sshyrkov
Date: Tue Dec 4 12:28:28 2007
New Revision: 19339
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D19339&repname=
=3Djahia
Log:
[trunk r19332] JAHIA-2156: Sp3 Topbar Redesign: New "Quick Validate" button
http://www.jahia.net/jira/browse/JAHIA-2156
Resolution: "Quick validate" icon added to perform most "permissive" workfl=
ow action
Added:
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/ajax/actionme=
nus/QuickValidationAction.java
- copied unchanged from r19336, trunk/core/src/java/org/jahia/ajax/ac=
tionmenus/QuickValidationAction.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/services/work=
flow/QuickActivationJob.java
- copied unchanged from r19336, trunk/core/src/java/org/jahia/service=
s/workflow/QuickActivationJob.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/webapp/jsp/jahia/engines/ima=
ges/gear_ok.png
- copied unchanged from r19336, trunk/core/src/webapp/jsp/jahia/engin=
es/images/gear_ok.png
Modified:
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/conf/java/jahiatemplates/com=
mon.properties
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/conf/java/jahiatemplates/com=
mon_en.properties
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/webapp/WEB-INF/etc/struts/st=
ruts-config.xml
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/webapp/WEB-INF/tags/topbar.t=
ag
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/webapp/WEB-INF/tags/workflow=
.tagf
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/webapp/jsp/jahia/topbar/topm=
enu.inc
Modified: branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/conf/java/jahiatemplat=
es/common.properties
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-INCLUD=
E-TAG-BRANCH/core/src/conf/java/jahiatemplates/common.properties&rev=3D1933=
9&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-INCLUDE-TAG-BRANCH/core/src/conf/java/jahiatemplates/com=
mon.properties (original)
+++ branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/conf/java/jahiatemplates/com=
mon.properties Tue Dec 4 12:28:28 2007
@@ -14,6 +14,8 @@
siteSettings =3D Site settings
esiInvalidatePage =3D Regenerate the current page i=
n the ESI Cache Server
filemanager.name =3D File manager
+quickValidate =3D Quick validation =
+quickValidate.prompt =3D This will perform a workflow =
validation operation. You can enter your comment here. Would you like to co=
ntinue?
=
ContentPageOperations =3D Page operations
ContentContainerListOperations =3D List operations
Modified: branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/conf/java/jahiatemplat=
es/common_en.properties
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-INCLUD=
E-TAG-BRANCH/core/src/conf/java/jahiatemplates/common_en.properties&rev=3D1=
9339&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-INCLUDE-TAG-BRANCH/core/src/conf/java/jahiatemplates/com=
mon_en.properties (original)
+++ branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/conf/java/jahiatemplates/com=
mon_en.properties Tue Dec 4 12:28:28 2007
@@ -14,6 +14,8 @@
siteSettings =3D Site settings
esiInvalidatePage =3D Regenerate the current page i=
n the ESI Cache Server
filemanager.name =3D File manager
+quickValidate =3D Quick validation =
+quickValidate.prompt =3D This will perform a workflow =
validation operation. You can enter your comment here. Would you like to co=
ntinue?
=
ContentPageOperations =3D Page operations
ContentContainerListOperations =3D List operations
Modified: branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/webapp/WEB-INF/etc/str=
uts/struts-config.xml
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-INCLUD=
E-TAG-BRANCH/core/src/webapp/WEB-INF/etc/struts/struts-config.xml&rev=3D193=
39&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-INCLUDE-TAG-BRANCH/core/src/webapp/WEB-INF/etc/struts/st=
ruts-config.xml (original)
+++ branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/webapp/WEB-INF/etc/struts/st=
ruts-config.xml Tue Dec 4 12:28:28 2007
@@ -395,6 +395,11 @@
validate=3D"false">
</action>
=
+ <action path=3D"/QuickValidate"
+ type=3D"org.jahia.ajax.actionmenus.QuickValidationAction"
+ validate=3D"false">
+ </action>
+ =
<!--=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D-->
<!-- ADMININSTRATION SECTION
-->
<!--=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D-->
Modified: branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/webapp/WEB-INF/tags/to=
pbar.tag
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-INCLUD=
E-TAG-BRANCH/core/src/webapp/WEB-INF/tags/topbar.tag&rev=3D19339&repname=3D=
jahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=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-INCLUDE-TAG-BRANCH/core/src/webapp/WEB-INF/tags/topbar.t=
ag (original)
+++ branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/webapp/WEB-INF/tags/topbar.t=
ag Tue Dec 4 12:28:28 2007
@@ -41,6 +41,19 @@
new JahiaWorkflowStateInfo().showState();
});
Event.observe(window, 'unload', Event.unloadCache);
+ function doPublishPage() {
+ var comment =3D prompt("<content:resourceBundle resourceBundle=
=3D'jahiatemplates.common' resourceName=3D'quickValidate.prompt' defaultVal=
ue=3D'!!!This will perform a workflow validation operation. You can enter y=
our comment here. Would you like to continue?'/>", "");
+ if (comment !=3D null) {
+ new Ajax.Request(jahia.config.contextPath + '/ajaxaction/Q=
uickValidate', {
+ method: 'post',
+ parameters: 'pid=3D' + jahia.config.pageId + '&key=3DC=
ontentPage_' + jahia.config.pageId + '&commentsInput=3D' + encodeURICompone=
nt(comment),
+ onFailure: function(transport) {
+ alert('Error ' + transport.status + ' - ' + transp=
ort.statusText);
+ }
+ });
+ }
+ return false;
+ } =
</script>
</logic:equal>
<%@ include file=3D"declarations.tagf"%>
Modified: branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/webapp/WEB-INF/tags/wo=
rkflow.tagf
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-INCLUD=
E-TAG-BRANCH/core/src/webapp/WEB-INF/tags/workflow.tagf&rev=3D19339&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-INCLUDE-TAG-BRANCH/core/src/webapp/WEB-INF/tags/workflow=
.tagf (original)
+++ branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/webapp/WEB-INF/tags/workflow=
.tagf Tue Dec 4 12:28:28 2007
@@ -45,6 +45,7 @@
=
java.util.Map pageOnlyLanguagesStates =3D
cop.getLanguagesStates(true);
java.util.Enumeration languageEnum =3D languageSettings.elemen=
ts();
+ boolean hasSomethingToPublish =3D false;
=
%><ul class=3D"workflowstates"><%
while (siteLangSettingsEnum.hasMoreElements()) {
@@ -78,6 +79,7 @@
href=3D'<%=3DcurrentLanguageCode.equals(languageCo=
de) ? "" : jData.gui().drawPageLanguageSwitch(languageCode)%>'
alt=3D"<%=3DlanguageName%>"/><%
if (languageState !=3D null /*&& wf_visu.trim().eq=
ualsIgnoreCase("true")*/) {
+ hasSomethingToPublish =3D hasSomethingToPublis=
h || languageState.intValue() > 1; =
%><content:displayIcon src=3D"<%=3DlanguageSta=
te.toString()%>" lang=3D"<%=3DlanguageCode%>"/><%
}
%>
@@ -88,6 +90,9 @@
%>
</ul>
<%
+ if (hasSomethingToPublish) {
+ %><a style=3D"margin-left: 15px;" href=3D"#publish" onclic=
k=3D"return doPublishPage();" title=3D"<content:resourceBundle resourceBund=
le=3D'jahiatemplates.common' resourceName=3D'quickValidate' defaultValue=3D=
'Quick validation'/>"><img style=3D"margin-top: 3px;" src=3D"<content:serve=
rHttpPath />/jsp/jahia/engines/images/gear_ok.png" width=3D"16" height=3D"1=
6" alt=3D"<content:resourceBundle resourceBundle=3D'jahiatemplates.common' =
resourceName=3D'quickValidate' defaultValue=3D'Quick validation'/>" title=
=3D"<content:resourceBundle resourceBundle=3D'jahiatemplates.common' resour=
ceName=3D'quickValidate' defaultValue=3D'Quick validation'/>" border=3D"0" =
/></a></span><%
+ }
}
}
}
Modified: branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/webapp/jsp/jahia/topba=
r/topmenu.inc
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-INCLUD=
E-TAG-BRANCH/core/src/webapp/jsp/jahia/topbar/topmenu.inc&rev=3D19339&repna=
me=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-INCLUDE-TAG-BRANCH/core/src/webapp/jsp/jahia/topbar/topm=
enu.inc (original)
+++ branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/webapp/jsp/jahia/topbar/topm=
enu.inc Tue Dec 4 12:28:28 2007
@@ -96,7 +96,22 @@
function reportError(request) {
var thekey =3D request.responseText;
alert(thekey);
- }
+ }
+
+function doPublishPage() {
+ var comment =3D prompt("<content:resourceBundle resourceBundle=3D'jahi=
atemplates.common' resourceName=3D'quickValidate.prompt' defaultValue=3D'!!=
!This will perform a workflow validation operation. You can enter your comm=
ent here. Would you like to continue?'/>", "");
+ if (comment !=3D null) {
+ new Ajax.Request(jahia.config.contextPath + '/ajaxaction/QuickVali=
date', {
+ method: 'post',
+ parameters: 'pid=3D' + jahia.config.pageId + '&key=3DContentPa=
ge_' + jahia.config.pageId + '&commentsInput=3D' + encodeURIComponent(comme=
nt),
+ onFailure: function(transport) {
+ alert('Error ' + transport.status + ' - ' + transport.stat=
usText);
+ }
+ });
+ }
+
+ return false;
+} =
</script>
<%
}
@@ -157,7 +172,8 @@
request.setAttribute("languagesStates",
pageOnlyLanguagesStates=
);
}
=
- Enumeration languageEnum =3D languageSettings.elements();
+ Enumeration languageEnum =3D languageSettings.elements();
+ boolean hasSomethingToPublish =3D false;
=
while (siteLangSettingsEnum.hasMoreElements()) {
SiteLanguageSettings curSetting =3D (SiteLanguageSetti=
ngs)siteLangSettingsEnum.nextElement();
@@ -188,11 +204,15 @@
%><div class=3D"workflowState"><jahia:displayLa=
nguageFlag code=3D"<%=3DlanguageCode%>"
href=3D'<%=3DcurrentLanguageCode.equals(la=
nguageCode) ? "" : jData.gui().drawPageLanguageSwitch(languageCode)%>'
alt=3D"<%=3DlanguageName%>"/><%
- if (languageState !=3D null /*&& wf_visu.t=
rim().equalsIgnoreCase("true")*/) {
+ if (languageState !=3D null /*&& wf_visu.t=
rim().equalsIgnoreCase("true")*/) {
+ hasSomethingToPublish =3D hasSomething=
ToPublish || languageState.intValue() > 1; =
%><jahia:displayIcon src=3D"<%=3Dlangu=
ageState.toString()%>" lang=3D"<%=3DlanguageCode%>"/><%
} %></div><%
}
- }//end while
+ }//end while
+ if (hasSomethingToPublish) {
+ %><span>|</span><span><a href=3D"#publish" onclick=3D"retu=
rn doPublishPage();" title=3D"<content:resourceBundle resourceBundle=3D'jah=
iatemplates.common' resourceName=3D'quickValidate' defaultValue=3D'Quick va=
lidation'/>" style=3D"margin-top: 0; padding-top: 0;"><img style=3D"margin-=
top: 0" src=3D"<content:serverHttpPath />/jsp/jahia/engines/images/gear_ok.=
png" width=3D"16" height=3D"16" alt=3D"<content:resourceBundle resourceBund=
le=3D'jahiatemplates.common' resourceName=3D'quickValidate' defaultValue=3D=
'Quick validation'/>" title=3D"<content:resourceBundle resourceBundle=3D'ja=
hiatemplates.common' resourceName=3D'quickValidate' defaultValue=3D'Quick v=
alidation'/>" border=3D"0" /></a></span><%
+ }
}
}
}
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
