Big honkin' merge from head. Sheesh!

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

source/web/jsp/workflow/start-workflow-wizard/workflow-options.jsp

@@ -0,0 +1,50 @@
+<%--
+  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="/WEB-INF/alfresco.tld" prefix="a" %>
+<%@ taglib uri="/WEB-INF/repo.tld" prefix="r" %>
+
+<%@ page import="org.alfresco.web.ui.common.PanelGenerator" %>
+
+<h:panelGroup rendered="#{WizardManager.bean.taskMetadataNode == null}">
+   <f:verbatim>
+      <%PanelGenerator.generatePanelStart(out, request.getContextPath(), "yellowInner", "#ffffcc");%>
+      <table><tr><td>
+   </f:verbatim>
+   <h:graphicImage url="/images/icons/info_icon.gif" />
+   <f:verbatim>
+      </td><td>
+   </f:verbatim>
+   <h:outputText value="#{msg.start_workflow_no_metadata}" />
+   <f:verbatim>
+      </td></tr></table>
+      <%PanelGenerator.generatePanelEnd(out, request.getContextPath(), "yellowInner");%>
+   </f:verbatim>
+</h:panelGroup>
+
+<h:panelGroup rendered="#{WizardManager.bean.taskMetadataNode != null}">
+   <a:panel id="props-panel" label="#{msg.properties}" border="white" bgcolor="white" 
+            titleBorder="blue" titleBgcolor="#D3E6FE" styleClass="mainSubTitle">
+      
+      <r:propertySheetGrid id="task-props" value="#{WizardManager.bean.taskMetadataNode}" 
+                           var="taskProps" columns="1" externalConfig="true" />
+   </a:panel>
+</h:panelGroup>
+
+
+