fixed: Config::Text() returned a reference to a local variable (std::string)

added: 'static' directory with *.css and images
       we have a default layout
moved: locale from data to templates       
       notification templates have its own locale object
added: reload function reloades locale now too
added: 'nice' form of item_info in templates



git-svn-id: svn://ttmath.org/publicrep/winix/trunk@582 e52654a7-88a9-db11-a3e9-0013d4bc506e
This commit is contained in:
2010-02-15 00:31:14 +00:00
parent c58031cbf4
commit fa8d8f9ea0
38 changed files with 678 additions and 574 deletions

View File

@@ -1,35 +1,25 @@
<div>
[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-one item_static_auth_is_image]
<img src="[item_link_static_auth]" alt="[item_subject]">
[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-one item_static_auth_is_image]
<img src="[item_link_static_auth]" alt="[item_subject]">
[item_print_content]
[else]
[if-one item_static_auth_is_other]
{download}: <a href="[item_link_static_auth]" title="[item_subject]">[item_subject]</a>
[item_print_content]
[else]
[if-one item_static_auth_is_other]
{download}: <a href="[item_link_static_auth]" title="[item_subject]">[item_subject]</a>
[if-one item_static_auth_is_none]
[item_print_content]
[else]
[if-one item_static_auth_is_none]
[item_print_content]
[end]
[end]
[end]
</div>
[end]

View File

@@ -29,14 +29,14 @@
[if-one mount_type_is_thread]<p class="withnext">{form_emacs_content_thread}</p>[end]
[if-one mount_type_is_ticket]<p class="withnext">{form_emacs_content_ticket}</p>[end]
<textarea class="multitext" rows="[if-one mount_type_is_cms]30[else]10[end]" cols="60" name="content">[item_content]</textarea>
<textarea class="multitext" rows="[if-one mount_type_is_cms]30[else]10[end]" cols="60" name="itemcontent">[item_content]</textarea>
<input type="hidden" name="contenttype" value="2">
[is winix_function_param_is "full"]
<script type="text/javascript">CKEDITOR.replace('content', \{filebrowserUploadUrl: '[doc_base_url][dir]upload/', filebrowserBrowseUrl: '[doc_base_url][dir]ls/ckeditor_browse/fullscreen/', customConfig : '[doc_base_url_static_ext]/ckeditor_full.js' \});</script>
<script type="text/javascript">CKEDITOR.replace('itemcontent', \{filebrowserUploadUrl: '[doc_base_url][dir]upload/', filebrowserBrowseUrl: '[doc_base_url][dir]ls/ckeditor_browse/fullscreen/', customConfig : '[doc_base_url_static_ext]/ckeditor_full.js' \});</script>
[else]
<script type="text/javascript">CKEDITOR.replace('content', \{filebrowserUploadUrl: '[doc_base_url][dir]upload/', filebrowserBrowseUrl: '[doc_base_url][dir]ls/ckeditor_browse/fullscreen/', customConfig : '[doc_base_url_static_ext]/ckeditor_winix.js' \});</script>
<script type="text/javascript">CKEDITOR.replace('itemcontent', \{filebrowserUploadUrl: '[doc_base_url][dir]upload/', filebrowserBrowseUrl: '[doc_base_url][dir]ls/ckeditor_browse/fullscreen/', customConfig : '[doc_base_url_static_ext]/ckeditor_winix.js' \});</script>
[end]
[if-no user_logged]

View File

@@ -7,7 +7,7 @@
[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="content">[item_content]</textarea>
<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>
<p class="withnext">{form_emacs_content_type}</p>

View File

@@ -15,7 +15,7 @@
<tr>
<td><a href="[doc_base_url][dir][thread_tab_url]">[thread_tab_subject]</a></td>
<td class="smallfont">[thread_tab_author]</td><td class="smallfont">[thread_tab_answers]</td>
<td class="smallfont">[thread_tab_last_item_date_modification] ([thread_tab_last_item_user])</td>
<td class="smallfont">[thread_tab_last_item_date_modification_nice] ([thread_tab_last_item_user])</td>
</tr>
[end]
</table>

View File

@@ -1,84 +1,4 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
<html lang="{language}">
<head>
<title>[doc_title]</title>
<meta http-equiv="content-type" content="text/html; charset={charset}">
<meta name="description" content="">
<meta name="keywords" content="">
<link rel="stylesheet" href="[doc_base_url_static]/css/styles.css" type="text/css">
<link rel="shortcut icon" href="[doc_base_url_static]/favicon.ico">
[is winix_function_is "ckeditor"]<script type="text/javascript" src="[doc_base_url_static_ext]/ckeditor/ckeditor.js"></script>[end]
</head>
[is-no winix_function_param_is "fullscreen"]
<body>
<div id="container">
<div id="header">
[if-one user_logged]
<span id="zalogowany">{logged_as}: [user_name]
<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></span>
[else]
<form id="loguj" method="post" action="[doc_base_url][if-one dir_can_read_exec][dir][if-any item_is item_can_read][item_url]/[end][else]/[end]login">
<fieldset>
<legend>{form_login_legend}:</legend>
<input class="edit" type="text" name="login">
<input class="edit" type="password" name="password">
<input class="submit" type="submit" value="{button_login}">
<p><label><input class="remember" type="checkbox" name="rememberme">{remember_me}</label></p>
</fieldset>
</form>
[end]
<a href="[doc_base_url]" id="logo">{home_page}</a>
[if-one dir_tab]
<ul id="current_dir">
[for dir_tab]
<li><a href="[dir_tab_link]">[dir_tab_url] /&nbsp;</a></li>
[end]
[if-one item_is]
<li><a href="[item_link]">[item_url]</a></li>
[end]
</ul>
[end]
</div> <!-- header -->
[is-no winix_function_is "ckeditor"]
<div id="contentleft">
</div> <!-- contentleft -->
<div id="contentright">
[content]
</div> <!-- contentright -->
[else]
<div id="contentfull">
[content]
</div> <!-- contentfull -->
[end] [# is-no winix_function_is "ckeditor"]
<div id="footer">
</div> <!-- footer -->
</div> <!-- container -->
</body>
[else]
<body class="white">
<div id="containerfull">
[content]
</div> <!-- containerfull -->
</body>
[end] [# is-no winix_function_param_is "fullscreen"]
</html>
[include "index_root.html"]

12
html/index_contentmenu.html Executable file
View File

@@ -0,0 +1,12 @@
<div id="winix_contentleft">
<h2>Menu</h2>
<ul class="winix_menu">
<li><a href="[doc_base_url]/">menu 1</a></li>
<li><a href="[doc_base_url]/">menu 2</a></li>
<li><a href="[doc_base_url]/">menu 3</a></li>
</ul>
</div> <!-- winix_contentleft -->

4
html/index_footer.html Executable file
View File

@@ -0,0 +1,4 @@
<div id="winix_footer">
</div> <!-- winix_footer -->

9
html/index_head.html Executable file
View File

@@ -0,0 +1,9 @@
<head>
<title>[doc_title]</title>
<meta http-equiv="content-type" content="text/html; charset={charset}">
<meta name="description" content="">
<meta name="keywords" content="">
<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"]<script type="text/javascript" src="[doc_base_url_static_ext]/ckeditor/ckeditor.js"></script>[end]
</head>

32
html/index_header.html Executable file
View File

@@ -0,0 +1,32 @@
<div id="winix_header">
[if-one user_logged]
<span id="winix_logged">{logged_as}: [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></span>
[else]
<form id="winix_login" method="post" action="[doc_base_url][if-one dir_can_read_exec][dir][if-any item_is item_can_read][item_url]/[end][else]/[end]login">
<fieldset>
<legend>{form_login_legend}:</legend>
<input class="edit" type="text" name="login">
<input class="edit" type="password" name="password">
<input class="submit" type="submit" value="{button_login}">
<p><label><input class="remember" type="checkbox" name="rememberme">{remember_me}</label></p>
</fieldset>
</form>
[end]
<a href="[doc_base_url]" id="winix_logo">{home_page}</a>
[if-one dir_tab]
<ul id="winix_current_dir">
[for dir_tab]
<li><a href="[dir_tab_link]">[dir_tab_url] /&nbsp;</a></li>
[end]
[if-one item_is]
<li><a href="[item_link]">[item_url]</a></li>
[end]
</ul>
[end]
</div> <!-- winix_header -->

44
html/index_root.html Executable file
View File

@@ -0,0 +1,44 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
<html lang="{language}">
[include "index_head.html"]
[is-no winix_function_param_is "fullscreen"]
<body>
<div id="winix_container">
[include "index_header.html"]
[is-no winix_function_is "ckeditor"]
[include "index_contentmenu.html"]
<div id="winix_contentright">
[content]
</div> <!-- winix_contentright -->
[else]
<div id="winix_contentfull">
[content]
</div> <!-- winix_contentfull -->
[end] [# is-no winix_function_is "ckeditor"]
[include "index_footer.html"]
</div> <!-- winix_container -->
</body>
[else]
<body>
<div id="winix_containerfull">
[content]
</div> <!-- winix_containerfull -->
</body>
[end] [# is-no winix_function_param_is "fullscreen"]
</html>

View File

@@ -1 +1 @@
<p class="iteminfo">{added_by}: [item_user], [item_date_creation][if-no item_dates_equal], {last_modified}: [item_date_modification][end]</p>
<p class="iteminfo">{added_by}: [item_user], [item_date_creation_nice][if-no item_dates_equal], {last_modified}: [item_date_modification_nice][end]</p>

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][if-no item_tab_dates_equal], {last_modified}: [item_tab_date_modification][end]</p>
<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}: [item_tab_date_modification_nice][end]</p>