For #1433: remove autocomplete from toolbar, make names more consistent

orbeon · Jul 17, 2019 · 231bef6 · 231bef6
1 parent c36181d
commit 231bef6
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 8 deletions.
diff --git a/form-runner/jvm/src/main/resources/xbl/orbeon/databound-select1/databound-select1.xbl b/form-runner/jvm/src/main/resources/xbl/orbeon/databound-select1/databound-select1.xbl
@@ -31,10 +31,10 @@
             xmlns="http://orbeon.org/oxf/xml/form-builder"
             xmlns:xf="http://www.w3.org/2002/xforms">
 
-            <display-name lang="en">Dynamic Data Dropdown</display-name>
+            <display-name lang="en">Dynamic Dropdown</display-name>
             <display-name lang="es">Lista Desplegable Dinámica</display-name>
             <display-name lang="fi">Dynaamisen datan pudotusvalikko</display-name>
-            <display-name lang="fr">Menu données dynamique</display-name>
+            <display-name lang="fr">Menu déroulant dynamique</display-name>
             <display-name lang="ru">Список из веб-сервиса</display-name>
             <display-name lang="de">Daten Dropdown-Liste</display-name>
             <display-name lang="it">Tendina dati</display-name>

diff --git a/...ner/jvm/src/main/resources/xbl/orbeon/dropdown-select1-search/dropdown-select1-search.xbl b/...ner/jvm/src/main/resources/xbl/orbeon/dropdown-select1-search/dropdown-select1-search.xbl
@@ -40,7 +40,7 @@
             <display-name lang="nl" todo="true">[With Search]</display-name>
             <display-name lang="sv" todo="true">[With Search]</display-name>
             <display-name lang="pt" todo="true">[With Search]</display-name>
-<!--            <toolbox show="false"/>-->
+            <toolbox show="false"/>
             <icon>
                 <icon-class>fa fa-fw fa-search</icon-class>
             </icon>

diff --git a/form-runner/jvm/src/main/resources/xbl/orbeon/dropdown-select1/dropdown-select1.xbl b/form-runner/jvm/src/main/resources/xbl/orbeon/dropdown-select1/dropdown-select1.xbl
@@ -28,10 +28,10 @@
         xxbl:label-for="select1">
 
         <metadata xmlns="http://orbeon.org/oxf/xml/form-builder">
-            <display-name lang="en">Dropdown Menu</display-name>
+            <display-name lang="en">Static Dropdown</display-name>
             <display-name lang="es">Menú Desplegable</display-name>
             <display-name lang="fi">Pudotusvalikko</display-name>
-            <display-name lang="fr">Menu déroulant</display-name>
+            <display-name lang="fr">Menu déroulant statique</display-name>
             <display-name lang="ru">Выпадающий список</display-name>
             <display-name lang="de">Dropdown-Menü</display-name>
             <display-name lang="it">Menu a tendina</display-name>

diff --git a/src/main/resources/config/properties-form-builder.xml b/src/main/resources/config/properties-form-builder.xml
@@ -73,16 +73,15 @@
         oxf:/forms/orbeon/builder/xbl/selection-controls.xbl
         oxf:/xbl/orbeon/dropdown-select1/dropdown-select1.xbl
         oxf:/xbl/orbeon/dropdown-select1-search/dropdown-select1-search.xbl
+        oxf:/xbl/orbeon/databound-select1/databound-select1.xbl
+        oxf:/xbl/orbeon/databound-select1-search/databound-select1-search.xbl
         oxf:/forms/orbeon/builder/xbl/selection-select1-full.xbl
         oxf:/xbl/orbeon/open-select1/open-select1.xbl
         oxf:/forms/orbeon/builder/xbl/selection-select-full.xbl
         oxf:/xbl/orbeon/box-select/box-select.xbl
         oxf:/xbl/orbeon/checkbox-input/checkbox-input.xbl
         oxf:/xbl/orbeon/yesno-input/yesno-input.xbl
         oxf:/forms/orbeon/builder/xbl/selection-input-boolean.xbl
-        oxf:/xbl/orbeon/databound-select1/databound-select1.xbl
-        oxf:/xbl/orbeon/databound-select1-search/databound-select1-search.xbl
-        oxf:/xbl/orbeon/autocomplete/autocomplete.xbl
     </property>
 
     <property as="xs:string"  name="oxf.fb.toolbox.group.attachment.uri.*.*">