back to buttons

git-svn-id: svn://svn.open-ils.org/ILS/trunk@7276 dcc99617-32d9-48b4-a31d-7c20da2025e4

diff --git a/Open-ILS/web/reports/xul/template_builder.xul b/Open-ILS/web/reports/xul/template_builder.xul
index 7512ca0..2fb0ff5 100644 (file)
--- a/Open-ILS/web/reports/xul/template_builder.xul
+++ b/Open-ILS/web/reports/xul/template_builder.xul
@@ -185,7 +185,9 @@
                                                                </hbox>
                                                                <hbox pack="center">
                                                                        <button label="Alter Display Header" oncommand="alterColumnLabel()"/>
-                                                                       <menulist label="Change Transform" popup='dis_tab_trans_menu'/>
+                                                                       <button type="menu" label="Change Transform">
+                                                                               <menupopup id='dis_tab_trans_menu'/>
+                                                                       </button>
                                                                        <spacer flex="1"/>
                                                                        <button label="Move Up" oncommand="changeDisplayOrder('u')"/>
                                                                        <button label="Move Down" oncommand="changeDisplayOrder('d')"/>
@@ -218,8 +220,12 @@
                                                                        </tree>
                                                                </hbox>
                                                                <hbox pack="center">
-                                                                       <menulist label="Change Transform" popup='filter_tab_trans_menu'/>
-                                                                       <menulist label="Change Operator" popup='filter_tab_op_menu'/>
+                                                                       <button type="menu" label="Change Transform">
+                                                                               <menupopup id='filter_tab_trans_menu'/>
+                                                                       </button>
+                                                                       <button type="menu" label="Change Operator">
+                                                                               <menupopup id='filter_tab_op_menu'/>
+                                                                       </button>
                                                                        <button label="Change value" command="filter_tab_value_action"/>
                                                                        <button label="Remove value" oncommand="removeTemplateFilterValue()"/>
                                                                        <spacer flex="1"/>
@@ -251,8 +257,12 @@
                                                                        </tree>
                                                                </hbox>
                                                                <hbox pack="center">
-                                                                       <menulist label="Change Transform" popup='aggfilter_tab_trans_menu'/>
-                                                                       <menulist label="Change Operator" popup='aggfilter_tab_op_menu'/>
+                                                                       <button type="menu" label="Change Transform">
+                                                                               <menupopup id='aggfilter_tab_trans_menu'/>
+                                                                       </button>
+                                                                       <button type="menu" label="Change Operator">
+                                                                               <menupopup id='aggfilter_tab_op_menu'/>
+                                                                       </button>
                                                                        <button label="Change value" command="aggfilter_tab_value_action"/>
                                                                        <button label="Remove value" oncommand="removeTemplateFilterValue()"/>
                                                                        <spacer flex="1"/>
@@ -295,11 +305,6 @@
 
 <popupset>
        <popup id="source-menu" position="after_start"/>
-       <popup id="dis_tab_trans_menu" position="before_start"/>
-       <popup id="filter_tab_op_menu" position="before_start"/>
-       <popup id="filter_tab_trans_menu" position="before_start"/>
-       <popup id="aggfilter_tab_op_menu" position="before_start"/>
-       <popup id="aggfilter_tab_trans_menu" position="before_start"/>
        <popup
                id="calendar-widget"
                position="before_start"