Merge branch 'develop'

* develop:
  add select elements to form

Resources/Private/Templates/Dashboard/Index.html

@@ -95,11 +95,33 @@
     </div>
     <div class="form-group">
       <label for="typeTitle">Type:</label>
-      <f:form.textfield name="typeTitle" additionalAttributes="{style: 'width: 150px; height: 30px; display: block;'}" /><br>
+      <f:form.select name="typeTitle" additionalAttributes="{style: 'width: 150px; height: 30px; display: block;'}">
+        <f:form.select.option value="middleWords">middleWords</f:form.select.option>
+        <f:form.select.option value="ausbildungWords">ausbildungWords</f:form.select.option>
+        <f:form.select.option value="studiumWords">studiumWords</f:form.select.option>
+        <f:form.select.option value="bewerbung">bewerbung</f:form.select.option>
+        <f:form.select.option value="weiterbildung">weiterbildung</f:form.select.option>
+        <f:form.select.option value="direct">direct</f:form.select.option>
+        <f:form.select.option value="medical">medical</f:form.select.option>
+        <f:form.select.option value="blacklist">blacklist</f:form.select.option>
+      </f:form.select><br>
     </div>
     <div class="form-group">
       <label for="categoryTitle">Category:</label>
-      <f:form.textfield name="categoryTitle" additionalAttributes="{style: 'width: 150px; height: 30px; display: block;'}" /><br>
+      <f:form.select name="categoryTitle" additionalAttributes="{style: 'width: 150px; height: 30px; display: block;'}">
+        <f:form.select.option value="Verben">Verben</f:form.select.option>
+        <f:form.select.option value="Nomen">Nomen</f:form.select.option>
+        <f:form.select.option value="Adjektive">Adjektive</f:form.select.option>
+        <f:form.select.option value="Konjunktionen">Konjunktionen</f:form.select.option>
+        <f:form.select.option value="Artikel">Artikel</f:form.select.option>
+        <f:form.select.option value="Personalpronomen">Personalpronomen</f:form.select.option>
+        <f:form.select.option value="Relativpronomen">Relativpronomen</f:form.select.option>
+        <f:form.select.option value="Indefinitpronomen">Indefinitpronomen</f:form.select.option>
+        <f:form.select.option value="Numerale">Numerale</f:form.select.option>
+        <f:form.select.option value="Praepositionen">Präpositionen</f:form.select.option>
+        <f:form.select.option value="Adverbien">Adverbien</f:form.select.option>
+        <f:form.select.option value="Partikel">Partikel</f:form.select.option>
+      </f:form.select><br>
     </div>
     <div class="form-group">
       <label for="urlTitle">URL:</label>