diff --git a/core/session.h b/core/session.h index 4171bbd..637097d 100755 --- a/core/session.h +++ b/core/session.h @@ -78,6 +78,8 @@ struct Session // buffer for the session log TextStream log_buffer; + // !! IMPROVE ME it is still needed? + // css cannot be taken directly from the mountpoint? // table with css files // used by some javascript wysiwyg editors (ckeditor, tinymce) std::vector last_css; diff --git a/html/dir_last_info.html b/html/dir_last_info.html index 21d2985..e8e80b7 100755 --- a/html/dir_last_info.html +++ b/html/dir_last_info.html @@ -1,4 +1,4 @@ -

+

{added_by}: [dir_last_user], [dir_last_date_creation_nice] [if-no dir_last_dates_equal] diff --git a/html/err_404.html b/html/err_404.html index 8f60406..eecdea2 100755 --- a/html/err_404.html +++ b/html/err_404.html @@ -1,3 +1,7 @@ +

+

{error_404}

{error_404_msg}

+ +
diff --git a/html/err_per_denied.html b/html/err_per_denied.html index d03e0a1..ce2cace 100755 --- a/html/err_per_denied.html +++ b/html/err_per_denied.html @@ -1,5 +1,8 @@ +
+

{access_denied}

{access_denied_msg}

+
diff --git a/html/error.html b/html/error.html deleted file mode 100755 index f9e2c0b..0000000 --- a/html/error.html +++ /dev/null @@ -1,10 +0,0 @@ - -[if-no winix_err_is "0"] -

- [if-one winix_is_err_in_locales] - [winix_err_msg_from_locales] - [else] - {winix_err_default} [winix_err_code] - [end] -

-[end] diff --git a/html/fun_adduser.html b/html/fun_adduser.html index e85ca59..88955f4 100755 --- a/html/fun_adduser.html +++ b/html/fun_adduser.html @@ -1,3 +1,5 @@ +
+

[if-one user_logged]{adduser_header_add}[else]{adduser_header_register}[end]

@@ -35,4 +37,5 @@
+
diff --git a/html/fun_ckeditor.html b/html/fun_ckeditor.html index 24a4587..2eb4c3a 100755 --- a/html/fun_ckeditor.html +++ b/html/fun_ckeditor.html @@ -1,34 +1,43 @@ +
+ [if item_is]

{edit}

[else]

{add}

[end] -[include "error.html"]
-
- {form_emacs_legend} [if mount_type_is "cms"] -

{title}:

- - -

{suggested_url}:

- +
+ + +
+ +
+ + +
[end] - [if-any mount_type_is "thread" mount_thread_arg_is "subject"] -

{title}:

- + [if-any mount_type_is "thread" thread_mount_arg_is "subject"] +
+ + +
-

{suggested_url}:

- +
+ + +
[end] - [if mount_type_is "cms"]

{form_emacs_content_cms}

[end] - [if mount_type_is "thread"]

{form_emacs_content_thread}

[end] - [if mount_type_is "ticket"]

{form_emacs_content_ticket}

[end] +
+ [if mount_type_is "cms"][end] + [if mount_type_is "thread"][end] + [if mount_type_is "ticket"][end] [# template fun_ls.html uses the name: itemcontent to refer to this textarea item] - - + +
+ [if winix_function_param_is "full"] @@ -39,21 +48,24 @@ [end] [if-no user_logged] -

{nick}:

- - -

{rebus_how_is_it} [rebus_question]?

- +
+ + +
+ +
+
[end] - + [if winix_function_param_is "postredirect"] [end] - -
+
diff --git a/html/fun_cp.html b/html/fun_cp.html index 183ec3c..db22ba8 100755 --- a/html/fun_cp.html +++ b/html/fun_cp.html @@ -1,6 +1,7 @@ +
+

{cp_header}

-[include "error.html"]
@@ -35,3 +36,4 @@ +
diff --git a/html/fun_createthread.html b/html/fun_createthread.html index e18eb7d..5a7d05b 100755 --- a/html/fun_createthread.html +++ b/html/fun_createthread.html @@ -1,6 +1,7 @@ +
+

{create_thread_header}

-[include "error.html"] @@ -10,7 +11,7 @@

{title}:

- [if mount_thread_arg_is "subject"] + [if thread_mount_arg_is "subject"]

{suggested_url}:

[end] @@ -33,3 +34,4 @@ +
diff --git a/html/fun_createticket.html b/html/fun_createticket.html index f952d9e..6032ff2 100755 --- a/html/fun_createticket.html +++ b/html/fun_createticket.html @@ -1,32 +1,29 @@ +
+ [# this template is used in fun_editticket.html as well] [if item_is]

{edit_ticket_header}

[else]

{create_ticket_header}

[end] -[include "error.html"] -
-
+ -[if item_is] - {form_edit_ticket_legend} -[else] - {form_create_ticket_legend} -[end] -

{title}:

- +
+ + +
[if ticket_tab] - +
[for ticket_tab] - +
[ticket_tab_param_name]:[filter fil_firstup][ticket_tab_param_name]:[end] @@ -54,8 +51,8 @@ [ticket_tab_file_tab_path] [end] - - + + [end] @@ -68,8 +65,8 @@ [end] - - + + [end] [if-any-no ticket_tab_type_is "images" ticket_tab_type_is "files" ticket_is_creating_new ticket_tab_has_value] @@ -85,31 +82,36 @@ [end] -[# !! change names form_emacs_content_thread and form_emacs_content_ticket] - -

{form_emacs_content_ticket}

- +[# FIXME !! change names form_emacs_content_thread and form_emacs_content_ticket] +
+ + +
-

{form_emacs_content_type}

- - {form_emacs_content_type_text} {form_emacs_content_type_formatted_text} [if-one user_can_use_html]{form_emacs_content_type_html}[end] [if-one user_can_use_bbcode]{form_emacs_content_type_bbcode}[end] [if-one user_can_use_raw]{form_emacs_content_type_raw}[end] - + [if-no user_logged] -

{nick}:

- +
+ + +
-

{rebus_how_is_it} [rebus_question]?

- +
+
[end] @@ -118,6 +120,10 @@ [end] - - + + + + + + diff --git a/html/fun_default.html b/html/fun_default.html index 74f0498..d50618b 100755 --- a/html/fun_default.html +++ b/html/fun_default.html @@ -1,6 +1,7 @@ +
+

{default_header}

-[include "error.html"]
@@ -21,4 +22,5 @@ +
diff --git a/html/fun_emacs.html b/html/fun_emacs.html index 407f92b..3e38cb1 100755 --- a/html/fun_emacs.html +++ b/html/fun_emacs.html @@ -1,34 +1,42 @@ +
+ [if item_is]

{edit}

[else]

{add}

[end] -[include "error.html"] -
-
- {form_emacs_legend} + -

{title}:

- - -

{suggested_url}:

- +
+ + +
+ +
+ + +
[include "fun_emacs_post.html"] [if-no user_logged] -

{nick}:

- +
+ + +
-

{rebus_how_is_it} [rebus_question]?

- +
+ + +
[end] [if winix_function_param_is "postredirect"] [end] - -
+ +
+
diff --git a/html/fun_emacs_post.html b/html/fun_emacs_post.html index 1926acb..52490cc 100755 --- a/html/fun_emacs_post.html +++ b/html/fun_emacs_post.html @@ -1,24 +1,28 @@ +
+ [if winix_function_is "upload"] -

{upload_content}

+ [else] - [if mount_type_is "cms"]

{form_emacs_content_cms}

[end] - [if mount_type_is "thread"]

{form_emacs_content_thread}

[end] - [if mount_type_is "ticket"]

{form_emacs_content_ticket}

[end] + [if mount_type_is "cms"][end] + [if mount_type_is "thread"][end] + [if mount_type_is "ticket"][end] [end] - + +
-

{form_emacs_content_type}

- - {form_emacs_content_type_text} {form_emacs_content_type_formatted_text} [if user_can_use_html]{form_emacs_content_type_html}[end] [if user_can_use_bbcode]{form_emacs_content_type_bbcode}[end] [if user_can_use_raw]{form_emacs_content_type_raw}[end] + diff --git a/html/fun_env.html b/html/fun_env.html index 6bcf3f8..4114669 100755 --- a/html/fun_env.html +++ b/html/fun_env.html @@ -1,3 +1,5 @@ +
+

{env_header}

@@ -50,3 +52,5 @@ + +
diff --git a/html/fun_export.html b/html/fun_export.html index 6dbe566..2e9391e 100644 --- a/html/fun_export.html +++ b/html/fun_export.html @@ -1,3 +1,5 @@ +
+

Export

@@ -22,11 +24,4 @@ - - - - - - - - +
diff --git a/html/fun_gallery.html b/html/fun_gallery.html index d2af30b..b55404d 100755 --- a/html/fun_gallery.html +++ b/html/fun_gallery.html @@ -1,3 +1,5 @@ +
+ [if mount_page_arg_is "subject"][if mount_page_arg_is "info"]

[else]

[end][dir_last_subject]

[end] [if mount_page_arg_is "info"][include "dir_last_info.html"][end] @@ -77,3 +79,4 @@ [end] +
diff --git a/html/fun_last.html b/html/fun_last.html index e896b72..19b95a8 100755 --- a/html/fun_last.html +++ b/html/fun_last.html @@ -1,3 +1,5 @@ +
+

{last_header}

[if-one last_tab] @@ -12,3 +14,4 @@ [end] +
diff --git a/html/fun_ln.html b/html/fun_ln.html index 040aca4..3b5ea28 100755 --- a/html/fun_ln.html +++ b/html/fun_ln.html @@ -1,6 +1,7 @@ +
+

{ln_header}

-[include "error.html"]
@@ -33,4 +34,5 @@ +
diff --git a/html/fun_locale.html b/html/fun_locale.html index e8f55e1..b183884 100755 --- a/html/fun_locale.html +++ b/html/fun_locale.html @@ -1,3 +1,5 @@ +
+

{locale_header}

[if user_has_correct_locale] @@ -31,3 +33,4 @@ +
diff --git a/html/fun_login.html b/html/fun_login.html index d7d21e7..3e5fa19 100755 --- a/html/fun_login.html +++ b/html/fun_login.html @@ -1,3 +1,5 @@ +
+

{login_header}

[if-one user_logged] @@ -21,3 +23,4 @@ [end] +
diff --git a/html/fun_ls.html b/html/fun_ls.html index a297b65..c8c11f5 100755 --- a/html/fun_ls.html +++ b/html/fun_ls.html @@ -1,3 +1,5 @@ +
+ [if winix_function_param_is "ckeditor_browse"] @@ -27,8 +29,6 @@
- - [if-any item_tab]

{ls_pictures_in_dir} [dir]

@@ -59,7 +59,7 @@ [if-one dir_childs_tab item_tab] - +
[for dir_childs_tab] @@ -132,5 +132,6 @@ + diff --git a/html/fun_man.html b/html/fun_man.html index ae1c5ee..31950f1 100755 --- a/html/fun_man.html +++ b/html/fun_man.html @@ -1,3 +1,5 @@ +
+

{man_header}

{man_winix_funcions}

@@ -27,3 +29,4 @@
d
+
diff --git a/html/fun_meta.html b/html/fun_meta.html index 755b9c7..5045a13 100755 --- a/html/fun_meta.html +++ b/html/fun_meta.html @@ -1,3 +1,5 @@ +
+

{meta_header}

[if item_is] @@ -35,3 +37,6 @@ 
[dir_last_meta_str]
[end] [end] + + +
diff --git a/html/fun_mkdir.html b/html/fun_mkdir.html index 5b374b7..7e5802a 100755 --- a/html/fun_mkdir.html +++ b/html/fun_mkdir.html @@ -1,6 +1,7 @@ +
+

{mkdir_header}

-[include "error.html"]
@@ -19,5 +20,6 @@
+
diff --git a/html/fun_mount.html b/html/fun_mount.html index 2373df0..14ef3c6 100755 --- a/html/fun_mount.html +++ b/html/fun_mount.html @@ -1,9 +1,11 @@ +
+

{mount_header}

{mount_current}:

- +
@@ -26,7 +28,7 @@

{mount_table}:

[if mount_tab] -
{mount_type} {mount_dir}
+
@@ -50,3 +52,4 @@ [end] + diff --git a/html/fun_mv.html b/html/fun_mv.html index 4ec7f8a..001456c 100755 --- a/html/fun_mv.html +++ b/html/fun_mv.html @@ -1,6 +1,7 @@ +
+

{mv_header}

-[include "error.html"]
@@ -27,5 +28,6 @@
+
diff --git a/html/fun_nicedit.html b/html/fun_nicedit.html index bd86960..cfce402 100755 --- a/html/fun_nicedit.html +++ b/html/fun_nicedit.html @@ -1,6 +1,7 @@ +
+ [if item_is]

{edit}

[else]

{add}

[end] -[include "error.html"]
@@ -14,7 +15,7 @@ [end] - [if-any mount_type_is "thread" mount_thread_arg_is "subject"] + [if-any mount_type_is "thread" thread_mount_arg_is "subject"]

{title}:

@@ -58,3 +59,4 @@ +
diff --git a/html/fun_passwd.html b/html/fun_passwd.html index 8a27046..73919cc 100755 --- a/html/fun_passwd.html +++ b/html/fun_passwd.html @@ -1,3 +1,5 @@ +
+

{passwd_header}

@@ -29,3 +31,6 @@ + +
+ diff --git a/html/fun_priv.html b/html/fun_priv.html index e760bdd..5366125 100755 --- a/html/fun_priv.html +++ b/html/fun_priv.html @@ -1,9 +1,10 @@ +
+ [# this template is for following functions: priv, chmod, chown]

{priv_header}

-[include "error.html"] [if-no winix_function_param_is "r"] @@ -126,4 +127,5 @@ [end] +
diff --git a/html/fun_pw.html b/html/fun_pw.html index afb36bd..bbd2c89 100755 --- a/html/fun_pw.html +++ b/html/fun_pw.html @@ -1,3 +1,5 @@ +
+

Pw

[if winix_function_param_is "resetpassword"] @@ -54,3 +56,5 @@ [end] +
+ diff --git a/html/fun_reload.html b/html/fun_reload.html index 594694b..545d4e1 100755 --- a/html/fun_reload.html +++ b/html/fun_reload.html @@ -1,6 +1,7 @@ +
+

{reload_header}

-[include "error.html"]

{reload_select}:

@@ -22,3 +23,4 @@ +
diff --git a/html/fun_reply.html b/html/fun_reply.html index 6d442a8..1f4e1c2 100755 --- a/html/fun_reply.html +++ b/html/fun_reply.html @@ -1,43 +1,52 @@ +
+

{thread_header_reply}

-[include "error.html"] +
- -
- {form_thread_reply} + [if thread_mount_arg_is "subject"] +
+ + +
- [if mount_thread_arg_is "subject"] -

{title}:

- - -

{suggested_url}:

- +
+ + +
[end] - [if mount_type_is "thread"]

{form_emacs_content_thread}

[end] - +
+ [if mount_type_is "thread"][end] + +
-

{form_emacs_content_type}

- - [if user_can_use_html][end] [if user_can_use_bbcode][end] [if user_can_use_raw][end] +
[if-no user_logged] -

{nick}:

- +
+ + +
-

{rebus_how_is_it} [rebus_question]?

- +
+
[end] [if winix_function_param_is "postredirect"] @@ -45,7 +54,8 @@ [end] - - + + + diff --git a/html/fun_rm.html b/html/fun_rm.html index e155a28..414f430 100755 --- a/html/fun_rm.html +++ b/html/fun_rm.html @@ -1,3 +1,5 @@ +
+

{rm_header}

@@ -40,3 +42,4 @@ +
diff --git a/html/fun_rmuser.html b/html/fun_rmuser.html index 77577ca..83169c6 100755 --- a/html/fun_rmuser.html +++ b/html/fun_rmuser.html @@ -1,3 +1,5 @@ +
+

{rmuser_header}

[if user_logged] @@ -29,3 +31,6 @@ [end] + +
+ diff --git a/html/fun_showthreads.html b/html/fun_showthreads.html index c9d809c..38e4211 100755 --- a/html/fun_showthreads.html +++ b/html/fun_showthreads.html @@ -1,16 +1,20 @@ +
+ [if mount_page_arg_is "subject"][dir_last_subject][end] [if mount_page_arg_is "info"][include "dir_last_info.html"][end] [if thread_can_create] -
{mount_type}
+
[for thread_sort_tab] @@ -23,5 +27,6 @@ [end] + diff --git a/html/fun_showtickets.html b/html/fun_showtickets.html index cf60461..a194386 100755 --- a/html/fun_showtickets.html +++ b/html/fun_showtickets.html @@ -1,16 +1,20 @@ +
+ [if mount_page_arg_is "subject"][dir_last_subject][end] [if mount_page_arg_is "info"][include "dir_last_info.html"][end] [if ticket_can_create] - +
+ +
[end] [if tickets_tab] -
{thread_tab_title}{thread_tab_author}{thread_tab_replies}{thread_tab_last_post}
+
@@ -29,7 +33,7 @@ [for tickets_tab] - + [for tickets_tab_conf_tab] [if-any-no tickets_tab_conf_tab_type_is "images" tickets_tab_conf_tab_type_is "files"] [if tickets_tab_conf_tab_type_is "progress"] @@ -54,4 +58,5 @@ + diff --git a/html/fun_sort.html b/html/fun_sort.html index 8a9dfb1..de628db 100755 --- a/html/fun_sort.html +++ b/html/fun_sort.html @@ -1,30 +1,36 @@ +
+

{sort_header}

-

{sort_info1}

[if item_is] -
-
-

{sort_current_sortindex}:

- - + + + + +
+
+ + [if winix_function_param_is "postredirect"] [end] -
[else] +

{sort_info_multi}

+ [if item_tab] -
-
-
    + +
      [for item_tab] -
    • +
    • [if item_tab_has_thumb][item_tab_subject][end] [item_tab_url] @@ -36,9 +42,10 @@ [end] - -
+ [end] [end] + +
diff --git a/html/fun_stat.html b/html/fun_stat.html index a602b2b..62aaf88 100755 --- a/html/fun_stat.html +++ b/html/fun_stat.html @@ -1,3 +1,5 @@ +
+

{stat_header}

{tickets_header_name}
[if-no tickets_tab_subject_empty][tickets_tab_subject][else]<[tickets_tab_url]>[end][if-no tickets_tab_subject_empty][tickets_tab_subject][else]<[tickets_tab_url]>[end]
@@ -20,3 +22,7 @@
+ + +
+ diff --git a/html/fun_subject.html b/html/fun_subject.html index 4338531..030577b 100755 --- a/html/fun_subject.html +++ b/html/fun_subject.html @@ -1,6 +1,7 @@ +
+

{subject_header}

-[include "error.html"]
@@ -19,3 +20,4 @@ +
diff --git a/html/fun_template.html b/html/fun_template.html index f1f6a01..4828486 100755 --- a/html/fun_template.html +++ b/html/fun_template.html @@ -1,6 +1,7 @@ +
+

{template_header}

-[include "error.html"]

@@ -67,3 +68,6 @@ + +

+ diff --git a/html/fun_thread.html b/html/fun_thread.html index 9e62824..74d9836 100755 --- a/html/fun_thread.html +++ b/html/fun_thread.html @@ -1,17 +1,21 @@ -[if mount_page_arg_is "subject"][item_subject][end] +
+ +[if mount_page_arg_is "subject"][item_subject][end] [if mount_page_arg_is "info"][include "item_info.html"][end] [if thread_can_reply] -
    +
    + +
    [end] [if-no thread_mount_arg_is "sort_desc"] -
    - [if item_can_write]\[{edit}\][end] - [if thread_mount_arg_is "subject"][item_subject][end] +
    + [if item_can_write]\[{edit}\][end] + [if thread_mount_arg_is "subject"][item_subject][end] [if thread_mount_arg_is "info"][include "item_info.html"][end] [item_print_content]
    @@ -19,21 +23,23 @@ [for thread_sort_tab] -
    - [if thread_sort_tab_can_write]\[{edit}\][end] - [if thread_mount_arg_is "subject"][thread_sort_tab_subject][end] +
    + [if thread_sort_tab_can_write]\[{edit}\][end] + [if thread_mount_arg_is "subject"][thread_sort_tab_subject][end] [if thread_mount_arg_is "info"][include "thread_sort_tab_info.html"][end] [thread_sort_tab_print_content]
    [end] [if thread_mount_arg_is "sort_desc"] -
    - [if item_can_write]\[{edit}\][end] - [if thread_mount_arg_is "subject"][item_subject][end] +
    + [if item_can_write]\[{edit}\][end] + [if thread_mount_arg_is "subject"][item_subject][end] [if thread_mount_arg_is "info"][include "item_info.html"][end] [item_print_content]
    [end] +
    + diff --git a/html/fun_ticket.html b/html/fun_ticket.html index 53969e7..d23797e 100755 --- a/html/fun_ticket.html +++ b/html/fun_ticket.html @@ -1,10 +1,12 @@ +
    + [if mount_page_arg_is "subject"][item_subject][end] [if mount_page_arg_is "info"][include "item_info.html"][end] -
    - [if ticket_can_edit]

    \[{edit}\]

    [end] +
    + [if ticket_can_edit]

    \[{edit}\]

    [end] [for ticket_tab] [if ticket_tab_has_value] @@ -15,7 +17,7 @@ [if ticket_tab_type_is "images"] [for ticket_tab_file_tab] - + [ticket_tab_file_tab_path] [end] @@ -47,7 +49,7 @@ [if winix_has_plugin "thread"] [if thread_can_reply] -
      + [end] @@ -64,3 +66,5 @@ [end] + + diff --git a/html/fun_timezone.html b/html/fun_timezone.html index 8df2f08..8fed8e7 100755 --- a/html/fun_timezone.html +++ b/html/fun_timezone.html @@ -1,3 +1,5 @@ +
      +

      {timezone_header}

      [if user_has_correct_time_zone] @@ -29,4 +31,5 @@ +
      diff --git a/html/fun_tinymce.html b/html/fun_tinymce.html index 748dfc8..d41136a 100755 --- a/html/fun_tinymce.html +++ b/html/fun_tinymce.html @@ -1,6 +1,7 @@ +
      + [if item_is]

      {edit}

      [else]

      {add}

      [end] -[include "error.html"]
      @@ -15,7 +16,7 @@ [end] - [if-any mount_type_is "thread" mount_thread_arg_is "subject"] + [if-any mount_type_is "thread" thread_mount_arg_is "subject"]

      {title}:

      @@ -49,3 +50,4 @@ +
      diff --git a/html/fun_uname.html b/html/fun_uname.html index 4c570e2..699ade1 100755 --- a/html/fun_uname.html +++ b/html/fun_uname.html @@ -1,3 +1,5 @@ +
      +

      {uname_header}

      Winix [sys_ver_major].[sys_ver_minor].[sys_ver_revision]

      @@ -16,3 +18,4 @@ [end] +
      diff --git a/html/fun_upload.html b/html/fun_upload.html index f2c4ef4..c18dc5d 100755 --- a/html/fun_upload.html +++ b/html/fun_upload.html @@ -1,4 +1,5 @@ + [if winix_function_param_is "ckeditor_upload"] [end] @@ -24,6 +25,8 @@ [if-any-no winix_function_param_is "ckeditor_upload" winix_function_param_is "jquery_upload"] +
      +

      {upload_header}

      [# The file upload form used as target for the file upload widget] @@ -189,5 +192,7 @@ \}); \}); +
      + [end] diff --git a/html/fun_uptime.html b/html/fun_uptime.html index 323b0f3..c2a0f9b 100755 --- a/html/fun_uptime.html +++ b/html/fun_uptime.html @@ -1,3 +1,5 @@ +
      +

      {uptime_header}

      {uptime_current_time}: [winix_cur_time]
      @@ -16,3 +18,4 @@

      +
      diff --git a/html/fun_vim.html b/html/fun_vim.html index 3249eae..b16f798 100755 --- a/html/fun_vim.html +++ b/html/fun_vim.html @@ -1,6 +1,7 @@ +
      + [if item_is]

      {edit}

      [else]

      {add}

      [end] -[include "error.html"]
      @@ -14,7 +15,7 @@ [end] - [if-any mount_type_is "thread" mount_thread_arg_is "subject"] + [if-any mount_type_is "thread" thread_mount_arg_is "subject"]

      {title}:

      @@ -51,3 +52,4 @@ +
      diff --git a/html/fun_who.html b/html/fun_who.html index 96b7a63..2c5468e 100755 --- a/html/fun_who.html +++ b/html/fun_who.html @@ -1,3 +1,5 @@ +
      +

      {who_header}

      @@ -13,5 +15,5 @@ [end] - +
      diff --git a/html/index.html b/html/index.html index a1a28b9..69738bb 100755 --- a/html/index.html +++ b/html/index.html @@ -1,50 +1,25 @@ - + +[# minimalistic template] -[include "index_head.html"] + + + [doc_title] + + [include "index_head_functions_add.html"] + -[# now we don't need the check of fullscreen here] -[# we've got a second template for fullscreen -- index_fullscreen.html] -[if-no winix_function_param_is "fullscreen"] + - -
      - - [include "index_header.html"] - - - [if-no winix_show_content_in_full_window] -
      - [include "index_contentmenu.html"] - -
      - [include "slog.html"] - [content] -
      -
      - [else] -
      - [include "slog.html"] - [content] -
      - [end] - - - [include "index_footer.html"] - -
      - +
      +[include "slog.html"] + +[# each winix function has div.winix in its template defined -- only functions: cat and run don't have div.winix] +[# so you can easly use 'content' with your own template] +[# and when using other winix functions you automatically get proper styling] +[content] +
      -[else] - - -
      - [include "slog.html"] - [content] -
      - -[end] [# if-no winix_function_param_is "fullscreen"] - diff --git a/html/index_contentmenu.html b/html/index_contentmenu.html deleted file mode 100755 index 987c2b3..0000000 --- a/html/index_contentmenu.html +++ /dev/null @@ -1,12 +0,0 @@ -
      - -

      Menu

      - - - -
      - diff --git a/html/index_footer.html b/html/index_footer.html deleted file mode 100755 index f607500..0000000 --- a/html/index_footer.html +++ /dev/null @@ -1,4 +0,0 @@ - - - diff --git a/html/index_fullscreen.html b/html/index_fullscreen.html index b880a21..69738bb 100755 --- a/html/index_fullscreen.html +++ b/html/index_fullscreen.html @@ -1,30 +1,25 @@ - + +[# minimalistic template] - + [doc_title] - - - [if doc_css_tab] - [for doc_css_tab] - - [end] - [else] - - [end] - + [include "index_head_functions_add.html"] - -
      - [include "slog.html"] - [content] -
      +
      +[include "slog.html"] + +[# each winix function has div.winix in its template defined -- only functions: cat and run don't have div.winix] +[# so you can easly use 'content' with your own template] +[# and when using other winix functions you automatically get proper styling] +[content] +
      diff --git a/html/index_head.html b/html/index_head.html deleted file mode 100755 index f2d543a..0000000 --- a/html/index_head.html +++ /dev/null @@ -1,11 +0,0 @@ - - - [doc_title] - - - - - - - [include "index_head_functions_add.html"] - diff --git a/html/index_head_functions_add.html b/html/index_head_functions_add.html index bf7f2fc..f55d1f8 100755 --- a/html/index_head_functions_add.html +++ b/html/index_head_functions_add.html @@ -1,5 +1,49 @@ [# 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 "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"] + +[end] + + + [if winix_function_is "ckeditor"] [end] diff --git a/html/index_header.html b/html/index_header.html deleted file mode 100755 index 4cfcdf0..0000000 --- a/html/index_header.html +++ /dev/null @@ -1,32 +0,0 @@ -
      - -[if-one user_logged] - {logged_as}: [user_name]
      - {logout}       -[else] -
      -
      - {form_login_legend}: - - - -

      -
      - -[end] - - - -[if-one dir_tab] - -[end] - -
      diff --git a/html/item_info.html b/html/item_info.html index 0861914..e9e702a 100755 --- a/html/item_info.html +++ b/html/item_info.html @@ -1,4 +1,4 @@ -

      +

      {added_by}: [item_user], [item_date_creation_nice][if-no item_dates_equal], {last_modified}[if item_users_different] {by}: [item_modification_user],[else]:[end] [item_date_modification_nice][end] diff --git a/html/item_options.html b/html/item_options.html index a28623d..049bd87 100755 --- a/html/item_options.html +++ b/html/item_options.html @@ -1,10 +1,10 @@ [if-no winix_function_param_is "fullscreen"] [if-one dir_can_write item_can_write] -

      +
      [if-any dir_can_write]

      {add_page}

      -
        +
        • {admin_emacs_add}
          • [if user_can_use_html]
        • {admin_ckeditor_add}
          • @@ -16,7 +16,7 @@ [if-any item_is item_can_write]

          {edit_page}

          -
            +
            • {admin_emacs_edit}
              • [if user_can_use_html]
            • {admin_ckeditor_edit}
              • @@ -27,7 +27,7 @@ [end]

              {admin_options}:

              -
                +
                • {admin_ls}
                  • [if dir_can_write]
                • {admin_mkdir}
                  • [end] [if dir_can_write]
                • {admin_upload}
                  • [end] diff --git a/html/item_tab_info.html b/html/item_tab_info.html index 954a594..4bf08d4 100755 --- a/html/item_tab_info.html +++ b/html/item_tab_info.html @@ -1,4 +1,4 @@ -

                  +

                  {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] diff --git a/html/slog.html b/html/slog.html index 86bacb5..7c86e37 100755 --- a/html/slog.html +++ b/html/slog.html @@ -1,11 +1,11 @@ [if slog_tab] -

    +
    [for slog_tab] -
    + [if slog_tab_is_info] {slog_info}: diff --git a/html/thread_sort_tab_info.html b/html/thread_sort_tab_info.html index 1e5f66a..1ecab64 100755 --- a/html/thread_sort_tab_info.html +++ b/html/thread_sort_tab_info.html @@ -1,4 +1,4 @@ -

    +

    {added_by}: [thread_sort_tab_user], [thread_sort_tab_date_creation_nice][if-no thread_sort_tab_dates_equal], {last_modified}[if thread_sort_tab_users_different] {by}: [thread_sort_tab_modification_user],[else]:[end] diff --git a/locale/en b/locale/en index b9e479d..32f3a3f 100755 --- a/locale/en +++ b/locale/en @@ -91,8 +91,7 @@ rebus_how_is_it = Rebus: How is it edit_ticket_header = Edit ticket create_ticket_header = Create a new ticket -form_edit_ticket_legend = Edit ticket form. -form_create_ticket_legend = Ticket form. + form_ticket_type = Ticket type @@ -126,7 +125,6 @@ form_ln_legend = Link form -form_emacs_legend = Edit form form_emacs_content_cms = Content form_emacs_content_thread = Post @@ -238,7 +236,6 @@ thread_tab_author = Author thread_tab_replies = Rep. thread_tab_last_post = Last post thread_reply_in_this_thread = Reply in this thread -form_thread_reply = Reply form thread_header_reply = Reply @@ -396,7 +393,7 @@ slog_turn_over = Session's log turned over due to size greater than sort_header = Sort sort_current_sortindex = Current sort index -sort_info1 = Set an order of items by using the mouse. +sort_info_multi = Set an order of items by using the mouse. stat_header = Stat @@ -461,12 +458,9 @@ notify_footer4 = in your user control panel. -# errors -winix_err_default = An error occured, error code: - - # those errors are taken automatically by [winix_err_msg_from_locales] +# IMPROVE ME now they are not used, and should be moved to slog winix_err_3 = Incorrect directory. winix_err_18 = You are suspected to be a spammer, you cannot send anything without logging first. winix_err_19 = Solve the rebus please! diff --git a/locale/pl b/locale/pl index caf39a4..d3017af 100755 --- a/locale/pl +++ b/locale/pl @@ -95,8 +95,6 @@ rebus_how_is_it = Rebus: Ile to jest edit_ticket_header = Edytuj zgłoszenie create_ticket_header = Nowe zgłoszenie -form_edit_ticket_legend = Formularz edycji zgłoszenia. -form_create_ticket_legend = Formularz nowego zgłoszenia. form_ticket_type = Rodzaj zgłoszenia @@ -129,8 +127,6 @@ ln_make_redirect = "Wykonaj przekierowanie (jedynie dla linków symbolicznych)" form_ln_legend = Formularz zmiany linku -form_emacs_legend = Formularz edycji. - form_emacs_content_cms = Zawartość: form_emacs_content_thread = Post: form_emacs_content_ticket = Opis: @@ -259,7 +255,6 @@ thread_tab_author = Autor thread_tab_replies = Odp. thread_tab_last_post = Ostatni post thread_reply_in_this_thread = Odpowiedz w tym wątku -form_thread_reply = Formularz odpowiedzi w wątku thread_header_reply = Odpowiedz w wątku ticket_progress_image_path = ticket_progress @@ -417,7 +412,7 @@ slog_turn_over = Log sesji wyczyszczony w związku z przekroczeniem wielkości sort_header = Sortuj sort_current_sortindex = Bieżący indeks sortowania -sort_info1 = Ustaw kolejność elementów przeciągając je przy pomocy myszki. +sort_info_multi = Ustaw kolejność elementów przeciągając je przy pomocy myszki. stat_header = Stat stat_item_type = typ @@ -481,8 +476,6 @@ notify_footer3 = Jeśli nie chcesz dostawać więcej takich wiadomości możesz notify_footer4 = w swoim panelu użytkownika. -# errors -winix_err_default = Wystąpiły problemy z tą operacją, kod błędu: # those errors are taken automatically by [winix_err_msg_from_locales] winix_err_3 = Nieprawidłowy katalog. diff --git a/static/basic/winix.css b/static/basic/winix.css deleted file mode 100755 index aefc772..0000000 --- a/static/basic/winix.css +++ /dev/null @@ -1,675 +0,0 @@ -/* ---------------------- clearing -------------------------- */ - -html, body { -color: black; -background: white; -} - -html, body, div, span, -applet, object, iframe, -h1, h2, h3, h4, h5, h6, p, blockquote, pre, -a, abbr, acronym, address, big, cite, code, -del, dfn, em, font, img, ins, kbd, q, s, samp, -small, strike, strong, sub, sup, tt, var, -dd, dl, dt, li, ol, ul, -fieldset, form, label, legend, -table, caption, tbody, tfoot, thead, tr, th, td { - margin: 0; - padding: 0; - border: 0; - font-weight: inherit; - font-style: inherit; - font-size: 100%; - line-height: 1.4em; - font-family: inherit; - text-align: left; - vertical-align: baseline; -} - -a img, :link img, :visited img { - border: 0; -} - -table { - border-collapse: collapse; - border-spacing: 0; -} - -ol, ul { - list-style: none; -} - -q:before, q:after, -blockquote:before, blockquote:after { - content: ""; -} - - -blockquote { -margin-left: 40px; -margin-right: 40px; -} - -sub, sup { -font-size: .83em; -vertical-align: super; -} - -sub { -vertical-align: sub; -} - -em { -font-style: italic; -font-weight: normal; -} - -strong { -font-weight: bold; -} - -ul > li { -list-style-type: bullet; -margin-left: 2em; -padding: 0.4em 0 0.4em 15px; -} - -ol > li { -list-style-type: decimal; -margin-left: 3em; -padding: 0.4em 0 0.4em 5px; -} - -dl { -margin: 0.5em 0 0.5em 0; -} - -dt { -margin: 0.7em 0 0.0em 0; -} - - -* html ul li { -list-style-type: bullet; -margin-left: 2em; -padding: 0.4em 0 0.4em 15px; -} - -* html ol li { -list-style-type: decimal; -margin-left: 3em; -padding: 0.4em 0 0.4em 5px; -} - -span.strikethrough { -text-decoration: line-through; -} - -span.underline { -text-decoration: underline; -} - -table { -margin-left: 3em; -} - -table tr.roweven { -background: #F8F8F8; -} - -table tr.rowodd { -} - -table th { -font-weight: bold; -padding-right: 2em; -} - -table td { -padding-right: 2em; -} - - -table.tablea { -border: none; -} - -table.tablea th, table.tablea td { -border: none; -} - - -table.tableb { -border: none; -} - -table.tableb th { -border: none; -border-bottom: 1px solid #AEAEAE; -} - -table.tableb td { -border: none; -} - - - - -table.tablec { -border: none; -border: 1px solid #AEAEAE; -} - -table.tablec th { -border: none; -border-bottom: 1px solid #AEAEAE; -border-left: 1px dotted #AEAEAE; -border-right: 1px dotted #AEAEAE; -} - -table.tablec td { -border: none; -border-left: 1px dotted #AEAEAE; -border-right: 1px dotted #AEAEAE; -} - - -p { -margin: 0.5em 0 0.5em 0; -} - - - -/* */ - -p.withnext { -margin: 1em 0 0 0; -width: 520px; -} - -p.iteminfo { -font-size: 0.7em; -color: #AAAAAA; -margin: 0.4em 0 1.8em 0; -} - -p.itemtabinfo { -font-size: 0.7em; -color: #AAAAAA; -margin: 0 0 1em 0; -padding: 0.5em 0 0 0; -} - -p.itemtabinfo2 { -font-size: 0.7em; -color: #AAAAAA; -margin: 0 0 1em 0; -padding: 1.5em 0 0 0; -} - -.error { -color: red; -font-weight: bold; -} - - -#additem legend { -display: none; -} - - -#additem .edit { -margin: 0.3em 0 0.3em 0; -padding: 0.2em; -border: 1px solid #dedede; -display: block; -width: 530px; -} - -#additem .editshort { -margin: 0.3em 0 0.3em 0; -padding: 0.2em; -border: 1px solid #dedede; -display: block; -width: 250px; -} - -#additem .check { -vertical-align: middle; -} - - -#additem label { -vertical-align: top; -margin: 0.3em 0 0.3em 0; -padding: 0.2em; -display: block; -} - - - -#additem select { -border: 1px solid #dedede; -width: 100px; -margin: 0.3em 0 0.3em 0; -} - - -#additem select.contenttype { -width: 150px; -} - - -#additem select.template { -width: 200px; -} - - -#additem .privileges { -margin: 0.5em 0 0.5em 0; -border: 1px solid #dedede; -display: block; -width: 100px; -} - - -#additem .multitext { -margin: 0.5em 0 0.5em 0; -border: 1px solid #dedede; -display: block; -width: 100%; -} - -#additem .multitextfull { -margin: 0.5em 0 0.5em 0; -border: 1px solid #dedede; -display: block; -width: 100%; -} - - -#additem .submit { -margin: 1.5em 0 0.5em 0; -display: block; -width: 10em; -padding: 0.2em; -} - -div.itemoptions { -clear: both; -border-top: 1px solid #D1D1E1; -padding: 1em; -margin: 5em 0 1em 0; -} - -div.itemoptions h2 { -margin-top: 0; -font-size: 1.1em; -} - - -ul.itemmenu { -overflow: hidden; -margin: 1em 0 2em 0; -display: block; -} - - -/* ie6 has some problems */ -* html ul.itemmenu { -overflow: visible; -height: 1em; -} - -ul.itemmenu li { -display: block; -margin-right: 2em; -font-size: 0.8em; -line-height: 1.8em; -} - - -div.threadbox { -padding: 0.2em 1em 1em 1em; -} - - -div.threadboxcolor { -background: #F4F4F4; -border-radius: 8px; --moz-border-radius: 8px; --webkit-border-radius: 8px; -} - - -div.threadbox a.threadedit { -margin: 0.5em 0 0 0; -float: right; -font-size: 0.8em; -} - - -table.forum { -border: 1px solid #D1D1E1; -} - - -table.forum th { -border: 1px solid #D1D1E1; -} - - -table.forum td { -border: 1px solid #D1D1E1; -} - -table.forum a { -display: block; -padding: 0 4px 0 4px; -} - -.smallfont { -font-size: 0.7em; -} - -table.tickettab { -border: 1px solid #D1D1E1; -} - - -table.tickettab th { -font-weight: bold; -} - - -table.tickettab th, table.tickettab td { -text-align: center; -border: 0; -font-size: 0.7em; -border: 1px solid #D1D1E1; -vertical-align: middle; -} - -table.tickettab td.tickettabtitle { -font-size: 1em; -text-align: left; -padding: 0 4px 0 4px; -} - -table.tickettab a { -display: block; -padding: 0 4px 0 4px; -} - -table.ticket { -margin: 1em 0 1em 0; -} - - -table.ticket th { -text-align: left; -font-weight: normal; -padding: 0 1em 0 0; -} - - -table.ticket th, table.ticket td { -border: 0; -vertical-align: middle; -} - - -table.ticket input { -margin: 0.3em 0 0.3em 0; -padding: 0.2em; -border: 1px solid #dedede; -display: block; -width: 100px; -} - - -div.ticketinfo { -background: #FFFED5; -padding: 2em; -border: 1px dotted #AFAFAF; -} - - -div.ticketinfo table th { -text-align: left; -border: 0; -padding: 0 1em 0 0; -} - - -div.ticketinfo table td { -border: 0; -} - - -div.ticketinfo p.edit { -font-size: 0.8em; -text-align: right; -float: right; -} - - - -div#winix_ls_browse_leftcolumn { -float: left; -width: 30%; -margin: 0 2em 1em 1em; -} - -div#winix_ls_browse_leftcolumn li { -margin: 0; -padding: 0; -list-style-type: none; -list-style-image: none; -background: none; -} - -div#winix_ls_browse_leftcolumn a { -text-decoration: none; -outline-style: none; -} - -div#winix_ls_browse_leftcolumn a:hover, div#winix_ls_browse_leftcolumn a:focus { -text-decoration: underline; -} - -div#winix_ls_browse_rightcolumn { -float: left; -width: 60%; -} - -div#winix_ls_browse_rightcolumn li { -display: block; -float: left; -margin: 0 1em 1em 0; -padding: 0; -list-style-type: none; -list-style-image: none; -background: none; -} - -div#winix_ls_browse_rightcolumn li a img { -padding: 3px; -} - -div#winix_ls_browse_rightcolumn li a:focus { -outline-style: none; -} - -div#winix_ls_browse_rightcolumn li a:hover img, div#winix_ls_browse_rightcolumn li a:focus img { -border: 1px solid black; -padding: 2px; -} - - -strong { -font-weight: bold; -} - -img.catimage { -max-width: 600px; -} - -pre.nowinixbreak { -display: inline; -white-space: normal; -} - - - -/* - from bbcode -*/ - -span.bbitalic { -font-style: italic; -} - - -span.bbunderline { -text-decoration: underline; -} - - -span.bbstrike { -text-decoration: line-through; -} - - -div.bbquote { -display: block; -padding: 0.5em; -margin: 0.5em 0 1em 0; -border: 1px solid #C3C3C3; -background: #F0F0F0; -} - -div.bbquote span.bbquotewho { -font-size: 0.8em; -color: #BABABA; -} - -code.bbcode { -display: block; -background-color: #fafafa; -padding: 1em; -font-size: 0.8em; -} - - -ul.bblist { -margin-left: 2em; -} - - -ul.bblist li { -list-style-type: disc; -} - -span.bbcolyellow { -color: yellow; -} - -span.bbcolred { -color: red; -} - -span.bbcolgreen { -color: green; -} - -span.bbcolblue { -color: blue; -} - -span.bbcolbrown { -color: brown; -} - -span.bbcolblack { -color: black; -} - - - -ul.galleryimages li { -display: block; -float: left; -margin: 0 0 6px 10px; -background: none; -} - -ul.galleryimages a, ul.galleryimages a:hover, ul.galleryimages a:focus, ul.galleryimages a:active { -background: none; -} - -ul.galleryimages img { -background: none; -} - -table.mountpoints { - -} - -table.mountpoints th { -font-weight: bold; -white-space: normal; -text-align: center; -} - -table.slog th, table.slog td { -border: 0; -} - -td.slogerror { -background: red; -color: white; -} - -td.slogwarning { -background: #7373FF; -color: white; -} - -td.sloginfo { -background: #F0F0F0; -color: black; -} - -ul#sortable li{ -list-style-type: none; -display: block; -padding: 0.2em 1em 0.2em 1em; -border: 1px solid #D3D3D3; -background: #EDEDED; -margin: 0.3em 0 0.3em 0; -} - -ul#sortable input{ -width: 30px; -margin: 0 10px 0 0; -} - -ul#sortable img { -height: 50px; -} - - -form#fileupload { -display: block; -margin: 3em 0 1em 0; -font-size: 11px; -} - -/* after sending a file the file is shown very large for the first time */ -form#fileupload tr.template-download td.preview img { -max-width: 120px; -max-height: 120px; -} - - diff --git a/static/layout1/a1.gif b/static/layout1/a1.gif deleted file mode 100644 index 508837b..0000000 Binary files a/static/layout1/a1.gif and /dev/null differ diff --git a/static/layout1/a2.gif b/static/layout1/a2.gif deleted file mode 100644 index e639386..0000000 Binary files a/static/layout1/a2.gif and /dev/null differ diff --git a/static/layout1/b.gif b/static/layout1/b.gif deleted file mode 100644 index b858d81..0000000 Binary files a/static/layout1/b.gif and /dev/null differ diff --git a/static/layout1/winix.css b/static/layout1/winix.css deleted file mode 100755 index b65d420..0000000 --- a/static/layout1/winix.css +++ /dev/null @@ -1,1025 +0,0 @@ -/* ---------------------- clearing -------------------------- */ - -html, body { -color: black; -background: white; -} - -html, body, div, span, -applet, object, iframe, -h1, h2, h3, h4, h5, h6, p, blockquote, pre, -a, abbr, acronym, address, big, cite, code, -del, dfn, em, font, img, ins, kbd, q, s, samp, -small, strike, strong, sub, sup, tt, var, -dd, dl, dt, li, ol, ul, -fieldset, form, label, legend, -table, caption, tbody, tfoot, thead, tr, th, td { - margin: 0; - padding: 0; - border: 0; - font-weight: inherit; - font-style: inherit; - font-size: 100%; - line-height: 1.4em; - font-family: inherit; - text-align: left; - vertical-align: baseline; -} - -a img, :link img, :visited img { - border: 0; -} - -table { - border-collapse: collapse; - border-spacing: 0; -} - -ol, ul { - list-style: none; -} - -q:before, q:after, -blockquote:before, blockquote:after { - content: ""; -} - -blockquote { -margin-left: 40px; -margin-right: 40px; -} - -sub, sup { -font-size: .83em; -vertical-align: super; -} - -sub { -vertical-align: sub; -} - -em { -font-style: italic; -font-weight: normal; -} - -strong { -font-weight: bold; -} - -ul li { -list-style-type: bullet; -margin-left: 2em; -} - -ol li { -list-style-type: decimal; -margin-left: 2em; -} - -/* ---------------------- index template -------------------------- */ - - -html, body { -background: #DEDEDE; -color: #626262; -font-size: 14px; -line-height: 1.3em; -font-family: Verdana, Tahoma, Arial CE, Sans-Serif; -} - - -#winix_container { -width: 909px; -margin: 10px auto 33px auto; -background: white url('/winix/a2.gif') repeat-y right top; -} - - -#winix_containerfull { -background: white; -padding: 2em; -overflow: hidden; -} - - -#winix_contentleft { -margin: 20px 30px 0 50px; -width: 150px; -float: left; -} - - -* html #winix_contentleft { -margin-left: 25px; -} - - -#winix_contentleft h2 { -margin-top: 0; -} - - -#winix_contentleft h2.next { -margin-top: 1.2em; -} - - -.winix_menu { -list-style-type: none; -margin: 0; -} - - -.winix_menu li { -width: 150px; -padding: 0 12px 2px 0; -line-height: 1.5; -} - - -.winix_menu li a { -text-decoration: none; -color: #666666; -} - - -.winix_menu li a:hover, .winix_menu li a:focus { -text-decoration: none; -background: black; -color: white; -} - - -#winix_contentright { -min-height: 400px; -width: 600px; -float: left; -margin: 20px 0 40px 0; -padding-right: 30px; -} - - -* html #winix_contentright { -height: 400px; -} - - -#winix_contentfull { -min-height: 400px; -width: 840px; -margin: 20px 0 40px 0; -padding: 30px; -} - - -* html #winix_contentfull { -height: 400px; -} - - -#winix_header { -height: 130px; -background: url('/winix/a1.gif') no-repeat right top; -overflow: hidden; -} - - -#winix_login { -width: 240px; -float: right; -margin-top: 20px; -} - - -#winix_login legend { -width: 0; -height: 0; -overflow: hidden; -display: none; -} - - -#winix_login .edit { -border: #848484 1px solid; -width: 80px; -font-size: 0.8em; -line-height: 1; -} - - -#winix_login .submit { -background: white; -font-size: 0.8em; -border: 0; -} - - -#winix_login p { -font-size: 0.7em; -margin: 0.6em 0 0.6em 0; -} - - -#winix_login .remember { -margin: 0 0.5em 0 0; -vertical-align: middle; -} - - -#winix_logged { -width: 280px; -float: right; -margin-top: 20px; -font-size: 0.8em; -text-align: right; -padding-right: 30px; -} - -#winix_header #winix_logo { -display: block; -float: left; -margin: 20px 0 5px 20px; -} - -* html #winix_header #winix_logo { -margin-left: 10px; -} - -#winix_current_dir { -list-style-type: none; -margin: 20px 0 0 10px; -overflow: hidden; -float: left; -} - - -#winix_current_dir li { -display: block; -float: left; -} - - -#winix_current_dir a { -text-decoration: none; -color: #666666; -font-size: 1em; -} - - -#winix_current_dir a:focus, #winix_current_dir a:hover { -color: white; -background: black; -} - - -#winix_footer { -clear: both; -height: 40px; -background: url('/winix/b.gif') no-repeat left bottom; -} - - -#winix_menu_bottom { -font-size: 0.8em; -list-style-type: none; -margin: 0 auto 0 auto; -display: block; -text-align: center; -} - - -#winix_menu_bottom li { -display: inline; -margin-right: 15px; -padding-right: 15px; -border-right: 1px solid #626262; -} - - -#winix_menu_bottom li.last { -margin-right: 0; -padding-right: 0; -border-right: none; -} - - -#winix_menu_bottom li a { -text-decoration: none; -color: #666666; -} - - -#winix_menu_bottom li a:hover, #winix_menu_bottom li a:focus { -text-decoration: none; -color: white; -background: black; -} - - - -/* ---------------------- content -------------------------- */ - - -h1 { -font-size: 1.8em; -margin: 0 0 1em 0; -color: #FF8700; -font-weight: normal; -} - - -h1.withinfo { -margin: 0 0 0 0; -} - - -h1.next { -margin-top: 1.2em; -} - - -h2 { -font-size: 1.2em; -margin: 1.2em 0 0.8em 0; -color: #FF8700; -font-weight: normal; -} - - -h2.withinfo { -margin: 1.2em 0 0.2em 0; -} - - -h3 { -font-size: 1.1em; -margin: 1.2em 0 0.8em 0; -color: #FF8700; -font-weight: normal; -} - - -a { -color: #065A8B; -text-decoration: none; -} - - -a:hover, a:focus { -background: #065A8B; -color: white; -text-decoration: none; -} - - -p { -margin: 1em 0 1em 0; -line-height: 1.5em; -} - - -p.withnext { -margin: 1em 0 0 0; -width: 520px; -} - - -p.iteminfo { -font-size: 0.7em; -color: #AAAAAA; -margin: 0.4em 0 1.8em 0; -} - - -p.itemtabinfo { -font-size: 0.7em; -color: #AAAAAA; -margin: 0 0 1em 0; -padding: 0.5em 0 0 0; -} - - -p.itemtabinfo2 { -font-size: 0.7em; -color: #AAAAAA; -margin: 0 0 1em 0; -padding: 1.5em 0 0 0; -} - - -.error { -color: red; -font-weight: bold; -} - - -cite { -font-style: normal; -} - - -ul { -line-height: 1.49em; -list-style-type: none; -} - - -ul.a li { -margin: 0.7em 0 0.7em 2em; -list-style-type: disc; -} - - -ol { -margin-left: 2.5em; -} - - -dt { -margin: 1em 0 0 0; -font-weight: bold; -} - - -dd { -margin: 0 0 1em 0; -} - - -#additem legend { -display: none; -} - - -#additem .edit { -margin: 0.3em 0 0.3em 0; -padding: 0.2em; -border: 1px solid #dedede; -display: block; -width: 530px; -} - -#additem .editshort { -margin: 0.3em 0 0.3em 0; -padding: 0.2em; -border: 1px solid #dedede; -display: block; -width: 250px; -} - -#additem .check { -vertical-align: middle; -} - - -#additem label { -vertical-align: top; -margin: 0.3em 0 0.3em 0; -padding: 0.2em; -display: block; -} - - - -#additem select { -border: 1px solid #dedede; -width: 100px; -margin: 0.3em 0 0.3em 0; -} - - -#additem select.contenttype { -width: 150px; -} - - -#additem select.template { -width: 200px; -} - - -#additem .privileges { -margin: 0.5em 0 0.5em 0; -border: 1px solid #dedede; -display: block; -width: 100px; -} - - -#additem .multitext { -margin: 0.5em 0 0.5em 0; -border: 1px solid #dedede; -display: block; -width: 530px; -} - -#additem .multitextfull { -margin: 0.5em 0 0.5em 0; -border: 1px solid #dedede; -display: block; -width: 630px; -} - - -#additem .submit { -margin: 1.5em 0 0.5em 0; -display: block; -width: 10em; -padding: 0.2em; -} - - -table { -margin-left: 3em; -} - -table tr.roweven { -background: #F8F8F8; -} - -table tr.rowodd { -} - -table th { -font-weight: bold; -padding-right: 2em; -} - -table td { -padding-right: 2em; -} - - -table.tablea { -border: none; -} - -table.tablea th, table.tablea td { -border: none; -} - - -table.tableb { -border: none; -} - -table.tableb th { -border: none; -border-bottom: 1px solid #AEAEAE; -} - -table.tableb td { -border: none; -} - - - - -table.tablec { -border: none; -border: 1px solid #AEAEAE; -} - -table.tablec th { -border: none; -border-bottom: 1px solid #AEAEAE; -border-left: 1px dotted #AEAEAE; -border-right: 1px dotted #AEAEAE; -} - -table.tablec td { -border: none; -border-left: 1px dotted #AEAEAE; -border-right: 1px dotted #AEAEAE; -} - - - -table { -margin: 0.5em 0 1em 0; -border-collapse: collapse; -} - - -table tr th { -border: 1px solid #CCCCCC; -padding: 0.3em 1em 0.3em 1em; -font-weight: bold; -text-align: center; -white-space: nowrap; -} - - -table tr td { -border: 1px solid #CCCCCC; -padding: 0.3em 1em 0.3em 1em; -font-weight: normal; -text-align: left; -} - - -table.who { -font-size: 0.8em; -} - - -table.withoutborder th { -border: 0; -padding: 0 1em 0 0; -text-align: left; -font-weight: bold; -vertical-align: middle; -} - -table.withoutborder td { -border: 0; -padding: 0 1em 0 0; -vertical-align: middle; -} - - -div.itemoptions { -clear: both; -border-top: 1px solid #D1D1E1; -padding: 1em; -margin: 5em 0 1em 0; -} - - -div.itemoptions h2 { -margin-top: 0; -font-size: 1.1em; -} - - -ul.itemmenu { -overflow: hidden; -margin: 1em 0 2em 0; -display: block; -} - - -/* ie6 has some problems */ -* html ul.itemmenu { -overflow: visible; -height: 1em; -} - - -ul.itemmenu li { -display: block; -margin-right: 2em; -font-size: 0.8em; -line-height: 1.8em; -} - - -em { -font-style: normal; -font-weight: bold; -} - - -div.threadbox { -padding: 0.2em 1em 1em 1em; -} - - -div.threadboxcolor { -background: #F4F4F4; -border-radius: 8px; --moz-border-radius: 8px; --webkit-border-radius: 8px; -} - - -div.threadbox a.threadedit { -margin: 0.5em 0 0 0; -float: right; -font-size: 0.8em; -} - - -table.forum { -border: 1px solid #D1D1E1; -} - - -table.forum th { -border: 1px solid #D1D1E1; -} - - -table.forum td { -border: 1px solid #D1D1E1; -} - -table.forum a { -display: block; -padding: 0 4px 0 4px; -} - - -.smallfont { -font-size: 0.7em; -} - - -table.tickettab { -border: 1px solid #D1D1E1; -} - - -table.tickettab th { -font-weight: bold; -} - - -table.tickettab th, table.tickettab td { -text-align: center; -border: 0; -font-size: 0.7em; -border: 1px solid #D1D1E1; -vertical-align: middle; -} - -table.tickettab td.tickettabtitle { -font-size: 1em; -text-align: left; -padding: 0 4px 0 4px; -} - -table.tickettab a { -display: block; -padding: 0 4px 0 4px; -} - -table.ticket { -margin: 1em 0 1em 0; -} - - -table.ticket th { -text-align: left; -font-weight: normal; -padding: 0 1em 0 0; -} - - -table.ticket th, table.ticket td { -border: 0; -vertical-align: middle; -} - - -table.ticket input { -margin: 0.3em 0 0.3em 0; -padding: 0.2em; -border: 1px solid #dedede; -display: block; -width: 100px; -} - - -div.ticketinfo { -background: #FFFED5; -padding: 2em; -border: 1px dotted #AFAFAF; -} - - -div.ticketinfo table th { -text-align: left; -border: 0; -padding: 0 1em 0 0; -} - - -div.ticketinfo table td { -border: 0; -} - - -div.ticketinfo p.edit { -font-size: 0.8em; -text-align: right; -float: right; -} - - -div#winix_ls_browse_leftcolumn { -float: left; -width: 30%; -margin: 0 2em 1em 1em; -} - -div#winix_ls_browse_leftcolumn li { -margin: 0; -padding: 0; -list-style-type: none; -list-style-image: none; -background: none; -} - -div#winix_ls_browse_leftcolumn a { -text-decoration: none; -outline-style: none; -} - -div#winix_ls_browse_leftcolumn a:hover, div#winix_ls_browse_leftcolumn a:focus { -text-decoration: underline; -} - -div#winix_ls_browse_rightcolumn { -float: left; -width: 60%; -} - -div#winix_ls_browse_rightcolumn li { -display: block; -float: left; -margin: 0 1em 1em 0; -padding: 0; -list-style-type: none; -list-style-image: none; -background: none; -} - -div#winix_ls_browse_rightcolumn li a img { -padding: 3px; -} - -div#winix_ls_browse_rightcolumn li a:focus { -outline-style: none; -} - -div#winix_ls_browse_rightcolumn li a:hover img, div#winix_ls_browse_rightcolumn li a:focus img { -border: 1px solid black; -padding: 2px; -} - - - -strong { -font-weight: bold; -} - -img.catimage { -max-width: 600px; -} - -pre.nowinixbreak { -display: inline; -white-space: normal; -} - - - -/* - from bbcode -*/ - -span.bbitalic { -font-style: italic; -} - - -span.bbunderline { -text-decoration: underline; -} - - -span.bbstrike { -text-decoration: line-through; -} - - -div.bbquote { -display: block; -padding: 0.5em; -margin: 0.5em 0 1em 0; -border: 1px solid #C3C3C3; -background: #F0F0F0; -} - -div.bbquote span.bbquotewho { -font-size: 0.8em; -color: #BABABA; -} - -code.bbcode { -display: block; -background-color: #fafafa; -padding: 1em; -font-size: 0.8em; -} - - -ul.bblist { -margin-left: 2em; -} - - -ul.bblist li { -list-style-type: disc; -} - -span.bbcolyellow { -color: yellow; -} - -span.bbcolred { -color: red; -} - -span.bbcolgreen { -color: green; -} - -span.bbcolblue { -color: blue; -} - -span.bbcolbrown { -color: brown; -} - -span.bbcolblack { -color: black; -} - - - -ul.galleryimages li { -display: block; -float: left; -margin: 0 0 6px 10px; -background: none; -} - -ul.galleryimages a, ul.galleryimages a:hover, ul.galleryimages a:focus, ul.galleryimages a:active { -background: none; -} - -ul.galleryimages img { -background: none; -} - -table.mountpoints { - -} - -table.mountpoints th { -font-weight: bold; -white-space: normal; -text-align: center; -} - -table.slog th, table.slog td { -border: 0; -} - -td.slogerror { -background: red; -color: white; -} - -td.slogwarning { -background: #7373FF; -color: white; -} - -td.sloginfo { -background: #F0F0F0; -color: black; -} - -ul#sortable li{ -list-style-type: none; -display: block; -padding: 0.2em 1em 0.2em 1em; -border: 1px solid #D3D3D3; -background: #EDEDED; -margin: 0.3em 0 0.3em 0; -} - -ul#sortable input{ -width: 30px; -margin: 0 10px 0 0; -} - -ul#sortable img { -height: 50px; -} - - -div#fileupload { -font-size: 11px; -/* warning: file upload "add file" button doesn't want to work for small fonts in Firefox */ -} - -div#fileupload table, div#fileupload th, div#fileupload td { -border: none; -} - diff --git a/templates/templates.cpp b/templates/templates.cpp index 7bddbec..1d69f3f 100755 --- a/templates/templates.cpp +++ b/templates/templates.cpp @@ -577,10 +577,6 @@ void Templates::CreateFunctions() ezc_functions.Insert("winix_req_per_sec_1", winix_req_per_sec_1); ezc_functions.Insert("winix_req_per_sec_5", winix_req_per_sec_5); ezc_functions.Insert("winix_req_per_sec_15", winix_req_per_sec_15); - ezc_functions.Insert("winix_err_is", winix_err_is); - ezc_functions.Insert("winix_err_code", winix_err_code); - ezc_functions.Insert("winix_is_err_in_locales", winix_is_err_in_locales); - ezc_functions.Insert("winix_err_msg_from_locales", winix_err_msg_from_locales); ezc_functions.Insert("winix_show_content_in_full_window", winix_show_content_in_full_window); ezc_functions.Insert("false", winix_false); ezc_functions.Insert("true", winix_true); diff --git a/templates/templates.h b/templates/templates.h index 6a20009..bcf6013 100755 --- a/templates/templates.h +++ b/templates/templates.h @@ -489,10 +489,6 @@ namespace TemplatesFunctions void winix_req_per_sec_1(Info & i); void winix_req_per_sec_5(Info & i); void winix_req_per_sec_15(Info & i); - void winix_err_is(Info & i); - void winix_err_code(Info & i); - void winix_is_err_in_locales(Info & i); - void winix_err_msg_from_locales(Info & i); void winix_show_content_in_full_window(Info & i); void winix_false(Info & i); void winix_true(Info & i); diff --git a/templates/winix.cpp b/templates/winix.cpp index 37186ab..fa99a1f 100755 --- a/templates/winix.cpp +++ b/templates/winix.cpp @@ -188,40 +188,8 @@ char buf[20]; } -void winix_err_is(Info & i) -{ - int value = Toi(i.par); - i.res = (cur->request->status == value); -} -void winix_err_code(Info & i) -{ - i.out << cur->request->status; -} - - - - -void winix_is_err_in_locales(Info & i) -{ -wchar_t buff[40]; -size_t buff_len = sizeof(buff) / sizeof(wchar_t); - - swprintf(buff, buff_len, L"winix_err_%d", cur->request->status); - i.res = locale.IsKey(buff); -} - - -void winix_err_msg_from_locales(Info & i) -{ -wchar_t buff[40]; -size_t buff_len = sizeof(buff) / sizeof(wchar_t); - - swprintf(buff, buff_len, L"winix_err_%d", cur->request->status); - i.out << locale.Get(buff); -} - void winix_show_content_in_full_window(Info & i) {