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

updated to the new version of ezc 

git-svn-id: svn://ttmath.org/publicrep/winix/trunk@621 e52654a7-88a9-db11-a3e9-0013d4bc506e
This commit is contained in:
Tomasz Sowa 2010-07-19 23:07:34 +00:00
parent 62a0e52092
commit 93da32cfb3
20 changed files with 50 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
html/error.html
View File

@ -1,5 +1,5 @@
[is-no winix_err_is "0"]
[if-no winix_err_is "0"]
<p class="error">
[if-one winix_is_err_in_locales]
[winix_err_msg_from_locales]

4
html/fun_cat.html
View File

@ -1,5 +1,5 @@
[is mount_page_is "subject"][is mount_page_is "info"]<h1 class="withinfo">[else]<h1>[end][item_subject]</h1>[end]
[is mount_page_is "info"][item_info][end]
[if mount_page_is "subject"][if mount_page_is "info"]<h1 class="withinfo">[else]<h1>[end][item_subject]</h1>[end]
[if mount_page_is "info"][item_info][end]
[if-one item_auth_is_image]
<img class="catimage" src="[item_link]/download/thumb" alt="[item_subject]">

4
html/fun_ckeditor.html
View File

@ -16,7 +16,7 @@
[end]
[if-one mount_type_is_thread]
[is mount_thread_is "subject"]
[if mount_thread_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">
[is winix_function_param_is "full"]
[if winix_function_param_is "full"]
<script type="text/javascript">CKEDITOR.replace('itemcontent', \{filebrowserUploadUrl: '[doc_base_url][dir]upload/noredirect/ckeditor_upload/', filebrowserBrowseUrl: '[doc_base_url][dir]ls/ckeditor_browse/fullscreen/', customConfig : '[doc_base_url_common]/ckeditor_full.js' \});</script>
[else]
<script type="text/javascript">CKEDITOR.replace('itemcontent', \{filebrowserUploadUrl: '[doc_base_url][dir]upload/noredirect/ckeditor_upload/', filebrowserBrowseUrl: '[doc_base_url][dir]ls/ckeditor_browse/fullscreen/', customConfig : '[doc_base_url_common]/ckeditor_winix.js' \});</script>

2
html/fun_emacs.html
View File

@ -16,7 +16,7 @@
[end]
[if-one mount_type_is_thread]
[is mount_thread_is "subject"]
[if mount_thread_is "subject"]
<p class="withnext">{title}:</p>
<input class="edit" type="text" name="subject" value="[item_subject]">

14
html/fun_emacs_post.html
View File

@ -1,5 +1,5 @@
[is winix_function_is "upload"]
[if winix_function_is "upload"]
<p class="withnext">{upload_content}</p>
[else]
[if-one mount_type_is_cms]<p class="withnext">{form_emacs_content_cms}</p>[end]
@ -7,17 +7,17 @@
[if-one mount_type_is_ticket]<p class="withnext">{form_emacs_content_ticket}</p>[end]
[end]
<textarea class="multitext" rows="[is winix_function_is "upload"]7[else][if-one mount_type_is_cms]30[else]10[end][end]" cols="60" name="itemcontent">[item_content]</textarea>
<textarea class="multitext" rows="[if winix_function_is "upload"]7[else][if-one mount_type_is_cms]30[else]10[end][end]" cols="60" name="itemcontent">[item_content]</textarea>
<p class="withnext">{form_emacs_content_type}</p>
<select name="contenttype" class="contenttype">
<option[is item_content_type_is "text"] selected[end] value="0">{form_emacs_content_type_text}</option>
<option[is item_content_type_is "formatted text"] selected[end] value="1">{form_emacs_content_type_formatted_text}</option>
[if-one user_can_use_html]<option[is item_content_type_is "html"] selected[end] value="2">{form_emacs_content_type_html}</option>[end]
[if-one user_can_use_bbcode]<option[is item_content_type_is "bbcode"] selected[end] value="3">{form_emacs_content_type_bbcode}</option>[end]
[if-one user_can_use_raw]<option[is 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>

12
html/fun_ls.html
View File

@ -1,6 +1,6 @@
[is winix_function_param_is "ckeditor_browse"]
[if winix_function_param_is "ckeditor_browse"]
<script type="text/javascript">function select(link) \{ window.opener.CKEDITOR.tools.callFunction([ls_ckeditor_funnum_browse], link); window.close(); \} </script>
@ -21,7 +21,7 @@
[if-no item_is]
[is winix_function_param_is "l"]
[if winix_function_param_is "l"]
[# loading dir childs table with a parent directory]
[dir_childs_tab "with_parent"]
@ -37,9 +37,9 @@
<td>[dir_childs_tab_group]</td>
<td>
[if-one dir_childs_is_parent]
<a href="[doc_base_url][dir_parent_without_slash][is winix_function_param_is "dirls"]/ls/l/dirls[end]">../</a>
<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][is winix_function_param_is "dirls"]/ls/l/dirls[end]">[dir_childs_tab_url]/</a>
<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>
[end]
</td>
</tr>
@ -68,9 +68,9 @@
[for dir_childs_tab]
<li>
[if-one dir_childs_is_parent]
<a href="[doc_base_url][dir_parent_without_slash][is winix_function_param_is "dirls"]/ls/dirls[end]">../</a>
<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][is winix_function_param_is "dirls"]/ls/dirls[end]">[dir_childs_tab_url]/</a>
<a href="[doc_base_url][dir][dir_childs_tab_url][if winix_function_param_is "dirls"]/ls/dirls[end]">[dir_childs_tab_url]/</a>
[end]
</li>
[end]

2
html/fun_priv.html
View File

@ -6,7 +6,7 @@
[include "error.html"]
[is-no winix_function_param_is "r"]
[if-no winix_function_param_is "r"]
<form id="additem" method="post" action="[doc_base_url][dir][if-one item_is][item_url]/[end][winix_function]">
<fieldset>

6
html/fun_run.html
View File

@ -1,6 +1,6 @@
<div>
[is mount_page_is "subject"]
[is mount_page_is "info"]
[if mount_page_is "subject"]
[if mount_page_is "info"]
<h1 class="withinfo">
[else]
<h1>
@ -11,7 +11,7 @@
[end]
[is mount_page_is "info"]
[if mount_page_is "info"]
[item_info]
[end]

8
html/fun_thread.html
View File

@ -1,5 +1,5 @@
[is mount_page_is "subject"]<h1[is mount_page_is "info"] class="withinfo"[end]>[dir_last_subject]</h1>[end]
[is mount_page_is "info"][dir_last_info][end]
[if mount_page_is "subject"]<h1[if mount_page_is "info"] class="withinfo"[end]>[dir_last_subject]</h1>[end]
[if mount_page_is "info"][dir_last_info][end]
[if-one thread_can_create]
<ul class="itemmenu">
@ -33,8 +33,8 @@
[for item_tab]
<div class="threadbox[if-index item_tab odd] threadboxcolor[end]">
[if-one item_tab_can_use_emacs]<a class="threadedit" href="[item_tab_link]/emacs">\[{edit}\]</a>[end]
[is mount_thread_is "subject"]<h2[is mount_thread_is "info"] class="withinfo"[end]>[item_tab_subject]</h2>[end]
[is mount_thread_is "info"][item_tab_info][end]
[if mount_thread_is "subject"]<h2[if mount_thread_is "info"] class="withinfo"[end]>[item_tab_subject]</h2>[end]
[if mount_thread_is "info"][item_tab_info][end]
[item_tab_print_content]
</div>
[end]

8
html/fun_ticket.html
View File

@ -1,5 +1,5 @@
[is mount_page_is "subject"]<h1[is mount_page_is "info"] class="withinfo"[end]>[dir_last_subject]</h1>[end]
[is mount_page_is "info"][dir_last_info][end]
[if mount_page_is "subject"]<h1[if mount_page_is "info"] class="withinfo"[end]>[dir_last_subject]</h1>[end]
[if mount_page_is "info"][dir_last_info][end]
[if-one ticket_can_create]
@ -55,8 +55,8 @@
[for item_tab]
<div class="threadbox[if-index item_tab odd] threadboxcolor[end]">
[is mount_thread_is "subject"]<h2[is mount_thread_is "info"] class="withinfo"[end]>[item_tab_subject]</h2>[end]
[is mount_thread_is "info"][item_tab_info][end]
[if mount_thread_is "subject"]<h2[if mount_thread_is "info"] class="withinfo"[end]>[item_tab_subject]</h2>[end]
[if mount_thread_is "info"][item_tab_info][end]
[item_tab_print_content]
</div>
[end]

2
html/fun_tinymce.html
View File

@ -16,7 +16,7 @@
[end]
[if-one mount_type_is_thread]
[is mount_thread_is "subject"]
[if mount_thread_is "subject"]
<p class="withnext">{title}:</p>
<input class="edit" type="text" name="subject" value="[item_subject]">

4
html/fun_upload.html
View File

@ -1,4 +1,4 @@
[is winix_function_param_is "ckeditor_upload"]
[if winix_function_param_is "ckeditor_upload"]
<script type="text/javascript">window.parent.CKEDITOR.tools.callFunction([upload_ckeditor_funnum], '[item_link]');</script>
[else]
@ -10,7 +10,7 @@
<fieldset>
<legend>{upload_form_legend}</legend>
[is winix_function_param_is "multi"]
[if winix_function_param_is "multi"]
<p class="withnext">{upload_form_file_multi}</p>
<input size="68" class="edit" type="file" name="fileupload1">

2
html/index.html
View File

@ -5,7 +5,7 @@
[include "index_head.html"]
[is-no winix_function_param_is "fullscreen"]
[if-no winix_function_param_is "fullscreen"]
<body>
<div id="winix_container">

4
html/index_head.html
View File

@ -7,12 +7,12 @@
<link rel="stylesheet" href="[doc_base_url_static]/winix/winix.css" type="text/css">
<link rel="shortcut icon" href="[doc_base_url_static]/favicon.ico">
[is winix_function_is "ckeditor"]
[if winix_function_is "ckeditor"]
<script type="text/javascript" src="[doc_base_url_common]/ckeditor/ckeditor.js"></script>
[end]
[# in the future tinymce will be placed in doc_base_url_common]
[is winix_function_is "tinymce"]
[if winix_function_is "tinymce"]
<script type="text/javascript" src="[doc_base_url_static]/tiny_mce/tiny_mce.js"></script>
<script type="text/javascript" src="[doc_base_url_static]/tinymce.js"></script>
[end]

2
html/item_options.html
View File

@ -1,4 +1,4 @@
[is-no winix_function_param_is "fullscreen"]
[if-no winix_function_param_is "fullscreen"]
[if-one dir_can_write item_can_write]
<div class="itemoptions">

2
html/item_tab_info.html
View File

@ -1 +1 @@
<p class="[if-index item_tab odd]itemtabinfo[else][is mount_thread_is "subject"]itemtabinfo[else]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][item_tab_date_modification_nice][end]</p>
<p class="[if-index item_tab odd]itemtabinfo[else][if mount_thread_is "subject"]itemtabinfo[else]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][item_tab_date_modification_nice][end]</p>

2
templates/indexpatterns.cpp
View File

@ -74,7 +74,7 @@ void IndexPatterns::ReadPattern(Tab::iterator & iter, Locale & locale, LocaleFil
for(i=0 ; i<len ; ++i)
{
templ.patterns[i].delete_all_white = delete_white;
templ.patterns[i].DeleteWhiteTextItems(delete_white);
templ.patterns[i].Directory(data.templates_dir, data.templates_dir_default);
templ.patterns[i].ParseFile(iter->first);

2
templates/misc.cpp
View File

@ -69,7 +69,7 @@ void Read(Patterns & patterns, size_t pat, Locale & locale, LocaleFilter & local
{
if( pat < patterns[i].size() )
{
patterns[i][pat].delete_all_white = delete_white;
patterns[i][pat].DeleteWhiteTextItems(delete_white);
patterns[i][pat].Directory(data.templates_dir, data.templates_dir_default);
patterns[i][pat].ParseFile(file);

2
templates/patterncacher.cpp
View File

@ -56,7 +56,7 @@ void PatternCacher::CheckTableSize()
void PatternCacher::CreatePattern(const Item & item, Ezc::Pattern & pattern)
{
pattern.allow_include = false;
pattern.AllowInclude(false);
pattern.ParseString(item.content);
}

11
templates/templates.cpp
View File

@ -28,8 +28,9 @@ Locale locale;
LocaleFilter locale_filter;
CKEditorGetParser ckeditor_getparser;
const std::string empty; // used by GenerateRunRaw()
// used by GenerateRunRaw()
std::vector<std::string> empty_pars;
const std::string empty_string;
@ -620,8 +621,12 @@ using namespace TemplatesFunctions;
void Templates::GenerateRunRaw()
{
using namespace TemplatesFunctions;
if( !empty_pars.empty() )
empty_pars.clear();
Ezc::Info info(request.page, empty_pars, empty_string);
Ezc::Info info(request.page, empty);
info.iter = 0;
info.res = false;