Skip to content

Commit

Permalink
zmi: whitespace-cleanup, minor html fixes (#1169)
Browse files Browse the repository at this point in the history 
* zmi: whitespace-cleanup, minor html fixes

* - isolate the original issue

---------

Co-authored-by: Jens Vagelpohl <jens@plyp.com>
  • Loading branch information
@drfho @dataflake
drfho and dataflake committed Oct 3, 2023
1 parent 9b52f66 commit ca04df1
Show file tree
Hide file tree
Showing 4 changed files with 116 additions and 116 deletions.
80 changes: 40 additions & 40 deletions src/App/dtml/manage_tabs.dtml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,52 +40,52 @@
</dtml-unless>
</dtml-comment>

<nav aria-label="breadcrumb">
<dtml-let breadcrumb_length="tabs_path_length(REQUEST)">
<ol class="breadcrumb <dtml-var "'zmi-' + title_or_id().replace(' ','')">"
data-length="<dtml-var breadcrumb_length>">
<li class="breadcrumb-item meta_type">
<dtml-if meta_type>
<i class="&dtml-zmi_icon;" title="&dtml-meta_type;"></i>
<dtml-var "breadcrumb_length==1 and 'Root Folder' or meta_type">
<dtml-else>
Object
<nav aria-label="breadcrumb">
<dtml-let breadcrumb_length="tabs_path_length(REQUEST)">
<ol class="breadcrumb <dtml-var "'zmi-' + title_or_id().replace(' ','')">"
data-length="<dtml-var breadcrumb_length>">
<li class="breadcrumb-item meta_type">
<dtml-if meta_type>
<i class="&dtml-zmi_icon;" title="&dtml-meta_type;"></i>
<dtml-var "breadcrumb_length==1 and 'Root Folder' or meta_type">
<dtml-else>
Object
</dtml-if>
</li>
<dtml-in expr="tabs_path_default(REQUEST)" mapping>
<li class="breadcrumb-item<dtml-if last> active</dtml-if>"
<dtml-if last>
aria-current="page"
title="<dtml-if meta_type>&dtml-meta_type;<dtml-else>Object</dtml-if>"
</dtml-if>
</li>
<dtml-in expr="tabs_path_default(REQUEST)" mapping>
<li class="breadcrumb-item<dtml-if last> active</dtml-if>"
<dtml-if last>
aria-current="page"
title="<dtml-if meta_type>&dtml-meta_type;<dtml-else>Object</dtml-if>"
</dtml-if>
><a href="&dtml-url;">
<dtml-if "_['sequence-index']==0">
<strong title="Root Folder">&nbsp;/&nbsp;</strong>
<dtml-else>
&dtml-title;
</dtml-if>
</a>
<dtml-if "_['sequence-index']!=0 and last==False">
&nbsp;/&nbsp;
><a href="&dtml-url;">
<dtml-if "_['sequence-index']==0">
<strong title="Root Folder">&nbsp;/&nbsp;</strong>
<dtml-else>
<dtml-var title html_quote>
</dtml-if>
<dtml-if last>
<dtml-if wl_isLocked
><span class="badge badge-warning"
title="This item has been locked by WebDAV"><i class="fa fa-lock"></i></span>
</dtml-if>
</a>
<dtml-if "_['sequence-index']!=0 and last==False">
&nbsp;/&nbsp;
</dtml-if>
<dtml-if last>
<dtml-if wl_isLocked
><span class="badge badge-warning"
title="This item has been locked by WebDAV"><i class="fa fa-lock"></i></span>
</dtml-if>
</li>
</dtml-in>
</ol>
</dtml-let>
</nav>
</dtml-if>
</li>
</dtml-in>
</ol>
</dtml-let>
</nav>


<dtml-if manage_tabs_message>
<div class="alert alert-<dtml-var manage_tabs_type missing=success html_quote>" role="alert">
<dtml-var manage_tabs_message newline_to_br html_quote
> (<dtml-var ZopeTime fmt="%Y-%m-%d %H:%M">)
</div>
<div class="alert alert-<dtml-var manage_tabs_type missing=success html_quote>" role="alert">
<dtml-var manage_tabs_message newline_to_br html_quote
> (<dtml-var ZopeTime fmt="%Y-%m-%d %H:%M">)
</div>
</dtml-if>

</dtml-with>
4 changes: 2 additions & 2 deletions src/OFS/dtml/cmassoc.dtml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<table class="table table-sm table-striped">
<dtml-in results mapping sort=sortkey>
<tr>
<td class="text-right>
<td class="text-right">
<input type="checkbox" name="associate_&dtml-path;:int" value="1"<dtml-if associated> checked="checked"</dtml-if> />
<input type="hidden" name="associate_&dtml-path;:int:default" value="0" />
</td>
Expand Down Expand Up @@ -58,7 +58,7 @@
<div class="form-group row">
<label for="meta_types" class="form-label col-sm-3 col-md-2">Of the type(s)</label>
<div class=" col-sm-9 col-md-10">
<select class="form-control" multiple="multiple" id=meta_types" name="meta_types:list" size="5">
<select class="form-control" multiple="multiple" id="meta_types" name="meta_types:list" size="5">
<option value="" selected>All</option>
<dtml-in all_meta_types mapping sort=name>
<option value="&dtml-name;">&dtml-name;</option>
Expand Down
2 changes: 1 addition & 1 deletion src/OFS/dtml/fileEdit.dtml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
enctype="multipart/form-data" class="zmi-file zmi-edit">

<div class="form-group row">
<label for="title" class="form-label col-sm-3 col-md-2">Title</label>
<label for="title" class="form-label col-sm-3 col-md-2">Title</label>
<div class="col-sm-9 col-md-10">
<input id="title" class="form-control" type="text" name="title"
value="<dtml-if title>&dtml-title;</dtml-if>" />
Expand Down
146 changes: 73 additions & 73 deletions src/OFS/dtml/findForm.dtml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
></dtml-else
></dtml-in>
<dtml-call "REQUEST.set('obj_metatypes',
[x for x in (REQUEST.get('obj_metatypes', []) or [])])">
[x for x in (REQUEST.get('obj_metatypes', []) or [])])">

<dtml-if btn_submit>
<dtml-with "_.namespace(
Expand Down Expand Up @@ -79,12 +79,12 @@

<ul class="zmi-find-results list-group mb-5">
<dtml-in results size="batch_size" start="query_start" sort_expr="skey"
reverse_expr="rkey">
reverse_expr="rkey">
<li class="list-group-item">
<a href="&dtml.url_quote-sequence-key;/manage_workspace">
<i title="&dtml-meta_type;"
class="&dtml-zmi_icon;">&nbsp;</i>
&dtml-sequence-key; <dtml-if title>(&dtml-title;)</dtml-if>
<i title="&dtml-meta_type;"
class="&dtml-zmi_icon;">&nbsp;</i>
&dtml-sequence-key; <dtml-if title>(&dtml-title;)</dtml-if>
</a>
</li>
</dtml-in>
Expand All @@ -101,128 +101,128 @@
<label for="type" class="form-label">Find objects of type:</label>
</td>
<td style="width:*">
<div class="form-element">
<select id="type" class="form-control" name="obj_metatypes:list" size="8" multiple="multiple">
<option value="all"
<dtml-if "not obj_metatypes">
selected="selected"
<dtml-else>
<dtml-var "('all' in obj_metatypes) and 'selected=\042selected\042' or ''">
</dtml-if>
>All types</option>
<dtml-let sorted_meta_types="[]"
><dtml-in all_meta_types mapping
><dtml-call "sorted_meta_types.append(name)"
></dtml-in><dtml-call "sorted_meta_types.sort()"
><dtml-in sorted_meta_types
><option value="&dtml-sequence-item;"
<div class="form-element">
<select id="type" class="form-control" name="obj_metatypes:list" size="8" multiple="multiple">
<option value="all"
<dtml-if "not obj_metatypes">
selected="selected"
<dtml-else>
<dtml-var "(_['sequence-item'] in obj_metatypes) and 'selected=\042selected\042' or ''">
<dtml-var "('all' in obj_metatypes) and 'selected=\042selected\042' or ''">
</dtml-if>
>&dtml-sequence-item;</option>
</dtml-in
></dtml-let>
</select>
</div>
>All types</option>
<dtml-let sorted_meta_types="[]"
><dtml-in all_meta_types mapping
><dtml-call "sorted_meta_types.append(name)"
></dtml-in><dtml-call "sorted_meta_types.sort()"
><dtml-in sorted_meta_types
><option value="&dtml-sequence-item;"
<dtml-if "not obj_metatypes">
<dtml-else>
<dtml-var "(_['sequence-item'] in obj_metatypes) and 'selected=\042selected\042' or ''">
</dtml-if>
>&dtml-sequence-item;</option>
</dtml-in
></dtml-let>
</select>
</div>
</td>
</tr>

<tr class="simple-search">
<td>
<label for="ids" class="form-label">With ids:</label>
<label for="ids" class="form-label">With ids:</label>
</td>
<td>
<input id="ids" class="form-control" type="text" name="obj_ids:tokens" value="<dtml-var "' '.join(obj_ids or [])" html_quote>" />
<input id="ids" class="form-control" type="text" name="obj_ids:tokens" value="<dtml-var "' '.join(obj_ids or [])" html_quote>" />
</td>
</tr>

<tr class="simple-search">
<td>
<label for="contain" class="form-label">Containing:</label>
<label for="contain" class="form-label">Containing:</label>
</td>
<td>
<input id="contain" class="form-control" type="text" name="obj_searchterm"
value="<dtml-var "obj_searchterm and obj_searchterm or ''" html_quote>" />
<input id="contain" class="form-control" type="text" name="obj_searchterm"
value="<dtml-var "obj_searchterm and obj_searchterm or ''" html_quote>" />
</td>
</tr>

<tr class="advanced-search-only" <dtml-if "searchtype!='advanced'">style="display:none;"</dtml-if>>
<td>
<label for="expr" class="form-label">Expr:</label>
<label for="expr" class="form-label">Expr:</label>
</td>
<td>
<textarea id="expr" class="form-control" name="obj_expr" rows="4" cols="30"
><dtml-var "obj_expr and obj_expr or ''"></textarea>
<textarea id="expr" class="form-control" name="obj_expr" rows="4" cols="30"
><dtml-var "obj_expr and obj_expr or ''"></textarea>
</td>
</tr>

<tr class="advanced-search-only" <dtml-if "searchtype!='advanced'">style="display:none;"</dtml-if>>
<td>
<label for="roles" class="form-label">Where the roles:</label>
<label for="roles" class="form-label">Where the roles:</label>
</td>
<td>
<div class="form-element">
<select id="roles" class="form-control" name="obj_roles:list" size="3" multiple="multiple">
<dtml-in valid_roles>
<dtml-if obj_roles>
<option value="&dtml-sequence-item;"<dtml-if "_['sequence-item'] in obj_roles"> selected="selected"</dtml-if>>&dtml-sequence-item;</option>
<dtml-else>
<option value="&dtml-sequence-item;">&dtml-sequence-item;</option>
</dtml-if>
</dtml-in>
</select>
</div>
<div class="form-element">
<select id="roles" class="form-control" name="obj_roles:list" size="3" multiple="multiple">
<dtml-in valid_roles>
<dtml-if obj_roles>
<option value="&dtml-sequence-item;"<dtml-if "_['sequence-item'] in obj_roles"> selected="selected"</dtml-if>>&dtml-sequence-item;</option>
<dtml-else>
<option value="&dtml-sequence-item;">&dtml-sequence-item;</option>
</dtml-if>
</dtml-in>
</select>
</div>
</td>
</tr>

<tr class="advanced-search-only" <dtml-if "searchtype!='advanced'">style="display:none;"</dtml-if>>
<td>
<label for="perm" class="form-label">Have permission:</label>
<label for="perm" class="form-label">Have permission:</label>
</td>
<td>
<div class="form-element">
<select id="perm" class="form-control" name="obj_permission">
<dtml-in permission_settings mapping>
<option value="&dtml-name;"> &dtml-name;</option>
</dtml-in>
</select>
</div>
<div class="form-element">
<select id="perm" class="form-control" name="obj_permission">
<dtml-in permission_settings mapping>
<option value="&dtml-name;"> &dtml-name;</option>
</dtml-in>
</select>
</div>
</td>
</tr>

<tr class="advanced-search-only" <dtml-if "searchtype!='advanced'">style="display:none;"</dtml-if>>
<td>
<label for="skey" class="form-label">Sort results by:</label>
<label for="skey" class="form-label">Sort results by:</label>
</td>
<td>
<div class="form-group">
<select name="skey" id="skey" class="form-control">
<option value="meta_type">Type</option>
<option value="id">Id</option>
</select>
<div class="form-check px-4 mt-2">
<input id="rkey" class="form-check-input" type="checkbox" name="rkey" value="reverse" />
<label for="rkey" class="form-check-label">Reverse?</label>
<div class="form-group">
<select name="skey" id="skey" class="form-control">
<option value="meta_type">Type</option>
<option value="id">Id</option>
</select>
<div class="form-check px-4 mt-2">
<input id="rkey" class="form-check-input" type="checkbox" name="rkey" value="reverse" />
<label for="rkey" class="form-check-label">Reverse?</label>
</div>
</div>
</div>
</td>
</tr>

<tr class="simple-search">
<td>
<label for="mod" class="form-label">Modified:</label>
<label for="mod" class="form-label">Modified:</label>
</td>
<td>
<div class="form-inline">
<div class="input-group px-0 col-12">
<select id="mod" name="obj_mspec" class="input-group-prepend form-control col-4 col-md-3">
<option value="&lt;"> before</option>
<option value="&gt;"> after</option>
</select>
<input class="form-control col-8 col-md-9 px-0" type="text" name="obj_mtime" />
<div class="form-inline">
<div class="input-group px-0 col-12">
<select id="mod" name="obj_mspec" class="input-group-prepend form-control col-4 col-md-3">
<option value="&lt;"> before</option>
<option value="&gt;"> after</option>
</select>
<input class="form-control col-8 col-md-9 px-0" type="text" name="obj_mtime" />
</div>
</div>
</div>
</td>
</tr>

Expand Down

0 comments on commit ca04df1

Please sign in to comment.