tomasz.sowa/winix
1
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

changed: now Request class is a model class - we have fields() method there to map fields for ezc templates (currently only dir_tab)

Browse Source 
removed: [dir_tab] ezc statement
changed: Ls winix function loads its own dir_tab container (beforehand it was loaded by [dir_tab] ezc statement)
         it's available by [child_dirs] name
This commit is contained in:
Tomasz Sowa
2021-06-17 21:44:29 +02:00
parent 4db421d6c3
commit ebd791a256
11 changed files with 146 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

69
winixd/html/fun_ls.html
View File

@@ -7,14 +7,14 @@
<div class="uk-margin">
<ul class="uk-breadcrumb">
[for dir_tab]
[for request.dirs]
<li>
<a href="[doc_base_url][dir_tab_link]ls/ckeditor_browse/CKEditor:itemcontent/CKEditorFuncNum:[ls_ckeditor_funnum_browse]">
[if cmp dir_tab_url ""]
<a href="[doc_base_url][request.dirs.link]ls/ckeditor_browse/CKEditor:itemcontent/CKEditorFuncNum:[ls_ckeditor_funnum_browse]">
[if cmp request.dirs.url ""]
[# !! IMPROVE ME it would be better to have a flag of some kind to indicate that this is a root dir]
{ls_root_dir_name}
[else]
[dir_tab_url]
[request.dirs.url]
[end]
</a>
</li>
@@ -25,16 +25,16 @@
<div class="uk-flex uk-margin-medium">
<div class="uk-width-1-4">
[if dir_childs_tab "with_parent"]
[if child_dirs]
<ul class="uk-list uk-list-disc uk-list-collapse">
[for dir_childs_tab "with_parent"]
[for child_dirs]
<li>
[if dir_childs_is_parent]
[if child_dirs.is_parent_for_current_dir]
[# make sure the name of the textarea in fun_ckeditor.html is called: itemcontent]
[# is it needed?]
<a href="[doc_base_url][dir_parent]ls/ckeditor_browse/CKEditor:itemcontent/CKEditorFuncNum:[ls_ckeditor_funnum_browse]">../</a>
[else]
<a href="[doc_base_url][dir][dir_childs_tab_url]/ls/ckeditor_browse/CKEditor:itemcontent/CKEditorFuncNum:[ls_ckeditor_funnum_browse]">[dir_childs_tab_url]/</a>
<a href="[doc_base_url][dir][child_dirs.url]/ls/ckeditor_browse/CKEditor:itemcontent/CKEditorFuncNum:[ls_ckeditor_funnum_browse]">[child_dirs.url]/</a>
[end]
</li>
[end]
@@ -45,12 +45,12 @@
<div class="">
[if item_tab]
[if items]
<ul class="uk-list uk-list-collapse" data-uk-grid>
[for item_tab]
<li><a href="javascript:select('[item_tab_link]')"><img data-src="[item_tab_link]/-/thumb" alt="[item_tab_subject]" height="120" data-uk-img></a></li>
[for items]
<li><a href="javascript:select('[items.link]')"><img data-src="[items.link]/-/thumb" alt="[items.subject]" height="120" data-uk-img></a></li>
[end]
</ul>
@@ -69,11 +69,7 @@
[if winix_function_param_is "l"]
[# loading dir childs table with a parent directory]
[# now the parameter can be passed directly to if-one]
[dir_childs_tab "with_parent"]
[if one dir_childs_tab item_tab]
[if one child_dirs items]
<table class="uk-table uk-table-divider uk-table-small uk-table-justify uk-table-responsive">
<tr>
@@ -84,29 +80,29 @@
<th>{ls_name}</th>
</tr>
[for dir_childs_tab]
[for child_dirs]
<tr>
<td>d</td>
<td>[dir_childs_tab_privileges]</td>
<td>[dir_childs_tab_user]</td>
<td>[dir_childs_tab_group]</td>
<td>[child_dirs_privileges]</td>
<td>[child_dirs_user]</td>
<td>[child_dirs_group]</td>
<td>
[if dir_childs_is_parent]
[if child_dirs.is_parent_for_current_dir]
<a href="[doc_base_url][dir_parent_without_slash][if winix_function_param_is "dirls"]/ls/l/dirls[end]">../</a>
[else]
<a href="[doc_base_url][dir][dir_childs_tab_url][if winix_function_param_is "dirls"]/ls/l/dirls[end]">[dir_childs_tab_url]/</a>
<a href="[doc_base_url][dir][child_dirs.url][if winix_function_param_is "dirls"]/ls/l/dirls[end]">[child_dirs.url]/</a>
[end]
</td>
</tr>
[end]
[for item_tab]
[for items]
<tr>
<td>[if item_tab_type_is_symlink]l[else][if item_tab_has_static_file]s[else]-[end][end]</td>
<td>[item_tab_privileges]</td>
<td>[item_tab_user]</td>
<td>[item_tab_group]</td>
<td><a href="[doc_base_url][dir][item_tab_url]">[item_tab_url]</a>[if item_tab_type_is_symlink] -> [item_tab_link_to][end]</td>
<td>[if items_type_is_symlink]l[else][if items_has_static_file]s[else]-[end][end]</td>
<td>[items_privileges]</td>
<td>[items_user]</td>
<td>[items_group]</td>
<td><a href="[doc_base_url][dir][items.url]">[items.url]</a>[if items_type_is_symlink] -> [items_link_to][end]</td>
</tr>
[end]
</table>
@@ -115,27 +111,24 @@
[else]
[# loading dir childs table with a parent directory]
[dir_childs_tab "with_parent"]
[if dir_childs_tab]
[if child_dirs]
<ul class="uk-list uk-list-disc uk-list-collapse">
[for dir_childs_tab]
[for child_dirs]
<li>
[if dir_childs_is_parent]
[if child_dirs.is_parent_for_current_dir]
<a href="[doc_base_url][dir_parent_without_slash][if winix_function_param_is "dirls"]/ls/dirls[end]">../</a>
[else]
<a href="[doc_base_url][dir][dir_childs_tab_url][if winix_function_param_is "dirls"]/ls/dirls[end]">[dir_childs_tab_url]/</a>
<a href="[doc_base_url][dir][child_dirs.url][if winix_function_param_is "dirls"]/ls/dirls[end]">[child_dirs.url]/</a>
[end]
</li>
[end]
</ul>
[end]
[# !! IMPROVE ME those two lists (above and below) can be combined together]
[if item_tab]
[if items]
<ul class="uk-list uk-list-disc uk-list-collapse">
[for item_tab]
<li><a href="[doc_base_url][dir][item_tab_url]">[item_tab_url]</a></li>
[for items]
<li><a href="[doc_base_url][dir][items.url]">[items.url]</a></li>
[end]
</ul>
[end]