Humongous merge. It is incomplete, however; faces-config-navigation.xml and ClientConfigElement

were both beyond me, and are just the raw conflict merge data.  If Kev can't figure out how they should
go together by tomorrow AM (for me) I'll dig back in.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@4306 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261

source/web/jsp/admin/workflow-console.jsp

@@ -0,0 +1,102 @@
+<%--
+  Copyright (C) 2005 Alfresco, Inc.
+ 
+  Licensed under the Mozilla Public License version 1.1 
+  with a permitted attribution clause. You may obtain a
+  copy of the License at
+ 
+    http://www.alfresco.org/legal/license.txt
+ 
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+  either express or implied. See the License for the specific
+  language governing permissions and limitations under the
+  License.
+--%>
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
+<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="/WEB-INF/repo.tld" prefix="r" %>
+
+<%@ page buffer="32kb" contentType="text/html;charset=UTF-8" %>
+<%@ page isELIgnored="false" %>
+<%@ page import="org.alfresco.web.ui.common.PanelGenerator" %>
+
+<r:page titleId="title_workflow_console">
+
+<f:view>
+   
+	<%-- load a bundle of properties with I18N strings --%>
+	<f:loadBundle basename="alfresco.messages.webclient" var="msg"/>
+
+	<h:form id="workflow-console-title">
+	
+		<table width="100%">
+			<tr>
+	        	<td>
+	            	<h:graphicImage value="/images/logo/AlfrescoLogo32.png" alt="Alfresco" />
+	         	</td>
+	         	<td>
+	            	<nobr><h:outputText id="titleWFConsole" styleClass="mainTitle" value="#{msg.title_workflow_console}"/></nobr>
+	         	</td>
+				<td width="100%" align="right">
+					<h:commandButton value="#{msg.close}" action="adminConsole" />
+				</td>
+	      	</tr>
+	   	</table>
+	
+	</h:form>
+
+	<br>
+
+	<h:outputText id="contextTitle" styleClass="mainTitle" value="#{msg.workflow_context}"/>
+
+	<table>
+    	<tr>
+        	<td><b>User:</b></td><td><h:outputText id="userName" value="#{WorkflowConsoleBean.currentUserName}"/></td>
+		</tr>
+		<tr>
+			<td><b>Workflow Definition:</b></td><td><h:outputText id="workflowDef" value="#{WorkflowConsoleBean.currentWorkflowDef}"/></td>
+		</tr>
+	</table>
+
+	<br>
+
+	<h:outputText id="commandTitle" styleClass="mainTitle" value="#{msg.workflow_command}"/>
+
+	<h:form id="searchForm">
+		<table>
+        	<tr>
+				<td>
+					<h:inputText id="command" size="100" value="#{WorkflowConsoleBean.command}"/>
+				</td>
+				<td>
+					<h:commandButton id="submitCommand" action="#{WorkflowConsoleBean.submitCommand}" value="#{msg.workflow_command_submit}"/>
+				</td>
+			</tr>
+		</table>
+	</h:form>
+
+	<table>
+		<tr>
+			<td>
+				<h:outputText id="submittedCommandLabel" value="#{msg.workflow_last_command}"/> <h:outputText id="submittedCommand" value="#{WorkflowConsoleBean.submittedCommand}"/><br>
+				<h:outputText id="durationLabel" value="#{msg.workflow_duration}"/> <h:outputText id="duration" value="#{WorkflowConsoleBean.duration}"/><h:outputText id="durationMsLabel" value="#{msg.workflow_duration_ms}"/><br>
+				-----
+			</td>
+		</tr>
+		<tr>
+			<td>
+				<pre><h:outputText id="result" value="#{WorkflowConsoleBean.result}"/></pre>
+			</td>
+		</tr>
+	</table>
+
+</f:view>
+
+</r:page>
+
+<script>
+   document.getElementById("searchForm:command").focus();
+</script>