You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lenya.apache.org by gr...@apache.org on 2004/02/04 20:15:00 UTC
cvs commit: cocoon-lenya/src/webapp/lenya/content/publishing reject-screen.xsp submit-screen.xsp
gregor 2004/02/04 11:15:00
Modified: src/webapp/lenya/xslt/publishing reject-screen.xsl
submit-screen.xsl
src/webapp/lenya/content/publishing reject-screen.xsp
submit-screen.xsp
Log:
reject / submit screen usability improvements
thanks to trapo for the suggestions
Revision Changes Path
1.4 +35 -25 cocoon-lenya/src/webapp/lenya/xslt/publishing/reject-screen.xsl
Index: reject-screen.xsl
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/webapp/lenya/xslt/publishing/reject-screen.xsl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- reject-screen.xsl 7 Nov 2003 10:02:33 -0000 1.3
+++ reject-screen.xsl 4 Feb 2004 19:15:00 -0000 1.4
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
<xsl:stylesheet version="1.0"
xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
@@ -9,38 +9,48 @@
<xsl:import href="../util/page-util.xsl"/>
-<xsl:output version="1.0" indent="yes" encoding="ISO-8859-1"/>
+<xsl:output version="1.0" indent="yes" encoding="UTF-8"/>
<xsl:param name="lenya.event"/>
<xsl:template match="/usecase:reject">
<page:page>
- <page:title>Reject</page:title>
+ <page:title>Reject: <xsl:value-of select="document-id"/></page:title>
<page:body>
-
- <form method="GET" action="">
-
- <input type="hidden" name="lenya.usecase" value="transition"/>
- <input type="hidden" name="lenya.event" value="{$lenya.event}"/>
- <input type="hidden" name="task-id" value="ant"/>
- <input type="hidden" name="target" value="mail"/>
-
- <not:notification>
- <not:preset>
- <xsl:copy-of select="not:users"/>
- </not:preset>
- </not:notification>
-
- <input type="submit" name="submit" value="Reject"/>
-  
- <input type="button" onClick="location.href='{usecase:referer}';" value="Cancel"/>
-
- </form>
-
+ <div class="lenya-box">
+ <div class="lenya-box-title">Do you want to reject <xsl:value-of select="document-id"/>?</div>
+ <form method="GET" action="">
+ <table class="lenya-table-noborder">
+ <tr>
+ <td class="lenya-entry-caption" valign="top">
+ <input type="hidden" name="lenya.usecase" value="transition"/>
+ <input type="hidden" name="lenya.event" value="{$lenya.event}"/>
+ <input type="hidden" name="task-id" value="ant"/>
+ <input type="hidden" name="target" value="mail"/>
+ <not:notification>
+ <not:preset><xsl:copy-of select="not:users"/></not:preset>
+ </not:notification>
+ </td>
+ </tr>
+ <tr>
+ <td> </td>
+ </tr>
+ <tr>
+ <td/>
+ <td>
+ <input type="submit" name="submit" value="Reject"/>  
+ <input type="button" onClick="location.href='{usecase:referer}';" value="Cancel"/>
+ </td>
+ </tr>
+ <tr>
+ <td> </td>
+ </tr>
+ </table>
+ </form>
+ </div>
</page:body>
</page:page>
</xsl:template>
-
-</xsl:stylesheet>
+</xsl:stylesheet>
\ No newline at end of file
1.4 +34 -24 cocoon-lenya/src/webapp/lenya/xslt/publishing/submit-screen.xsl
Index: submit-screen.xsl
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/webapp/lenya/xslt/publishing/submit-screen.xsl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- submit-screen.xsl 22 Sep 2003 16:27:26 -0000 1.3
+++ submit-screen.xsl 4 Feb 2004 19:15:00 -0000 1.4
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
<xsl:stylesheet version="1.0"
xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
@@ -10,38 +10,48 @@
<xsl:import href="../util/page-util.xsl"/>
-<xsl:output version="1.0" indent="yes" encoding="ISO-8859-1"/>
+<xsl:output version="1.0" indent="yes" encoding="UTF-8"/>
<xsl:param name="lenya.event"/>
<xsl:template match="/usecase:submit">
<page:page>
- <page:title>Submit</page:title>
+ <page:title>Submit for Approval: <xsl:value-of select="document-id"/></page:title>
<page:body>
-
- <form method="GET" action="">
-
- <input type="hidden" name="lenya.usecase" value="transition"/>
- <input type="hidden" name="lenya.event" value="{$lenya.event}"/>
- <input type="hidden" name="task-id" value="ant"/>
- <input type="hidden" name="target" value="mail"/>
-
- <not:notification>
- <not:select>
- <xsl:copy-of select="not:users"/>
- </not:select>
- </not:notification>
-
- <input type="submit" name="submit" value="Submit"/>
-  
- <input type="button" onClick="location.href='{usecase:referer}';" value="Cancel"/>
-
- </form>
-
+ <div class="lenya-box">
+ <div class="lenya-box-title">Do you want to submit <xsl:value-of select="document-id"/> for approval?</div>
+ <form method="GET" action="">
+ <table class="lenya-table-noborder">
+ <tr>
+ <td class="lenya-entry-caption" valign="top">
+ <input type="hidden" name="lenya.usecase" value="transition"/>
+ <input type="hidden" name="lenya.event" value="{$lenya.event}"/>
+ <input type="hidden" name="task-id" value="ant"/>
+ <input type="hidden" name="target" value="mail"/>
+ <not:notification>
+ <not:select><xsl:copy-of select="not:users"/></not:select>
+ </not:notification>
+ </td>
+ </tr>
+ <tr>
+ <td> </td>
+ </tr>
+ <tr>
+ <td/>
+ <td>
+ <input type="submit" name="submit" value="Submit"/>  
+ <input type="button" onClick="location.href='{usecase:referer}';" value="Cancel"/>
+ </td>
+ </tr>
+ <tr>
+ <td> </td>
+ </tr>
+ </table>
+ </form>
+ </div>
</page:body>
</page:page>
</xsl:template>
-
</xsl:stylesheet>
1.6 +3 -0 cocoon-lenya/src/webapp/lenya/content/publishing/reject-screen.xsp
Index: reject-screen.xsp
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/webapp/lenya/content/publishing/reject-screen.xsp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- reject-screen.xsp 29 Jan 2004 17:15:19 -0000 1.5
+++ reject-screen.xsp 4 Feb 2004 19:15:00 -0000 1.6
@@ -4,6 +4,7 @@
language="java"
xmlns:xsp="http://apache.org/xsp"
xmlns:usecase="http://apache.org/cocoon/lenya/usecase/1.0"
+ xmlns:xsp-session="http://apache.org/xsp/session/2.0"
xmlns:not="http://apache.org/cocoon/lenya/notification/1.0"
xmlns:input="http://apache.org/cocoon/xsp/input/1.0"
>
@@ -20,6 +21,8 @@
<usecase:reject>
<usecase:referer><input:get-attribute module="request" name="requestURI" as="string"/></usecase:referer>
+ <publication-id><xsp-session:get-attribute name="org.apache.lenya.cms.cocoon.acting.Authenticator.id"/></publication-id>
+ <document-id><input:get-attribute module="page-envelope" as="string" name="document-id"/></document-id>
<not:users>
<xsp:logic>
1.6 +3 -0 cocoon-lenya/src/webapp/lenya/content/publishing/submit-screen.xsp
Index: submit-screen.xsp
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/webapp/lenya/content/publishing/submit-screen.xsp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- submit-screen.xsp 29 Jan 2004 17:15:19 -0000 1.5
+++ submit-screen.xsp 4 Feb 2004 19:15:00 -0000 1.6
@@ -4,6 +4,7 @@
language="java"
xmlns:xsp="http://apache.org/xsp"
xmlns:usecase="http://apache.org/cocoon/lenya/usecase/1.0"
+ xmlns:xsp-session="http://apache.org/xsp/session/2.0"
xmlns:not="http://apache.org/cocoon/lenya/notification/1.0"
xmlns:input="http://apache.org/cocoon/xsp/input/1.0"
>
@@ -15,6 +16,8 @@
<usecase:submit>
<usecase:referer><input:get-attribute module="request" name="requestURI" as="string"/></usecase:referer>
+ <publication-id><xsp-session:get-attribute name="org.apache.lenya.cms.cocoon.acting.Authenticator.id"/></publication-id>
+ <document-id><input:get-attribute module="page-envelope" as="string" name="document-id"/></document-id>
<not:users>
<xsp:logic>
---------------------------------------------------------------------
To unsubscribe, e-mail: lenya-cvs-unsubscribe@cocoon.apache.org
For additional commands, e-mail: lenya-cvs-help@cocoon.apache.org