Merged 'feature/layouteditor' into 1.x.

src/Orchard.Web/Modules/Orchard.DynamicForms/Orchard.DynamicForms.csproj

@@ -48,6 +48,10 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Microsoft.CSharp" />
+    <Reference Include="Newtonsoft.Json, Version=4.5.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\lib\newtonsoft.json\Newtonsoft.Json.dll</HintPath>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Data" />
     <Reference Include="System.ComponentModel.DataAnnotations">
@@ -74,14 +78,25 @@
     <Reference Include="System.Xml.Linq" />
   </ItemGroup>
   <ItemGroup>
-    <Content Include="Scripts\jquery.validate.js" />
-    <Content Include="Scripts\jquery.validate.min.js" />
-    <Content Include="Scripts\jquery.validate.unobtrusive.additional.js" />
-    <Content Include="Scripts\jquery.validate.unobtrusive.js" />
-    <Content Include="Scripts\jquery.validate.unobtrusive.min.js" />
-    <Content Include="Styles\form-elements.css" />
+    <Content Include="Scripts\Forms.js">
+      <DependentUpon>Forms.js.bundle</DependentUpon>
+    </Content>
+    <Content Include="Scripts\Forms.min.js">
+      <DependentUpon>Forms.js</DependentUpon>
+    </Content>
+    <Content Include="Scripts\Layouts\Directives\Form.js" />
+    <Content Include="Scripts\Layouts\Models\Form.js" />
+    <Content Include="Scripts\Lib\jquery.validate.js" />
+    <Content Include="Scripts\Lib\jquery.validate.min.js">
+      <DependentUpon>jquery.validate.js</DependentUpon>
+    </Content>
+    <Content Include="Scripts\Lib\jquery.validate.unobtrusive.additional.js" />
+    <Content Include="Scripts\Lib\jquery.validate.unobtrusive.js" />
+    <Content Include="Scripts\Lib\jquery.validate.unobtrusive.min.js">
+      <DependentUpon>jquery.validate.unobtrusive.js</DependentUpon>
+    </Content>
+    <Content Include="Styles\forms.css" />
     <Content Include="Styles\forms-admin.css" />
-    <Content Include="Styles\form.designer.css" />
     <Content Include="Styles\menu.dynamicforms-admin.css" />
     <Content Include="Styles\menu.dynamicforms.png" />
     <Content Include="Web.config" />
@@ -107,6 +122,10 @@
       <Project>{3dd574cd-9c5d-4a45-85e1-ebba64c22b5f}</Project>
       <Name>Orchard.AuditTrail</Name>
     </ProjectReference>
+    <ProjectReference Include="..\Orchard.Fields\Orchard.Fields.csproj">
+      <Project>{3787dde5-e5c8-4841-bda7-dcb325388064}</Project>
+      <Name>Orchard.Fields</Name>
+    </ProjectReference>
     <ProjectReference Include="..\Orchard.Forms\Orchard.Forms.csproj">
       <Project>{642a49d7-8752-4177-80d6-bfbbcfad3de0}</Project>
       <Name>Orchard.Forms</Name>
@@ -145,6 +164,10 @@
     <Compile Include="Activities\AddModelErrorActivity.cs" />
     <Compile Include="Activities\DynamicFormValidatingActivity.cs" />
     <Compile Include="Activities\DynamicFormSubmittedActivity.cs" />
+    <Compile Include="Bindings\BooleanFieldBindings.cs" />
+    <Compile Include="Bindings\EnumerationFieldBindings.cs" />
+    <Compile Include="Bindings\InputFieldBindings.cs" />
+    <Compile Include="Bindings\TaxonomyFieldBindings.cs" />
     <Compile Include="Forms\AddModelErrorForm.cs" />
     <Compile Include="Forms\SelectDynamicForms.cs" />
     <Compile Include="Bindings\TextFieldBindings.cs" />
@@ -153,12 +176,12 @@
     <Compile Include="Controllers\SubmissionAdminController.cs" />
     <Compile Include="Controllers\AdminController.cs" />
     <Compile Include="Controllers\FormController.cs" />
-    <Compile Include="Drivers\EmailFieldDriver.cs" />
-    <Compile Include="Drivers\PasswordFieldDriver.cs" />
-    <Compile Include="Drivers\QueryDriver.cs" />
-    <Compile Include="Drivers\ReCaptchaDriver.cs" />
-    <Compile Include="Drivers\ValidationMessageDriver.cs" />
-    <Compile Include="Drivers\ValidationSummaryDriver.cs" />
+    <Compile Include="Drivers\EmailFieldElementDriver.cs" />
+    <Compile Include="Drivers\PasswordFieldElementDriver.cs" />
+    <Compile Include="Drivers\QueryElementDriver.cs" />
+    <Compile Include="Drivers\ReCaptchaElementDriver.cs" />
+    <Compile Include="Drivers\ValidationMessageElementDriver.cs" />
+    <Compile Include="Drivers\ValidationSummaryElementDriver.cs" />
     <Compile Include="Elements\EmailField.cs" />
     <Compile Include="Elements\PasswordField.cs" />
     <Compile Include="Elements\Query.cs" />
@@ -167,7 +190,10 @@
     <Compile Include="Elements\ValidationSummary.cs" />
     <Compile Include="Forms\DynamicFormValidatingForm.cs" />
     <Compile Include="Handlers\ClientValidationRegistrationCoordinator.cs" />
+    <Compile Include="Handlers\LayoutEditorShapeEventHandler.cs" />
     <Compile Include="Handlers\WorkflowValidatorCoordinator.cs" />
+    <Compile Include="ResourceManifest.cs" />
+    <Compile Include="Services\FormModelMap.cs" />
     <Compile Include="Services\Models\FormSubmissionTokenContext.cs" />
     <Compile Include="Handlers\ValidatorsCoordinator.cs" />
     <Compile Include="Handlers\FormSubmissionCoordinator.cs" />
@@ -203,13 +229,13 @@
     <Compile Include="Services\Models\FormEventContext.cs" />
     <Compile Include="Drivers\ValidationElementDriver.cs" />
     <Compile Include="Drivers\BindingsElementDriver.cs" />
-    <Compile Include="Drivers\TaxonomyDriver.cs" />
-    <Compile Include="Drivers\HiddenFieldDriver.cs" />
-    <Compile Include="Drivers\CheckboxDriver.cs" />
-    <Compile Include="Drivers\TextAreaDriver.cs" />
-    <Compile Include="Drivers\RadioButtonDriver.cs" />
-    <Compile Include="Drivers\EnumerationDriver.cs" />
-    <Compile Include="Drivers\UserNameFieldDriver.cs" />
+    <Compile Include="Drivers\TaxonomyElementDriver.cs" />
+    <Compile Include="Drivers\HiddenFieldElementDriver.cs" />
+    <Compile Include="Drivers\CheckboxElementDriver.cs" />
+    <Compile Include="Drivers\TextAreaElementDriver.cs" />
+    <Compile Include="Drivers\RadioButtonElementDriver.cs" />
+    <Compile Include="Drivers\EnumerationElementDriver.cs" />
+    <Compile Include="Drivers\UserNameFieldElementDriver.cs" />
     <Compile Include="Elements\LabeledFormElement.cs" />
     <Compile Include="Elements\Taxonomy.cs" />
     <Compile Include="Elements\HiddenField.cs" />
@@ -257,9 +283,9 @@
     <Compile Include="Helpers\SubmissionExtensions.cs" />
     <Compile Include="ViewModels\FormsIndexViewModel.cs" />
     <Compile Include="Drivers\CommonFormElementDriver.cs" />
-    <Compile Include="Drivers\FormDriver.cs" />
-    <Compile Include="Drivers\ButtonDriver.cs" />
-    <Compile Include="Drivers\IpAddressFieldDriver.cs" />
+    <Compile Include="Drivers\FormElementDriver.cs" />
+    <Compile Include="Drivers\ButtonElementDriver.cs" />
+    <Compile Include="Drivers\IpAddressFieldElementDriver.cs" />
     <Compile Include="Elements\IpAddressField.cs" />
     <Compile Include="Handlers\IpAddressFieldHandler.cs" />
     <Compile Include="AdminMenu.cs" />
@@ -272,8 +298,8 @@
     <Compile Include="Services\FormService.cs" />
     <Compile Include="Services\IFormElementEventHandler.cs" />
     <Compile Include="Services\IFormService.cs" />
-    <Compile Include="Drivers\LabelDriver.cs" />
-    <Compile Include="Drivers\TextFieldDriver.cs" />
+    <Compile Include="Drivers\LabelElementDriver.cs" />
+    <Compile Include="Drivers\TextFieldElementDriver.cs" />
     <Compile Include="Elements\FormCategoryProvider.cs" />
     <Compile Include="Elements\FormElement.cs" />
     <Compile Include="Elements\Form.cs" />
@@ -286,28 +312,25 @@
     <Content Include="Views\SubmissionAdmin\Index.cshtml" />
   </ItemGroup>
   <ItemGroup>
-    <Content Include="Views\Element-Form-TextField.cshtml" />
+    <Content Include="Views\Elements\TextField.cshtml" />
   </ItemGroup>
   <ItemGroup>
-    <Content Include="Views\Element-Form.Design.cshtml" />
+    <Content Include="Views\Elements\Button.cshtml" />
   </ItemGroup>
   <ItemGroup>
-    <Content Include="Views\Element-Form-Button.cshtml" />
+    <Content Include="Views\Elements\Form.cshtml" />
   </ItemGroup>
   <ItemGroup>
-    <Content Include="Views\Element-Form.cshtml" />
+    <Content Include="Views\Elements\Label.cshtml" />
   </ItemGroup>
   <ItemGroup>
-    <Content Include="Views\Element-Form-Label.cshtml" />
+    <Content Include="Views\Elements\TextField.Design.cshtml" />
   </ItemGroup>
   <ItemGroup>
-    <Content Include="Views\Element-Form-TextField.Design.cshtml" />
+    <Content Include="Views\Elements\IpAddressField.cshtml" />
   </ItemGroup>
   <ItemGroup>
-    <Content Include="Views\Element-Form-IpAddressField.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\Element-Form-IpAddressField.Design.cshtml" />
+    <Content Include="Views\Elements\IpAddressField.Design.cshtml" />
   </ItemGroup>
   <ItemGroup>
     <Content Include="Views\Admin\Index.cshtml" />
@@ -319,58 +342,58 @@
     <Content Include="Views\EditorTemplates\FormBindings.cshtml" />
   </ItemGroup>
   <ItemGroup>
-    <Content Include="Views\Element-Form-UserNameField.cshtml" />
+    <Content Include="Views\Elements\UserNameField.cshtml" />
   </ItemGroup>
   <ItemGroup>
-    <Content Include="Views\Element-Form-UserNameField.Design.cshtml" />
+    <Content Include="Views\Elements\UserNameField.Design.cshtml" />
   </ItemGroup>
   <ItemGroup>
-    <Content Include="Views\Element-Form-HiddenField.Design.cshtml" />
+    <Content Include="Views\Elements\HiddenField.Design.cshtml" />
   </ItemGroup>
   <ItemGroup>
-    <Content Include="Views\Element-Form-HiddenField.cshtml" />
+    <Content Include="Views\Elements\HiddenField.cshtml" />
   </ItemGroup>
   <ItemGroup>
-    <Content Include="Views\Element-Form-TextArea.cshtml" />
+    <Content Include="Views\Elements\TextArea.cshtml" />
   </ItemGroup>
   <ItemGroup>
-    <Content Include="Views\Element-Form-TextArea.Design.cshtml" />
+    <Content Include="Views\Elements\TextArea.Design.cshtml" />
   </ItemGroup>
   <ItemGroup>
-    <Content Include="Views\Element-Form-RadioButton.cshtml" />
+    <Content Include="Views\Elements\RadioButton.cshtml" />
   </ItemGroup>
   <ItemGroup>
-    <Content Include="Views\Element-Form-RadioButton.Design.cshtml" />
+    <Content Include="Views\Elements\RadioButton.Design.cshtml" />
   </ItemGroup>
   <ItemGroup>
-    <Content Include="Views\Element-Form-Checkbox.Design.cshtml" />
+    <Content Include="Views\Elements\Checkbox.Design.cshtml" />
   </ItemGroup>
   <ItemGroup>
-    <Content Include="Views\Element-Form-Checkbox.cshtml" />
+    <Content Include="Views\Elements\Checkbox.cshtml" />
   </ItemGroup>
   <ItemGroup>
-    <Content Include="Views\Element-Form-Enumeration-SelectList.cshtml" />
+    <Content Include="Views\Elements\Enumeration-SelectList.cshtml" />
   </ItemGroup>
   <ItemGroup>
-    <Content Include="Views\Element-Form-Enumeration-MultiSelectList.cshtml" />
+    <Content Include="Views\Elements\Enumeration-MultiSelectList.cshtml" />
   </ItemGroup>
   <ItemGroup>
-    <Content Include="Views\Element-Form-Enumeration-RadioList.cshtml" />
+    <Content Include="Views\Elements\Enumeration-RadioList.cshtml" />
   </ItemGroup>
   <ItemGroup>
-    <Content Include="Views\Element-Form-Enumeration-CheckList.cshtml" />
+    <Content Include="Views\Elements\Enumeration-CheckList.cshtml" />
   </ItemGroup>
   <ItemGroup>
-    <Content Include="Views\Element-Form-Taxonomy-SelectList.cshtml" />
+    <Content Include="Views\Elements\Taxonomy-SelectList.cshtml" />
   </ItemGroup>
   <ItemGroup>
-    <Content Include="Views\Element-Form-Taxonomy-RadioList.cshtml" />
+    <Content Include="Views\Elements\Taxonomy-RadioList.cshtml" />
   </ItemGroup>
   <ItemGroup>
-    <Content Include="Views\Element-Form-Taxonomy-MultiSelectList.cshtml" />
+    <Content Include="Views\Elements\Taxonomy-MultiSelectList.cshtml" />
   </ItemGroup>
   <ItemGroup>
-    <Content Include="Views\Element-Form-Taxonomy-CheckList.cshtml" />
+    <Content Include="Views\Elements\Taxonomy-CheckList.cshtml" />
   </ItemGroup>
   <ItemGroup>
     <Content Include="Views\Activity-DynamicFormSubmitted.cshtml" />
@@ -379,49 +402,70 @@
     <Content Include="Views\BlueprintAdmin\Index.cshtml" />
   </ItemGroup>
   <ItemGroup>
-    <Content Include="Views\Element-Form-ValidationSummary.cshtml" />
+    <Content Include="Views\Elements\ValidationSummary.cshtml" />
   </ItemGroup>
   <ItemGroup>
-    <Content Include="Views\Element-Form-ValidationSummary.Design.cshtml" />
+    <Content Include="Views\Elements\ValidationSummary.Design.cshtml" />
   </ItemGroup>
   <ItemGroup>
-    <Content Include="Views\Element-Form-ValidationMessage.cshtml" />
+    <Content Include="Views\Elements\ValidationMessage.cshtml" />
   </ItemGroup>
   <ItemGroup>
-    <Content Include="Views\Element-Form-ValidationMessage.Design.cshtml" />
+    <Content Include="Views\Elements\ValidationMessage.Design.cshtml" />
   </ItemGroup>
   <ItemGroup>
     <Content Include="Views\FormElement.Wrapper.cshtml" />
   </ItemGroup>
   <ItemGroup>
-    <Content Include="Views\Element-Form-PasswordField.Design.cshtml" />
+    <Content Include="Views\Elements\PasswordField.Design.cshtml" />
   </ItemGroup>
   <ItemGroup>
-    <Content Include="Views\Element-Form-PasswordField.cshtml" />
+    <Content Include="Views\Elements\PasswordField.cshtml" />
   </ItemGroup>
   <ItemGroup>
-    <Content Include="Views\Element-Form-Query-SelectList.cshtml" />
+    <Content Include="Views\Elements\Query-SelectList.cshtml" />
   </ItemGroup>
   <ItemGroup>
-    <Content Include="Views\Element-Form-Query-CheckList.cshtml" />
+    <Content Include="Views\Elements\Query-CheckList.cshtml" />
   </ItemGroup>
   <ItemGroup>
-    <Content Include="Views\Element-Form-Query-MultiSelectList.cshtml" />
+    <Content Include="Views\Elements\Query-MultiSelectList.cshtml" />
   </ItemGroup>
   <ItemGroup>
-    <Content Include="Views\Element-Form-Query-RadioList.cshtml" />
+    <Content Include="Views\Elements\Query-RadioList.cshtml" />
   </ItemGroup>
   <ItemGroup>
-    <Content Include="Views\Element-Form-EmailField.Design.cshtml" />
+    <Content Include="Views\Elements\EmailField.Design.cshtml" />
   </ItemGroup>
   <ItemGroup>
-    <Content Include="Views\Element-Form-EmailField.cshtml" />
+    <Content Include="Views\Elements\EmailField.cshtml" />
   </ItemGroup>
   <ItemGroup>
-    <Content Include="Views\Element-Form-ReCaptcha.cshtml" />
+    <Content Include="Views\Elements\ReCaptcha.cshtml" />
   </ItemGroup>
   <ItemGroup>
-    <Content Include="Views\Element-Form-ReCaptcha.Design.cshtml" />
+    <Content Include="Views\Elements\ReCaptcha.Design.cshtml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Scripts\Lib\jquery.validate.min.js.map">
+      <DependentUpon>jquery.validate.min.js</DependentUpon>
+    </Content>
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Scripts\Lib\jquery.validate.unobtrusive.min.js.map">
+      <DependentUpon>jquery.validate.unobtrusive.min.js</DependentUpon>
+    </Content>
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Scripts\Forms.js.bundle" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Views\LayoutEditor.Template.Form.cshtml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Scripts\Forms.min.js.map">
+      <DependentUpon>Forms.min.js</DependentUpon>
+    </Content>
   </ItemGroup>
   <PropertyGroup>
     <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>