we can create links (hard links, symbolic links) now

added winix functions: ln

winix function 'default' can be used without redirecting now

added new tickets types: TypeProgress, TypeString, TypeMultistring, TypeImages, TypeFiles
now tickets are combined with files
added winix functions: showtickets

fixed mountpoints:
when the default root mount was created its parameter table was empty
and it caused accessing to a non-existing objects

fixed logger:
modifiers (log1, log2, log3) were incorrectly treated
added modifier: log4 (debug info)

now we are moving threads to a new plugin 'thread'
created directory: plugins/thread
(not finished yet)




git-svn-id: svn://ttmath.org/publicrep/winix/trunk@704 e52654a7-88a9-db11-a3e9-0013d4bc506e
This commit is contained in:
2011-01-05 21:24:11 +00:00
parent bb83aed20d
commit 8154c403d8
113 changed files with 5840 additions and 2972 deletions

View File

@@ -20,6 +20,7 @@
[if-no 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>
[end]
</p>

View File

@@ -1,23 +1,23 @@
[# this template is used in fun_editticket.html as well]
[if-one ticket_is]<h1>{edit_ticket_header}</h1>[else]<h1>{create_ticket_header}</h1>[end]
[if item_is]<h1>{edit_ticket_header}</h1>[else]<h1>{create_ticket_header}</h1>[end]
[include "error.html"]
<form id="additem" method="post" action="[doc_base_url][dir][if-one ticket_is]editticket[else]createticket[end]">
<form id="additem" method="post" action="[doc_base_url][dir][if item_is][item_url]/editticket[else]createticket[end]" enctype="multipart/form-data">
<fieldset>
[if-one ticket_is]
[if item_is]
<legend>{form_edit_ticket_legend}</legend>
[else]
<legend>{form_create_ticket_legend}</legend>
[end]
<p class="withnext">{title}:</p>
<input class="edit" type="text" name="subject" value="[ticket_item_subject]">
<input class="edit" type="text" name="subject" value="[item_subject]">
[if ticket_tab]
@@ -39,10 +39,36 @@
[end]
[if ticket_tab_is_integer]
[if-one ticket_tab_is_integer ticket_tab_is_progress ticket_tab_is_string]
<input type="text" name="ticketparam[ticket_tab_param_index]" value="[ticket_tab_value]">
[end]
[if ticket_tab_is_multistring]
<textarea name="ticketparam[ticket_tab_param_index]">[ticket_tab_value]</textarea>
[end]
[if ticket_tab_is_images]
[for ticket_tab_files_tab]
<img src="[doc_base_url][ticket_tab_value]/-/thumb" alt="[ticket_tab_value]" height="150">
[end]
<input size="30" class="edit" type="file" name="ticketparam[ticket_tab_param_index]">
<input class="filesubmit" type="submit" name="fileuploadsubmit" value="Add">
[end]
[if ticket_tab_is_files]
[for ticket_tab_files_tab]
<a href="[doc_base_url][ticket_tab_value]/download">[ticket_tab_value]</a>
[end]
<input size="30" class="edit" type="file" name="ticketparam[ticket_tab_param_index]">
<input class="filesubmit" type="submit" name="fileuploadsubmit" value="Add">
[end]
</td>
</tr>
@@ -55,17 +81,17 @@
[# !! change names form_emacs_content_thread and form_emacs_content_ticket]
<p class="withnext">{form_emacs_content_ticket}</p>
<textarea class="multitext" rows="10" cols="60" name="itemcontent">[ticket_item_content]</textarea>
<textarea class="multitext" rows="10" cols="60" name="itemcontent">[item_content]</textarea>
<p class="withnext">{form_emacs_content_type}</p>
<select name="contenttype" class="contenttype">
<option[if ticket_item_content_type_is "text"] selected[end] value="0">{form_emacs_content_type_text}</option>
<option[if ticket_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 ticket_item_content_type_is "html"] selected[end] value="2">{form_emacs_content_type_html}</option>[end]
[if-one user_can_use_bbcode]<option[if ticket_item_content_type_is "bbcode"] selected[end] value="3">{form_emacs_content_type_bbcode}</option>[end]
[if-one user_can_use_raw]<option[if ticket_item_content_type_is "raw"] selected[end] value="4">{form_emacs_content_type_raw}</option>[end]
<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]
</select>
@@ -80,6 +106,6 @@
[end]
<input class="submit" type="submit" value="[if-one ticket_is]{form_ticket_edit_submit}[else]{form_ticket_create_submit}[end]">
<input class="submit" type="submit" value="[if item_is]{form_ticket_edit_submit}[else]{form_ticket_create_submit}[end]">
</fieldset>
</form>

View File

@@ -6,7 +6,12 @@
<fieldset>
<legend>{form_default_legend}</legend>
{url}:<br>
<input class="edit" type="text" name="defaultitem" value="[dir_last_default_item_dir][dir_last_default_item_url]">
<input class="edit" type="text" name="linkto" value="[dir_last_link_to]">
<p>
<label><input class="" type="checkbox" name="makeredirect"[if dir_last_is_link_redirect] checked="checked"[end]>{default_make_redirect}</label>
</p>
<input class="submit" type="submit" value="{change}">
</fieldset>
</form>

31
html/fun_ln.html Executable file
View File

@@ -0,0 +1,31 @@
<h1>{ln_header}</h1>
[include "error.html"]
<form id="additem" method="post" action="[doc_base_url][dir]ln">
<fieldset>
<legend>{form_ln_legend}</legend>
<p>{ln_info}: [dir]</p>
<p class="withnext">{suggested_url}</p>
<input class="edit" type="text" name="url" value="">
<p class="withnext">{ln_to}</p>
<input class="edit" type="text" name="linkto" value="[dir][if item_is][item_url][end]">
<p>
<label><input id="radiohard" type="radio" name="linktype" checked="checked" value="0">{ln_hardlink}</label>
<label><input id="radiosymb" type="radio" name="linktype" value="1">{ln_symlink}</label>
</p>
<p>
<label><input class="" type="checkbox" name="makeredirect">{ln_make_redirect}</label>
</p>
<input class="submit" type="submit" value="{change}">
</fieldset>
</form>

View File

@@ -47,11 +47,11 @@
[for item_tab]
<tr>
<td>-</td>
<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></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>
</tr>
[end]
</table>

View File

@@ -1,30 +1,39 @@
[if-one item_is]
<h1>{rm_header}</h1>
[include "error.html"]
<h1>{rm_file_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]">
<fieldset>
<legend>{rm_form_legend}</legend>
<p>
{url}: <a href="[doc_base_url][dir][item_url]">[doc_base_url][dir][item_url]</a><br>
{title}: [item_subject]
[if item_is]
[if item_type_is_symlink]
{rm_symlink}: [dir][item_url]
[else]
{rm_file}: [dir][item_url]
[end]
[else]
[if dir_is_root]
{rm_root}
[else]
{rm_dir}: [dir_without_slash]
[end]
[end]
</p>
<ul>
<li><a href="[doc_base_url][dir][item_url]/rm">{yes}</a></li>
<li><a href="[doc_base_url][dir][item_url]">{no}</a></li>
</ul>
[else]
<h1>{rm_dir_header}</h1>
[if-no item_is]
<p>
{url}: <a href="[doc_base_url][dir]">[doc_base_url][dir]</a>
<label><input type="checkbox" name="onlycontent">{rm_only_content}</label>
</p>
[end]
<ul>
<li><a href="[doc_base_url][dir]rm/r">{yes}</a></li>
<li><a href="[doc_base_url][dir]">{no}</a></li>
</ul>
[end]
<input class="submit" type="submit" value="{rm_submit}">
</fieldset>
</form>

40
html/fun_showtickets.html Executable file
View File

@@ -0,0 +1,40 @@
[if mount_page_arg_is "subject"]<h1[if mount_page_arg_is "info"] class="withinfo"[end]>[dir_last_subject]</h1>[end]
[if mount_page_arg_is "info"][include "dir_last_info.html"][end]
[if-one ticket_can_create]
<ul class="itemmenu">
<li><a href="[doc_base_url][dir]createticket">{ticket_create_new}</a></li>
</ul>
[end]
[if tickets_tab]
<table class="tickettab">
<tr>
<th>{tickets_header_name}</th>
[for ticket_tab]
<th>[ticket_tab_param]</th>
[end]
</tr>
[for tickets_tab]
<tr>
<td class="tickettabtitle"><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>
[for tickets_tab_conf_tab]
[if tickets_tab_conf_tab_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]
<td>[tickets_tab_conf_tab_value]</td>
[end]
[end]
</tr>
[end]
</table>
[end]

View File

@@ -1,66 +1,52 @@
[if mount_page_arg_is "subject"]<h1[if mount_page_arg_is "info"] class="withinfo"[end]>[dir_last_subject]</h1>[end]
[if mount_page_arg_is "info"][include "dir_last_info.html"][end]
[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]
[if-one ticket_can_create]
<div class="ticketinfo">
[if ticket_can_edit]<p class="edit"><a href="[doc_base_url][dir][item_url]/editticket">\[{edit}\]</a></p>[end]
<table>
[for ticket_tab]
<tr>
<th>[ticket_tab_param]:</th>
<td>
[if ticket_tab_is_images]
[for ticket_tab_files_tab]
<img src="[doc_base_url][ticket_tab_value]/-/thumb" alt="[ticket_tab_value]" height="150">
[end]
[end]
[if ticket_tab_is_files]
[for ticket_tab_files_tab]
<a href="[doc_base_url][ticket_tab_value]/download">[ticket_tab_value]</a>
[end]
[end]
[if-any-no ticket_tab_is_images ticket_tab_is_files]
[ticket_tab_value]
[end]
</td>
</th>
</tr>
[end]
</table>
[item_print_content]
</div>
[if-one dir_can_use_emacs]
<ul class="itemmenu">
<li><a href="[doc_base_url][dir]createticket">{ticket_create_new}</a></li>
<li><a href="[doc_base_url][dir]emacs">{ticket_reply_in_this_thread}</a></li>
</ul>
[end]
[if tickets_tab]
<table class="tickettab">
<tr>
<th>{tickets_header_name}</th>
[for ticket_tab]
<th>[ticket_tab_param]</th>
[end]
</tr>
[for tickets_tab]
<tr>
<td class="tickettabtitle"><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>
[for tickets_tab_conf_tab]
[if tickets_tab_conf_tab_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]
<td>[tickets_tab_conf_tab_value]</td>
[end]
[end]
</tr>
[end]
</table>
[end]
[if-one ticket_is]
<div class="ticketinfo">
[if-one ticket_can_edit]<p class="edit"><a href="[doc_base_url][dir]editticket">\[{edit}\]</a></p>[end]
<table>
[for ticket_tab]
<tr><th>[ticket_tab_param]:</th><td>[ticket_tab_value]</td></th></tr>
[end]
</table>
[ticket_item_print_content]
[for item_tab]
<div class="threadbox[if-index item_tab odd] threadboxcolor[end]">
[if mount_thread_arg_is "subject"]<h2[if mount_thread_arg_is "info"] class="withinfo"[end]>[item_tab_subject]</h2>[end]
[if mount_thread_arg_is "info"][include "item_tab_info.html"][end]
[item_tab_print_content]
</div>
[if-one dir_can_use_emacs]
<ul class="itemmenu">
<li><a href="[doc_base_url][dir]emacs">{ticket_reply_in_this_thread}</a></li>
</ul>
[end]
[for item_tab]
<div class="threadbox[if-index item_tab odd] threadboxcolor[end]">
[if mount_thread_arg_is "subject"]<h2[if mount_thread_arg_is "info"] class="withinfo"[end]>[item_tab_subject]</h2>[end]
[if mount_thread_arg_is "info"][include "item_tab_info.html"][end]
[item_tab_print_content]
</div>
[end]
[end]

View File

@@ -25,7 +25,7 @@
<li><a href="[doc_base_url][dir]ls">{admin_ls}</a></li>
[if-one dir_can_write]<li><a href="[doc_base_url][dir]mkdir">{admin_mkdir}</a></li>[end]
[if-one dir_can_write]<li><a href="[doc_base_url][dir]upload">{admin_upload}</a></li>[end]
[if-any item_is item_can_remove]<li><a href="[doc_base_url][dir][item_url]/rm/confirm">{admin_rm}</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]