Merge pull request #9 from creative-commoners/pulls/1.0/up-to-date-or…

…-prune FIX Update i18n plurals, block type, add title to template and clearfix underneath form
dnadesign · Oct 25, 2017 · 81a72cf · 81a72cf
2 parents 5a8cc3c + 44c7c27
commit 81a72cf
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 15 deletions.
diff --git a/lang/_manifest_exclude b/lang/_manifest_exclude
diff --git a/lang/en.yml b/lang/en.yml
@@ -0,0 +1,8 @@
+en:
+  DNADesign\ElementalUserForms\Model\ElementForm:
+    BlockType: Form
+    PLURALNAME: forms
+    PLURALS:
+      one: 'A form'
+      other: '{count} forms'
+    SINGULARNAME: form
diff --git a/src/Model/ElementForm.php b/src/Model/ElementForm.php
@@ -12,26 +12,16 @@ class ElementForm extends BaseElement
 {
     use UserForm;
 
-    /**
-     * @var string
-     */
     private static $table_name = 'ElementForm';
 
-    /**
-     * @var string
-     */
-    private static $title = 'Form';
-
-    /**
-     * @var string
-     */
     private static $icon = 'dnadesign/silverstripe-elemental-userforms:images/form.svg';
 
-    /**
-     * @var string
-     */
     private static $controller_class = ElementFormController::class;
 
+    private static $singular_name = 'form';
+
+    private static $plural_name = 'forms';
+
     /**
      * @return UserForm
      */
@@ -70,4 +60,9 @@ public function Link($action = null)
 
         return parent::Link($action);
     }
+
+    public function getType()
+    {
+        return _t(__CLASS__ . '.BlockType', 'Form');
+    }
 }
diff --git a/templates/DNADesign/ElementalUserForms/Model/ElementForm.ss b/templates/DNADesign/ElementalUserForms/Model/ElementForm.ss
@@ -1,3 +1,8 @@
-<div class="formelement__form">
+<div class="form-element__form $ExtraClass">
+    <% if $Title && $ShowTitle %>
+        <h2 class="form-element__title">$Title</h2>
+    <% end_if %>
+
     $ElementForm
 </div>
+<div style="clear: both"></div>