[jbpm-commits] JBoss JBPM SVN: r3413 - in projects/jsf-console/trunk/console/src/main/webapp: ua and 1 other directory.

do-not-reply at jboss.org do-not-reply at jboss.org
Wed Dec 17 16:21:22 EST 2008


Author: heiko.braun at jboss.com
Date: 2008-12-17 16:21:22 -0500 (Wed, 17 Dec 2008)
New Revision: 3413

Modified:
   projects/jsf-console/trunk/console/src/main/webapp/app/deployproc.xhtml
   projects/jsf-console/trunk/console/src/main/webapp/app/group.xhtml
   projects/jsf-console/trunk/console/src/main/webapp/app/identities.xhtml
   projects/jsf-console/trunk/console/src/main/webapp/app/jobs.xhtml
   projects/jsf-console/trunk/console/src/main/webapp/app/procdef.xhtml
   projects/jsf-console/trunk/console/src/main/webapp/app/processes.xhtml
   projects/jsf-console/trunk/console/src/main/webapp/app/procins.xhtml
   projects/jsf-console/trunk/console/src/main/webapp/app/t_comments.xhtml
   projects/jsf-console/trunk/console/src/main/webapp/app/t_loggedin.xhtml
   projects/jsf-console/trunk/console/src/main/webapp/app/t_pager.xhtml
   projects/jsf-console/trunk/console/src/main/webapp/app/t_processinstances.xhtml
   projects/jsf-console/trunk/console/src/main/webapp/app/t_tasks.xhtml
   projects/jsf-console/trunk/console/src/main/webapp/app/t_tokens.xhtml
   projects/jsf-console/trunk/console/src/main/webapp/app/t_vars.xhtml
   projects/jsf-console/trunk/console/src/main/webapp/app/task.xhtml
   projects/jsf-console/trunk/console/src/main/webapp/app/tasks.xhtml
   projects/jsf-console/trunk/console/src/main/webapp/app/token.xhtml
   projects/jsf-console/trunk/console/src/main/webapp/app/user.xhtml
   projects/jsf-console/trunk/console/src/main/webapp/ua/login-example.xhtml
   projects/jsf-console/trunk/console/src/main/webapp/ua/login.xhtml
   projects/jsf-console/trunk/console/src/main/webapp/ua/t_base.xhtml
Log:
Identation to simplify comparison to SOA-P overlays

Modified: projects/jsf-console/trunk/console/src/main/webapp/app/deployproc.xhtml
===================================================================
--- projects/jsf-console/trunk/console/src/main/webapp/app/deployproc.xhtml	2008-12-17 20:58:23 UTC (rev 3412)
+++ projects/jsf-console/trunk/console/src/main/webapp/app/deployproc.xhtml	2008-12-17 21:21:22 UTC (rev 3413)
@@ -1,4 +1,5 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" 
+"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 
 <html xmlns="http://www.w3.org/1999/xhtml"
       xmlns:ui="http://java.sun.com/jsf/facelets"

Modified: projects/jsf-console/trunk/console/src/main/webapp/app/group.xhtml
===================================================================
--- projects/jsf-console/trunk/console/src/main/webapp/app/group.xhtml	2008-12-17 20:58:23 UTC (rev 3412)
+++ projects/jsf-console/trunk/console/src/main/webapp/app/group.xhtml	2008-12-17 21:21:22 UTC (rev 3413)
@@ -1,4 +1,5 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" 
+"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 
 <html xmlns="http://www.w3.org/1999/xhtml"
       xmlns:ui="http://java.sun.com/jsf/facelets"
@@ -23,8 +24,10 @@
             <ga:parameter name="view" target="#{viewMode}" default="children"/>
             <ga:parameter name="page" target="#{page}" default="1"/>
             <id:loadGroup id="#{id}" target="#{group}"/>
-            <gd:sort source="#{group.memberships}" target="#{members}" entryVar="e" argument="#{e.role == null ? '' : e.role}"/>
-            <gd:sort source="#{members}" target="#{members}" entryVar="e" argument="#{e.user.name == null ? '' : e.user.name}"/>
+            <gd:sort source="#{group.memberships}" target="#{members}" entryVar="e" 
+            argument="#{e.role == null ? '' : e.role}"/>
+            <gd:sort source="#{members}" target="#{members}" entryVar="e" 
+            argument="#{e.user.name == null ? '' : e.user.name}"/>
             <gd:pager target="#{members_pager}" value="#{members}" page="#{page}"/>
             <gd:sort source="#{group.children}" target="#{children}" entryVar="e" argument="#{e.name}"/>
             <gd:pager target="#{children_pager}" value="#{children}" page="#{page}"/>
@@ -100,7 +103,8 @@
                         <h:inputHidden value="#{id}"/>
                         <gs:ul>
                             <gs:li>
-                                <h:commandLink value="Delete" onclick="return confirm('#{msgs['identities.groups.confirm.delete']}');">
+                                <h:commandLink value="Delete" 
+                                onclick="return confirm('#{msgs['identities.groups.confirm.delete']}');">
                                     <f:param name="xid">
                                         <ga:attribute name="value" value="#{group.id}"/>
                                     </f:param>
@@ -146,7 +150,8 @@
                 </tr>
             </thead>
             <tbody class="results">
-                <gd:repeat value="#{children}" var="child" idVar="rid" first="#{children_pager.first}" limit="#{children_pager.limit}">
+                <gd:repeat value="#{children}" var="child" idVar="rid" first="#{children_pager.first}" 
+                limit="#{children_pager.limit}">
                     <gs:tr>
                         <ga:attribute name="styleClass" value="#{rid % 2 == 0 ? 'odd' : 'even'}"/>
                         <td>
@@ -157,7 +162,8 @@
                         </td>
                         <td>
                             <h:form>
-                                <h:commandLink value="Remove" onclick="return confirm('#{msgs['identities.groups.confirm.delete']}')">
+                                <h:commandLink value="Remove" 
+                                onclick="return confirm('#{msgs['identities.groups.confirm.delete']}')">
                                     <f:param name="xgid">
                                         <ga:attribute name="value" value="#{child.id}"/>
                                     </f:param>
@@ -197,7 +203,8 @@
             </thead>
             <gs:tbody styleClass="results">
                 <ga:attribute name="rendered" value="#{! empty members}"/>
-                <gd:repeat value="#{members}" var="member" idVar="rid" first="#{members_pager.first}" limit="#{members_pager.limit}">
+                <gd:repeat value="#{members}" var="member" idVar="rid" first="#{members_pager.first}" 
+                limit="#{members_pager.limit}">
                     <gs:tr>
                         <ga:attribute name="styleClass" value="#{rid % 2 == 0 ? 'odd' : 'even'}"/>
                         <td>
@@ -238,7 +245,6 @@
 </ui:define>
 
 
-
 </ui:composition>
 
 </html>
\ No newline at end of file

Modified: projects/jsf-console/trunk/console/src/main/webapp/app/identities.xhtml
===================================================================
--- projects/jsf-console/trunk/console/src/main/webapp/app/identities.xhtml	2008-12-17 20:58:23 UTC (rev 3412)
+++ projects/jsf-console/trunk/console/src/main/webapp/app/identities.xhtml	2008-12-17 21:21:22 UTC (rev 3413)
@@ -1,4 +1,5 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" 
+"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 
 <html xmlns="http://www.w3.org/1999/xhtml"
       xmlns:ui="http://java.sun.com/jsf/facelets"
@@ -23,7 +24,8 @@
                     <ga:checkRole roles="#{access.role.identities.user}">
                         <f:setPropertyActionListener value="users" target="#{viewModeDefault}"/>
                     </ga:checkRole>
-                    <ga:parameter name="view" target="#{viewMode}" default="#{empty viewModeDefault ? 'users' : viewModeDefault}"/>
+                    <ga:parameter name="view" target="#{viewMode}" 
+                    default="#{empty viewModeDefault ? 'users' : viewModeDefault}"/>
                     <ga:parameter name="page" target="#{page}" default="1">
                         <f:convertNumber integerOnly="true"/>
                     </ga:parameter>
@@ -38,8 +40,10 @@
                             <f:converter converterId="gravel.StringWildcardFilter"/>
                         </ga:parameter>
                         <id:listUsers unless="#{viewMode != 'users'}" target="#{users}"/>
-                        <gd:filter if="#{users != null}" source="#{users}" target="#{users}" entryVar="e" filter="#{userName}" filterArgument="#{e.name}"/>
-                        <gd:filter if="#{users != null}" source="#{users}" target="#{users}" entryVar="e" filter="#{userEmail}" filterArgument="#{e.email}"/>
+                        <gd:filter if="#{users != null}" source="#{users}" target="#{users}" entryVar="e" filter="#{userName}" 
+                        filterArgument="#{e.name}"/>
+                        <gd:filter if="#{users != null}" source="#{users}" target="#{users}" entryVar="e" filter="#{userEmail}" 
+                        filterArgument="#{e.email}"/>
                         <gd:sort if="#{users != null}" source="#{users}" target="#{users}" entryVar="e" argument="#{e.name}"/>
                         <gd:pager target="#{users_pager}" value="#{users}" page="#{page}"/>
                     </ga:checkRole>
@@ -57,9 +61,12 @@
                             <f:converter converterId="gravel.StringWildcardFilter"/>
                         </ga:parameter>
                         <id:listGroups unless="#{viewMode != 'groups'}" target="#{groups}"/>
-                        <gd:filter if="#{groups != null}" source="#{groups}" target="#{groups}" entryVar="e" filter="#{groupName}" filterArgument="#{e.name}"/>
-                        <gd:filter if="#{groups != null}" source="#{groups}" target="#{groups}" entryVar="e" filter="#{groupType}" filterArgument="#{e.type}"/>
-                        <gd:filter if="#{groups != null}" source="#{groups}" target="#{groups}" entryVar="e" filter="#{groupParentName}" filterArgument="#{e.parent.name}"/>
+                        <gd:filter if="#{groups != null}" source="#{groups}" target="#{groups}" entryVar="e" filter="#{groupName}" 
+                        filterArgument="#{e.name}"/>
+                        <gd:filter if="#{groups != null}" source="#{groups}" target="#{groups}" entryVar="e" filter="#{groupType}" 
+                        filterArgument="#{e.type}"/>
+                        <gd:filter if="#{groups != null}" source="#{groups}" target="#{groups}" entryVar="e" filter="#{groupParentName}" 
+                        filterArgument="#{e.parent.name}"/>
                         <gd:sort if="#{groups != null}" source="#{groups}" target="#{groups}" entryVar="e" argument="#{e.name}"/>
                         <gd:pager target="#{groups_pager}" value="#{groups}" page="#{page}"/>
                     </ga:checkRole>
@@ -114,7 +121,8 @@
                                 <gs:ul>
                                     <ga:checkRole roles="#{access.role.identities.user}">
                                         <gs:li>
-                                            <h:outputLink style="#{empty viewMode or viewMode == 'users' ? 'font-weight:bold' : ''}">
+                                            <h:outputLink 
+                                            style="#{empty viewMode or viewMode == 'users' ? 'font-weight:bold' : ''}">
                                                 <f:param name="view" value="users"/>
                                                 <h:outputText value="#{msgs['identities.view.users']}"/>
                                             </h:outputLink>
@@ -178,10 +186,12 @@
                                 <tr>
                                     <td/>
                                     <td>
-                                        <input name="name_i" type="text" style="width:90px;" value="#{userName}" onkeypress="keypress(event,'apply')"/>
+                                        <input name="name_i" type="text" style="width:90px;" value="#{userName}" 
+                                        onkeypress="keypress(event,'apply')"/>
                                     </td>
                                     <td>
-                                        <input name="email_i" type="text" style="width:110px;" value="#{userEmail}" onkeypress="keypress(event,'apply')"/>
+                                        <input name="email_i" type="text" style="width:110px;" value="#{userEmail}" 
+                                        onkeypress="keypress(event,'apply')"/>
                                     </td>
                                     <td/>
                                     <td colspan="2" style="width:150px;">
@@ -190,7 +200,9 @@
                                             <input type="hidden" name="name"/>
                                             <input type="hidden" name="email"/>
                                         </form>
-                                        <a id="apply" accesskey="a" onclick="document.getElementsByName('name')[0].value=document.getElementsByName('name_i')[0].value;document.getElementsByName('email')[0].value=document.getElementsByName('email_i')[0].value;document.getElementById('sf').submit();return false;"><h:outputText value="#{msgs['filter.apply']}"/></a>
+                                        <a id="apply" accesskey="a" 
+                                        onclick="document.getElementsByName('name')[0].value=document.getElementsByName('name_i')[0].value;document.getElementsByName('email')[0].value=document.getElementsByName('email_i')[0].value;document.getElementById('sf').submit();return false;"><h:outputText 
+                                        value="#{msgs['filter.apply']}"/></a>
                                         <h:outputLink style="margin-left:10px">
                                             <f:param name="view" value="users"/>
                                             <h:outputText value="#{msgs['filter.clear']}"/>
@@ -214,8 +226,10 @@
                                             </td>
                                             <td>
                                                 <ga:responseActions>
-                                                    <gd:sort source="#{user.memberships}" target="#{memberships}" entryVar="e" argument="#{e.group.name}"/>
-                                                    <gd:sort source="#{memberships}" target="#{memberships}" entryVar="e" argument="#{e.group.type}"/>
+                                                    <gd:sort source="#{user.memberships}" target="#{memberships}" entryVar="e" 
+                                                    argument="#{e.group.name}"/>
+                                                    <gd:sort source="#{memberships}" target="#{memberships}" entryVar="e" 
+                                                    argument="#{e.group.type}"/>
                                                 </ga:responseActions>
                                                 <gd:repeat value="#{memberships}" var="membership">
                                                     <h:outputText value="Group (#{membership.group.type}): #{membership.group.name}"/>
@@ -231,7 +245,8 @@
                                             <ga:checkRole roles="#{access.role.identities.user.delete}">
                                                 <td>
                                                     <h:form>
-                                                        <h:commandLink value="Delete" onclick="return confirm('#{msgs['identities.users.confirm.delete']}')">
+                                                        <h:commandLink value="Delete" 
+                                                        onclick="return confirm('#{msgs['identities.users.confirm.delete']}')">
                                                             <f:param name="xid">
                                                                 <ga:attribute name="value" value="#{user.id}"/>
                                                             </f:param>
@@ -342,13 +357,15 @@
                                 <tr>
                                     <td/>
                                     <td>
-                                        <input name="gname_i" type="text" style="width:90px;" value="#{groupName}" onkeypress="keypress(event,'gapply')"/>
+                                        <input name="gname_i" type="text" style="width:90px;" value="#{groupName}" 
+                                        onkeypress="keypress(event,'gapply')"/>
                                     </td>
                                     <td>
                                         <input name="gtype_i" type="text" style="width:110px;" value="#{groupType}" onkeypress="keypress(event,'gapply')"/>
                                     </td>
                                     <td>
-                                        <input name="gpname_i" type="text" style="width:90px;" value="#{groupParentName}" onkeypress="keypress(event,'gapply')"/>
+                                        <input name="gpname_i" type="text" style="width:90px;" value="#{groupParentName}" 
+                                        onkeypress="keypress(event,'gapply')"/>
                                     </td>
                                     <td colspan="2" style="width:150px;">
                                         <form id="gsf" action="identities.jsf">
@@ -357,7 +374,9 @@
                                             <input type="hidden" name="gtype"/>
                                             <input type="hidden" name="gpname"/>
                                         </form>
-                                        <a id="gapply" accesskey="a" onclick="document.getElementsByName('gname')[0].value=document.getElementsByName('gname_i')[0].value;document.getElementsByName('gpname')[0].value=document.getElementsByName('gpname_i')[0].value;document.getElementsByName('gtype')[0].value=document.getElementsByName('gtype_i')[0].value;document.getElementById('gsf').submit();return false;"><h:outputText value="#{msgs['filter.apply']}"/></a>
+                                        <a id="gapply" accesskey="a" 
+                                        onclick="document.getElementsByName('gname')[0].value=document.getElementsByName('gname_i')[0].value;document.getElementsByName('gpname')[0].value=document.getElementsByName('gpname_i')[0].value;document.getElementsByName('gtype')[0].value=document.getElementsByName('gtype_i')[0].value;document.getElementById('gsf').submit();return false;"><h:outputText 
+                                        value="#{msgs['filter.apply']}"/></a>
                                         <h:outputLink style="margin-left:10px">
                                             <f:param name="view" value="groups"/>
                                             <h:outputText value="#{msgs['filter.clear']}"/>
@@ -368,7 +387,8 @@
                             <h:outputText>
                                 <ga:attribute name="rendered" value="#{! empty groups}"/>
                                 <tbody class="results">
-                                    <gd:repeat value="#{groups}" var="group" idVar="rid" first="#{groups_pager.first}" limit="#{groups_pager.limit}">
+                                    <gd:repeat value="#{groups}" var="group" idVar="rid" first="#{groups_pager.first}" 
+                                    limit="#{groups_pager.limit}">
                                         <gs:tr>
                                             <ga:attribute name="styleClass" value="#{rid % 2 == 0 ? 'odd' : 'even'}"/>
                                             <td>
@@ -391,7 +411,8 @@
                                             <ga:checkRole roles="#{access.role.identities.group.delete}">
                                                 <td>
                                                     <h:form>
-                                                        <h:commandLink value="Delete" onclick="return confirm('#{msgs['identities.groups.confirm.delete']}')">
+                                                        <h:commandLink value="Delete" 
+                                                        onclick="return confirm('#{msgs['identities.groups.confirm.delete']}')">
                                                             <f:param name="xid">
                                                                 <ga:attribute name="value" value="#{group.id}"/>
                                                             </f:param>

Modified: projects/jsf-console/trunk/console/src/main/webapp/app/jobs.xhtml
===================================================================
--- projects/jsf-console/trunk/console/src/main/webapp/app/jobs.xhtml	2008-12-17 20:58:23 UTC (rev 3412)
+++ projects/jsf-console/trunk/console/src/main/webapp/app/jobs.xhtml	2008-12-17 21:21:22 UTC (rev 3413)
@@ -1,4 +1,5 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" 
+"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 
 <html xmlns="http://www.w3.org/1999/xhtml"
       xmlns:ui="http://java.sun.com/jsf/facelets"
@@ -69,10 +70,15 @@
             <ga:parameter name="page" target="#{page}" default="1"/>
 
             <j4j:listJobs target="#{jobs}"/>
-            <f:setPropertyActionListener value="#{viewMode == 'timers' ? 12 : viewMode == 'action' ? 9 : viewMode == 'node' ? 9 : 10}" target="#{colspan}"/>
-            <gd:filter if="#{viewMode == 'timers'}" entryVar="e" source="#{jobs}" target="#{jobs}" test="#{e.class.name == 'org.jbpm.job.Timer'}"/>
-            <gd:filter if="#{viewMode == 'action'}" entryVar="e" source="#{jobs}" target="#{jobs}" test="#{e.class.name == 'org.jbpm.job.ExecuteActionJob'}"/>
-            <gd:filter if="#{viewMode == 'node'}" entryVar="e" source="#{jobs}" target="#{jobs}" test="#{e.class.name == 'org.jbpm.job.ExecuteNodeJob'}"/>
+            <f:setPropertyActionListener 
+            value="#{viewMode == 'timers' ? 12 : viewMode == 'action' ? 9 : viewMode == 'node' ? 9 : 10}" 
+            target="#{colspan}"/>
+            <gd:filter if="#{viewMode == 'timers'}" entryVar="e" source="#{jobs}" target="#{jobs}" 
+            test="#{e.class.name == 'org.jbpm.job.Timer'}"/>
+            <gd:filter if="#{viewMode == 'action'}" entryVar="e" source="#{jobs}" target="#{jobs}" 
+            test="#{e.class.name == 'org.jbpm.job.ExecuteActionJob'}"/>
+            <gd:filter if="#{viewMode == 'node'}" entryVar="e" source="#{jobs}" target="#{jobs}" 
+            test="#{e.class.name == 'org.jbpm.job.ExecuteNodeJob'}"/>
             <gd:pager target="#{pager}" value="#{jobs}" page="#{page}"/>
         </ga:responseActions>
     </ui:define>
@@ -84,7 +90,8 @@
                     <th colspan="#{colspan}">
                         <ui:decorate template="t_pager.xhtml">
                         </ui:decorate>
-                        <h:outputText value="#{viewMode == 'timers' ? 'Timers' : viewMode == 'action' ? 'Execute Action Jobs' : viewMode == 'node' ? 'Execute Node Jobs' : 'All Jobs'}"/>
+                        <h:outputText 
+                        value="#{viewMode == 'timers' ? 'Timers' : viewMode == 'action' ? 'Execute Action Jobs' : viewMode == 'node' ? 'Execute Node Jobs' : 'All Jobs'}"/>
                     </th>
                 </tr>
                 <tr>
@@ -130,7 +137,8 @@
                             </h:outputText>
                             <h:outputText rendered="#{viewMode == 'all'}">
                                 <td>
-                                    <h:outputText value="#{job.class.name == 'org.jbpm.job.Timer' ? 'Timer' : job.class.name == 'org.jbpm.job.ExecuteActionJob' ? 'Execute Action' : job.class.name == 'org.jbpm.job.ExecuteNodeJob' ? 'Execute Node' : job.class.name}"/>
+                                    <h:outputText 
+                                    value="#{job.class.name == 'org.jbpm.job.Timer' ? 'Timer' : job.class.name == 'org.jbpm.job.ExecuteActionJob' ? 'Execute Action' : job.class.name == 'org.jbpm.job.ExecuteNodeJob' ? 'Execute Node' : job.class.name}"/>
                                 </td>
                             </h:outputText>
                             <td>
@@ -173,7 +181,8 @@
                             </td>
                             <td>
                                 <h:form>
-                                    <h:commandLink onclick="return confirm('Are you sure you want to delete this job?  The operation cannot be undone.');">
+                                    <h:commandLink 
+                                    onclick="return confirm('Are you sure you want to delete this job?  The operation cannot be undone.');">
                                         <h:outputText value="Delete"/>
                                         <j4j:loadJob id="#{job.id}" target="#{xjob}"/>
                                         <j4j:delete value="#{xjob}"/>

Modified: projects/jsf-console/trunk/console/src/main/webapp/app/procdef.xhtml
===================================================================
--- projects/jsf-console/trunk/console/src/main/webapp/app/procdef.xhtml	2008-12-17 20:58:23 UTC (rev 3412)
+++ projects/jsf-console/trunk/console/src/main/webapp/app/procdef.xhtml	2008-12-17 21:21:22 UTC (rev 3413)
@@ -1,4 +1,5 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" 
+"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 
 <html xmlns="http://www.w3.org/1999/xhtml"
       xmlns:ui="http://java.sun.com/jsf/facelets"
@@ -40,12 +41,17 @@
     <j4j:loadProcess id="#{id}" target="#{pd}"/>
     <j4j:listTasksForProcess unless="#{viewMode != 'task'}" process="#{pd}" target="#{tasks}"/>
     <j4j:listProcessInstances unless="#{viewMode != 'ins'}" target="#{piList}" processId="#{id}"/>
-    <gd:filter source="#{piList}" target="#{piList}" entryVar="entry" test="#{filter_ended and entry.end != null or entry.end == null and (filter_suspended and entry.suspended or filter_running and ! entry.suspended)}"/>
-    <gd:filter if="#{! empty pi_key}" source="#{piList}" target="#{piList}" entryVar="entry" filter="#{pi_key}" filterArgument="#{entry.key == null ? '' : entry.key}"/>
+    <gd:filter source="#{piList}" target="#{piList}" entryVar="entry" 
+    test="#{filter_ended and entry.end != null or entry.end == null and (filter_suspended and entry.suspended or filter_running and ! entry.suspended)}"/>
+    <gd:filter if="#{! empty pi_key}" source="#{piList}" target="#{piList}" entryVar="entry" filter="#{pi_key}" 
+    filterArgument="#{entry.key == null ? '' : entry.key}"/>
 
-    <gd:filter source="#{tasks}" target="#{tasks}" entryVar="entry" test="#{task_filter_notstarted and entry.start == null and entry.end == null or task_filter_ended and entry.end != null or (entry.start != null and entry.end == null) and (task_filter_suspended and entry.suspended or task_filter_running and ! entry.suspended)}"/>
-    <gd:filter if="#{! empty task_filter_name}" entryVar="entry" source="#{tasks}" target="#{tasks}" filter="#{task_filter_name}" filterArgument="#{entry.name == null ? '' : entry.name}"/>
-    <gd:filter if="#{! empty task_filter_actor}" entryVar="entry" source="#{tasks}" target="#{tasks}" filter="#{task_filter_actor}" filterArgument="#{entry.actorId == null ? '' : entry.actorId}"/>
+    <gd:filter source="#{tasks}" target="#{tasks}" entryVar="entry" 
+    test="#{task_filter_notstarted and entry.start == null and entry.end == null or task_filter_ended and entry.end != null or (entry.start != null and entry.end == null) and (task_filter_suspended and entry.suspended or task_filter_running and ! entry.suspended)}"/>
+    <gd:filter if="#{! empty task_filter_name}" entryVar="entry" source="#{tasks}" target="#{tasks}" 
+    filter="#{task_filter_name}" filterArgument="#{entry.name == null ? '' : entry.name}"/>
+    <gd:filter if="#{! empty task_filter_actor}" entryVar="entry" source="#{tasks}" target="#{tasks}" 
+    filter="#{task_filter_actor}" filterArgument="#{entry.actorId == null ? '' : entry.actorId}"/>
 </ga:responseActions>
 <gs:div style="padding:0;margin:0">
     <ga:attribute name="rendered" value="#{pd != null}"/>
@@ -125,7 +131,8 @@
                                 <h:outputText value=" a new instance of this process"/>
                             </gs:li>
                             <gs:li>
-                                <h:commandLink value="Delete" onclick="return confirm('Are you sure you want to permanently delete this process?  This operation cannot be undone.')">
+                                <h:commandLink value="Delete" 
+                                onclick="return confirm('Are you sure you want to permanently delete this process?  This operation cannot be undone.')">
                                     <ga:parameter name="id" target="#{id}">
                                         <f:convertNumber integerOnly="true" maxFractionDigits="0"/>
                                     </ga:parameter>

Modified: projects/jsf-console/trunk/console/src/main/webapp/app/processes.xhtml
===================================================================
--- projects/jsf-console/trunk/console/src/main/webapp/app/processes.xhtml	2008-12-17 20:58:23 UTC (rev 3412)
+++ projects/jsf-console/trunk/console/src/main/webapp/app/processes.xhtml	2008-12-17 21:21:22 UTC (rev 3413)
@@ -1,4 +1,5 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" 
+"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 
 <html xmlns="http://www.w3.org/1999/xhtml"
       xmlns:ui="http://java.sun.com/jsf/facelets"
@@ -23,8 +24,10 @@
                 <ga:parameter name="version" target="#{version}" default="">
                     <f:converter converterId="gravel.RangeListFilter"/>
                 </ga:parameter>
-                <gd:filter source="#{proclist}" target="#{proclist}" entryVar="entry" filter="#{name}" filterArgument="#{entry.name}"/>
-                <gd:filter source="#{proclist}" target="#{proclist}" entryVar="entry" filter="#{version}" filterArgument="#{entry.version}"/>
+                <gd:filter source="#{proclist}" target="#{proclist}" entryVar="entry" filter="#{name}" 
+                filterArgument="#{entry.name}"/>
+                <gd:filter source="#{proclist}" target="#{proclist}" entryVar="entry" filter="#{version}" 
+                filterArgument="#{entry.version}"/>
                 <!-- calculate action column size -->
                 <f:setPropertyActionListener value="1" target="#{actionColspan}"/>
                 <ga:checkRole roles="#{access.role.process.delete}">
@@ -105,14 +108,17 @@
                                 <input name="name_i" type="text" style="width:110px;" value="#{name}" onkeypress="keypress(event,'apply')"/>
                             </td>
                             <td>
-                                <input name="version_i" type="text" style="width:40px;" value="#{version}" onkeypress="keypress(event,'apply')"/>
+                                <input name="version_i" type="text" style="width:40px;" value="#{version}" 
+                                onkeypress="keypress(event,'apply')"/>
                             </td>
                             <td colspan="#{actionColspan}" style="width:150px;">
                                 <form id="sf" action="processes.jsf">
                                     <input type="hidden" name="name"/>
                                     <input type="hidden" name="version"/>
                                 </form>
-                                <a href="#" id="apply" accesskey="a" onclick="document.getElementsByName('name')[0].value=document.getElementsByName('name_i')[0].value;document.getElementsByName('version')[0].value=document.getElementsByName('version_i')[0].value;document.getElementById('sf').submit();return false;">Apply Filter</a>
+                                <a href="#" id="apply" accesskey="a" 
+                                onclick="document.getElementsByName('name')[0].value=document.getElementsByName('name_i')[0].value;document.getElementsByName('version')[0].value=document.getElementsByName('version_i')[0].value;document.getElementById('sf').submit();return false;">Apply 
+                                Filter</a>
                                 <a href="?" style="margin-left:10px">Clear Filter</a>
                             </td>
                         </tr>
@@ -144,7 +150,8 @@
                                         <td>
                                             <h:form>
                                                 <h:commandLink>Delete
-                                                    <ga:attribute name="onclick" value="return confirm('#{msgs['confirm.process.delete']}')"/>
+                                                    <ga:attribute name="onclick" 
+                                                    value="return confirm('#{msgs['confirm.process.delete']}')"/>
                                                     <f:param name="id" value="#{pd.id}"/>
                                                     <ga:parameter name="id" target="#{id}">
                                                         <f:convertNumber integerOnly="true"/>

Modified: projects/jsf-console/trunk/console/src/main/webapp/app/procins.xhtml
===================================================================
--- projects/jsf-console/trunk/console/src/main/webapp/app/procins.xhtml	2008-12-17 20:58:23 UTC (rev 3412)
+++ projects/jsf-console/trunk/console/src/main/webapp/app/procins.xhtml	2008-12-17 21:21:22 UTC (rev 3413)
@@ -1,4 +1,5 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" 
+"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 
 <html xmlns="http://www.w3.org/1999/xhtml"
       xmlns:ui="http://java.sun.com/jsf/facelets"
@@ -39,9 +40,12 @@
         <ga:parameter name="fs" target="#{task_filter_suspended}" default="true"/>
         <ga:parameter name="fe" target="#{task_filter_ended}" default="false"/>
 
-        <gd:filter source="#{tasks}" target="#{tasks}" entryVar="entry" test="#{task_filter_notstarted and entry.start == null and entry.end == null or task_filter_ended and entry.end != null or (entry.start != null and entry.end == null) and (task_filter_suspended and entry.suspended or task_filter_running and ! entry.suspended)}"/>
-        <gd:filter if="#{! empty task_filter_name}" entryVar="entry" source="#{tasks}" target="#{tasks}" filter="#{task_filter_name}" filterArgument="#{entry.name == null ? '' : entry.name}"/>
-        <gd:filter if="#{! empty task_filter_actor}" entryVar="entry" source="#{tasks}" target="#{tasks}" filter="#{task_filter_actor}" filterArgument="#{entry.actorId == null ? '' : entry.actorId}"/>
+        <gd:filter source="#{tasks}" target="#{tasks}" entryVar="entry" 
+        test="#{task_filter_notstarted and entry.start == null and entry.end == null or task_filter_ended and entry.end != null or (entry.start != null and entry.end == null) and (task_filter_suspended and entry.suspended or task_filter_running and ! entry.suspended)}"/>
+        <gd:filter if="#{! empty task_filter_name}" entryVar="entry" source="#{tasks}" target="#{tasks}" 
+        filter="#{task_filter_name}" filterArgument="#{entry.name == null ? '' : entry.name}"/>
+        <gd:filter if="#{! empty task_filter_actor}" entryVar="entry" source="#{tasks}" target="#{tasks}" 
+        filter="#{task_filter_actor}" filterArgument="#{entry.actorId == null ? '' : entry.actorId}"/>
     </ga:responseActions>
 </ui:define>
 
@@ -189,7 +193,8 @@
                                 <h:outputText value=" this process instance"/>
                             </gs:li>
                             <gs:li>
-                                <h:commandLink value="Delete" onclick="return confirm('Are you sure you want to permanently delete this process instance?  This operation cannot be undone.')">
+                                <h:commandLink value="Delete" 
+                                onclick="return confirm('Are you sure you want to permanently delete this process instance?  This operation cannot be undone.')">
                                     <j4j:loadProcessInstance id="#{id}" target="#{pi}" forUpdate="false"/>
                                     <f:setPropertyActionListener value="#{pi.processDefinition.id}" target="#{pdid}"/>
                                     <j4j:delete value="#{pi}"/>
@@ -226,7 +231,8 @@
             </ui:decorate>
         </h:outputText>
         <gs:div>
-            <ga:attribute name="style" value="position:relative;height:#{diagramInfo.height}px;width:#{diagramInfo.width}px"/>
+            <ga:attribute name="style" 
+            value="position:relative;height:#{diagramInfo.height}px;width:#{diagramInfo.width}px"/>
             <ga:attribute name="rendered" value="#{viewMode == 'img'}"/>
             <img
                 alt=""
@@ -236,18 +242,24 @@
                 <ui:fragment>
                     <ui:param name="node" value="#{diagramInfo.nodeMap[token.node.name]}"/>
                     <gs:div>
-                        <ga:attribute name="style" value="top:#{node.y - 12}px;left:#{node.x + 2}px;width:#{node.width - 3}px;height:#{node.height + 11}px"/>
-                        <ga:attribute name="styleClass" value="#{token.end != null ? 'pboxs_e' : token.suspended ? 'pboxs_s' : 'pboxs'}"/>
+                        <ga:attribute name="style" 
+                        value="top:#{node.y - 12}px;left:#{node.x + 2}px;width:#{node.width - 3}px;height:#{node.height + 11}px"/>
+                        <ga:attribute name="styleClass" 
+                        value="#{token.end != null ? 'pboxs_e' : token.suspended ? 'pboxs_s' : 'pboxs'}"/>
                     </gs:div>
                     <gs:div>
-                        <ga:attribute name="style" value="top:#{node.y}px;left:#{node.x}px;width:#{node.width - 3}px;height:#{node.height - 3}px"/>
-                        <ga:attribute name="styleClass" value="#{token.end != null ? 'pbox_e' : token.suspended ? 'pbox_s' : 'pbox'}"/>
+                        <ga:attribute name="style"
+                         value="top:#{node.y}px;left:#{node.x}px;width:#{node.width - 3}px;height:#{node.height - 3}px"/>
+                        <ga:attribute name="styleClass" 
+                        value="#{token.end != null ? 'pbox_e' : token.suspended ? 'pbox_s' : 'pbox'}"/>
                     </gs:div>
                     <gs:div>
-                        <ga:attribute name="style" value="top:#{node.y - 14}px;left:#{node.x}px;width:#{node.width - 1}px"/>
+                        <ga:attribute name="style" 
+                        value="top:#{node.y - 14}px;left:#{node.x}px;width:#{node.width - 1}px"/>
                         <ga:attribute name="styleClass" value="pboxce"/>
                         <gs:div>
-                            <ga:attribute name="styleClass" value="#{token.end != null ? 'pboxc_e' : token.suspended ? 'pboxc_s' : 'pboxc'}"/>
+                            <ga:attribute name="styleClass" 
+                            value="#{token.end != null ? 'pboxc_e' : token.suspended ? 'pboxc_s' : 'pboxc'}"/>
                             <h:outputLink value="token.jsf">
                                 <f:param name="id" value="#{token.id}"/>
                                 <h:outputText value="Running" rendered="#{token.end == null and ! token.suspended}"/>

Modified: projects/jsf-console/trunk/console/src/main/webapp/app/t_comments.xhtml
===================================================================
--- projects/jsf-console/trunk/console/src/main/webapp/app/t_comments.xhtml	2008-12-17 20:58:23 UTC (rev 3412)
+++ projects/jsf-console/trunk/console/src/main/webapp/app/t_comments.xhtml	2008-12-17 21:21:22 UTC (rev 3413)
@@ -1,4 +1,5 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" 
+"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 
 <html xmlns="http://www.w3.org/1999/xhtml"
       xmlns:ui="http://java.sun.com/jsf/facelets"
@@ -27,9 +28,12 @@
                             <gs:div>
                                 <h:outputText value="Anonymous comment" rendered="#{empty comment.actorId}"/>
                                 <h:outputText value="Comment by " rendered="#{! empty comment.actorId}"/>
-                                <h:outputText value="#{comment.actorId}" rendered="#{! empty comment.actorId}" style="font-weight:bold"/>
-                                <h:outputText value=" relating to task &quot;" rendered="#{comment.taskInstance != null}"/>
-                                <h:outputText value="#{comment.taskInstance.name}" rendered="#{comment.taskInstance != null}" style="font-weight:bold"/>
+                                <h:outputText value="#{comment.actorId}" rendered="#{! empty comment.actorId}" 
+                                style="font-weight:bold"/>
+                                <h:outputText value=" relating to task &quot;" 
+                                rendered="#{comment.taskInstance != null}"/>
+                                <h:outputText value="#{comment.taskInstance.name}" 
+                                rendered="#{comment.taskInstance != null}" style="font-weight:bold"/>
                                 <h:outputText value="&quot;" rendered="#{comment.taskInstance != null}"/>
                                 <h:outputText value=" on "/>
                                 <h:outputText value="#{comment.time}" style="white-space:nowrap">

Modified: projects/jsf-console/trunk/console/src/main/webapp/app/t_loggedin.xhtml
===================================================================
--- projects/jsf-console/trunk/console/src/main/webapp/app/t_loggedin.xhtml	2008-12-17 20:58:23 UTC (rev 3412)
+++ projects/jsf-console/trunk/console/src/main/webapp/app/t_loggedin.xhtml	2008-12-17 21:21:22 UTC (rev 3413)
@@ -1,4 +1,5 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" 
+"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 
 <html xmlns="http://www.w3.org/1999/xhtml"
       xmlns:ui="http://java.sun.com/jsf/facelets"
@@ -32,10 +33,12 @@
 
         <ui:define name="header">
             <h:outputText value="#{msgs['topmenu.caption']}" style="margin-left:30px;margin-right:10px"/>
-            <h:outputLink styleClass="headermenufirst" value="processes.jsf" style="#{view.viewId == '/app/processes.xhtml' ? 'font-weight:bold' : ''}">
+            <h:outputLink styleClass="headermenufirst" value="processes.jsf" 
+            style="#{view.viewId == '/app/processes.xhtml' ? 'font-weight:bold' : ''}">
                 <h:outputText value="#{msgs['topmenu.processes']}"/>
             </h:outputLink>
-            <h:outputLink styleClass="headermenu" value="tasks.jsf" style="#{view.viewId == '/app/tasks.xhtml' ? 'font-weight:bold' : ''}">
+            <h:outputLink styleClass="headermenu" value="tasks.jsf" 
+            style="#{view.viewId == '/app/tasks.xhtml' ? 'font-weight:bold' : ''}">
                 <h:outputText value="#{msgs['topmenu.tasks']}"/>
             </h:outputLink>
             <ga:checkRole roles="#{access.role.tasks.listAll}">

Modified: projects/jsf-console/trunk/console/src/main/webapp/app/t_pager.xhtml
===================================================================
--- projects/jsf-console/trunk/console/src/main/webapp/app/t_pager.xhtml	2008-12-17 20:58:23 UTC (rev 3412)
+++ projects/jsf-console/trunk/console/src/main/webapp/app/t_pager.xhtml	2008-12-17 21:21:22 UTC (rev 3413)
@@ -1,4 +1,5 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" 
+"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 
 <html xmlns="http://www.w3.org/1999/xhtml"
       xmlns:ui="http://java.sun.com/jsf/facelets"

Modified: projects/jsf-console/trunk/console/src/main/webapp/app/t_processinstances.xhtml
===================================================================
--- projects/jsf-console/trunk/console/src/main/webapp/app/t_processinstances.xhtml	2008-12-17 20:58:23 UTC (rev 3412)
+++ projects/jsf-console/trunk/console/src/main/webapp/app/t_processinstances.xhtml	2008-12-17 21:21:22 UTC (rev 3413)
@@ -1,4 +1,5 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" 
+"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 
 <html xmlns="http://www.w3.org/1999/xhtml"
       xmlns:ui="http://java.sun.com/jsf/facelets"

Modified: projects/jsf-console/trunk/console/src/main/webapp/app/t_tasks.xhtml
===================================================================
--- projects/jsf-console/trunk/console/src/main/webapp/app/t_tasks.xhtml	2008-12-17 20:58:23 UTC (rev 3412)
+++ projects/jsf-console/trunk/console/src/main/webapp/app/t_tasks.xhtml	2008-12-17 21:21:22 UTC (rev 3413)
@@ -1,4 +1,5 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" 
+"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 
 <html xmlns="http://www.w3.org/1999/xhtml"
       xmlns:ui="http://java.sun.com/jsf/facelets"
@@ -62,11 +63,13 @@
         <tr>
             <td/>
             <td>
-                <input name="name_i" type="text" style="width:150px;" value="#{task_filter_name}" onkeypress="keypress(event,'apply')"/>
+                <input name="name_i" type="text" style="width:150px;" value="#{task_filter_name}" 
+                onkeypress="keypress(event,'apply')"/>
             </td>
             <td/>
             <td>
-                <input name="actor_i" type="text" style="width:80px;" value="#{task_filter_actor}" onkeypress="keypress(event,'apply')"/>
+                <input name="actor_i" type="text" style="width:80px;" value="#{task_filter_actor}" 
+                onkeypress="keypress(event,'apply')"/>
             </td>
             <td style="width:120px;white-space:nowrap">
                 <h:selectBooleanCheckbox id="task_notstarted_i" value="#{task_filter_notstarted}"/>

Modified: projects/jsf-console/trunk/console/src/main/webapp/app/t_tokens.xhtml
===================================================================
--- projects/jsf-console/trunk/console/src/main/webapp/app/t_tokens.xhtml	2008-12-17 20:58:23 UTC (rev 3412)
+++ projects/jsf-console/trunk/console/src/main/webapp/app/t_tokens.xhtml	2008-12-17 21:21:22 UTC (rev 3413)
@@ -1,4 +1,5 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" 
+"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 
 <html xmlns="http://www.w3.org/1999/xhtml"
       xmlns:ui="http://java.sun.com/jsf/facelets"
@@ -70,7 +71,8 @@
                 </td>
                 <td>
                     <h:outputText value="(no parent)" style="font-style:italic" rendered="#{token.parent == null}"/>
-                    <h:outputText value="#{token.parent.name} (ID #{token.parent.id})" rendered="#{token.parent != null and ! empty token.parent.name}"/>
+                    <h:outputText value="#{token.parent.name} (ID #{token.parent.id})" 
+                    rendered="#{token.parent != null and ! empty token.parent.name}"/>
                     <h:outputText value="ID #{token.parent.id}" rendered="#{token.parent != null and empty token.parent.name}"/>
                 </td>
                 <td>

Modified: projects/jsf-console/trunk/console/src/main/webapp/app/t_vars.xhtml
===================================================================
--- projects/jsf-console/trunk/console/src/main/webapp/app/t_vars.xhtml	2008-12-17 20:58:23 UTC (rev 3412)
+++ projects/jsf-console/trunk/console/src/main/webapp/app/t_vars.xhtml	2008-12-17 21:21:22 UTC (rev 3413)
@@ -1,4 +1,5 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" 
+"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 
 <html xmlns="http://www.w3.org/1999/xhtml"
       xmlns:ui="http://java.sun.com/jsf/facelets"

Modified: projects/jsf-console/trunk/console/src/main/webapp/app/task.xhtml
===================================================================
--- projects/jsf-console/trunk/console/src/main/webapp/app/task.xhtml	2008-12-17 20:58:23 UTC (rev 3412)
+++ projects/jsf-console/trunk/console/src/main/webapp/app/task.xhtml	2008-12-17 21:21:22 UTC (rev 3413)
@@ -1,4 +1,5 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" 
+"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 
 <html xmlns="http://www.w3.org/1999/xhtml"
       xmlns:ui="http://java.sun.com/jsf/facelets"
@@ -18,11 +19,14 @@
                 <j4j:loadTask id="#{id}" target="#{task}"/>
                 <ga:parameter name="view" target="#{viewMode}" default="#{task.end != null ? 'comments' : 'form'}"/>
                 <gd:reverse source="#{task.comments}" target="#{comments}"/>
-                <gd:sort if="#{! empty task.availableTransitions}" source="#{task.availableTransitions}" target="#{transitions}" entryVar="e" argument="#{e.name == null ? '' : e.name}"/>
+                <gd:sort if="#{! empty task.availableTransitions}" source="#{task.availableTransitions}" target="#{transitions}" 
+                entryVar="e" argument="#{e.name == null ? '' : e.name}"/>
                 <j4j:getVariableMap target="#{taskVariableMap}" value="#{task}"/>
                 <j4j:getTaskFormInfo process="#{task.processInstance.processDefinition}" target="#{taskForms}"/>
-                <gd:sort if="#{! empty task.pooledActors}" source="#{task.pooledActors}" target="#{taskActors}" entryVar="e" argument="#{e.actorId}"/>
-                <gd:filter if="#{! empty taskActors and ! empty task.actorId}" entryVar="e" source="#{taskActors}" target="#{taskActors}" test="#{e.actorId != task.actorId}"/>
+                <gd:sort if="#{! empty task.pooledActors}" source="#{task.pooledActors}" target="#{taskActors}" entryVar="e" 
+                argument="#{e.actorId}"/>
+                <gd:filter if="#{! empty taskActors and ! empty task.actorId}" entryVar="e" source="#{taskActors}" 
+                target="#{taskActors}" test="#{e.actorId != task.actorId}"/>
             </ga:responseActions>
             <ga:keepAlive value="#{taskVariableMap}"/>
         </ui:define>
@@ -104,7 +108,8 @@
                             <td>
                                 <h:outputLink value="procdef.jsf">
                                     <f:param name="id" value="#{task.processInstance.processDefinition.id}"/>
-                                    <h:outputText value="#{task.processInstance.processDefinition.name} v#{task.processInstance.processDefinition.version}"/>
+                                    <h:outputText 
+                                    value="#{task.processInstance.processDefinition.name} v#{task.processInstance.processDefinition.version}"/>
                                 </h:outputLink>
                             </td>
                         </tr>
@@ -339,7 +344,8 @@
                                                     </ga:parameter>
                                                     <j4j:loadTask id="#{id}" target="#{task}"/>
                                                     <j4j:completeTask task="#{task}" transition="#{transition.name}"/>
-                                                    <n:nav outcome="success" url="procins.jsf?id=#{task.processInstance.id}" storeMessages="true"/>
+                                                    <n:nav outcome="success" url="procins.jsf?id=#{task.processInstance.id}" 
+                                                    storeMessages="true"/>
                                                     <n:nav outcome="error" redirect="true" storeMessages="true"/>
                                                 </h:commandLink>
                                             </h:form>
@@ -359,9 +365,12 @@
                                 <f:convertNumber integerOnly="true" maxFractionDigits="0"/>
                             </ga:parameter>
                             <j4j:loadTask id="#{id}" target="#{xtask}" navigate="false" unless="#{button == 'cancel'}"/>
-                            <j4j:applyVariableMap target="#{xtask}" variableMap="#{taskVariableMap}" navigate="false" unless="#{button == 'cancel'}"/>
-                            <j4j:addComment comment="#{comment}" target="#{xtask}" unless="#{empty comment or button == 'cancel'}" navigate="false"/>
-                            <j4j:completeTask task="#{xtask}" transition="#{transition}" unless="#{button != 'transition'}" navigate="false"/>
+                            <j4j:applyVariableMap target="#{xtask}" variableMap="#{taskVariableMap}" navigate="false" 
+                            unless="#{button == 'cancel'}"/>
+                            <j4j:addComment comment="#{comment}" target="#{xtask}" unless="#{empty comment or button == 'cancel'}" 
+                            navigate="false"/>
+                            <j4j:completeTask task="#{xtask}" transition="#{transition}" unless="#{button != 'transition'}" 
+                            navigate="false"/>
                             <n:nav outcome="error" redirect="true" storeMessages="true"/>
                             <n:nav outcome="save" redirect="true" storeMessages="true"/>
                             <n:nav outcome="cancel" redirect="true" storeMessages="true"/>

Modified: projects/jsf-console/trunk/console/src/main/webapp/app/tasks.xhtml
===================================================================
--- projects/jsf-console/trunk/console/src/main/webapp/app/tasks.xhtml	2008-12-17 20:58:23 UTC (rev 3412)
+++ projects/jsf-console/trunk/console/src/main/webapp/app/tasks.xhtml	2008-12-17 21:21:22 UTC (rev 3413)
@@ -1,4 +1,5 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" 
+"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 
 <html xmlns="http://www.w3.org/1999/xhtml"
       xmlns:ui="http://java.sun.com/jsf/facelets"

Modified: projects/jsf-console/trunk/console/src/main/webapp/app/token.xhtml
===================================================================
--- projects/jsf-console/trunk/console/src/main/webapp/app/token.xhtml	2008-12-17 20:58:23 UTC (rev 3412)
+++ projects/jsf-console/trunk/console/src/main/webapp/app/token.xhtml	2008-12-17 21:21:22 UTC (rev 3413)
@@ -1,4 +1,5 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" 
+"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 
 <html xmlns="http://www.w3.org/1999/xhtml"
       xmlns:ui="http://java.sun.com/jsf/facelets"
@@ -17,7 +18,8 @@
                 <ga:parameter name="id" target="#{id}"/>
                 <ga:parameter name="view" target="#{viewMode}" default="tran"/>
                 <j4j:loadToken id="#{id}" target="#{token}"/>
-                <gd:sort if="#{! empty token.availableTransitions}" source="#{token.availableTransitions}" target="#{transitions}" entryVar="e" argument="#{e.name == null ? '' : e.name}"/>
+                <gd:sort if="#{! empty token.availableTransitions}" source="#{token.availableTransitions}" 
+                target="#{transitions}" entryVar="e" argument="#{e.name == null ? '' : e.name}"/>
             </ga:responseActions>
         </ui:define>
 
@@ -76,7 +78,8 @@
                             <td>
                                 <h:outputLink value="procdef.jsf">
                                     <f:param name="id" value="#{token.processInstance.processDefinition.id}"/>
-                                    <h:outputText value="#{token.processInstance.processDefinition.name} v#{token.processInstance.processDefinition.version}"/>
+                                    <h:outputText 
+                                    value="#{token.processInstance.processDefinition.name} v#{token.processInstance.processDefinition.version}"/>
                                 </h:outputLink>
                             </td>
                         </tr>
@@ -268,13 +271,15 @@
                                 <gd:repeat value="#{token.processInstance.processDefinition.nodes}" var="node" idVar="rid">
                                     <gs:tr styleClass="#{rid % 2 == 0 ? 'odd' : 'even'}">
                                         <td>
-                                            <h:outputText value="#{node.name}" style="#{token.node.id == node.id ? 'font-weight:bold;' : ''}"/>
+                                            <h:outputText value="#{node.name}" 
+                                            style="#{token.node.id == node.id ? 'font-weight:bold;' : ''}"/>
                                         </td>
                                         <td>
                                             <h:form>
                                                 <ga:attribute name="rendered" value="#{token.node.id != node.id}"/>
                                                 <h:commandLink>
-                                                    <ga:attribute name="onclick" value="return confirm('#{msgs['confirm.token.move']}')"/>
+                                                    <ga:attribute name="onclick" 
+                                                    value="return confirm('#{msgs['confirm.token.move']}')"/>
                                                     <h:outputText value="Move to this node"/>
                                                     <ga:attribute name="rendered" value="#{! token.suspended}"/>
                                                     <f:param name="id" value="#{id}"/>

Modified: projects/jsf-console/trunk/console/src/main/webapp/app/user.xhtml
===================================================================
--- projects/jsf-console/trunk/console/src/main/webapp/app/user.xhtml	2008-12-17 20:58:23 UTC (rev 3412)
+++ projects/jsf-console/trunk/console/src/main/webapp/app/user.xhtml	2008-12-17 21:21:22 UTC (rev 3413)
@@ -1,4 +1,5 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" 
+"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 
 <html xmlns="http://www.w3.org/1999/xhtml"
       xmlns:ui="http://java.sun.com/jsf/facelets"
@@ -34,9 +35,12 @@
                 <f:converter converterId="gravel.StringWildcardFilter"/>
             </ga:parameter>
             <id:loadUser id="#{id}" target="#{user}"/>
-            <gd:filter source="#{user.memberships}" target="#{memberships}" entryVar="e" filter="#{groupName}" filterArgument="#{e.group.name}"/>
-            <gd:filter source="#{memberships}" target="#{memberships}" entryVar="e" filter="#{groupType}" filterArgument="#{e.group.type}"/>
-            <gd:filter source="#{memberships}" target="#{memberships}" entryVar="e" filter="#{roleName}" filterArgument="#{e.role}"/>
+            <gd:filter source="#{user.memberships}" target="#{memberships}" entryVar="e" filter="#{groupName}" 
+            filterArgument="#{e.group.name}"/>
+            <gd:filter source="#{memberships}" target="#{memberships}" entryVar="e" filter="#{groupType}" 
+            filterArgument="#{e.group.type}"/>
+            <gd:filter source="#{memberships}" target="#{memberships}" entryVar="e" filter="#{roleName}" 
+            filterArgument="#{e.role}"/>
             <gd:sort source="#{memberships}" target="#{memberships}" entryVar="e" argument="#{e.group.name}"/>
             <gd:sort source="#{memberships}" target="#{memberships}" entryVar="e" argument="#{e.group.type}"/>
             <gd:pager target="#{memberships_pager}" value="#{memberships}" page="#{page}"/>
@@ -54,9 +58,13 @@
                 <ga:parameter name="fs" target="#{task_filter_suspended}" default="true"/>
                 <ga:parameter name="fe" target="#{task_filter_ended}" default="false"/>
 
-                <gd:filter source="#{tasks}" target="#{tasks}" entryVar="entry" test="#{task_filter_notstarted and entry.start == null and entry.end == null or task_filter_ended and entry.end != null or (entry.start != null and entry.end == null) and (task_filter_suspended and entry.suspended or task_filter_running and ! entry.suspended)}"/>
-                <gd:filter if="#{! empty task_filter_name}" entryVar="entry" source="#{tasks}" target="#{tasks}" filter="#{task_filter_name}" filterArgument="#{entry.name == null ? '' : entry.name}"/>
-                <gd:filter if="#{! empty task_filter_actor}" entryVar="entry" source="#{tasks}" target="#{tasks}" filter="#{task_filter_actor}" filterArgument="#{entry.actorId == null ? '' : entry.actorId}"/>
+                <gd:filter source="#{tasks}" target="#{tasks}" entryVar="entry" 
+                test="#{task_filter_notstarted and entry.start == null and entry.end == null or task_filter_ended and entry.end != null or (entry.start != null and entry.end == null) and (task_filter_suspended and entry.suspended or task_filter_running and ! entry.suspended)}"/>
+                <gd:filter if="#{! empty task_filter_name}" entryVar="entry" source="#{tasks}" target="#{tasks}" 
+                filter="#{task_filter_name}" filterArgument="#{entry.name == null ? '' : entry.name}"/>
+                <gd:filter if="#{! empty task_filter_actor}" entryVar="entry" source="#{tasks}" target="#{tasks}" 
+                filter="#{task_filter_actor}" 
+                filterArgument="#{entry.actorId == null ? '' : entry.actorId}"/>
             </ga:checkRole>
         </ga:checkRole>
     </ga:checkRole>
@@ -115,7 +123,8 @@
                         <h:inputHidden value="#{id}"/>
                         <gs:ul>
                             <gs:li>
-                                <h:commandLink value="Delete" onclick="return confirm('Are you sure you want to delete this user?  This operation cannot be undone.')">
+                                <h:commandLink value="Delete" 
+                                onclick="return confirm('Are you sure you want to delete this user?  This operation cannot be undone.')">
                                     <f:param name="xid">
                                         <ga:attribute name="value" value="#{user.id}"/>
                                     </f:param>
@@ -184,7 +193,9 @@
                                 <input type="hidden" name="gtype"/>
                                 <input type="hidden" name="role"/>
                             </form>
-                            <a id="apply" accesskey="a" onclick="copyinput('gname_i','gname');copyinput('gtype_i','gtype');copyinput('role_i','role');document.getElementById('sf').submit();return false;">Apply Filter</a>
+                            <a id="apply" accesskey="a" 
+                            onclick="copyinput('gname_i','gname');copyinput('gtype_i','gtype');copyinput('role_i','role');document.getElementById('sf').submit();return false;">Apply 
+                            Filter</a>
                             <h:outputLink style="margin-left:10px">
                                 <f:param name="id" value="#{id}"/>Clear Filter
                             </h:outputLink>

Modified: projects/jsf-console/trunk/console/src/main/webapp/ua/login-example.xhtml
===================================================================
--- projects/jsf-console/trunk/console/src/main/webapp/ua/login-example.xhtml	2008-12-17 20:58:23 UTC (rev 3412)
+++ projects/jsf-console/trunk/console/src/main/webapp/ua/login-example.xhtml	2008-12-17 21:21:22 UTC (rev 3413)
@@ -1,4 +1,5 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" 
+"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 
 <html xmlns="http://www.w3.org/1999/xhtml"
       xmlns:ui="http://java.sun.com/jsf/facelets"

Modified: projects/jsf-console/trunk/console/src/main/webapp/ua/login.xhtml
===================================================================
--- projects/jsf-console/trunk/console/src/main/webapp/ua/login.xhtml	2008-12-17 20:58:23 UTC (rev 3412)
+++ projects/jsf-console/trunk/console/src/main/webapp/ua/login.xhtml	2008-12-17 21:21:22 UTC (rev 3413)
@@ -1,4 +1,5 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" 
+"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 
 <html xmlns="http://www.w3.org/1999/xhtml"
       xmlns:ui="http://java.sun.com/jsf/facelets"

Modified: projects/jsf-console/trunk/console/src/main/webapp/ua/t_base.xhtml
===================================================================
--- projects/jsf-console/trunk/console/src/main/webapp/ua/t_base.xhtml	2008-12-17 20:58:23 UTC (rev 3412)
+++ projects/jsf-console/trunk/console/src/main/webapp/ua/t_base.xhtml	2008-12-17 21:21:22 UTC (rev 3413)
@@ -1,4 +1,5 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" 
+"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 
 <html xmlns="http://www.w3.org/1999/xhtml"
       xmlns:ui="http://java.sun.com/jsf/facelets"
@@ -95,7 +96,8 @@
                                     <tr>
                                         <td>
                                             <h:outputText value="#{msg.summary}"/>
-                                            <h:outputText rendered="#{msg.detail != null and msg.detail != msg.summary}" value=": #{msg.detail}"/>
+                                            <h:outputText rendered="#{msg.detail != null and msg.detail != msg.summary}" 
+                                            value=": #{msg.detail}"/>
                                         </td>
                                     </tr>
                                 </gd:repeat>
@@ -115,7 +117,8 @@
                                     <tr>
                                         <td>
                                             <h:outputText value="#{msg.summary}"/>
-                                            <h:outputText rendered="#{msg.detail != null and msg.detail != msg.summary}" value=": #{msg.detail}"/>
+                                            <h:outputText rendered="#{msg.detail != null and msg.detail != msg.summary}" 
+                                            value=": #{msg.detail}"/>
                                         </td>
                                     </tr>
                                 </gd:repeat>
@@ -135,7 +138,8 @@
                                     <tr>
                                         <td>
                                             <h:outputText value="#{msg.summary}"/>
-                                            <h:outputText rendered="#{msg.detail != null and msg.detail != msg.summary}" value=": #{msg.detail}"/>
+                                            <h:outputText rendered="#{msg.detail != null and msg.detail != msg.summary}" 
+                                            value=": #{msg.detail}"/>
                                         </td>
                                     </tr>
                                 </gd:repeat>
@@ -155,7 +159,8 @@
                                     <tr>
                                         <td>
                                             <h:outputText value="#{msg.summary}"/>
-                                            <h:outputText rendered="#{msg.detail != null and msg.detail != msg.summary}" value=": #{msg.detail}"/>
+                                            <h:outputText rendered="#{msg.detail != null and msg.detail != msg.summary}" 
+                                            value=": #{msg.detail}"/>
                                         </td>
                                     </tr>
                                 </gd:repeat>




More information about the jbpm-commits mailing list