Added short title to fields (#6)

* Implemented #2 by added short title to fields

CHANGELOG.md

@@ -1,6 +1,8 @@
 # Changelog
 
 ## dev-develop
+
+ - FEATURE     #3     Added short title to fields
  - FEATURE     #2     Changed title field for labels to texteditor
  - ENHANCEMENT #-     Updated namespaces and rename table names
- - ENHANCEMENT #-     Forked from `alexander-schranz/sulu-form-bundle` from commit `36a7cd11562ed0c9f64752b37707cc2771e0baca`
+ - ENHANCEMENT #-     Forked from `alexander-schranz/sulu-form-bundle` from commit `36a7cd11562ed0c9f64752b37707cc2771e0baca`

Controller/FormController.php

@@ -569,6 +569,7 @@ private function getApiEntity(Form $entity, $locale)
                 $fieldData['title'] = $fieldTranslation->getTitle();
                 $fieldData['placeholder'] = $fieldTranslation->getPlaceholder();
                 $fieldData['defaultValue'] = $fieldTranslation->getDefaultValue();
+                $fieldData['shortTitle'] = $fieldTranslation->getShortTitle();
 
                 foreach ($fieldTranslation->getOptions() as $key => $option) {
                     $fieldData['options[' . $key . ']'] = $option;

Entity/Form.php

@@ -203,6 +203,7 @@ public function serializeForLocale($locale, Dynamic $dynamic = null)
                 'options' => $fieldTranslation->getOptions(),
                 'defaultValue' => $fieldTranslation->getDefaultValue(),
                 'placeholder' => $fieldTranslation->getPlaceholder(),
+                'shortTitle' => $fieldTranslation->getShortTitle(),
                 'value' => $value,
             ];
 

Entity/FormFieldTranslation.php

@@ -34,6 +34,11 @@ class FormFieldTranslation
      */
     private $defaultValue;
 
+    /**
+     * @var string
+     */
+    private $shortTitle;
+
     /**
      * @var string
      */
@@ -147,6 +152,26 @@ public function setDefaultValue($defaultValue)
         return $this;
     }
 
+    /**
+     * @return string
+     */
+    public function getShortTitle()
+    {
+        return $this->shortTitle;
+    }
+
+    /**
+     * @param string $shortTitle
+     *
+     * @return FormFieldTranslation
+     */
+    public function setShortTitle($shortTitle)
+    {
+        $this->shortTitle = $shortTitle;
+
+        return $this;
+    }
+
     /**
      * @return array
      */

Manager/FormManager.php

@@ -142,6 +142,7 @@ public function save($data, $locale = null, $id = null)
             $fieldTranslation->setTitle(self::getValue($fieldData, 'title'));
             $fieldTranslation->setPlaceholder(self::getValue($fieldData, 'placeholder'));
             $fieldTranslation->setDefaultValue(self::getValue($fieldData, 'defaultValue'));
+            $fieldTranslation->setShortTitle(self::getValue($fieldData, 'shortTitle'));
 
 
             // Field Options

Resources/config/doctrine/FormFieldTranslation.orm.xml

@@ -11,6 +11,7 @@
         <field name="title" column="title" type="text" nullable="true"/>
         <field name="placeholder" column="placeholder" type="string" length="255" nullable="true"/>
         <field name="defaultValue" column="defaultValue" type="string" length="255" nullable="true"/>
+        <field name="shortTitle" column="shortTitle" type="string" length="255" nullable="true"/>
         <field name="locale" column="locale" type="string" length="5"/>
         <field name="options" column="options" type="text" nullable="true"/>
 

Resources/doc/dynamic.md

@@ -137,7 +137,7 @@ form-notify.html.twig
     {% endif %}
 
     {% if value is not empty %}
-        <strong>{{ field.title|default('')|raw }}</strong>: {{ value }}<br>
+        <strong>{{ field.shortTitle|default(field.title)|raw }}</strong>: {{ value }}<br>
     {% endif %}
 {% endfor %}
 ```

Resources/translations/sulu/backend.de.xlf

@@ -257,6 +257,14 @@
                 <source>sulu_form.width.five-sixths</source>
                 <target>Fünf Sechstel</target>
             </trans-unit>
+            <trans-unit id="78">
+                <source>sulu_form.short_title</source>
+                <target>Kurztitel</target>
+            </trans-unit>
+            <trans-unit id="79">
+                <source>sulu_form.short_title_description</source>
+                <target>Optionaler Titel des Feldes, z.B. in der Benachrichtigungs-Email.</target>
+            </trans-unit>
         </body>
     </file>
 </xliff>

Resources/translations/sulu/backend.en.xlf

@@ -257,6 +257,14 @@
                 <source>sulu_form.width.five-sixths</source>
                 <target>five sixths</target>
             </trans-unit>
+            <trans-unit id="78">
+                <source>sulu_form.short_title</source>
+                <target>Short title</target>
+            </trans-unit>
+            <trans-unit id="79">
+                <source>sulu_form.short_title_description</source>
+                <target>Optional title of field, for example in notification mail.</target>
+            </trans-unit>
         </body>
     </file>
 </xliff>

Resources/translations/sulu/backend.fr.xlf

@@ -256,6 +256,14 @@
                 <source>sulu_form.width.five-sixths</source>
                 <target>cinq sixièmes</target>
             </trans-unit>
+            <trans-unit id="78">
+                <source>sulu_form.short_title</source>
+                <target>Titre abrégé</target>
+            </trans-unit>
+            <trans-unit id="79">
+                <source>sulu_form.short_title_description</source>
+                <target>Titre facultatif du champ dans la notification email p. ex.</target>
+            </trans-unit>
         </body>
     </file>
 </xliff>

Resources/views/forms/fields/default-field.html.twig

@@ -99,6 +99,25 @@
                                     <div class="input-description"></div>
                                 </div>
                             {% endblock %}
+
+                            {% block short_title %}
+                                <div class="grid-col-12 floating form-group">
+                                    <label for="short-title<~=index~>" class="pointer" title="Short Title">
+                                        <%= translate('sulu_form.short_title') %>
+                                    </label>
+
+                                    <input id="short-title<~=index~>"
+                                           data-property="shortTitle"
+                                           type="text"
+                                           class="form-element preview-update trigger-save-button"
+                                           maxlength="255"
+                                           data-mapper-property="shortTitle"/>
+
+                                    <div class="block-content" data-sort-mode-id="{{ blockId }}shortTitle<~=index~>"></div>
+
+                                    <div class="input-description"><%= translate('sulu_form.short_title_description') %></div>
+                                </div>
+                            {% endblock %}
                         </div>
                     </div>
                 {% endblock %}

Resources/views/forms/fields/types/freetext.html.twig

@@ -2,6 +2,8 @@
 
 {% block required %}{% endblock %}
 
+{% block short_title %}{% endblock %}
+
 {% block placeholder_default %}
 {% endblock %}
 

Resources/views/forms/fields/types/headline.html.twig

@@ -2,6 +2,8 @@
 
 {% block required %}{% endblock %}
 
+{% block short_title %}{% endblock %}
+
 {% block placeholder_default %}
 {% endblock %}
 

Resources/views/forms/fields/types/spacer.html.twig

@@ -2,7 +2,7 @@
 
 {% block required %}{% endblock %}
 
-{% block title %}{% endblock %}
+{% block title_short_title %}{% endblock %}
 
 {% block placeholder_default %}
 {% endblock %}