Optimize locations of Div and FileInput widgets

pyzebra/app/panel_ccl_integrate.py

@@ -103,7 +103,7 @@ def create():
     def ccl_file_select_callback(_attr, _old, _new):
         pass
 
-    file_select = Select(title="Available files:")
+    file_select = Select(title="Available .ccl/.dat files:")
     file_select.on_change("value", ccl_file_select_callback)
 
     def file_open_button_callback():
@@ -137,6 +137,7 @@ def create():
 
         _init_datatable()
 
+    upload_div = Div(text="or upload .ccl/.dat file:", margin=(5, 5, 0, 5))
     upload_button = FileInput(accept=".ccl,.dat")
     upload_button.on_change("value", upload_button_callback)
 
@@ -150,6 +151,7 @@ def create():
 
         _init_datatable()
 
+    append_upload_div = Div(text="append extra file:", margin=(5, 5, 0, 5))
     append_upload_button = FileInput(accept=".ccl,.dat")
     append_upload_button.on_change("value", append_upload_button_callback)
 
@@ -595,19 +597,14 @@ def create():
         ),
     )
 
-    upload_div = Div(text="or upload file:")
-    append_upload_div = Div(text="append extra files:")
     tab_layout = column(
         row(
             proposal_textinput,
             file_select,
             column(Spacer(height=19), row(file_open_button, file_append_button)),
-        ),
+            Spacer(width=100),
-        row(
+            column(upload_div, upload_button),
-            column(Spacer(height=5), upload_div),
+            column(append_upload_div, append_upload_button),
-            upload_button,
-            column(Spacer(height=5), append_upload_div),
-            append_upload_button,
         ),
         row(scan_table, plot, Spacer(width=30), fit_output_textinput, export_layout),
         row(findpeak_controls, Spacer(width=30), fitpeak_controls),

pyzebra/app/panel_hdf_anatric.py

@@ -12,6 +12,7 @@ from bokeh.models import (
     Panel,
     RadioButtonGroup,
     Select,
+    Spacer,
     TextAreaInput,
     TextInput,
 )
@@ -98,12 +99,11 @@ def create():
         minPeakCount_textinput.disabled = disable_adaptivedynamic
         displacementCurve_textinput.disabled = disable_adaptivedynamic
 
-    upload_div = Div(text="Open XML configuration file:")
-
     def upload_button_callback(_attr, _old, new):
         with io.BytesIO(base64.b64decode(new)) as file:
             _load_config_file(file)
 
+    upload_div = Div(text="Open XML configuration file:")
     upload_button = FileInput(accept=".xml")
     upload_button.on_change("value", upload_button_callback)
 
@@ -362,8 +362,7 @@ def create():
 
     tab_layout = row(
         column(
-            upload_div,
+            row(column(Spacer(height=2), upload_div), upload_button),
-            upload_button,
             row(logfile_textinput, logfile_verbosity_select),
             row(filelist_type, filelist_format_textinput),
             filelist_datapath_textinput,

pyzebra/app/panel_hdf_viewer.py

@@ -44,6 +44,7 @@ IMAGE_H = 128
 
 PROPOSAL_PATH = "/afs/psi.ch/project/sinqdata/2020/zebra/"
 
+
 def create():
     det_data = {}
     roi_selection = {}
@@ -67,6 +68,7 @@ def create():
             filelist.options = [(entry, os.path.basename(entry)) for entry in file_list]
             filelist.value = file_list[0]
 
+    upload_div = Div(text="or upload .cami file:", margin=(5, 5, 0, 5))
     upload_button = FileInput(accept=".cami")
     upload_button.on_change("value", upload_button_callback)
 
@@ -588,11 +590,11 @@ def create():
         ),
     )
 
-    upload_div = Div(text="Or upload .cami file:")
     tab_layout = row(
         column(
-            row(proposal_textinput, filelist),
+            row(
-            row(column(Spacer(height=5), upload_div), upload_button),
+                proposal_textinput, filelist, Spacer(width=100), column(upload_div, upload_button),
+            ),
             layout_overview,
             layout_controls,
         ),

pyzebra/app/panel_param_study.py

@@ -157,6 +157,7 @@ def create():
 
         _init_datatable()
 
+    upload_div = Div(text="or upload .dat files:", margin=(5, 5, 0, 5))
     upload_button = FileInput(accept=".dat", multiple=True)
     upload_button.on_change("value", upload_button_callback)
 
@@ -169,6 +170,7 @@ def create():
 
         _init_datatable()
 
+    append_upload_div = Div(text="append extra files:", margin=(5, 5, 0, 5))
     append_upload_button = FileInput(accept=".dat", multiple=True)
     append_upload_button.on_change("value", append_upload_button_callback)
 
@@ -677,19 +679,14 @@ def create():
 
     export_layout = column(preview_output_textinput, row(preview_output_button, save_button))
 
-    upload_div = Div(text="Or upload .dat files:")
-    append_upload_div = Div(text="append extra .dat files:")
     tab_layout = column(
         row(
             proposal_textinput,
             file_select,
             column(Spacer(height=19), row(file_open_button, file_append_button)),
-        ),
+            Spacer(width=100),
-        row(
+            column(upload_div, upload_button),
-            column(Spacer(height=5), upload_div),
+            column(append_upload_div, append_upload_button),
-            upload_button,
-            column(Spacer(height=5), append_upload_div),
-            append_upload_button,
         ),
         row(scan_table, plots, Spacer(width=30), fit_output_textinput, export_layout),
         row(findpeak_controls, Spacer(width=30), fitpeak_controls),