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

moved some ezc functions from templates/item.cpp to Item and ItemContent

Browse Source 
removed: templates/item.cpp
updated: some html templates which use [item] or [item_tab]
removed some old html templates: item_info.html and itam_tab_info.html
This commit is contained in:
Tomasz Sowa
2021-07-06 21:52:29 +02:00
parent 746aa41111
commit 9d65d931d0
24 changed files with 67 additions and 1297 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
winixd/html/fun_ckeditor.html
View File

@@ -29,7 +29,7 @@
[# template fun_ls.html uses the name: itemcontent to refer to this textarea item]
<div class="uk-form-controls">
<div style="border-top: 1px solid #dadada; border-bottom: 1px solid #dadada; padding: 0.2em 0 0.2em 0; margin: 1em 0 1em 0;" id="winix-editor-content" data-winix-post-name="itemcontent">[item_print_content]</div>
<div style="border-top: 1px solid #dadada; border-bottom: 1px solid #dadada; padding: 0.2em 0 0.2em 0; margin: 1em 0 1em 0;" id="winix-editor-content" data-winix-post-name="itemcontent">[item.content.print_content]</div>
</div>
</div>
@@ -42,7 +42,7 @@
<div class="uk-margin">
<label class="uk-form-label" for="winix_nick_id">{nick}</label>
<div class="uk-form-controls">
<input class="uk-input" id="winix_nick_id" type="text" name="guestname" value="[item_guest_name]">
<input class="uk-input" id="winix_nick_id" type="text" name="guestname" value="[item.content.guest_name]">
</div>
</div>

4
winixd/html/fun_imgcrop.html
View File

@@ -5,7 +5,7 @@
[if request.is_item]
[if any request.is_item item_filetype_is_image]
[if any request.is_item item.content.filetype_is_image]
[if winix_function_param_is "thumb"]
<p>{imgcrop_crop_only_thumb_info}</p>
@@ -80,7 +80,7 @@
<td data-uk-lightbox="animation: slide">
<a href="[item_tab.link]">
<img src="[item_tab.link][if item_tab.has_thumb]/-/thumb[end]" alt="[item_tab.subject]">
<img src="[item_tab.link][if item_tab.content.has_thumb]/-/thumb[end]" alt="[item_tab.subject]">
</a>
</td>

2
winixd/html/fun_login.html
View File

@@ -9,7 +9,7 @@
</p>
<div class="uk-margin-top">
<a href="[doc_base_url][if dir_can_read_exec][dir][if any request.is_item item_can_read][item.url]/[end][else]/[end]logout" class="uk-button uk-button-primary uk-width-small">{login_logout_button}</a>
<a href="[doc_base_url][if dir_can_read_exec][dir][if any request.is_item item.has_read_access][item.url]/[end][else]/[end]logout" class="uk-button uk-button-primary uk-width-small">{login_logout_button}</a>
</div>
</div>
[else]

2
winixd/html/fun_nicedit.html
View File

@@ -44,7 +44,7 @@
<div class="uk-margin">
<label class="uk-form-label" for="winix_nick_id">{nick}</label>
<div class="uk-form-controls">
<input class="uk-input" id="winix_nick_id" type="text" name="guestname" value="[item_guest_name]">
<input class="uk-input" id="winix_nick_id" type="text" name="guestname" value="[item.content.guest_name]">
</div>
</div>

2
winixd/html/fun_rm.html
View File

@@ -5,7 +5,7 @@
<p>
[if request.is_item]
[if item_type_is_symlink]
[if item.type_is_symlink]
{rm_symlink}: [dir][item.url]
[else]
{rm_file}: [dir][item.url]

12
winixd/html/fun_run.html
View File

@@ -1,19 +1,7 @@
[if item.content.type_is "other"][item.run][else]
<div>
[if false]
[if mount_page_arg_is "subject"]
<h1>[item.subject]</h1>
[end]
[if mount_page_arg_is "info"]
[include "item_info.html"]
[end]
[end]
[item.execute]
</div>
[end]

4
winixd/html/fun_template.html
View File

@@ -9,8 +9,8 @@
{template_info_file}:
[if item_has_html_template]
[item_html_template]
[if item.has_html_template]
[item.html_template]
[else]
{template_from_mount_point}

11
winixd/html/fun_thread.html
View File

@@ -1,15 +1,9 @@
<div class="winix winix-thread">
[if mount_page_arg_is "subject"]<h1[if mount_page_arg_is "info"] class="winix_withinfo"[end]>[item.subject]</h1>[end]
[if false]
[if mount_page_arg_is "info"][include "item_info.html"][end]
[end]
[if not [thread_mount_arg_is "sort_desc"]]
<div class="uk-margin">
[if item.has_write_access]<a class="uk-button uk-button-default uk-button-small" href="[item.link]/emacs" rel="nofollow">{edit}</a>[end]
[if thread_mount_arg_is "subject"]<h2[if thread_mount_arg_is "info"] class="winix_withinfo"[end]>[item.subject]</h2>[end]
[if thread_mount_arg_is "info"][include "item_info.html"][end]
<h2[if thread_mount_arg_is "info"] class="winix_withinfo"[end]>[item.subject]</h2>
[item.content.print_content]
</div>
[end]
@@ -38,8 +32,7 @@
[if thread_mount_arg_is "sort_desc"]
<div class="uk-margin">
[if item.has_write_access]<a class="uk-button uk-button-default uk-button-small" href="[item.link]/emacs" rel="nofollow">{edit}</a>[end]
[if thread_mount_arg_is "subject"]<h2[if thread_mount_arg_is "info"] class="winix_withinfo"[end]>[item.subject]</h2>[end]
[if thread_mount_arg_is "info"][include "item_info.html"][end]
<h2[if thread_mount_arg_is "info"] class="winix_withinfo"[end]>[item.subject]</h2>
[item.content.print_content]
</div>
[end]

5
winixd/html/fun_ticket.html
View File

@@ -1,10 +1,5 @@
<div class="winix">
[if mount_page_arg_is "subject"]<h1[if mount_page_arg_is "info"] class="withinfo"[end]>[item.subject]</h1>[end]
[if mount_page_arg_is "info"][include "item_info.html"][end]
<div class="uk-section uk-section-muted uk-padding">
[if ticket_can_edit]<p class="winix_ticket_edit"><a href="[doc_base_url][dir][item.url]/editticket" rel="nofollow">\[{edit}\]</a></p>[end]
<table class="uk-table uk-table-small">

4
winixd/html/fun_tinymce.html
View File

@@ -26,7 +26,7 @@
[if mount_type_is "ticket"]<label class="uk-form-label" for="winix_content_id">{form_emacs_content_ticket}</label>[end]
<div class="uk-form-controls">
<div style="border-top: 1px solid #dadada; border-bottom: 1px solid #dadada; padding: 0.2em 0 0.2em 0; margin: 1em 0 1em 0;" id="winix-editor-content" data-winix-post-name="itemcontent">[item_print_content]</div>
<div style="border-top: 1px solid #dadada; border-bottom: 1px solid #dadada; padding: 0.2em 0 0.2em 0; margin: 1em 0 1em 0;" id="winix-editor-content" data-winix-post-name="itemcontent">[item.content.print_content]</div>
</div>
</div>
@@ -38,7 +38,7 @@
<div class="uk-margin">
<label class="uk-form-label" for="winix_nick_id">{nick}</label>
<div class="uk-form-controls">
<input class="uk-input" id="winix_nick_id" type="text" name="guestname" value="[item_guest_name]">
<input class="uk-input" id="winix_nick_id" type="text" name="guestname" value="[item.content.guest_name]">
</div>
</div>

2
winixd/html/fun_vim.html
View File

@@ -42,7 +42,7 @@
<div class="uk-margin">
<label class="uk-form-label" for="winix_nick_id">{nick}</label>
<div class="uk-form-controls">
<input class="uk-input" id="winix_nick_id" type="text" name="guestname" value="[item_guest_name]">
<input class="uk-input" id="winix_nick_id" type="text" name="guestname" value="[item.content.guest_name]">
</div>
</div>

5
winixd/html/item_info.html
View File

@@ -1,5 +0,0 @@
<p class="uk-text-meta">
{added_by}: [item.content.display_user_name], [item_date_creation_nice][if not item_dates_equal],
{last_modified}[if item_users_different] {by}: [item_modification_user],[else]:[end]
[item_date_modification_nice][end]
</p>

8
winixd/html/item_tab_info.html
View File

@@ -1,8 +0,0 @@
<p class="uk-text-meta">
{added_by}: [item_tab_user], [item_tab_date_creation_nice][if not item_tab_dates_equal],
{last_modified}[if item_tab_users_different] {by}: [item_tab_modification_user],[else]:[end]
[item_tab_date_modification_nice]
[end]
</p>