updated: to the new ezc api

added:   following ezc functions: ezc_and_not, ezc_any_not, ezc_or_not, ezc_one_not, is, is_not, is_empty, is_not_empty





git-svn-id: svn://ttmath.org/publicrep/winix/trunk@1005 e52654a7-88a9-db11-a3e9-0013d4bc506e
This commit is contained in:
Tomasz Sowa 2015-03-08 23:22:05 +00:00
parent dc301d4c50
commit 901663b145
42 changed files with 260 additions and 158 deletions

View File

@ -1,7 +1,7 @@
<p class="winix_iteminfo">
{added_by}: [dir_last_user], [dir_last_date_creation_nice]
[if-no dir_last_dates_equal]
[if not dir_last_dates_equal]
, {last_modified}
[if dir_last_users_different]

View File

@ -1,6 +1,6 @@
<div class="winix">
<h1>[if-one user_logged]{adduser_header_add}[else]{adduser_header_register}[end]</h1>
<h1>[if user_logged]{adduser_header_add}[else]{adduser_header_register}[end]</h1>
<form id="additem" method="post" action="[doc_base_url][dir]adduser">
<fieldset>
@ -33,7 +33,7 @@
[end]
<input class="submit" type="submit" value="[if-one user_logged]{adduser_submit}[else]{register_user_submit}[end]">
<input class="submit" type="submit" value="[if user_logged]{adduser_submit}[else]{register_user_submit}[end]">
</fieldset>
</form>

View File

@ -1,9 +1,9 @@
[if mount_page_arg_is "subject"][if mount_page_arg_is "info"]<h1 class="withinfo">[else]<h1>[end][item_subject]</h1>[end]
[if mount_page_arg_is "info"][include "item_info.html"][end]
[if-one item_filetype_is_image]
[if one item_filetype_is_image]
<a href="[item_link]"><img class="catimage" [if-no item_has_thumb]height="100"[end] src="[item_link]/download[if item_has_thumb]/thumb[end]" alt="[item_subject]"></a>
<a href="[item_link]"><img class="catimage" [if not item_has_thumb]height="100"[end] src="[item_link]/download[if item_has_thumb]/thumb[end]" alt="[item_subject]"></a>
[# we use pre.nowinixbreak to tell the html_filter not to put a blank space into those urles]
@ -18,7 +18,7 @@
[else]
[if-no item_filetype_is_none]
[if not item_filetype_is_none]
{download}: <a href="[item_link]/download" title="[item_subject]">[item_subject]</a>
<div>
<pre class="nowinixbreak">

View File

@ -17,7 +17,7 @@
</div>
[end]
[if-any mount_type_is "thread" thread_mount_arg_is "subject"]
[if any [mount_type_is "thread"] [thread_mount_arg_is "subject"]]
<div class="winix_input_a">
<label for="winix_title_id">{title}:</label>
<input id="winix_title_id" type="text" name="subject" value="[item_subject]">
@ -47,7 +47,7 @@
[end]
[if-no user_logged]
[if not user_logged]
<div class="winix_input_a">
<label for="winix_nick_id">{nick}:</label>
<input id="winix_nick_id" type="text" name="guestname" value="[item_guest_name]">

View File

@ -3,22 +3,22 @@
<h1>{cp_header}</h1>
<form id="additem" method="post" action="[doc_base_url][dir][if-one item_is][item_url]/[end]cp[if-no item_is]/r[end]">
<form id="additem" method="post" action="[doc_base_url][dir][if item_is][item_url]/[end]cp[if not item_is]/r[end]">
<fieldset>
<legend>{cp_form_legend}</legend>
<p>
[if-one item_is]{cp_page} "[item_url]":[else]{cp_dir} "[dir_without_slash]"[end]
[if item_is]{cp_page} "[item_url]":[else]{cp_dir} "[dir_without_slash]"[end]
</p>
<p class="withnext">{suggested_url}</p>
<input class="edit" type="text" name="to" value="[dir_without_slash][if-one item_is]/[item_url][end]">
<input class="edit" type="text" name="to" value="[dir_without_slash][if item_is]/[item_url][end]">
<p>
<label><input type="checkbox" name="preserveattr">{cp_preserve_attr}</label>
[if-no item_is]
[if not item_is]
<label><input type="checkbox" name="onlycontent">{cp_only_content}</label>
<label><input type="checkbox" name="removedefaults" checked="checked">{cp_remove_defaults}</label>
<label><input type="checkbox" name="followsymlinks" checked="checked">{cp_follow_symlinks}</label>

View File

@ -18,7 +18,7 @@
[include "fun_emacs_post.html"]
[if-no user_logged]
[if not user_logged]
<p class="withnext">{nick}:</p>
<input class="edit" type="text" name="guestname" value="[item_guest_name]">

View File

@ -36,7 +36,7 @@
[end]
[if-one ticket_tab_type_is "integer" ticket_tab_type_is "progress" ticket_tab_type_is "string"]
[if one [ticket_tab_type_is "integer"] [ticket_tab_type_is "progress"] [ticket_tab_type_is "string"]]
<input type="text" name="ticketparam[ticket_tab_param_id]" value="[ticket_tab_value]">
[end]
@ -76,7 +76,7 @@
<input type="submit" name="fileuploadsubmit" value="{add}">
[end]
[if-any-no ticket_tab_type_is "images" ticket_tab_type_is "files" ticket_is_creating_new ticket_tab_has_value]
[if any_not [ticket_tab_type_is "images"] [ticket_tab_type_is "files"] ticket_is_creating_new ticket_tab_has_value]
{ticket_value_not_set}
[end]
@ -101,15 +101,15 @@
<select id="winix_content_type_id" name="contenttype">
<option[if item_content_type_is "text"] selected[end] value="0">{form_emacs_content_type_text}</option>
<option[if item_content_type_is "formatted text"] selected[end] value="1">{form_emacs_content_type_formatted_text}</option>
[if-one user_can_use_html]<option[if item_content_type_is "html"] selected[end] value="2">{form_emacs_content_type_html}</option>[end]
[if-one user_can_use_bbcode]<option[if item_content_type_is "bbcode"] selected[end] value="3">{form_emacs_content_type_bbcode}</option>[end]
[if-one user_can_use_raw]<option[if item_content_type_is "raw"] selected[end] value="4">{form_emacs_content_type_raw}</option>[end]
[if user_can_use_html]<option[if item_content_type_is "html"] selected[end] value="2">{form_emacs_content_type_html}</option>[end]
[if user_can_use_bbcode]<option[if item_content_type_is "bbcode"] selected[end] value="3">{form_emacs_content_type_bbcode}</option>[end]
[if user_can_use_raw]<option[if item_content_type_is "raw"] selected[end] value="4">{form_emacs_content_type_raw}</option>[end]
</select>
</div>
[if-no user_logged]
[if not user_logged]
<div class="winix_input_a">
<label for="winix_nick_id">{nick}:</label>
<input id="winix_nick_id" type="text" name="guestname" value="[item_guest_name]">

View File

@ -18,7 +18,7 @@
[include "fun_emacs_post.html"]
[if-no user_logged]
[if not user_logged]
<div class="winix_input_a">
<label for="winix_nick_id">{nick}:</label>
<input id="winix_nick_id" type="text" name="guestname" value="[item_guest_name]">

View File

@ -4,7 +4,7 @@
[if mount_page_arg_is "info"][include "dir_last_info.html"][end]
[if-one gallery_has_not_mount_type gallery_mount_type_arg_is "lightbox"]
[if one gallery_has_not_mount_type [gallery_mount_type_arg_is "lightbox"]]
[if gallery_tab]
<ul class="galleryimages">
@ -36,7 +36,7 @@
[end]
[end]
[if-no winix_function_param_is "image"]
[if not [winix_function_param_is "image"]]
<script type="text/javascript">$('.galleryimages').galleria();</script>
[else]
[# !! IMPROVE ME add this javascript code to the rest of galleria types]
@ -61,7 +61,7 @@
[if gallery_mount_theme_arg_is "transparent"]
<script type="text/javascript">Galleria.loadTheme('[doc_base_url_common]/galleria/themes/transparent/galleria.transparent.js');</script>
[if-no winix_function_param_is "image"]
[if not [winix_function_param_is "image"]]
<script type="text/javascript">Galleria.configure(\{showInfo:false\}); Galleria.run('.galleryimages');</script>
[else]
<script type="text/javascript">Galleria.configure(\{showInfo:false, show: [winix_function_param_value "image"]\}); Galleria.run('.galleryimages');</script>
@ -71,7 +71,7 @@
[if gallery_mount_theme_arg_is "transparentinfo"]
<script type="text/javascript">Galleria.loadTheme('[doc_base_url_common]/galleria/themes/transparentinfo/galleria.transparent.js');</script>
[if-no winix_function_param_is "image"]
[if not [winix_function_param_is "image"]]
<script type="text/javascript">Galleria.configure(\{\}); Galleria.run('.galleryimages');</script>
[else]
<script type="text/javascript">Galleria.configure(\{show: [winix_function_param_value "image"]\}); Galleria.run('.galleryimages');</script>
@ -79,7 +79,7 @@
[else]
<script type="text/javascript">Galleria.loadTheme('[doc_base_url_common]/galleria/themes/classic/galleria.classic.js');</script>
[if-no winix_function_param_is "image"]
[if not [winix_function_param_is "image"]]
<script type="text/javascript">Galleria.configure(\{\}); Galleria.run('.galleryimages');</script>
[else]
<script type="text/javascript">Galleria.configure(\{show: [winix_function_param_value "image"]\}); Galleria.run('.galleryimages');</script>
@ -94,7 +94,7 @@
[if gallery_mount_type_arg_is "galleriathumb"]
[if-no winix_function_param_is "image"]
[if not [winix_function_param_is "image"]]
[if gallery_tab]
<ul class="galleryimages">
[for gallery_tab]
@ -128,7 +128,7 @@
[if gallery_mount_type_arg_is "galleriathumb1.2.9"]
[if-no winix_function_param_is "image"]
[if not [winix_function_param_is "image"]]
[if gallery_tab]
<ul class="galleryimages">
[for gallery_tab]

View File

@ -15,7 +15,7 @@
[end]
[end]
[if-any item_is item_filetype_is_image]
[if any item_is item_filetype_is_image]
<script type="text/javascript">
var winix_jcrop;
@ -29,7 +29,7 @@
<input type="hidden" name="cropwidth" value="" id="winix_idcropwidth">
<input type="hidden" name="cropheight" value="" id="winix_idcropheight">
[if-any-no winix_function_param_is "thumb" winix_function_param_is "newthumb"]
[if any_not [winix_function_param_is "thumb"] [winix_function_param_is "newthumb"]]
[if false]
<div class="winix_input_b">

View File

@ -2,7 +2,7 @@
<h1 class="simple">{last_header}</h1>
[if-one last_tab]
[if last_tab]
<table>
<tr><th>{last_tab_login}</th><th>{last_tab_ip}</th><th>{last_tab_login_date}</th><th>{last_tab_logout_date}</th></tr>
[for last_tab]

View File

@ -9,7 +9,7 @@
[end]
<form id="additem" method="post" action="[doc_base_url][dir][if-one item_is][item_url]/[end]locale">
<form id="additem" method="post" action="[doc_base_url][dir][if item_is][item_url]/[end]locale">
<fieldset>
<legend>{locale_form_legend}</legend>
@ -18,7 +18,7 @@
[# add to styles]
<select name="localeid" style="width: 250px;">
[for winix_locale_tab]
<option value="[winix_locale_tab_id]" [if cmp [user_locale_id] [winix_locale_tab_id]]selected="selected"[end]>[winix_locale_tab_name]</option>
<option value="[winix_locale_tab_id]" [if cmp user_locale_id winix_locale_tab_id]selected="selected"[end]>[winix_locale_tab_name]</option>
[end]
</select>

View File

@ -2,12 +2,12 @@
<h1>{login_header}</h1>
[if-one user_logged]
[if user_logged]
<p>{logged_as_long}: [user_name]<br>
<a href="[doc_base_url][if-one dir_can_read_exec][dir][if-any item_is item_can_read][item_url]/[end][else]/[end]logout">{logout}</a></p>
<a href="[doc_base_url][if dir_can_read_exec][dir][if any item_is item_can_read][item_url]/[end][else]/[end]logout">{logout}</a></p>
[else]
[if-no ipban_is_login_allowed_from_this_ip]
[if not ipban_is_login_allowed_from_this_ip]
<p>{login_cannot_login_from_this_ip}<br>
{login_cannot_login_available} [ipban_current_ip_expires_time]</p>
[else]

View File

@ -29,7 +29,7 @@
<div id="winix_ls_browse_rightcolumn">
[if-any item_tab]
[if item_tab]
<h2>{ls_pictures_in_dir} [dir]</h2>
<ul>
@ -49,7 +49,7 @@
<h1>{ls_header}</h1>
[if-no item_is]
[if not item_is]
[if winix_function_param_is "l"]
@ -57,7 +57,7 @@
[# now the parameter can be passed directly to if-one]
[dir_childs_tab "with_parent"]
[if-one dir_childs_tab item_tab]
[if one dir_childs_tab item_tab]
<table>
[for dir_childs_tab]
@ -67,7 +67,7 @@
<td>[dir_childs_tab_user]</td>
<td>[dir_childs_tab_group]</td>
<td>
[if-one dir_childs_is_parent]
[if dir_childs_is_parent]
<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>
@ -94,11 +94,11 @@
[# loading dir childs table with a parent directory]
[dir_childs_tab "with_parent"]
[if-one dir_childs_tab]
[if dir_childs_tab]
<ul>
[for dir_childs_tab]
<li>
[if-one dir_childs_is_parent]
[if dir_childs_is_parent]
<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>
@ -108,7 +108,7 @@
</ul>
[end]
[if-one item_tab]
[if item_tab]
<ul>
[for item_tab]
<li><a href="[doc_base_url][dir][item_tab_url]">[item_tab_url]</a></li>

View File

@ -3,20 +3,20 @@
<h1>{mv_header}</h1>
<form id="additem" method="post" action="[doc_base_url][dir][if-one item_is][item_url]/[end]mv">
<form id="additem" method="post" action="[doc_base_url][dir][if item_is][item_url]/[end]mv">
<fieldset>
<legend>{mv_form_legend}</legend>
<p>
[if-one item_is]{mv_page} [item_url]:[else]{mv_dir} [dir][end]
[if item_is]{mv_page} [item_url]:[else]{mv_dir} [dir][end]
</p>
<p class="withnext">{suggested_url}</p>
<input class="edit" type="text" name="dst_path" value="[dir_without_slash][if-one item_is]/[item_url][end]">
<input class="edit" type="text" name="dst_path" value="[dir_without_slash][if item_is]/[item_url][end]">
[if-no item_is]
[if not item_is]
<label><input type="checkbox" name="c"[if winix_function_param_is "c"]checked="checked"[end]>{mv_only_content}</label>
[end]

View File

@ -15,7 +15,7 @@
<input class="edit" type="text" name="url" value="[item_url]">
[end]
[if-any mount_type_is "thread" thread_mount_arg_is "subject"]
[if any [mount_type_is "thread"] [thread_mount_arg_is "subject"]]
<p class="withnext">{title}:</p>
<input class="edit" type="text" name="subject" value="[item_subject]">
@ -42,7 +42,7 @@
[end]
[if-no user_logged]
[if not user_logged]
<p class="withnext">{nick}:</p>
<input class="edit" type="text" name="guestname" value="[item_guest_name]">

View File

@ -7,20 +7,20 @@
[if-no winix_function_param_is "r"]
[if not [winix_function_param_is "r"]]
<form id="additem" method="post" action="[doc_base_url][dir][if-one item_is][item_url]/[end][winix_function]">
<form id="additem" method="post" action="[doc_base_url][dir][if item_is][item_url]/[end][winix_function]">
<fieldset>
<legend>{priv_form_legend}</legend>
<table class="withoutborder">
[if-one priv_show_form_chown]
[if priv_show_form_chown]
<tr><th>{user}:</th><td>
<select name="user" class="users">
[for priv_user_tab]
<option[if-one priv_user_tab_isdefault] selected[end]>[priv_user_tab_name]</option>
<option[if priv_user_tab_isdefault] selected[end]>[priv_user_tab_name]</option>
[end]
</select>
</td></tr>
@ -28,14 +28,14 @@
<tr><th>{group}: </th><td>
<select name="group" class="groups">
[for priv_group_tab]
<option[if-one priv_group_tab_isdefault] selected[end]>[priv_group_tab_name]</option>
<option[if priv_group_tab_isdefault] selected[end]>[priv_group_tab_name]</option>
[end]
</select>
</td></tr>
[end]
[if-one priv_show_form_chmod]
[if priv_show_form_chmod]
<tr><th>{permissions}:</th><td><input class="privileges" type="text" name="privileges" value="[priv_privileges]"></td></tr>
[end]
@ -59,11 +59,11 @@
<h2>{priv_for_all_files}:</h2>
<table class="withoutborder">
[if-one priv_show_form_chown]
[if priv_show_form_chown]
<tr><th>{user}:</th><td>
<select name="userfile" class="users">
[for priv_user_tab]
<option[if-one priv_user_tab_isdefault] selected[end]>[priv_user_tab_name]</option>
<option[if priv_user_tab_isdefault] selected[end]>[priv_user_tab_name]</option>
[end]
</select>
</td></tr>
@ -71,13 +71,13 @@
<tr><th>{group}: </th><td>
<select name="groupfile" class="groups">
[for priv_group_tab]
<option[if-one priv_group_tab_isdefault] selected[end]>[priv_group_tab_name]</option>
<option[if priv_group_tab_isdefault] selected[end]>[priv_group_tab_name]</option>
[end]
</select>
</td></tr>
[end]
[if-one priv_show_form_chmod]
[if priv_show_form_chmod]
<tr><th>{permissions}:</th><td><input class="privileges" type="text" name="privilegesfile" value="[priv_privileges_for_files]"></td></tr>
[end]
@ -87,11 +87,11 @@
<h2>{priv_for_all_dirs}:</h2>
<table class="withoutborder">
[if-one priv_show_form_chown]
[if priv_show_form_chown]
<tr><th>{user}:</th><td>
<select name="userdir" class="users">
[for priv_user_tab]
<option[if-one priv_user_tab_isdefault] selected[end]>[priv_user_tab_name]</option>
<option[if priv_user_tab_isdefault] selected[end]>[priv_user_tab_name]</option>
[end]
</select>
</td></tr>
@ -99,13 +99,13 @@
<tr><th>{group}: </th><td>
<select name="groupdir" class="groups">
[for priv_group_tab]
<option[if-one priv_group_tab_isdefault] selected[end]>[priv_group_tab_name]</option>
<option[if priv_group_tab_isdefault] selected[end]>[priv_group_tab_name]</option>
[end]
</select>
</td></tr>
[end]
[if-one priv_show_form_chmod]
[if priv_show_form_chmod]
<tr><th>{permissions}:</th><td><input class="privileges" type="text" name="privilegesdir" value="[priv_privileges_for_dirs]"></td></tr>
[end]

View File

@ -37,7 +37,7 @@
[if-no user_logged]
[if not user_logged]
<div class="winix_input_a">
<label for="">{nick}:</label>
<input type="text" name="guestname" value="">

View File

@ -2,7 +2,7 @@
<h1>{rm_header}</h1>
<form id="additem" method="post" action="[doc_base_url][dir][if-one item_is][item_url]/[end]rm[if-no item_is]/r[end]">
<form id="additem" method="post" action="[doc_base_url][dir][if item_is][item_url]/[end]rm[if not item_is]/r[end]">
<fieldset>
<legend>{rm_form_legend}</legend>
@ -27,7 +27,7 @@
</p>
[if-no item_is]
[if not item_is]
<p>
<label><input type="checkbox" name="c" [if winix_function_param_is "c"]checked="checked"[end]>{rm_only_content}</label>
</p>

View File

@ -19,7 +19,7 @@
<tr>
<th>{tickets_header_name}</th>
[for ticket_tab]
[if-any-no ticket_tab_type_is "images" ticket_tab_type_is "files"]
[if any_not [ticket_tab_type_is "images"] [ticket_tab_type_is "files"]]
<th>[filter fil_firstup][ticket_tab_param_name][end]</th>
[end]
[end]
@ -33,9 +33,9 @@
[for tickets_tab]
<tr>
<td class="winix_tickets_tab_title"><a href="[doc_base_url][dir][tickets_tab_url]">[if-no tickets_tab_subject_empty][tickets_tab_subject][else]&lt;[tickets_tab_url]&gt;[end]</a></td>
<td class="winix_tickets_tab_title"><a href="[doc_base_url][dir][tickets_tab_url]">[if not tickets_tab_subject_empty][tickets_tab_subject][else]&lt;[tickets_tab_url]&gt;[end]</a></td>
[for tickets_tab_conf_tab]
[if-any-no tickets_tab_conf_tab_type_is "images" tickets_tab_conf_tab_type_is "files"]
[if any_not [tickets_tab_conf_tab_type_is "images"] [tickets_tab_conf_tab_type_is "files"]]
[if tickets_tab_conf_tab_type_is "progress"]
<td><img src="[doc_base_url_common]/{ticket_progress_image_path}/progress_[tickets_tab_conf_tab_progress_image_number].gif" alt="progress [tickets_tab_conf_tab_value]%"></td>
[else]

View File

@ -36,7 +36,7 @@
[# is it correct? may give this 'if' only to /-/thumb param? ]
[if item_tab_has_thumb]<img src="[item_tab_link]/-/thumb" alt="[item_tab_subject]">[end]
[item_tab_url] [if not [cmp [item_tab_subject] [str ""]]]<span class="winix_sort_item_title">({sort_item_subject}: [item_tab_subject])</span>[end]
[item_tab_url] [if not [is item_tab_subject ""]]<span class="winix_sort_item_title">({sort_item_subject}: [item_tab_subject])</span>[end]
</li>
[end]
</ul>

View File

@ -3,11 +3,11 @@
<h1>{subject_header}</h1>
<form method="post" action="[doc_base_url][dir][if-one item_is][item_url]/[end]subject">
<form method="post" action="[doc_base_url][dir][if item_is][item_url]/[end]subject">
<div class="winix_input_a">
<label for="winix_title_id">{title}</label>
<input id="winix_title_id" type="text" name="subject" value="[if-one item_is][item_subject][else][dir_last_subject][end]">
<input id="winix_title_id" type="text" name="subject" value="[if item_is][item_subject][else][dir_last_subject][end]">
</div>
[if winix_function_param_is "postredirect"]

View File

@ -44,7 +44,7 @@
<form id="additem" method="post" action="[doc_base_url][dir][if-one item_is][item_url]/[end]template">
<form id="additem" method="post" action="[doc_base_url][dir][if item_is][item_url]/[end]template">
<fieldset>
<legend>{template_form_legend}</legend>
@ -56,7 +56,7 @@
<option value="-1">({template_form_from_mount_point})</option>
[for template_tab]
<option value="[template_tab_index]"[if-one template_tab_isdefault] selected[end]>[template_tab_file_name]</option>
<option value="[template_tab_index]"[if template_tab_isdefault] selected[end]>[template_tab_file_name]</option>
[end]
</select>

View File

@ -12,7 +12,7 @@
</div>
[end]
[if-no thread_mount_arg_is "sort_desc"]
[if not [thread_mount_arg_is "sort_desc"]]
<div class="winix_threadbox">
[if item_can_write]<a class="winix_threadedit" 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]

View File

@ -33,7 +33,7 @@
[end]
[end]
[if-any-no ticket_tab_type_is "images" ticket_tab_type_is "files"]
[if any_not [ticket_tab_type_is "images"] [ticket_tab_type_is "files"]]
[ticket_tab_value]
[end]

View File

@ -9,7 +9,7 @@
[end]
<form id="additem" method="post" action="[doc_base_url][dir][if-one item_is][item_url]/[end]timezone">
<form id="additem" method="post" action="[doc_base_url][dir][if item_is][item_url]/[end]timezone">
<fieldset>
<legend>{timezone_form_legend}</legend>
@ -18,7 +18,7 @@
[# add to styles]
<select name="timezoneid" style="width: 250px;">
[for winix_tz_tab]
<option value="[winix_tz_tab_id]" [if cmp [user_time_zone_id] [winix_tz_tab_id]]selected="selected"[end]>UTC[winix_tz_tab_offset_hour_min] [winix_tz_tab_name]</option>
<option value="[winix_tz_tab_id]" [if cmp user_time_zone_id winix_tz_tab_id]selected="selected"[end]>UTC[winix_tz_tab_offset_hour_min] [winix_tz_tab_name]</option>
[end]
</select>

View File

@ -16,7 +16,7 @@
<input class="edit" type="text" name="url" value="[item_url]">
[end]
[if-any mount_type_is "thread" thread_mount_arg_is "subject"]
[if any [mount_type_is "thread"] [thread_mount_arg_is "subject"]]
<p class="withnext">{title}:</p>
<input class="edit" type="text" name="subject" value="[item_subject]">
@ -33,7 +33,7 @@
<input type="hidden" name="contenttype" value="2">
[if-no user_logged]
[if not user_logged]
<p class="withnext">{nick}:</p>
<input class="edit" type="text" name="guestname" value="[item_guest_name]">

View File

@ -5,7 +5,7 @@
[end]
[if-any-no winix_function_param_is "ckeditor_upload" winix_function_param_is "jquery_upload"]
[if any_not [winix_function_param_is "ckeditor_upload"] [winix_function_param_is "jquery_upload"]]
<div class="winix">
<h1>{upload_header}</h1>

View File

@ -5,7 +5,7 @@
<p>{uptime_current_time}: [winix_cur_time]<br>
{uptime_up}:
[if-one uptime_more_than_one_day]
[if uptime_more_than_one_day]
[uptime_days] {uptime_days}
[else]
[uptime_hours]

View File

@ -15,7 +15,7 @@
<input class="edit" type="text" name="url" value="[item_url]">
[end]
[if-any mount_type_is "thread" thread_mount_arg_is "subject"]
[if any [mount_type_is "thread"] [thread_mount_arg_is "subject"]]
<p class="withnext">{title}:</p>
<input class="edit" type="text" name="subject" value="[item_subject]">
@ -35,7 +35,7 @@
[else]
[end]
[if-no user_logged]
[if not user_logged]
<p class="withnext">{nick}:</p>
<input class="edit" type="text" name="guestname" value="[item_guest_name]">

View File

@ -3,7 +3,7 @@
<h1>{who_header}</h1>
[if-any who_tab]
[if who_tab]
<table class="who">
<tr><th>{who_tab_index}</th><th>{user}</th><th>{who_tab_start}</th><th>{who_tab_last_active}</th></tr>
[for who_tab]

View File

@ -4,7 +4,7 @@
<html lang="{language}">
<head>
<meta charset="{charset}">
<meta charset="UTF-8">
<title>[doc_title]</title>
[include "index_head_functions_add.html"]
</head>

View File

@ -4,7 +4,7 @@
<html lang="{language}">
<head>
<meta charset="{charset}">
<meta charset="UTF-8">
<title>[doc_title]</title>
[include "index_head_functions_add.html"]
</head>

View File

@ -1,46 +1,46 @@
[# other stuff needed by a specific function]
[if-one winix_function_is "adduser"
winix_function_is "chmod"
winix_function_is "chown"
winix_function_is "ckeditor"
winix_function_is "cp"
winix_function_is "default"
winix_function_is "download"
winix_function_is "emacs"
winix_function_is "env"
winix_function_is "imgcrop"
winix_function_is "ipban"
winix_function_is "last"
winix_function_is "ln"
winix_function_is "locale"
winix_function_is "login"
winix_function_is "logout"
winix_function_is "ls"
winix_function_is "man"
winix_function_is "meta"
winix_function_is "mkdir"
winix_function_is "mount"
winix_function_is "mv"
winix_function_is "nicedit"
winix_function_is "node"
winix_function_is "passwd"
winix_function_is "priv"
winix_function_is "pw"
winix_function_is "reload"
winix_function_is "rm"
winix_function_is "rmuser"
winix_function_is "sort"
winix_function_is "stat"
winix_function_is "subject"
winix_function_is "template"
winix_function_is "timezone"
winix_function_is "tinymce"
winix_function_is "uname"
winix_function_is "upload"
winix_function_is "uptime"
winix_function_is "vim"
winix_function_is "who"]
[if one [winix_function_is "adduser"]
[winix_function_is "chmod"]
[winix_function_is "chown"]
[winix_function_is "ckeditor"]
[winix_function_is "cp"]
[winix_function_is "default"]
[winix_function_is "download"]
[winix_function_is "emacs"]
[winix_function_is "env"]
[winix_function_is "imgcrop"]
[winix_function_is "ipban"]
[winix_function_is "last"]
[winix_function_is "ln"]
[winix_function_is "locale"]
[winix_function_is "login"]
[winix_function_is "logout"]
[winix_function_is "ls"]
[winix_function_is "man"]
[winix_function_is "meta"]
[winix_function_is "mkdir"]
[winix_function_is "mount"]
[winix_function_is "mv"]
[winix_function_is "nicedit"]
[winix_function_is "node"]
[winix_function_is "passwd"]
[winix_function_is "priv"]
[winix_function_is "pw"]
[winix_function_is "reload"]
[winix_function_is "rm"]
[winix_function_is "rmuser"]
[winix_function_is "sort"]
[winix_function_is "stat"]
[winix_function_is "subject"]
[winix_function_is "template"]
[winix_function_is "timezone"]
[winix_function_is "tinymce"]
[winix_function_is "uname"]
[winix_function_is "upload"]
[winix_function_is "uptime"]
[winix_function_is "vim"]
[winix_function_is "who"]]
<link rel="stylesheet" href="[doc_base_url_common]/winix/winix.css" type="text/css">
[end]
@ -93,19 +93,19 @@
[if winix_function_is "gallery"]
[if-one gallery_has_not_mount_type gallery_mount_type_arg_is "lightbox"]
[if one gallery_has_not_mount_type [gallery_mount_type_arg_is "lightbox"]]
<link rel="stylesheet" href="[doc_base_url_common]/lightbox/lightbox.css" type="text/css" media="screen">
<script src="[doc_base_url_common]/lightbox/js/prototype.js" type="text/javascript"></script>
<script src="[doc_base_url_common]/lightbox/js/scriptaculous.js?load=effects,builder" type="text/javascript"></script>
<script src="[doc_base_url_common]/lightbox/js/lightbox.js" type="text/javascript"></script>
[end]
[if-one gallery_mount_type_arg_is "galleria" gallery_mount_type_arg_is "galleriathumb"]
[if one [gallery_mount_type_arg_is "galleria"] [gallery_mount_type_arg_is "galleriathumb"]]
<script type="text/javascript" src="[doc_base_url_common]/jquery-1.4.4.min.js"></script>
<script src="[doc_base_url_common]/aino-galleria/galleria-1.2.2.min.js" type="text/javascript"></script>
[end]
[if-one gallery_mount_type_arg_is "galleria1.2.9" gallery_mount_type_arg_is "galleriathumb1.2.9"]
[if one [gallery_mount_type_arg_is "galleria1.2.9"] [gallery_mount_type_arg_is "galleriathumb1.2.9"]]
<script type="text/javascript" src="[doc_base_url_common]/jquery-1.9.1.min.js"></script>
<script src="[doc_base_url_common]/galleria/galleria-1.2.9.min.js" type="text/javascript"></script>
[end]
@ -219,7 +219,7 @@
[if winix_function_is "sort"]
[if-no item_is]
[if not item_is]
<script type="text/javascript" src="[doc_base_url_common]/jquery-1.6.1.min.js"></script>
<script type="text/javascript" src="[doc_base_url_common]/jquery-ui-1.8.13/js/jquery-ui-1.8.13.custom.min.js"></script>
<script type="text/javascript" src="[doc_base_url_common]/sort.js"></script>
@ -234,9 +234,10 @@
[end]
[if false]
[# temporarily blocked]
[if winix_has_plugin "stats"]
[include "stats_info.html"]
[end]
[end]

View File

@ -1,5 +1,5 @@
<p class="winix_iteminfo">
{added_by}: [item_user], [item_date_creation_nice][if-no item_dates_equal],
{added_by}: [item_user], [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>

View File

@ -1,8 +1,8 @@
[if-no winix_function_param_is "fullscreen"]
[if-one dir_can_write item_can_write]
[if not [winix_function_param_is "fullscreen"]]
[if dir_can_write item_can_write]
<div class="winix_itemoptions_a">
[if-any dir_can_write]
[if dir_can_write]
<h2>{add_page}</h2>
<ul>
<li><a href="[doc_base_url][dir]emacs">{admin_emacs_add}</a></li>
@ -14,7 +14,7 @@
</ul>
[end]
[if-any item_is item_can_write]
[if item_is item_can_write]
<h2>{edit_page}</h2>
<ul>
<li><a href="[doc_base_url][dir][item_url]/emacs">{admin_emacs_edit}</a></li>
@ -31,8 +31,8 @@
<li><a href="[doc_base_url][dir]ls">{admin_ls}</a></li>
[if dir_can_write]<li><a href="[doc_base_url][dir]mkdir">{admin_mkdir}</a></li>[end]
[if dir_can_write]<li><a href="[doc_base_url][dir]upload">{admin_upload}</a></li>[end]
[if-no item_is]<li><a href="[doc_base_url][dir]sort">{admin_sort}</a></li>[end]
[if-any item_is item_can_remove]<li><a href="[doc_base_url][dir][item_url]/rm">{admin_rm}</a></li>[end]
[if not item_is]<li><a href="[doc_base_url][dir]sort">{admin_sort}</a></li>[end]
[if any item_is item_can_remove]<li><a href="[doc_base_url][dir][item_url]/rm">{admin_rm}</a></li>[end]
</ul>
</div>
[end]

View File

@ -1,7 +1,7 @@
<p class="[if index "odd"]winix_itemtabinfo[else][if thread_mount_arg_is "subject"]winix_itemtabinfo[else]winix_itemtabinfo2[end][end]">
{added_by}: [item_tab_user], [item_tab_date_creation_nice][if-no item_tab_dates_equal],
{last_modified}[if-one item_tab_users_different] {by}: [item_tab_modification_user],[else]:[end]
{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]

View File

@ -1,4 +1,3 @@
[if slog_tab]
<table class="winix_slog">

View File

@ -1,6 +1,6 @@
<p class="[if index "even"]winix_itemtabinfo[else][if thread_mount_arg_is "subject"]winix_itemtabinfo[else]winix_itemtabinfo2[end][end]">
{added_by}: [thread_sort_tab_user], [thread_sort_tab_date_creation_nice][if-no thread_sort_tab_dates_equal],
{added_by}: [thread_sort_tab_user], [thread_sort_tab_date_creation_nice][if not thread_sort_tab_dates_equal],
{last_modified}[if thread_sort_tab_users_different] {by}: [thread_sort_tab_modification_user],[else]:[end]
[thread_sort_tab_date_modification_nice]
[end]

View File

@ -5,7 +5,7 @@
*/
/*
* Copyright (c) 2014, Tomasz Sowa
* Copyright (c) 2014-2015, Tomasz Sowa
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@ -102,6 +102,53 @@ void ezc_one(Info & i)
}
void ezc_and_not(Info & i)
{
if( !i.params.empty() )
{
i.res = true;
for(size_t a=0 ; a < i.params.size() ; ++a)
{
if( i.params[a].res )
{
i.res = false;
break;
}
}
}
}
void ezc_any_not(Info & i)
{
ezc_and_not(i);
}
void ezc_or_not(Info & i)
{
i.res = false;
for(size_t a=0 ; a < i.params.size() ; ++a)
{
if( !i.params[a].res )
{
i.res = true;
break;
}
}
}
void ezc_one_not(Info & i)
{
ezc_or_not(i);
}
void ezc_not(Info & i)
{
if( !i.params.empty() )
@ -110,6 +157,7 @@ void ezc_not(Info & i)
/*
* compare strings
*/
@ -132,6 +180,44 @@ void cmp(Info & i)
void is(Info & i)
{
cmp(i);
}
void is_not(Info & i)
{
cmp(i);
i.res = !i.res;
}
void is_empty(Info & i)
{
i.res = true;
for(size_t a=0 ; a < i.params.size() ; ++a)
{
if( !i.params[a].str.empty() )
{
i.res = false;
break;
}
}
}
void is_not_empty(Info & i)
{
is_empty(i);
i.res = !i.res;
}
// IMPROVE ME !! may we need such a filter too?

View File

@ -329,19 +329,27 @@ void Templates::CreateFunctions()
/*
generic functions
*/
ezc_functions.Insert("false", ezc_false);
ezc_functions.Insert("true", ezc_true);
ezc_functions.Insert("and", ezc_and);
ezc_functions.Insert("any", ezc_any);
ezc_functions.Insert("or", ezc_or);
ezc_functions.Insert("one", ezc_one);
ezc_functions.Insert("not", ezc_not);
ezc_functions.Insert("cmp", cmp);
ezc_functions.Insert("trim", trim);
ezc_functions.Insert("to_lower", to_lower);
ezc_functions.Insert("to_upper", to_upper);
ezc_functions.Insert("index", index);
ezc_functions.Insert("str", str);
ezc_functions.Insert("false", ezc_false);
ezc_functions.Insert("true", ezc_true);
ezc_functions.Insert("and", ezc_and);
ezc_functions.Insert("any", ezc_any);
ezc_functions.Insert("or", ezc_or);
ezc_functions.Insert("one", ezc_one);
ezc_functions.Insert("and_not", ezc_and_not);
ezc_functions.Insert("any_not", ezc_any_not);
ezc_functions.Insert("or_not", ezc_or_not);
ezc_functions.Insert("one_not", ezc_one_not);
ezc_functions.Insert("not", ezc_not);
ezc_functions.Insert("cmp", cmp);
ezc_functions.Insert("is", is);
ezc_functions.Insert("is_not", is_not);
ezc_functions.Insert("is_empty", is_empty);
ezc_functions.Insert("is_not_empty", is_not_empty);
ezc_functions.Insert("trim", trim);
ezc_functions.Insert("to_lower", to_lower);
ezc_functions.Insert("to_upper", to_upper);
ezc_functions.Insert("index", index);
ezc_functions.Insert("str", str);
/*

View File

@ -248,8 +248,16 @@ namespace TemplatesFunctions
void ezc_any(Info & i);
void ezc_or(Info & i);
void ezc_one(Info & i);
void ezc_and_not(Info & i);
void ezc_any_not(Info & i);
void ezc_or_not(Info & i);
void ezc_one_not(Info & i);
void ezc_not(Info & i);
void cmp(Info & i);
void is(Info & i);
void is_not(Info & i);
void is_empty(Info & i);
void is_not_empty(Info & i);
void trim(Info & i);
void to_lower(Info & i);
void to_upper(Info & i);