Skip to content

Commit 1f4fc42

Browse files
RdornierRdornier
committed
fix UI layout
1 parent f40bb0e commit 1f4fc42

File tree

1 file changed

+64
-69
lines changed

1 file changed

+64
-69
lines changed

‎omeroweb/webclient/templates/webclient/scripts/split_view_figure.html‎

Lines changed: 64 additions & 69 deletions
Original file line numberDiff line numberDiff line change
@@ -178,75 +178,70 @@ <h2 style="color: red">{{ warning }}</h2>
178178

179179
{% block custom_controls %}
180180
<!------------------- Custom Controls - in addition to script parameters ------------>
181-
<table cellspacing='3' style="margin-left:auto; margin-right:auto">
182-
<tr>
183-
<td></td>
184-
<td colspan="{{ channels|length }}" align="center">
185-
<div title="If true, all split panels are greyscale">
186-
Split Panels Grey:
187-
<input type="checkbox" name="Split_Panels_Grey" />
188-
</div>
189-
</td>
190-
<td align="center">
191-
<div style="height:20px" title="If true, label the merged panel with channel names. Otherwise label with &#39;Merged&#39;">
192-
Merged Names: <input type="checkbox" name="Merged_Names" checked="True"/>
193-
</div>
194-
</td>
195-
</tr>
196-
<tr>
197-
<td title="Label images with Image name (default) or datasets or tags" valign="bottom">
198-
<select name="Image_Labels" style="margin-right:20px">
199-
<option value="Image Name" selected="True" >Image Name</option>
200-
<option value="Datasets" >Datasets</option>
201-
<option value="Tags" >Tags</option>
202-
<option value="Custom" >Custom</option>
203-
</select>
204-
</td>
205-
{% for c in channels %}
206-
<td id="split_channels" valign="bottom">
207-
<div class="toggle_channel" style="background:#{{c.getColor.getHtml}}">
208-
<input type="text" size='10' name="{{ forloop.counter0 }}cName" value="{{ c.getLabel }}" />
209-
<input type="checkbox" name="{{ forloop.counter0 }}cActive" checked="true" />
210-
</div>
211-
</td>
212-
{% endfor %}
213-
<td align="center" valign="bottom">
214-
<table style="padding-left:10px">
215-
<tr><td width="15"> </td>
216-
{% for c in channels %}
217-
<td>
218-
<div id="merged_channels" class="toggle_channel" style="background:#{{c.getColor.getHtml}}">
219-
<input type="checkbox" name="{{ forloop.counter0 }}cMerged"
220-
{% if c.isActive %}checked="true"{% endif %} value="{{c.getColor.getInt}}"/>
221-
</div>
222-
</td>
223-
{% endfor %}
224-
</tr>
225-
</table>
226-
</td>
227-
</tr>
228-
<tr>
229-
<td>
230-
<div title="Custom label" class="customLabelInput" style="display:none">
231-
Custom label:
232-
<input type="text" name="Custom_Label" value="" />
233-
</div>
234-
</td>
235-
<td title="Image selection for custom labels" valign="bottom">
236-
<select name="Image_Custom_Label_List" style="margin-right:20px;display:none;">
237-
<option value="All" selected="True">All Images</option>
238-
{% for imgData in imgDict %}
239-
<option value="{{ imgData.id }}">{{imgData.name}}</option>
240-
{% endfor %}
241-
</select>
242-
</td>
243-
<td>
244-
<div title="All custom labels" class="allLabels" style="display:none">
245-
<input type="text" name="All_labels" value="" />
246-
</div>
247-
</td>
248-
</tr>
249-
</table>
181+
<table cellspacing='3' style="margin-left:auto; margin-right:auto">
182+
<tr>
183+
<td></td>
184+
<td colspan="{{ channels|length }}" align="center">
185+
<div title="If true, all split panels are greyscale">
186+
Split Panels Grey:
187+
<input type="checkbox" name="Split_Panels_Grey" />
188+
</div>
189+
</td>
190+
<td align="center">
191+
<div style="height:20px" title="If true, label the merged panel with channel names. Otherwise label with &#39;Merged&#39;">
192+
Merged Names: <input type="checkbox" name="Merged_Names" checked="True"/>
193+
</div>
194+
</td>
195+
</tr>
196+
<tr>
197+
<td title="Label images with Image name (default) or datasets or tags" valign="bottom">
198+
<select name="Image_Labels" style="margin-right:20px">
199+
<option value="Image Name" selected="True" >Image Name</option>
200+
<option value="Datasets" >Datasets</option>
201+
<option value="Tags" >Tags</option>
202+
<option value="Custom" >Custom</option>
203+
</select>
204+
</td>
205+
{% for c in channels %}
206+
<td id="split_channels" valign="bottom">
207+
<div class="toggle_channel" style="background:#{{c.getColor.getHtml}}">
208+
<input type="text" size='10' name="{{ forloop.counter0 }}cName" value="{{ c.getLabel }}" />
209+
<input type="checkbox" name="{{ forloop.counter0 }}cActive" checked="true" />
210+
</div>
211+
</td>
212+
{% endfor %}
213+
<td align="center" valign="bottom">
214+
<table style="padding-left:10px">
215+
<tr><td width="15"> </td>
216+
{% for c in channels %}
217+
<td>
218+
<div id="merged_channels" class="toggle_channel" style="background:#{{c.getColor.getHtml}}">
219+
<input type="checkbox" name="{{ forloop.counter0 }}cMerged"
220+
{% if c.isActive %}checked="true"{% endif %} value="{{c.getColor.getInt}}"/>
221+
</div>
222+
</td>
223+
{% endfor %}
224+
</tr>
225+
</table>
226+
</td>
227+
</tr>
228+
</table>
229+
230+
<hr />
231+
232+
<div title="Custom label" class="customLabelInput" align="center" style="display:none;position:relative;left:float;">
233+
Custom label:
234+
<input type="text" name="Custom_Label" value="" />
235+
<select name="Image_Custom_Label_List" style="margin-right:20px;display:none;">
236+
<option value="All" selected="True">All Images</option>
237+
{% for imgData in imgDict %}
238+
<option value="{{ imgData.id }}">{{imgData.name}}</option>
239+
{% endfor %}
240+
</select>
241+
</div>
242+
<div title="All custom labels" class="allLabels" style="display:none">
243+
<input type="text" name="All_labels" value="" />
244+
</div>
250245
{% endblock %}
251246

252247
<!---------------------------- FIGURE PREVIEW ---------------------->

0 commit comments

Comments
 (0)