From 2099092e164ade233010aaa9cbb4d3307499fb97 Mon Sep 17 00:00:00 2001 From: Tomasz Sowa Date: Thu, 21 Jan 2021 17:08:05 +0100 Subject: [PATCH 01/67] updated .gitignore --- .gitignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitignore b/.gitignore index 8c6bc44..fa44f75 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,5 @@ .cproject .project .settings/ +*.o +*.so -- 2.44.0 From 46c17cc4418b0cea86d790cff1905c5e3de89957 Mon Sep 17 00:00:00 2001 From: Tomasz Sowa Date: Thu, 21 Jan 2021 17:10:04 +0100 Subject: [PATCH 02/67] added UIkit https://getuikit.com front-end framework to index_head_functions_add.html and index.html --- winixd/html/index.html | 31 ++++++++--- winixd/html/index_head_functions_add.html | 63 +++++++---------------- 2 files changed, 41 insertions(+), 53 deletions(-) diff --git a/winixd/html/index.html b/winixd/html/index.html index bc6f937..71fffd8 100644 --- a/winixd/html/index.html +++ b/winixd/html/index.html @@ -4,20 +4,35 @@ + [include "index_head_functions_add.html"] [doc_title] - [include "index_head_functions_add.html"] - - +[if winix_function_is "login"] +[# login template: https://zzseba78.github.io/Kick-Off/login.html ] +
-[include "slog.html"] +[else] + +
+[end] -[# 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] + + +
+ + © [current_year] [doc_base_url] - Powered by winix [sys_ver_major].[sys_ver_minor].[sys_ver_revision] + | Built with + +
+ + [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/winixd/html/index_head_functions_add.html b/winixd/html/index_head_functions_add.html index 29e38b2..d70b51f 100644 --- a/winixd/html/index_head_functions_add.html +++ b/winixd/html/index_head_functions_add.html @@ -1,49 +1,14 @@ -[# other stuff needed by a specific function] +[def winix_has_uikit "true"] +[def winix_has_jquery "false"] + +[# UIkit CSS] + + +[# UIkit JS] + + + -[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 "seo"] - [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 "emacs"] @@ -136,6 +101,7 @@ cm.save() [if winix_function_is "ckeditor"] + [def winix_has_jquery "true"] @@ -159,6 +125,7 @@ cm.save() [# this editor doesn't work on different domains by default, solution: http://forum.wymeditor.org/forum/viewtopic.php?f=2&t=731&p=2507#p2504 ] [# you should add one file to winix: wymiframe.html ] + [def winix_has_jquery "true"] @@ -192,11 +159,13 @@ cm.save() [end] [if one [gallery_mount_type_arg_is "galleria"] [gallery_mount_type_arg_is "galleriathumb"]] + [def winix_has_jquery "true"] [end] [if one [gallery_mount_type_arg_is "galleria1.2.9"] [gallery_mount_type_arg_is "galleriathumb1.2.9"]] + [def winix_has_jquery "true"] [end] @@ -216,6 +185,7 @@ cm.save() + @@ -248,6 +218,7 @@ cm.save() --> + [def winix_has_jquery "true"] @@ -296,6 +267,7 @@ cm.save() [if winix_function_is "sort"] [if not item_is] + [def winix_has_jquery "true"] @@ -304,6 +276,7 @@ cm.save() [if winix_function_is "imgcrop"] + [def winix_has_jquery "true"] -- 2.44.0 From a16e82bf54290bc1db94fb8b0b7c95d1d9cb91be Mon Sep 17 00:00:00 2001 From: Tomasz Sowa Date: Thu, 21 Jan 2021 17:12:56 +0100 Subject: [PATCH 03/67] updated .gitignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index fa44f75..d011c30 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ .settings/ *.o *.so +winixd/winix -- 2.44.0 From d29b33532d3fd6e2a8f077a70a65b77a7df9d322 Mon Sep 17 00:00:00 2001 From: Tomasz Sowa Date: Thu, 21 Jan 2021 17:13:27 +0100 Subject: [PATCH 04/67] added UIkit markup for login winix function --- winixd/html/fun_login.html | 107 ++++++++++++++++++++++++++----------- winixd/locale/en | 13 +++-- winixd/locale/pl | 12 ++++- 3 files changed, 96 insertions(+), 36 deletions(-) diff --git a/winixd/html/fun_login.html b/winixd/html/fun_login.html index 7408735..6bfe1dc 100644 --- a/winixd/html/fun_login.html +++ b/winixd/html/fun_login.html @@ -1,47 +1,92 @@
-

{login_header}

- [if user_logged] -

{logged_as_long}: [user_name]
- {logout}

+
+

{login_header}

+ +

+ {login_currently_logged_as} [user_name] +

+ +
+ {login_logout_button} +
+
[else] [if not ipban_is_login_allowed_from_this_ip] -

{login_cannot_login_from_this_ip}
- {login_cannot_login_available} [ipban_current_ip_expires_time]

+
+

{login_cannot_login_from_this_ip}
+ {login_cannot_login_available} [ipban_current_ip_expires_time]

+
[else] -
-
- -
+
+ + +
+
+
+ + +
+
+
+
+ + +
+
-
- -
+ [if login_should_use_captcha] +
+
+ + +
+
+ [end] -
- - -
+
+ +
+
+ +
- [if login_should_use_captcha] -
- - + [if winix_function_param_is "postredirect"] + + [end] + +
+ + + + + + + + + + - [end] - - - - [if winix_function_param_is "postredirect"] - - [end] - - - + +
[end] diff --git a/winixd/locale/en b/winixd/locale/en index 22007de..20a6d30 100644 --- a/winixd/locale/en +++ b/winixd/locale/en @@ -5,7 +5,6 @@ language = en charset = UTF-8 logged_as = logged as -logged_as_long = You are logged as display_guest_name = guest unknown = unknown @@ -40,7 +39,6 @@ email_sent_to = An email has been sent to: logout = logout -remember_me = Remember me home_page = Home page @@ -340,7 +338,16 @@ login_cannot_login_from_this_ip = We are sorry but you cannot login from this IP #We are sorry but there were too many incorrect login attempts from your IP address. login_cannot_login_available = The login process will be available since: - +login_currently_logged_as = You are logged as: +login_username = Username +login_password = Password +login_remember_me = Remember me +login_button = Log in +login_forgot_password_question = Forgot your password? +login_back_to_login_form = Back to Login +login_forgot_password_email = E-mail +login_forgot_password_button = Change password +login_logout_button = Logout uptime_header = Uptime uptime_current_time = current time diff --git a/winixd/locale/pl b/winixd/locale/pl index 72a46fd..f4c291e 100644 --- a/winixd/locale/pl +++ b/winixd/locale/pl @@ -6,7 +6,6 @@ language = pl charset = UTF-8 logged_as = zalogowany jako -logged_as_long = Aktualnie jesteś zalogowany jako display_guest_name = gość unknown = nie znany @@ -45,7 +44,6 @@ email_sent_to = Wiadomość została wysłana do: logout = wyloguj -remember_me = Zapamiętaj mnie home_page = Strona główna @@ -361,6 +359,16 @@ login_cannot_login_from_this_ip = Przepraszamy ale nie możesz się zalogować z #Przepraszamy ale z twojego adresu IP było zbyt wiele prób nieprawidłowego logowania. login_cannot_login_available = Ponowne logowanie będzie możliwe dopiero od: +login_currently_logged_as = Aktualnie jesteś zalogowany jako: +login_username = Użytkownik +login_password = Hasło +login_remember_me = Zapamiętaj mnie +login_button = Zaloguj +login_forgot_password_question = Zapomniałeś hasła? +login_back_to_login_form = Powrót do logowania +login_forgot_password_email = E-mail +login_forgot_password_button = Zmień hasło +login_logout_button = Wyloguj uptime_header = Czas pracy systemu uptime_current_time = aktualna godzina -- 2.44.0 From 56f2eec5976b963aaad7d70f4ebc49e046b500e1 Mon Sep 17 00:00:00 2001 From: Tomasz Sowa Date: Thu, 21 Jan 2021 19:08:48 +0100 Subject: [PATCH 05/67] CodeMirror editor updated to version 5.59.2 - it is used in emacs winix function --- winixd/html/index_head_functions_add.html | 28 +++++++++++------------ 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/winixd/html/index_head_functions_add.html b/winixd/html/index_head_functions_add.html index d70b51f..aefe44c 100644 --- a/winixd/html/index_head_functions_add.html +++ b/winixd/html/index_head_functions_add.html @@ -12,28 +12,28 @@ [if winix_function_is "emacs"] - - + + - - - - + + + + - + - - + + [if false] - - + + [end] - - + + - + - [end] + [# CSS adjustments for browsers with JavaScript disabled] + - - - - - - - - - - - - - [def winix_has_jquery "true"] - - + - - - - + + - - + + + + + + + + - - + + + + + + + + + + + + + + + + - - + [if false] + [# the code to run the plugin we have in fun_upload.html] + + + [end] - - - - - - - - - - - - - - - - - - - - - - - + + [end] diff --git a/winixd/locale/pl b/winixd/locale/pl index 4599422..0d0fb1a 100644 --- a/winixd/locale/pl +++ b/winixd/locale/pl @@ -332,6 +332,7 @@ upload_button_delete = Usuń upload_button_processing = Wysyłanie... upload_button_download = Ściągnij upload_error = Błąd: +upload_processing = Processing... who_header = Lista sesji who_tab_index = L.p. -- 2.44.0 From db1c63a350cbb2ba76fd0b44ed3555a0b6887117 Mon Sep 17 00:00:00 2001 From: Tomasz Sowa Date: Fri, 22 Jan 2021 11:50:37 +0100 Subject: [PATCH 10/67] added html/index_bottom_adder.html template - at the moment empty, will be used at the bottom of an index template - before tag --- winixd/html/index_bottom_adder.html | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 winixd/html/index_bottom_adder.html diff --git a/winixd/html/index_bottom_adder.html b/winixd/html/index_bottom_adder.html new file mode 100644 index 0000000..139597f --- /dev/null +++ b/winixd/html/index_bottom_adder.html @@ -0,0 +1,2 @@ + + -- 2.44.0 From c9fe09ebe368310df1f733df040dd5584f507d2b Mon Sep 17 00:00:00 2001 From: Tomasz Sowa Date: Fri, 22 Jan 2021 14:18:50 +0100 Subject: [PATCH 11/67] updated locale files --- winixd/locale/en | 3 +++ winixd/locale/pl | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/winixd/locale/en b/winixd/locale/en index 034f3af..9ce71d5 100644 --- a/winixd/locale/en +++ b/winixd/locale/en @@ -308,7 +308,10 @@ upload_button_cancel_upload = Cancel upload upload_button_delete = Delete upload_button_processing = Processing... upload_button_download = Download +upload_button_edit = Edit upload_error = Error: +upload_processing = Processing... + who_header = Sessions who_tab_index = Ind. diff --git a/winixd/locale/pl b/winixd/locale/pl index 0d0fb1a..c89684e 100644 --- a/winixd/locale/pl +++ b/winixd/locale/pl @@ -331,8 +331,9 @@ upload_button_cancel_upload = Przerwij wysyłanie upload_button_delete = Usuń upload_button_processing = Wysyłanie... upload_button_download = Ściągnij +upload_button_edit = Edytuj upload_error = Błąd: -upload_processing = Processing... +upload_processing = Przygotowywanie... who_header = Lista sesji who_tab_index = L.p. -- 2.44.0 From 337f563bd415ffc5c39bc0010d7c3b6b32bbd10d Mon Sep 17 00:00:00 2001 From: Tomasz Sowa Date: Fri, 22 Jan 2021 16:56:51 +0100 Subject: [PATCH 12/67] changed html markup for tinymce and added support for 5.6.2 version --- winixd/html/fun_tinymce.html | 98 ++++++++++++++++------- winixd/html/index_head_functions_add.html | 13 ++- winixd/locale/en | 2 + winixd/locale/pl | 3 + 4 files changed, 81 insertions(+), 35 deletions(-) diff --git a/winixd/html/fun_tinymce.html b/winixd/html/fun_tinymce.html index 90a1de4..1aa2008 100644 --- a/winixd/html/fun_tinymce.html +++ b/winixd/html/fun_tinymce.html @@ -2,43 +2,52 @@ [if item_is]

{edit}

[else]

{add}

[end] +
+ [if one [mount_type_is "cms"] [any [mount_type_is "thread"] [thread_mount_arg_is "subject"]]] +
+ +
+ +
+
- -
- {form_emacs_legend} - - [if mount_type_is "cms"] -

{title}:

- - -

{suggested_url}:

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

{title}:

- - -

{suggested_url}:

- - [end] +
+ [if mount_type_is "cms"][end] + [if mount_type_is "thread"][end] + [if mount_type_is "ticket"][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] +
+
[item_print_content]
+
+
- - - +
+ +
[if not user_logged] -

{nick}:

- - -

{rebus_how_is_it} [rebus_question]?

- +
+ +
+ +
+
+ +
+ +
+ +
+
[include "antispam.html"] [end] @@ -47,8 +56,35 @@ [end] - -
+
+
+ + + +
+ {tinymce_update_progressbar_img_alt} +
+ +
+ +
+
+ +
+
+ +
+ +
diff --git a/winixd/html/index_head_functions_add.html b/winixd/html/index_head_functions_add.html index bde5dc5..ec7ef02 100644 --- a/winixd/html/index_head_functions_add.html +++ b/winixd/html/index_head_functions_add.html @@ -106,15 +106,20 @@ cm.save() [if winix_function_is "ckeditor"] [def winix_has_jquery "true"] - + [end] [if winix_function_is "tinymce"] - - - + + + [# tinymce can use a special theme called 'mobile' - it is used when /mobile param is provided] + + + [def winix_has_jquery "true"] + + [end] diff --git a/winixd/locale/en b/winixd/locale/en index 9ce71d5..1a596a7 100644 --- a/winixd/locale/en +++ b/winixd/locale/en @@ -469,6 +469,8 @@ stat_template_from_mount_point = from the mount point subject_header = Edit subject +tinymce_update_button = Update +tinymce_update_progressbar_img_alt = Progressbar uname_header = Uname uname_available_plugins = Available plugins diff --git a/winixd/locale/pl b/winixd/locale/pl index c89684e..a7fb39d 100644 --- a/winixd/locale/pl +++ b/winixd/locale/pl @@ -490,6 +490,9 @@ stat_template_from_mount_point = z punktu montowania subject_header = Zmień tytuł +tinymce_update_button = Aktualizuj +tinymce_update_progressbar_img_alt = Progressbar + uname_header = Nazwa systemu uname_available_plugins = Dostępne pluginy uname_plugin_unknown = Plugin nie ustawił swojej nazwy -- 2.44.0 From a8bc741883df9b03d94c2a080a79cb88a40272fb Mon Sep 17 00:00:00 2001 From: Tomasz Sowa Date: Mon, 25 Jan 2021 14:34:35 +0100 Subject: [PATCH 13/67] added uikit markup for vim editor (wymeditor) --- winixd/html/fun_vim.html | 83 +++++++++++++---------- winixd/html/index_head_functions_add.html | 13 ++-- 2 files changed, 54 insertions(+), 42 deletions(-) diff --git a/winixd/html/fun_vim.html b/winixd/html/fun_vim.html index 6c6486b..a5e2a63 100644 --- a/winixd/html/fun_vim.html +++ b/winixd/html/fun_vim.html @@ -3,44 +3,55 @@ [if item_is]

{edit}

[else]

{add}

[end] -
-
- {form_emacs_legend} - - [if mount_type_is "cms"] -

{title}:

- - -

{suggested_url}:

- + + + + [if one [mount_type_is "cms"] [any [mount_type_is "thread"] [thread_mount_arg_is "subject"]]] +
+ +
+ +
+
+ +
+ +
+ +
+
[end] + +
+ [if mount_type_is "cms"][end] + [if mount_type_is "thread"][end] + [if mount_type_is "ticket"][end] + - [if any [mount_type_is "thread"] [thread_mount_arg_is "subject"]] -

{title}:

- - -

{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 winix_function_param_is "full"] - [else] - [end] +
+ +
[if not user_logged] -

{nick}:

- - -

{rebus_how_is_it} [rebus_question]?

- +
+ +
+ +
+
+ +
+ +
+ +
+
[include "antispam.html"] [end] @@ -49,8 +60,10 @@ [end] - -
+
+ +
+
diff --git a/winixd/html/index_head_functions_add.html b/winixd/html/index_head_functions_add.html index ec7ef02..db867d7 100644 --- a/winixd/html/index_head_functions_add.html +++ b/winixd/html/index_head_functions_add.html @@ -130,15 +130,14 @@ cm.save() [if winix_function_is "vim"] -[# this editor doesn't work on different domains by default, solution: http://forum.wymeditor.org/forum/viewtopic.php?f=2&t=731&p=2507#p2504 ] -[# you should add one file to winix: wymiframe.html ] + + [# info from version 0.5-rc1: this editor doesn't work on different domains by default, solution: http://forum.wymeditor.org/forum/viewtopic.php?f=2&t=731&p=2507#p2504 ] + [# you should add one file to winix: wymiframe.html ] [def winix_has_jquery "true"] - - - - - + + + [end] -- 2.44.0 From cd0ae231dc399bae320b27f7d79b85b66525f7e9 Mon Sep 17 00:00:00 2001 From: Tomasz Sowa Date: Mon, 25 Jan 2021 15:57:37 +0100 Subject: [PATCH 14/67] added uikit markup for account winix function --- winixd/html/fun_account.html | 49 ++++++++++++++++++++++++++++-------- winixd/locale/en | 10 ++++++++ winixd/locale/pl | 9 +++++++ 3 files changed, 57 insertions(+), 11 deletions(-) diff --git a/winixd/html/fun_account.html b/winixd/html/fun_account.html index aaaa681..5230895 100644 --- a/winixd/html/fun_account.html +++ b/winixd/html/fun_account.html @@ -1,20 +1,47 @@
-

Account

+

{account_header}

[if user_logged] -

You are logged as: [user_name]
- [if user_super_user] - You are the root - [end] - [# !! IMPROVE ME add info about groups, may other parameters like time zone, language?] -

+ + + + + + + + + [if user_super_user] + + + + + [end] + + [if false] + [# improve me] + + + + + [end] + + + + + + + + + + + +
{account_logged_as}[user_name]
{account_admin}{account_admin_yes}
{account_groups}html, www, foo
{account_timezone}[user_time_zone_name]
{account_language}[user_locale_name]
+ + [else] -

You are not logged in.

+

{account_not_logged}

[end] - - -
diff --git a/winixd/locale/en b/winixd/locale/en index 1a596a7..ae469a1 100644 --- a/winixd/locale/en +++ b/winixd/locale/en @@ -23,6 +23,16 @@ account_already_activated = This account is already activated account_cannot_be_activated = This account cannot be activated, please contact with the system administrator account_email_sent = An email with an activation link has been sent to you +account_header = My Account +account_logged_as = You are logged as: +account_not_logged = You are not logged in. +account_admin = Root +account_admin_yes = yes +account_groups = Groups +account_timezone = Time zone +account_language = Language + + export_header = Export export_transer_file_info = Press Export to transfer the file to an external ftp server export_transer_dir_info = Press Export to transfer the directory to an external ftp server diff --git a/winixd/locale/pl b/winixd/locale/pl index a7fb39d..634a293 100644 --- a/winixd/locale/pl +++ b/winixd/locale/pl @@ -25,6 +25,15 @@ account_already_activated = To konto jest już aktywowane account_cannot_be_activated = To konto nie może być aktywowane, proszę skontaktować się z administratorem account_email_sent = Wysłaliśmy Tobie email z linkiem aktywacyjnym +account_header = Moje konto +account_logged_as = Jesteś zalogowany jako: +account_not_logged = Nie jesteś zalogowany. +account_admin = Administrator +account_admin_yes = tak +account_groups = Grupy +account_timezone = Strefa czasowa +account_language = Język + export_header = Export export_transer_file_info = Wciśnij przycisk Export aby wysłać ten plik na zewnętrzny serwer ftp -- 2.44.0 From 3c3660914f0fa6bd8d3e32e0f8b95ad52e45b5c0 Mon Sep 17 00:00:00 2001 From: Tomasz Sowa Date: Mon, 25 Jan 2021 16:10:42 +0100 Subject: [PATCH 15/67] added uikit markup for timezone winix function --- winixd/html/fun_timezone.html | 35 ++++++++++++++++++----------------- winixd/locale/en | 1 - winixd/locale/pl | 1 - 3 files changed, 18 insertions(+), 19 deletions(-) diff --git a/winixd/html/fun_timezone.html b/winixd/html/fun_timezone.html index 14e91f2..303ade8 100644 --- a/winixd/html/fun_timezone.html +++ b/winixd/html/fun_timezone.html @@ -9,25 +9,26 @@ [end] -
-
- {timezone_form_legend} - -

{timezone_select}:

- - [# add to styles] - + +
+ - [if winix_function_param_is "postredirect"] - - [end] +
+ +
+ + [if winix_function_param_is "postredirect"] + + [end] - -
+
+ +
+
diff --git a/winixd/locale/en b/winixd/locale/en index ae469a1..11ee54e 100644 --- a/winixd/locale/en +++ b/winixd/locale/en @@ -428,7 +428,6 @@ mv_incorrect_dir = Incorrect directory timezone_header = Time Zone -timezone_form_legend = Time Zone form timezone_select = Select your time zone timezone_your_zone = Your current time zone is timezone_has_incorrect_id = You don't have a correct time zone set diff --git a/winixd/locale/pl b/winixd/locale/pl index 634a293..a77e968 100644 --- a/winixd/locale/pl +++ b/winixd/locale/pl @@ -448,7 +448,6 @@ mv_incorrect_dir = Nieprawidłowy katalog timezone_header = Strefa czasowa -timezone_form_legend = Formularz wyboru strefy czasowej timezone_select = Wybierz swoją strefę czasową timezone_your_zone = Twoja aktualna strefa czasowa to timezone_has_incorrect_id = Nie masz prawidłowo ustawionej strefy czasowej -- 2.44.0 From 31a6aac9d3bfdafcc80b4b841392b7a3e19694f8 Mon Sep 17 00:00:00 2001 From: Tomasz Sowa Date: Mon, 25 Jan 2021 16:15:55 +0100 Subject: [PATCH 16/67] added uikit markup for locale winix function --- winixd/html/fun_locale.html | 35 ++++++++++++++++++----------------- winixd/locale/en | 1 - winixd/locale/pl | 1 - 3 files changed, 18 insertions(+), 19 deletions(-) diff --git a/winixd/html/fun_locale.html b/winixd/html/fun_locale.html index 0809fd0..ec21116 100644 --- a/winixd/html/fun_locale.html +++ b/winixd/html/fun_locale.html @@ -9,26 +9,27 @@ [end] -
-
- {locale_form_legend} - -

{locale_select}:

- - [# add to styles] - + +
+ - [if winix_function_param_is "postredirect"] - - [end] +
+ +
+ [if winix_function_param_is "postredirect"] + + [end] - -
+
+ +
+ +
diff --git a/winixd/locale/en b/winixd/locale/en index 11ee54e..06c114d 100644 --- a/winixd/locale/en +++ b/winixd/locale/en @@ -348,7 +348,6 @@ admin_sort = "Sort items (sort)" locale_header = Locale locale_your_locale = Current language locale_has_incorrect_id = You don't have a correct language set -locale_form_legend = Locale form locale_select = Select language diff --git a/winixd/locale/pl b/winixd/locale/pl index a77e968..26b9532 100644 --- a/winixd/locale/pl +++ b/winixd/locale/pl @@ -368,7 +368,6 @@ admin_sort = "Sortuj elementy (sort)" locale_header = Ustawienia językowe locale_your_locale = Bieżący język locale_has_incorrect_id = Nie masz prawidłowo ustawionego bieżącego języka -locale_form_legend = Formularz ustawienia języka locale_select = Wybierz język -- 2.44.0 From 6afd5c637e0d6d889d58fdebc035578f0372d21b Mon Sep 17 00:00:00 2001 From: Tomasz Sowa Date: Mon, 25 Jan 2021 16:23:13 +0100 Subject: [PATCH 17/67] added: in account winix function: links to locale and timezone --- winixd/html/fun_account.html | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/winixd/html/fun_account.html b/winixd/html/fun_account.html index 5230895..fffd056 100644 --- a/winixd/html/fun_account.html +++ b/winixd/html/fun_account.html @@ -9,12 +9,14 @@ {account_logged_as} [user_name] + [if user_super_user] {account_admin} {account_admin_yes} + [end] @@ -23,17 +25,24 @@ {account_groups} html, www, foo + [end] {account_timezone} [user_time_zone_name] + + {change} + {account_language} [user_locale_name] + + {change} + -- 2.44.0 From 50da49a3ed18c63f1f16b8c80d573cd1b3508336 Mon Sep 17 00:00:00 2001 From: Tomasz Sowa Date: Mon, 25 Jan 2021 17:17:54 +0100 Subject: [PATCH 18/67] added uikit markup for adduser winix function --- winixd/html/fun_adduser.html | 69 ++++++++++++++++++++++++------------ winixd/locale/en | 4 +-- winixd/locale/pl | 6 ++-- 3 files changed, 49 insertions(+), 30 deletions(-) diff --git a/winixd/html/fun_adduser.html b/winixd/html/fun_adduser.html index 196c9de..c6e81f3 100644 --- a/winixd/html/fun_adduser.html +++ b/winixd/html/fun_adduser.html @@ -2,39 +2,62 @@

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

-
-
- {adduser_form_legend} - -

{adduser_login}:

- - -

{adduser_password}:

- + -

{adduser_confirm_password}:

- +
+ - [if winix_account_need_email_verification] -

{adduser_need_email}
{adduser_need_email2}:

- [else] -

{adduser_email}:

- [end] - +
+ +
+
+ +
+ + +
+ +
+
+ +
+ + +
+ +
+
+ +
+ [if winix_account_need_email_verification] + + [else] + + [end] + +
+ +
+
[if user_super_user] -

- -

+
+
+ +
+
[end] [if winix_function_param_is "postredirect"] [end] - - -
+
+
+ +
+
+
diff --git a/winixd/locale/en b/winixd/locale/en index 06c114d..827432a 100644 --- a/winixd/locale/en +++ b/winixd/locale/en @@ -377,13 +377,11 @@ uptime_days = days adduser_header_add = Add a user adduser_header_register = Register -adduser_form_legend = Register user form adduser_login = Login adduser_password = Password adduser_confirm_password = Confirm password adduser_email = You can also provide your email address. If you ever forget your password we will be able send you the password back. -adduser_need_email = You have to provide your email address. -adduser_need_email2 = We send you an email with an activation link +adduser_need_email = You have to provide your email address. We send you an email with an activation link adduser_submit = Add user register_user_submit = Register adduser_err_login_empty = Provide a login please. diff --git a/winixd/locale/pl b/winixd/locale/pl index 26b9532..2d44f0a 100644 --- a/winixd/locale/pl +++ b/winixd/locale/pl @@ -397,13 +397,11 @@ uptime_days = dni adduser_header_add = Dodaj użytkownika adduser_header_register = Zarejestruj się -adduser_form_legend = Formularz rejestracji nowego użytkownika adduser_login = Login adduser_password = Hasło adduser_confirm_password = Potwierdź hasło adduser_email = Możesz także podać swój email. Jeśli zapomnisz kiedyś hasła to hasło zostanie wysłane na podany email -adduser_need_email = Wymagamy abyś podał nam swój adres email, -adduser_need_email2 = na ten adres wyślemy wiadomość z linkiem aktywacyjnym +adduser_need_email = Wymagamy abyś podał nam swój adres email, na ten adres wyślemy wiadomość z linkiem aktywacyjnym. adduser_submit = Dodaj użytkownika register_user_submit = Rejestruj adduser_err_login_empty = Proszę podać login. @@ -418,7 +416,7 @@ adduser_err_password_too_big = Hasło nie może być większe niż adduser_err_password_too_big2 = znaków adduser_err_email_too_big = Adres email nie może być większy niż adduser_err_email_too_big2 = znaków -adduser_auto_activate = Automatically activate this account +adduser_auto_activate = Aktywuj automatycznie to konto adduser_err_email_incorrect = Podany email jest nieprawidłowy -- 2.44.0 From 31befcba446688ae92d19d2760e22b069d3315e0 Mon Sep 17 00:00:00 2001 From: Tomasz Sowa Date: Mon, 25 Jan 2021 18:15:26 +0100 Subject: [PATCH 19/67] added uikit markup for slog.html --- winixd/html/slog.html | 35 ++++++++++++++++------------------- 1 file changed, 16 insertions(+), 19 deletions(-) diff --git a/winixd/html/slog.html b/winixd/html/slog.html index b9e5de8..11062c8 100644 --- a/winixd/html/slog.html +++ b/winixd/html/slog.html @@ -1,30 +1,27 @@ [if slog_tab] - [for slog_tab] - - - - + [if slog_tab_is_warning] + {slog_warning}: + [end] + + [if slog_tab_is_error] + {slog_error}: + [end] + + [slog_tab_print] + + [end] -
- - [if slog_tab_is_info] - {slog_info}: - [end] +
- [if slog_tab_is_warning] - {slog_warning}: - [end] + - [if slog_tab_is_error] - {slog_error}: - [end] + [if slog_tab_is_info] + {slog_info}: + [end] -
- [slog_tab_print] -
[end] -- 2.44.0 From 1e345f50104e8033ad6c35c39451697b11c7db89 Mon Sep 17 00:00:00 2001 From: Tomasz Sowa Date: Mon, 25 Jan 2021 18:19:30 +0100 Subject: [PATCH 20/67] changed: locale files --- winixd/locale/en | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/winixd/locale/en b/winixd/locale/en index 827432a..af58873 100644 --- a/winixd/locale/en +++ b/winixd/locale/en @@ -375,7 +375,7 @@ uptime_users_logged = logged users uptime_days = days -adduser_header_add = Add a user +adduser_header_add = Add a new user adduser_header_register = Register adduser_login = Login adduser_password = Password -- 2.44.0 From 0139919d14c46a4d326f50a561bce30ba2bb7152 Mon Sep 17 00:00:00 2001 From: Tomasz Sowa Date: Mon, 25 Jan 2021 19:19:45 +0100 Subject: [PATCH 21/67] added uikit markup for passwd winix function --- winixd/html/fun_passwd.html | 97 ++++++++++++++++++++++++------------- 1 file changed, 63 insertions(+), 34 deletions(-) diff --git a/winixd/html/fun_passwd.html b/winixd/html/fun_passwd.html index c79ca14..621022d 100644 --- a/winixd/html/fun_passwd.html +++ b/winixd/html/fun_passwd.html @@ -5,63 +5,92 @@ [if winix_function_param_is "resetpassword"] -
-
- {passwd_form_legend} - - - - -

{passwd_new_password}:

- + -

{passwd_confirm_new_password}:

- +
+ + - +
+ - [if winix_function_param_is "postredirect"] - - [end] +
+ +
+
-
+
+ + +
+ +
+
+ +
+
+ +
+
+ + [if winix_function_param_is "postredirect"] + + [end] + +
[else] -
+ [if user_super_user] -
- - + [for user_tab] + + [end] + +
- [else] -
- - +
+ + +
+ +
[end] -
- - +
+ + +
+ +
-
- - +
+ + +
+ +
[if winix_function_param_is "postredirect"] [end] - +
+
+ +
+
-- 2.44.0 From fdcefae2642b5cc547a17f6d41f91903b50f8593 Mon Sep 17 00:00:00 2001 From: Tomasz Sowa Date: Tue, 26 Jan 2021 15:46:47 +0100 Subject: [PATCH 22/67] added uikit markup for priv, chmod, chown winix functions WIP: #2 --- winixd/html/fun_priv.html | 188 ++++++++++++++++++++++++-------------- winixd/locale/en | 1 - winixd/locale/pl | 1 - 3 files changed, 117 insertions(+), 73 deletions(-) diff --git a/winixd/html/fun_priv.html b/winixd/html/fun_priv.html index acf8d58..2dfd171 100644 --- a/winixd/html/fun_priv.html +++ b/winixd/html/fun_priv.html @@ -2,126 +2,172 @@ [# this template is for following functions: priv, chmod, chown] -

{priv_header}

+[if winix_function_param_is "r"] +

{priv_change_in_dir}: [dir]

+[end] [if not [winix_function_param_is "r"]] -
-
- {priv_form_legend} - - + [if priv_show_form_chown] - - - - + +
+ + +
+ +
+
+ +
+ + +
+ +
+
+ [end] [if priv_show_form_chmod] - +
+ + +
+ +
+
[end] -
{user}: - -
{group}: - -
{permissions}:
+ [if winix_function_param_is "postredirect"] [end] - -
+
+ +
+
[else] -
-
- {priv_form_legend} -

{priv_change_in_dir}: [dir]

+ -

{priv_for_all_files}:

- +

{priv_for_all_files}

[if priv_show_form_chown] - +
+ + +
+ +
+
+ - +
+ + +
+ +
+
[end] [if priv_show_form_chmod] - +
+ + +
+ +
+
[end] -
{user}: - -
{group}: - -
{permissions}:
-

{priv_for_all_dirs}:

- +

{priv_for_all_dirs}

[if priv_show_form_chown] - +
+ + +
+ +
+
+ - +
+ + +
+ +
+
[end] [if priv_show_form_chmod] - +
+ + +
+ +
+
[end] - -
{user}: - -
{group}: - -
{permissions}:
- - +
+
+ +
+ +
+ [# !! improve me: for root directory dir_without_slash returns nothing, may would be better to show a slash?] + +
+
[if winix_function_param_is "postredirect"] [end] - +
+ +
-
[end] diff --git a/winixd/locale/en b/winixd/locale/en index af58873..adb28da 100644 --- a/winixd/locale/en +++ b/winixd/locale/en @@ -224,7 +224,6 @@ passwd_password_changed = The password has been changed priv_header = Permissions -priv_form_legend = Permissions priv_change_in_dir = Change permissions for all items in the following directory priv_for_all_files = For all files to priv_for_all_dirs = For all directories to diff --git a/winixd/locale/pl b/winixd/locale/pl index 2d44f0a..80a059b 100644 --- a/winixd/locale/pl +++ b/winixd/locale/pl @@ -247,7 +247,6 @@ passwd_password_changed = Hasło zostało zmienione priv_header = Zmień uprawnienia dostępu -priv_form_legend = Uprawnienia priv_change_in_dir = Zmień hurtowo uprawnienia w katalogu priv_for_all_files = Dla wszystkich plików na priv_for_all_dirs = Dla wszystkich katalogów na -- 2.44.0 From 89814cbc2e5cdca3500f4f71694598cd66136ab2 Mon Sep 17 00:00:00 2001 From: Tomasz Sowa Date: Tue, 26 Jan 2021 15:51:57 +0100 Subject: [PATCH 23/67] updated uikit to 3.6.14 version WIP: #2 --- winixd/html/index_head_functions_add.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/winixd/html/index_head_functions_add.html b/winixd/html/index_head_functions_add.html index db867d7..e84c86e 100644 --- a/winixd/html/index_head_functions_add.html +++ b/winixd/html/index_head_functions_add.html @@ -5,11 +5,11 @@ [def winix_has_jquery "false"] [# UIkit CSS] - + [# UIkit JS] - - + + -- 2.44.0 From 4408957770b6444fdd4dc7560d3d6656edef32a0 Mon Sep 17 00:00:00 2001 From: Tomasz Sowa Date: Tue, 26 Jan 2021 15:57:55 +0100 Subject: [PATCH 24/67] changed form width for locale template WIP: #2 --- winixd/html/fun_locale.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/winixd/html/fun_locale.html b/winixd/html/fun_locale.html index ec21116..70d6325 100644 --- a/winixd/html/fun_locale.html +++ b/winixd/html/fun_locale.html @@ -9,7 +9,7 @@ [end] -
+
-- 2.44.0 From 840c2221903b29d028539b4ff8fbc075025fd4e0 Mon Sep 17 00:00:00 2001 From: Tomasz Sowa Date: Tue, 26 Jan 2021 16:05:15 +0100 Subject: [PATCH 25/67] added uikit markup for mount winix function WIP: #2 --- winixd/html/fun_mount.html | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/winixd/html/fun_mount.html b/winixd/html/fun_mount.html index 14ef3c6..eafc131 100644 --- a/winixd/html/fun_mount.html +++ b/winixd/html/fun_mount.html @@ -3,9 +3,13 @@

{mount_header}

-

{mount_current}:

+

{mount_current}

+ + + + + -
@@ -25,10 +29,11 @@ -

{mount_table}:

+

{mount_table}

[if mount_tab] -
{mount_type} {mount_dir}
+
+ -- 2.44.0 From aa228732e3dde82489f1cf0613f1e7490ea949a0 Mon Sep 17 00:00:00 2001 From: Tomasz Sowa Date: Tue, 26 Jan 2021 16:11:09 +0100 Subject: [PATCH 26/67] added uk-table-responsive attribute to mount winix function markup WIP: #2 --- winixd/html/fun_mount.html | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/winixd/html/fun_mount.html b/winixd/html/fun_mount.html index eafc131..4661144 100644 --- a/winixd/html/fun_mount.html +++ b/winixd/html/fun_mount.html @@ -7,8 +7,7 @@ - -
{mount_type}
+
@@ -32,7 +31,7 @@

{mount_table}

[if mount_tab] -
{mount_type}
+
-- 2.44.0 From acfd87e54829d24b55deb846ce72c3d01852ad23 Mon Sep 17 00:00:00 2001 From: Tomasz Sowa Date: Tue, 26 Jan 2021 16:19:20 +0100 Subject: [PATCH 27/67] added uikit markup for 'default' winix function WIP: #2 --- winixd/html/fun_default.html | 26 ++++++++++++++++---------- winixd/locale/en | 1 - winixd/locale/pl | 3 +-- 3 files changed, 17 insertions(+), 13 deletions(-) diff --git a/winixd/html/fun_default.html b/winixd/html/fun_default.html index d50618b..8bb2d7a 100644 --- a/winixd/html/fun_default.html +++ b/winixd/html/fun_default.html @@ -3,22 +3,28 @@

{default_header}

- -
- {form_default_legend} - {url}:
- + -

- -

+
+ + +
+ +
+
+ +
+ +
[if winix_function_param_is "postredirect"] [end] - -
+
+ +
+ diff --git a/winixd/locale/en b/winixd/locale/en index adb28da..567c1d6 100644 --- a/winixd/locale/en +++ b/winixd/locale/en @@ -137,7 +137,6 @@ env_change_user = Change user default_header = Default item in a directory default_make_redirect = Make redirect -form_default_legend = Default item form ln_header = Link ln_info = Create a link in directory diff --git a/winixd/locale/pl b/winixd/locale/pl index 80a059b..6dad4fb 100644 --- a/winixd/locale/pl +++ b/winixd/locale/pl @@ -141,9 +141,8 @@ env_change_admin_env_for_user = Zmień zmienne środowiskowe administracyjne dla env_change_user = Zmień użytkownika -default_header = Domyślna pozycja w katalogu +default_header = Domyślny element w katalogu default_make_redirect = Wykonaj przekierowanie -form_default_legend = Formularz zmiany pozycji domyślnej ln_header = Link ln_info = Stwórz link w katalogu -- 2.44.0 From ec6f946b978aeee6f0dac2b9cef36c58cf0de4f4 Mon Sep 17 00:00:00 2001 From: Tomasz Sowa Date: Tue, 26 Jan 2021 16:26:34 +0100 Subject: [PATCH 28/67] added uikit markup for mkdir winix function WIP: #2 --- winixd/html/fun_mkdir.html | 29 ++++++++++++++++++++--------- winixd/locale/en | 1 - winixd/locale/pl | 1 - 3 files changed, 20 insertions(+), 11 deletions(-) diff --git a/winixd/html/fun_mkdir.html b/winixd/html/fun_mkdir.html index 7e5802a..b2c98d0 100644 --- a/winixd/html/fun_mkdir.html +++ b/winixd/html/fun_mkdir.html @@ -2,22 +2,33 @@

{mkdir_header}

+
+ +
+ + +
+ +
+
- -
- {mkdir_form_legend} -

{title}

- -

{suggested_url}

- +
+ + +
+ +
+
[if winix_function_param_is "postredirect"] [end] - -
+
+ +
+ diff --git a/winixd/locale/en b/winixd/locale/en index 567c1d6..7d53b81 100644 --- a/winixd/locale/en +++ b/winixd/locale/en @@ -206,7 +206,6 @@ meta_admin_header = Admin meta mkdir_header = Make directory -mkdir_form_legend = Make directory form html_lang_attr_value = "en" language_orphans = () diff --git a/winixd/locale/pl b/winixd/locale/pl index 6dad4fb..138bbe2 100644 --- a/winixd/locale/pl +++ b/winixd/locale/pl @@ -211,7 +211,6 @@ man_ezc_functions = Funkcje szablonów EZC mkdir_header = Stwórz katalog -mkdir_form_legend = Wypełnij wszystkie pozycje formularza html_lang_attr_value = "pl" -- 2.44.0 From 572afd360a95c40379078eab1ba0029874c79ab5 Mon Sep 17 00:00:00 2001 From: Tomasz Sowa Date: Tue, 26 Jan 2021 16:37:11 +0100 Subject: [PATCH 29/67] added uikit markup for mv winix function WIP: #2 --- winixd/html/fun_mv.html | 34 ++++++++++++++++++++-------------- winixd/locale/en | 1 - winixd/locale/pl | 1 - 3 files changed, 20 insertions(+), 16 deletions(-) diff --git a/winixd/html/fun_mv.html b/winixd/html/fun_mv.html index 7d9b294..b05f5a1 100644 --- a/winixd/html/fun_mv.html +++ b/winixd/html/fun_mv.html @@ -2,30 +2,36 @@

{mv_header}

+

+ [if item_is]{mv_page} [item_url]:[else]{mv_dir} [dir_without_slash][end] +

-
-
- {mv_form_legend} - -

- [if item_is]{mv_page} [item_url]:[else]{mv_dir} [dir][end] -

- - -

{suggested_url}

- + + + +
+ + +
+ +
+
[if not item_is] - +
+ +
[end] [if winix_function_param_is "postredirect"] [end] - -
+
+ +
+ diff --git a/winixd/locale/en b/winixd/locale/en index 7d53b81..b50a828 100644 --- a/winixd/locale/en +++ b/winixd/locale/en @@ -407,7 +407,6 @@ mount_current = Current mount point mv_header = Move -mv_form_legend = Move form mv_page = Move page mv_dir = Move directory mv_only_content = Move only content of the directory diff --git a/winixd/locale/pl b/winixd/locale/pl index 138bbe2..fd72306 100644 --- a/winixd/locale/pl +++ b/winixd/locale/pl @@ -427,7 +427,6 @@ mount_current = Bieżący punkt montowania mv_header = Przenieś -mv_form_legend = Formularz zmiany mv_page = Przenieś stronę mv_dir = Przenieś katalog mv_only_content = Przenieś tylko zawartość katalogu -- 2.44.0 From 56d53a455d27793a7645dcb0bbd7e346b4ee0440 Mon Sep 17 00:00:00 2001 From: Tomasz Sowa Date: Tue, 26 Jan 2021 16:52:11 +0100 Subject: [PATCH 30/67] added uikit markup for cp winix function WIP: #2 --- winixd/html/fun_cp.html | 64 +++++++++++++++++++++++++---------------- winixd/locale/en | 1 - winixd/locale/pl | 1 - 3 files changed, 39 insertions(+), 27 deletions(-) diff --git a/winixd/html/fun_cp.html b/winixd/html/fun_cp.html index fb2dc8d..57ceffc 100644 --- a/winixd/html/fun_cp.html +++ b/winixd/html/fun_cp.html @@ -2,38 +2,52 @@

{cp_header}

+

+ [if item_is]{cp_page} [item_url] [else]{cp_dir} [dir_without_slash][end] +

-
-
- {cp_form_legend} - -

- [if item_is]{cp_page} "[item_url]":[else]{cp_dir} "[dir_without_slash]"[end] -

- - -

{suggested_url}

- - -

- - - [if not item_is] - - - - [end] -

+ + + +
+ + +
+ +
+
+ +
+
+ +
+ + [if not item_is] + +
+ +
+ +
+ +
+ +
+ +
+ + [end] +
[if winix_function_param_is "postredirect"] [end] - -
+
+ +
+ - - diff --git a/winixd/locale/en b/winixd/locale/en index b50a828..f710efe 100644 --- a/winixd/locale/en +++ b/winixd/locale/en @@ -426,7 +426,6 @@ timezone_your_zone = Your current time zone is timezone_has_incorrect_id = You don't have a correct time zone set cp_header = Copy -cp_form_legend = Copy form cp_page = Copy page cp_dir = Copy directory cp_only_content = Copy only content of the directory diff --git a/winixd/locale/pl b/winixd/locale/pl index fd72306..5201eaf 100644 --- a/winixd/locale/pl +++ b/winixd/locale/pl @@ -447,7 +447,6 @@ timezone_has_incorrect_id = Nie masz prawidłowo ustawionej strefy czasowej cp_header = Kopiuj -cp_form_legend = Formularz kopiowania cp_page = Kopiuj stronę cp_dir = Kopiuj katalog cp_only_content = Kopiuj tylko zawartość katalogu -- 2.44.0 From a69e160f850877156b9731c57c5e4c1524d3921a Mon Sep 17 00:00:00 2001 From: Tomasz Sowa Date: Tue, 26 Jan 2021 17:24:48 +0100 Subject: [PATCH 31/67] added uikit markup for nicedit winix function and nicedit updated to 0.9_r25 version WIP: #2 --- winixd/html/fun_nicedit.html | 84 +++++++++++++---------- winixd/html/index_head_functions_add.html | 2 +- 2 files changed, 47 insertions(+), 39 deletions(-) diff --git a/winixd/html/fun_nicedit.html b/winixd/html/fun_nicedit.html index 0c49364..5f22870 100644 --- a/winixd/html/fun_nicedit.html +++ b/winixd/html/fun_nicedit.html @@ -3,51 +3,57 @@ [if item_is]

{edit}

[else]

{add}

[end] -
-
- {form_emacs_legend} - - [if mount_type_is "cms"] -

{title}:

- - -

{suggested_url}:

- + + + [if one [mount_type_is "cms"] [any [mount_type_is "thread"] [thread_mount_arg_is "subject"]]] +
+ +
+ +
+
+ +
+ +
+ +
+
[end] + +
+ [if mount_type_is "cms"][end] + [if mount_type_is "thread"][end] + [if mount_type_is "ticket"][end] - [if any [mount_type_is "thread"] [thread_mount_arg_is "subject"]] -

{title}:

- - -

{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 winix_function_param_is "full"] - - [else] - - [end] [if not user_logged] -

{nick}:

- - -

{rebus_how_is_it} [rebus_question]?

- +
+ +
+ +
+
+ +
+ +
+ +
+
[include "antispam.html"] [end] @@ -56,8 +62,10 @@ [end] - -
+
+ +
+ diff --git a/winixd/html/index_head_functions_add.html b/winixd/html/index_head_functions_add.html index e84c86e..7909e4e 100644 --- a/winixd/html/index_head_functions_add.html +++ b/winixd/html/index_head_functions_add.html @@ -124,7 +124,7 @@ cm.save() [if winix_function_is "nicedit"] - + [end] -- 2.44.0 From a9b9d0badf570bff67bbe39f042e482b7574bfe7 Mon Sep 17 00:00:00 2001 From: Tomasz Sowa Date: Wed, 27 Jan 2021 17:30:55 +0100 Subject: [PATCH 32/67] fixed: mv winix function didn't move a file correctly - if a file was moved (renamed) into the same directory and a file with the new name already existed then nothing was done (now a message is shown that such a file already exists) - if a file was moved to another directory and there was a file wich such a name there then the moved file had its original name (now a message is shown that such a file already exists) --- winixd/functions/mv.cpp | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/winixd/functions/mv.cpp b/winixd/functions/mv.cpp index 960129b..1ab030b 100644 --- a/winixd/functions/mv.cpp +++ b/winixd/functions/mv.cpp @@ -584,12 +584,16 @@ bool Mv::MoveFileOrSymlink2(Item & src_file, const std::wstring & dst_path, bool if( !ParseDir(dst_path, check_access) ) return false; - if( src_file.parent_id == out_dir_tab.back()->id ) + if( out_has_file && src_file.parent_id == out_dir_tab.back()->id && src_file.url == out_item.url ) { - // actually out_filename is here empty - // because ParseDir() have been read it to out_item - if( out_filename.empty() || src_file.url == out_filename ) - return true; // the same file -- there is nothing to do + return true; // the same file -- there is nothing to do + } + + if( out_has_file ) + { + log << log3 << "Mv: such file already exists (skipping)" << logend; + slog << logerror << T("mv_file_exists") << logend; + return false; } return MoveFileOrSymlink(src_file, out_dir_tab, out_filename); -- 2.44.0 From 7a25e333db4a74050350125d54d0765df911e3c5 Mon Sep 17 00:00:00 2001 From: Tomasz Sowa Date: Wed, 27 Jan 2021 17:55:48 +0100 Subject: [PATCH 33/67] added uikit markup for ls winix function WIP: #2 --- winixd/functions/ls.cpp | 9 +++++- winixd/html/fun_ls.html | 67 ++++++++++++++++++++++++++++------------- winixd/locale/en | 8 ++++- winixd/locale/pl | 10 ++++-- 4 files changed, 68 insertions(+), 26 deletions(-) diff --git a/winixd/functions/ls.cpp b/winixd/functions/ls.cpp index 500525b..9b01de3 100644 --- a/winixd/functions/ls.cpp +++ b/winixd/functions/ls.cpp @@ -5,7 +5,7 @@ */ /* - * Copyright (c) 2008-2018, Tomasz Sowa + * Copyright (c) 2008-2021, Tomasz Sowa * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -52,6 +52,13 @@ Ls::Ls() void Ls::MakeGet() { + // !! IMPROVE ME + // this should be moved to ckeditor function (similarly the html content from fun_ls.html) + if( cur->request->IsParam(L"ckeditor_browse") ) + { + cur->request->index_template = config->templates_index_generic; + } + if( !cur->request->is_item ) { DbItemQuery iq; diff --git a/winixd/html/fun_ls.html b/winixd/html/fun_ls.html index 1826445..f0e883b 100644 --- a/winixd/html/fun_ls.html +++ b/winixd/html/fun_ls.html @@ -1,24 +1,40 @@ -
- +
+[# !! IMPROVE ME: move this html code to a ckeditor template] [if winix_function_param_is "ckeditor_browse"] - -
+ +
+ +
+ +
+
[if dir_childs_tab "with_parent"] -

[for dir_tab][dir_tab_url]/[end]

- -
    +
      [for dir_childs_tab "with_parent"]
    • [if dir_childs_is_parent] [# make sure the name of the textarea in fun_ckeditor.html is called: itemcontent] [# is it needed?] - ../ + ../ [else] - [dir_childs_tab_url]/ + [dir_childs_tab_url]/ [end]
      • [end] @@ -27,15 +43,14 @@
-
+
[if item_tab] - -

{ls_pictures_in_dir} [dir]

-
    + +
      [for item_tab] -
    • [item_tab_subject]
      • +
    • [item_tab_subject]
      • [end]
    @@ -44,11 +59,12 @@ [end]
- +
[else]

{ls_header}

+ [# !! improve me: we need a 'l' flag to a file too, now it's working for dirs only] [if not item_is] [if winix_function_param_is "l"] @@ -59,7 +75,15 @@ [if one dir_childs_tab item_tab] -
+
+ + + + + + + + [for dir_childs_tab] @@ -95,7 +119,7 @@ [dir_childs_tab "with_parent"] [if dir_childs_tab] -
    +
      [for dir_childs_tab]
    • [if dir_childs_is_parent] @@ -107,9 +131,9 @@ [end]
    [end] - + [# !! IMPROVE ME those two lists (above and below) can be combined together [if item_tab] -
      +
        [for item_tab]
      • [item_tab_url]
        • [end] @@ -120,8 +144,9 @@ [else] -
          -
        • [item_url]
          • + [!! improve me: may it would be better to not use a list here?] + [end] diff --git a/winixd/locale/en b/winixd/locale/en index f710efe..cd7b52a 100644 --- a/winixd/locale/en +++ b/winixd/locale/en @@ -171,8 +171,13 @@ last_none = There is no anything information. ls_header = Directory listing -ls_pictures_in_dir = Pictures in directory ls_no_picture = There are not any pictures in this directory +ls_type = Type +ls_permissions = Permissions +ls_owner = Owner +ls_group = Group +ls_name = Name +ls_root_dir_name = Root dir ipban_header = IP Banned ipban_col_id = Id @@ -418,6 +423,7 @@ mv_dir_content_can_be_moved_to_dir = Directory content can be moved only to an o mv_cannot_move_to_inside = A directory cannot be moved to inside it mv_incorrect_dst_path = Incorrect destination path mv_incorrect_dir = Incorrect directory +mv_file_exists = Such file already exists timezone_header = Time Zone diff --git a/winixd/locale/pl b/winixd/locale/pl index 5201eaf..7a20268 100644 --- a/winixd/locale/pl +++ b/winixd/locale/pl @@ -175,9 +175,13 @@ last_none = Nie ma dostępnych żadnych informacji. ls_header = Zawartość katalogu -ls_pictures_in_dir = Obrazy w katalogu ls_no_picture = W tym katalogu nie ma żadnego obrazu - +ls_type = Typ +ls_permissions = Uprawnienia +ls_owner = Właściciel +ls_group = Grupa +ls_name = Nazwa +ls_root_dir_name = Katalog główny ipban_header = Lista zbanowanych adresów IP ipban_col_id = L.p. @@ -438,7 +442,7 @@ mv_dir_content_can_be_moved_to_dir = Zawartość katalogu może zostać przenies mv_cannot_move_to_inside = Nie mogę przenieść katalogu do jego środka mv_incorrect_dst_path = Nieprawidłowa ścieżka docelowa mv_incorrect_dir = Nieprawidłowy katalog - +mv_file_exists = Podany plik już istnieje timezone_header = Strefa czasowa timezone_select = Wybierz swoją strefę czasową -- 2.44.0 From 10e291bb39db464bd7e6e4d0fc062c3b2205b5bb Mon Sep 17 00:00:00 2001 From: Tomasz Sowa Date: Wed, 27 Jan 2021 18:31:48 +0100 Subject: [PATCH 34/67] added: generic html template: index_generic.html (config option: templates_index_generic) this is a generic template without additional site-css (only uikit), at the moment used only in ckeditor file browser added: to Request class: index_template (std::wstring) - a name of an index html template --- winixd/core/config.cpp | 3 ++- winixd/core/config.h | 6 +++++- winixd/core/request.cpp | 4 +++- winixd/core/request.h | 4 +++- winixd/functions/cat.cpp | 3 +++ winixd/functions/ls.cpp | 2 +- winixd/functions/run.cpp | 3 +++ winixd/functions/template.cpp | 7 ++++++- winixd/html/index_generic.html | 16 ++++++++++++++++ winixd/templates/template.cpp | 5 +++-- winixd/templates/templates.cpp | 15 +++++++++++---- winixd/templates/templates.h | 5 +++-- 12 files changed, 59 insertions(+), 14 deletions(-) create mode 100644 winixd/html/index_generic.html diff --git a/winixd/core/config.cpp b/winixd/core/config.cpp index 06e4f81..9558d74 100644 --- a/winixd/core/config.cpp +++ b/winixd/core/config.cpp @@ -5,7 +5,7 @@ */ /* - * Copyright (c) 2008-2018, Tomasz Sowa + * Copyright (c) 2008-2021, Tomasz Sowa * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -186,6 +186,7 @@ void Config::AssignValues(bool stdout_is_closed) templates_fun_prefix = Text(L"templates_fun_prefix", L"fun_"); templates_fun_postfix = Text(L"templates_fun_postfix", L".html"); templates_index = Text(L"templates_index", L"index.html"); + templates_index_generic = Text(L"templates_index_generic", L"index_generic.html"); templates_index_raw = Text(L"templates_index_raw", L"index_raw.html"); template_only_root_use_template_fun = Bool(L"template_only_root_use_template_fun", false); diff --git a/winixd/core/config.h b/winixd/core/config.h index 8322c26..97a17f6 100644 --- a/winixd/core/config.h +++ b/winixd/core/config.h @@ -5,7 +5,7 @@ */ /* - * Copyright (c) 2008-2018, Tomasz Sowa + * Copyright (c) 2008-2021, Tomasz Sowa * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -181,6 +181,10 @@ public: // default: index.html std::wstring templates_index; + // html template used to send generic content - without site-css styles and markup (only uikit) + // default: index_generic.html + std::wstring templates_index_generic; + // html template used to send raw content // default: index_raw.html std::wstring templates_index_raw; diff --git a/winixd/core/request.cpp b/winixd/core/request.cpp index d5e4884..f6cf15f 100644 --- a/winixd/core/request.cpp +++ b/winixd/core/request.cpp @@ -5,7 +5,7 @@ */ /* - * Copyright (c) 2008-2015, Tomasz Sowa + * Copyright (c) 2008-2021, Tomasz Sowa * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -153,6 +153,8 @@ void Request::Clear() ip = 0; ip_str.clear(); use_200_status_for_not_found_and_permission_denied = false; + + html_template.clear(); } diff --git a/winixd/core/request.h b/winixd/core/request.h index 86f21a0..d46bcb8 100644 --- a/winixd/core/request.h +++ b/winixd/core/request.h @@ -5,7 +5,7 @@ */ /* - * Copyright (c) 2008-2018, Tomasz Sowa + * Copyright (c) 2008-2021, Tomasz Sowa * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -339,6 +339,8 @@ struct Request bool gen_use_special_chars; + // index template name + std::wstring html_template; /* diff --git a/winixd/functions/cat.cpp b/winixd/functions/cat.cpp index 3b021fe..3fd37be 100644 --- a/winixd/functions/cat.cpp +++ b/winixd/functions/cat.cpp @@ -51,6 +51,9 @@ Cat::Cat() void Cat::MakeGet() { + // IMPROVE ME this probably should be set for all winix functions + cur->request->html_template = cur->request->last_item->html_template; + if( !cur->request->is_item ) { log << log1 << "Content: cat function requires an item" << logend; diff --git a/winixd/functions/ls.cpp b/winixd/functions/ls.cpp index 9b01de3..d50b5eb 100644 --- a/winixd/functions/ls.cpp +++ b/winixd/functions/ls.cpp @@ -56,7 +56,7 @@ void Ls::MakeGet() // this should be moved to ckeditor function (similarly the html content from fun_ls.html) if( cur->request->IsParam(L"ckeditor_browse") ) { - cur->request->index_template = config->templates_index_generic; + cur->request->html_template = config->templates_index_generic; } if( !cur->request->is_item ) diff --git a/winixd/functions/run.cpp b/winixd/functions/run.cpp index 280ad49..baf682b 100644 --- a/winixd/functions/run.cpp +++ b/winixd/functions/run.cpp @@ -60,6 +60,9 @@ void Run::MakePost() void Run::MakeGet() { + // IMPROVE ME this probably should be set for all winix functions + cur->request->html_template = cur->request->last_item->html_template; + if( !cur->request->is_item ) { log << log1 << "Content: Run function requires an item" << logend; diff --git a/winixd/functions/template.cpp b/winixd/functions/template.cpp index 2f8f4df..ac30372 100644 --- a/winixd/functions/template.cpp +++ b/winixd/functions/template.cpp @@ -97,12 +97,17 @@ void Template::CreateTemplateFileName(const std::wstring & index_str) } else if( index == 1 ) + { + html_template = config->templates_index_generic; + } + else + if( index == 2 ) { html_template = config->templates_index_raw; } else { - index -= 2; + index -= 3; Mount::ParamRow & par = system->mounts.pmount->param[system->mounts.MountParHtmlTemplate()]; if( !par.defined || (size_t)index >= par.arg.size() ) diff --git a/winixd/html/index_generic.html b/winixd/html/index_generic.html new file mode 100644 index 0000000..1420223 --- /dev/null +++ b/winixd/html/index_generic.html @@ -0,0 +1,16 @@ + +[# minimalistic template] + + + + + [include "index_head_functions_add.html"] + + [doc_title] + + + + [include "slog.html"] + [content] + + diff --git a/winixd/templates/template.cpp b/winixd/templates/template.cpp index d3a7d00..1293810 100644 --- a/winixd/templates/template.cpp +++ b/winixd/templates/template.cpp @@ -91,8 +91,9 @@ void template_init() // the first item in the html template is an empty string // added in the html template temp_tab.clear(); - temp_tab.push_back(config->templates_index); // index: 0 - temp_tab.push_back(config->templates_index_raw); // index: 1 + temp_tab.push_back(config->templates_index); // index: 0 (indices are used in template.cpp in functions) !! IMPROVE ME it should be done better + temp_tab.push_back(config->templates_index_generic);// index: 1 + temp_tab.push_back(config->templates_index_raw); // index: 2 Mount::ParamRow & par = system->mounts.pmount->param[system->mounts.MountParHtmlTemplate()]; diff --git a/winixd/templates/templates.cpp b/winixd/templates/templates.cpp index 2ca16a0..cc1db03 100644 --- a/winixd/templates/templates.cpp +++ b/winixd/templates/templates.cpp @@ -5,7 +5,7 @@ */ /* - * Copyright (c) 2008-2018, Tomasz Sowa + * Copyright (c) 2008-2021, Tomasz Sowa * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -46,7 +46,8 @@ namespace TemplatesFunctions { size_t pat_index; // main index pattern -size_t pat_index_raw; // pattern for a raw content +size_t pat_index_generic; // generic index pattern, without any css-site styles, only main css (uikit) +size_t pat_index_raw; // pattern for a raw content (raw content without html, body markup) size_t pat_err_404; // 404 error size_t pat_err_per_denied; // permission denied error @@ -964,6 +965,7 @@ using namespace TemplatesFunctions; ezc_blocks.Clear(); pat_index = patterns.Add(config->templates_index); + pat_index_generic = patterns.Add(config->templates_index_generic); pat_index_raw = patterns.Add(config->templates_index_raw); pat_err_404 = patterns.Add(L"err_404.html"); // !! IMPROVE ME name to the config pat_err_per_denied = patterns.Add(L"err_per_denied.html"); // !! IMPROVE ME name to the config @@ -1031,6 +1033,11 @@ using namespace TemplatesFunctions; index = patterns.Get(pat_index, TemplatesFunctions::locale.GetCurLang()); } else + if( template_name == config->templates_index_generic ) + { + index = patterns.Get(pat_index_generic, TemplatesFunctions::locale.GetCurLang()); + } + else if( template_name == config->templates_index_raw ) { index = patterns.Get(pat_index_raw, TemplatesFunctions::locale.GetCurLang()); @@ -1058,9 +1065,9 @@ using namespace TemplatesFunctions; Ezc::Pattern * index = 0; - if( (cur->request->function == &functions->fun_cat || cur->request->function == &functions->fun_run) && !cur->request->last_item->html_template.empty() ) + if( !cur->request->html_template.empty() ) { - index = SelectIndexPattern(cur->request->last_item->html_template); + index = SelectIndexPattern(cur->request->html_template); } else { diff --git a/winixd/templates/templates.h b/winixd/templates/templates.h index 41b037d..113a5c5 100644 --- a/winixd/templates/templates.h +++ b/winixd/templates/templates.h @@ -5,7 +5,7 @@ */ /* - * Copyright (c) 2008-2018, Tomasz Sowa + * Copyright (c) 2008-2021, Tomasz Sowa * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -67,7 +67,8 @@ class Functions; namespace TemplatesFunctions { extern size_t pat_index; - extern size_t pat_index_fullscreen; + extern size_t pat_index_generic; + extern size_t pat_index_raw; extern size_t pat_err_404; extern size_t pat_err_per_denied; -- 2.44.0 From ac6ede6aef4129e60179fbc28b8d83f36d79bd54 Mon Sep 17 00:00:00 2001 From: Tomasz Sowa Date: Wed, 27 Jan 2021 18:44:58 +0100 Subject: [PATCH 35/67] added uikit markup for template winix function WIP: #2 --- winixd/html/fun_template.html | 39 ++++++++++++++++++++--------------- winixd/locale/en | 1 - winixd/locale/pl | 1 - 3 files changed, 22 insertions(+), 19 deletions(-) diff --git a/winixd/html/fun_template.html b/winixd/html/fun_template.html index f6a01dc..578598a 100644 --- a/winixd/html/fun_template.html +++ b/winixd/html/fun_template.html @@ -44,28 +44,33 @@ -
          -
          - {template_form_legend} - - {template_form_info}: - - + + + +
          + + +
          + +
          +
          [if winix_function_param_is "postredirect"] [end] - -
          +
          + +
          + diff --git a/winixd/locale/en b/winixd/locale/en index cd7b52a..bc5eb48 100644 --- a/winixd/locale/en +++ b/winixd/locale/en @@ -307,7 +307,6 @@ template_header = Template template_info_file = Current html template for this file template_info_dir = Current html template for this directory template_from_mount_point = is taken from the mount point -template_form_legend = Template form template_form_info = Select a new template template_form_from_mount_point = from the mount point diff --git a/winixd/locale/pl b/winixd/locale/pl index 7a20268..3effbc5 100644 --- a/winixd/locale/pl +++ b/winixd/locale/pl @@ -327,7 +327,6 @@ template_header = Szablon template_info_file = Bieżący szablon dla tego pliku template_info_dir = Bieżący szablon dla tego katalogu template_from_mount_point = jest brany z punktu montowania -template_form_legend = Formularz zmiany szablonu template_form_info = Wybierz nowy szablon template_form_from_mount_point = z punktu montowania -- 2.44.0 From aa74d96fed4947388c15d1cc25fd947ea950a17d Mon Sep 17 00:00:00 2001 From: Tomasz Sowa Date: Wed, 27 Jan 2021 18:50:03 +0100 Subject: [PATCH 36/67] included index_bottom_adder.html in index.html and index_generic.html --- winixd/html/index.html | 1 + winixd/html/index_generic.html | 1 + 2 files changed, 2 insertions(+) diff --git a/winixd/html/index.html b/winixd/html/index.html index 71fffd8..832be35 100644 --- a/winixd/html/index.html +++ b/winixd/html/index.html @@ -35,5 +35,6 @@ [content] +[include "index_bottom_adder.html"] diff --git a/winixd/html/index_generic.html b/winixd/html/index_generic.html index 1420223..82eacb4 100644 --- a/winixd/html/index_generic.html +++ b/winixd/html/index_generic.html @@ -12,5 +12,6 @@ [include "slog.html"] [content] + [include "index_bottom_adder.html"] -- 2.44.0 From 0cc565ae8038c7162b373e32e07e92773bd74463 Mon Sep 17 00:00:00 2001 From: Tomasz Sowa Date: Thu, 28 Jan 2021 11:11:34 +0100 Subject: [PATCH 37/67] added uikit markup for env winix function WIP: #2 --- winixd/html/fun_env.html | 68 +++++++++++++++++++++++----------------- winixd/locale/en | 1 - winixd/locale/pl | 1 - 3 files changed, 39 insertions(+), 31 deletions(-) diff --git a/winixd/html/fun_env.html b/winixd/html/fun_env.html index 4114669..090ec35 100644 --- a/winixd/html/fun_env.html +++ b/winixd/html/fun_env.html @@ -5,51 +5,61 @@ [if user_super_user] - [if winix_function_param_is "a"] -

          {env_change_admin_env_for_user}:

          - [else] -

          {env_change_env_for_user}:

          - [end] +
          - -
          - {form_env_legend} - - +
          + + +
          + +
          +
          - + +
          + +
          [if winix_function_param_is "postredirect"] [end] - -
          - + [end] -
          -
          - {form_env_legend} - - - - + - [if winix_function_param_is "postredirect"] - - [end] +
          +
          + +
          +
          -
          + + +
          + +
          + + [if winix_function_param_is "postredirect"] + + [end] + diff --git a/winixd/locale/en b/winixd/locale/en index bc5eb48..05c5981 100644 --- a/winixd/locale/en +++ b/winixd/locale/en @@ -130,7 +130,6 @@ form_ticket_edit_submit = Edit a ticket env_header = Environment variables for a user -form_env_legend = Environment variables form env_change_env_for_user = Change environment variables for user env_change_admin_env_for_user = Change admin environment variables for user env_change_user = Change user diff --git a/winixd/locale/pl b/winixd/locale/pl index 3effbc5..fcb56c3 100644 --- a/winixd/locale/pl +++ b/winixd/locale/pl @@ -135,7 +135,6 @@ form_ticket_create_submit = Załóż zgłoszenie form_ticket_edit_submit = Edytuj zgłoszenie env_header = Zmienne środowiskowe -form_env_legend = Formularz zmiany zmiennych środowiskowych dla użytkownika env_change_env_for_user = Zmień zmienne środowiskowe dla użytkownika env_change_admin_env_for_user = Zmień zmienne środowiskowe administracyjne dla użytkownika env_change_user = Zmień użytkownika -- 2.44.0 From bbe2bd48d8efbcc4e826d3c794b30d2e7ae6fc80 Mon Sep 17 00:00:00 2001 From: Tomasz Sowa Date: Thu, 28 Jan 2021 11:49:10 +0100 Subject: [PATCH 38/67] added uikit markup for meta winix function WIP: #2 --- winixd/functions/meta.cpp | 4 +- winixd/html/fun_meta.html | 88 +++++++++++++++++---------------------- winixd/locale/en | 4 ++ winixd/locale/pl | 4 ++ 4 files changed, 50 insertions(+), 50 deletions(-) diff --git a/winixd/functions/meta.cpp b/winixd/functions/meta.cpp index d1c2af5..2ca7be4 100644 --- a/winixd/functions/meta.cpp +++ b/winixd/functions/meta.cpp @@ -5,7 +5,7 @@ */ /* - * Copyright (c) 2011-2018, Tomasz Sowa + * Copyright (c) 2011-2021, Tomasz Sowa * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -127,6 +127,8 @@ return false; void Meta::ChangeAdminMeta() { + // IMPROVE ME we need to show an error msg if the user is not an admin + if( cur->session->puser && cur->session->puser->super_user ) { const std::wstring & meta_str = cur->request->PostVar(L"itemmeta"); diff --git a/winixd/html/fun_meta.html b/winixd/html/fun_meta.html index 580ee4c..e94a4fa 100644 --- a/winixd/html/fun_meta.html +++ b/winixd/html/fun_meta.html @@ -1,62 +1,52 @@
          -[if winix_function_param_is "a"] -

          {meta_admin_header}

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

          + [if winix_function_param_is "a"] + {meta_admin_header} [else] -
          + {meta_header} + [end] +

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

          {meta_header}

          - - [if item_is] -
          - - - - - [if winix_function_param_is "postredirect"] - - [end] - - - [else] -
          - - - - - [if winix_function_param_is "postredirect"] - - [end] - - - [end] - -[end]
          diff --git a/winixd/locale/en b/winixd/locale/en index 05c5981..5b489a1 100644 --- a/winixd/locale/en +++ b/winixd/locale/en @@ -207,6 +207,10 @@ man_ezc_functions = EZC templates functions meta_header = Meta meta_admin_header = Admin meta +meta_for_dir = Additional information for directory +meta_for_page = Additional information for page +meta_admin_for_dir = Additional administrative information for directory +meta_admin_for_page = Additional administrative information for page mkdir_header = Make directory diff --git a/winixd/locale/pl b/winixd/locale/pl index fcb56c3..e46e67a 100644 --- a/winixd/locale/pl +++ b/winixd/locale/pl @@ -206,6 +206,10 @@ ipban_your_ip_is_banned = Twój adres IP jest zablokowany aż do: meta_header = Meta meta_admin_header = Admin meta +meta_for_dir = Dodatkowe informacje dla katalogu +meta_for_page = Dodatkowe informacje dla strony +meta_admin_for_dir = Dodatkowe informacje administracyjne dla katalogu +meta_admin_for_page = Dodatkowe informacje administracyjne dla strony man_header = Man -- 2.44.0 From 9698c25bc48eca896f95e02a9ea48470bd3971b0 Mon Sep 17 00:00:00 2001 From: Tomasz Sowa Date: Thu, 28 Jan 2021 12:41:43 +0100 Subject: [PATCH 39/67] added uikit markup for ln winix function WIP: #2 --- winixd/html/fun_ln.html | 51 ++++++++++++++++++++++++++--------------- winixd/locale/en | 2 +- winixd/locale/pl | 2 +- 3 files changed, 35 insertions(+), 20 deletions(-) diff --git a/winixd/html/fun_ln.html b/winixd/html/fun_ln.html index 3b5ea28..885d1de 100644 --- a/winixd/html/fun_ln.html +++ b/winixd/html/fun_ln.html @@ -2,35 +2,50 @@

          {ln_header}

          +

          {ln_info}: [dir]

          -
          -
          - {form_ln_legend} -

          {ln_info}: [dir]

          + -

          {suggested_url}

          - -

          {ln_to}

          - +
          + + +
          + +
          +
          + + +
          + + +
          + +
          +
          + + +
          + +
          -

          - - -

          +
          + +
          -

          - -

          +
          + +
          [if winix_function_param_is "postredirect"] [end] - - -
          +
          + +
          + diff --git a/winixd/locale/en b/winixd/locale/en index 5b489a1..dd952ad 100644 --- a/winixd/locale/en +++ b/winixd/locale/en @@ -143,7 +143,7 @@ ln_to = Link pointing to ln_hardlink = hardlink ln_symlink = symbolic link ln_make_redirect = "Make redirect (only for symbolic links)" -form_ln_legend = Link form + diff --git a/winixd/locale/pl b/winixd/locale/pl index e46e67a..2730e60 100644 --- a/winixd/locale/pl +++ b/winixd/locale/pl @@ -149,7 +149,7 @@ ln_to = Link wskazujący na ln_hardlink = hard link ln_symlink = link symboliczny ln_make_redirect = "Wykonaj przekierowanie (jedynie dla linków symbolicznych)" -form_ln_legend = Formularz zmiany linku + form_emacs_content_cms = Zawartość: -- 2.44.0 From e75918f5ed3817009e809dd58fc7b23104b5c3b5 Mon Sep 17 00:00:00 2001 From: Tomasz Sowa Date: Thu, 28 Jan 2021 15:36:39 +0100 Subject: [PATCH 40/67] added uikit markup for rm winix function WIP: #2 --- winixd/html/fun_rm.html | 56 ++++++++++++++++++++--------------------- winixd/locale/en | 1 - winixd/locale/pl | 1 - 3 files changed, 28 insertions(+), 30 deletions(-) diff --git a/winixd/html/fun_rm.html b/winixd/html/fun_rm.html index 763dd1e..d11f818 100644 --- a/winixd/html/fun_rm.html +++ b/winixd/html/fun_rm.html @@ -2,44 +2,44 @@

          {rm_header}

          -
          -
          - {rm_form_legend} - -

          - [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] -

          +

          +[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] + [# !! IMPROVE ME for root dir one has to privide 'c' parameter in order to show the form] + {rm_root} + [else] + {rm_dir}: [dir_without_slash] + [end] + +[end] +

          + + + + [if not item_is] -

          - -

          + [end] [if winix_function_param_is "postredirect"] [end] - +
          + +
          -
          + diff --git a/winixd/locale/en b/winixd/locale/en index dd952ad..cd47099 100644 --- a/winixd/locale/en +++ b/winixd/locale/en @@ -258,7 +258,6 @@ reload_menu = plugin menu cache rm_header = Remove -rm_form_legend = Remove form rm_file = Do you really want to remove file rm_symlink = Do you really want to remove symlink rm_dir = Do you really want to remove directory diff --git a/winixd/locale/pl b/winixd/locale/pl index 2730e60..e62a4d6 100644 --- a/winixd/locale/pl +++ b/winixd/locale/pl @@ -281,7 +281,6 @@ reload_menu = cache pluginu 'menu' rm_header = Usuń -rm_form_legend = Formularz usuwania rm_file = Czy napewno usunąć plik rm_symlink = Czy napewno usunąć symlink rm_dir = Czy napewno usunąć katalog -- 2.44.0 From a7629f638f34e1e05884ea0e6a611af63e0355ee Mon Sep 17 00:00:00 2001 From: Tomasz Sowa Date: Thu, 28 Jan 2021 20:16:44 +0100 Subject: [PATCH 41/67] added uikit markup for sort winix function WIP: #2 --- winixd/html/fun_sort.html | 113 +++++++++++----------- winixd/html/index_head_functions_add.html | 5 +- 2 files changed, 60 insertions(+), 58 deletions(-) diff --git a/winixd/html/fun_sort.html b/winixd/html/fun_sort.html index 52fdd15..5423b6d 100644 --- a/winixd/html/fun_sort.html +++ b/winixd/html/fun_sort.html @@ -1,54 +1,59 @@ -
          - -

          {sort_header}

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

          {sort_info_multi}

          - - [if item_tab] -
          -
            - [for item_tab] -
          • - - - [# is it correct? may give this 'if' only to /-/thumb param? ] - [if item_tab_has_thumb][item_tab_subject][end] - - [item_tab_url] [if not [is item_tab_subject ""]]({sort_item_subject}: [item_tab_subject])[end] -
            • - [end] -
          - - [if winix_function_param_is "postredirect"] - - [end] - - - - [end] - -[end] - -
          +
          + +

          {sort_header}

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

          {sort_info_multi}

          + + [if item_tab] +
          +
            + [for item_tab] +
          • + + + [# is it correct? may give this 'if' only to /-/thumb param? ] + [if item_tab_has_thumb][item_tab_subject][end] + + [item_tab_url][if item_tab_type_is_dir]/[end] [if not [is item_tab_subject ""]]({sort_item_subject}: [item_tab_subject])[end] +
            • + [end] +
          + + [if winix_function_param_is "postredirect"] + + [end] + +
          + +
          + + + [end] + +[end] + +
          diff --git a/winixd/html/index_head_functions_add.html b/winixd/html/index_head_functions_add.html index 7909e4e..783fda2 100644 --- a/winixd/html/index_head_functions_add.html +++ b/winixd/html/index_head_functions_add.html @@ -260,10 +260,7 @@ cm.save() [if winix_function_is "sort"] [if not item_is] - [def winix_has_jquery "true"] - - - + [end] [end] -- 2.44.0 From 9df146af3b71feb64ce9490b00d819a40c3a06d0 Mon Sep 17 00:00:00 2001 From: Tomasz Sowa Date: Fri, 29 Jan 2021 08:35:17 +0100 Subject: [PATCH 42/67] added: to 'sort' winix function: 'renumerate' button if 'index' param is present WIP: #2 --- winixd/html/fun_sort.html | 16 ++++++++++++++-- winixd/locale/en | 1 + winixd/locale/pl | 1 + 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/winixd/html/fun_sort.html b/winixd/html/fun_sort.html index 5423b6d..e17c22c 100644 --- a/winixd/html/fun_sort.html +++ b/winixd/html/fun_sort.html @@ -26,14 +26,20 @@ [else] -

          {sort_info_multi}

          +

          + [if winix_function_param_is "index"] + {sort_info_multi_index} + [else] + {sort_info_multi} + [end] +

          [if item_tab]
            [for item_tab]
          • - + [# is it correct? may give this 'if' only to /-/thumb param? ] [if item_tab_has_thumb][item_tab_subject][end] @@ -47,6 +53,12 @@ [end] + [if winix_function_param_is "index"] +
            + +
            + [end] +
            diff --git a/winixd/locale/en b/winixd/locale/en index cd47099..d54436d 100644 --- a/winixd/locale/en +++ b/winixd/locale/en @@ -457,6 +457,7 @@ slog_turn_over = Session's log turned over due to size greater than sort_header = Sort sort_current_sortindex = Current sort index sort_info_multi = Set an order of items by using the mouse. +sort_info_multi_index = Set an order of items by providing an index number. You can also set an order of items by using the mouse and then clicking the renumerate button. sort_item_subject = Subject: stat_header = Stat diff --git a/winixd/locale/pl b/winixd/locale/pl index e62a4d6..83e2261 100644 --- a/winixd/locale/pl +++ b/winixd/locale/pl @@ -475,6 +475,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_info_multi = Ustaw kolejność elementów przeciągając je przy pomocy myszki. +sort_info_multi_index = Ustaw kolejność elementów podająć ich indeks. Możesz także ustawić kolejność elementów przeciągając je przy pomocy myszki i następnie kliknąć przycisk Renumeruj. sort_item_subject = Tytuł: stat_header = Stat -- 2.44.0 From 8146f424929e888e4fd48ae5041bd7f173335ab2 Mon Sep 17 00:00:00 2001 From: Tomasz Sowa Date: Mon, 8 Feb 2021 02:01:37 +0100 Subject: [PATCH 43/67] added uikit markup for seo winix function --- winixd/html/fun_seo.html | 34 +++++++++++++++++++++------------- 1 file changed, 21 insertions(+), 13 deletions(-) diff --git a/winixd/html/fun_seo.html b/winixd/html/fun_seo.html index d5aea04..3b07eb6 100644 --- a/winixd/html/fun_seo.html +++ b/winixd/html/fun_seo.html @@ -3,28 +3,36 @@

            {seo_title}

            - + -
            - - -
            - -
            - - +
            + +
            + +
            -
            - - +
            + +
            + +
            +
            + +
            + +
            + +
            [if winix_function_param_is "postredirect"] [end] - +
            + +
            -- 2.44.0 From 9832b17fc2b74f8f49b9a5571586a981739317c8 Mon Sep 17 00:00:00 2001 From: Tomasz Sowa Date: Tue, 9 Feb 2021 18:10:01 +0100 Subject: [PATCH 44/67] updated uikit to 3.6.16 --- winixd/html/index_head_functions_add.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/winixd/html/index_head_functions_add.html b/winixd/html/index_head_functions_add.html index 783fda2..6ce8a80 100644 --- a/winixd/html/index_head_functions_add.html +++ b/winixd/html/index_head_functions_add.html @@ -5,11 +5,11 @@ [def winix_has_jquery "false"] [# UIkit CSS] - + [# UIkit JS] - - + + -- 2.44.0 From 2799a66c1640a07e6decf6cdb9b9178e1d35c082 Mon Sep 17 00:00:00 2001 From: Tomasz Sowa Date: Tue, 9 Feb 2021 18:11:37 +0100 Subject: [PATCH 45/67] added uikit markup for who winix function --- winixd/html/fun_who.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/winixd/html/fun_who.html b/winixd/html/fun_who.html index 3fa5a2e..48ec0fa 100644 --- a/winixd/html/fun_who.html +++ b/winixd/html/fun_who.html @@ -4,7 +4,7 @@ [if who_tab] -
{ls_type}{ls_permissions}{ls_owner}{ls_group}{ls_name}
d
+
[for who_tab] -- 2.44.0 From 55462fca9f5139fb01b960d34f7791984243cf3e Mon Sep 17 00:00:00 2001 From: Tomasz Sowa Date: Tue, 9 Feb 2021 18:26:30 +0100 Subject: [PATCH 46/67] added uikit markup for uptime winix function --- winixd/html/fun_uptime.html | 36 ++++++++++++++++++++++++++++-------- 1 file changed, 28 insertions(+), 8 deletions(-) diff --git a/winixd/html/fun_uptime.html b/winixd/html/fun_uptime.html index e3035f8..8a50e4c 100644 --- a/winixd/html/fun_uptime.html +++ b/winixd/html/fun_uptime.html @@ -2,20 +2,40 @@

{uptime_header}

-

{uptime_current_time}: [winix_cur_time]
-{uptime_up}: +

{who_tab_index}{user}{who_tab_start}{who_tab_last_active}
[who_tab_lp][who_tab_user][who_tab_time][who_tab_last_time]
+ + + + + + + + + + + + + + + + + + + + + + + + + +
{uptime_current_time}[winix_cur_time]
{uptime_up} [if uptime_more_than_one_day] [uptime_days] {uptime_days} [else] [uptime_hours] [end] -
-{uptime_how_many_sessions}: [winix_how_many_sessions]
-{uptime_users_logged}: [winix_users_logged]
-{load_avg}: [winix_loadavg_now], [winix_loadavg_1], [winix_loadavg_5], [winix_loadavg_15]
-{req_per_sec}: [winix_req_per_sec_now], [winix_req_per_sec_1], [winix_req_per_sec_5], [winix_req_per_sec_15] -

+
{uptime_how_many_sessions}[winix_how_many_sessions]
{uptime_users_logged}[winix_users_logged]
{load_avg}[winix_loadavg_now], [winix_loadavg_1], [winix_loadavg_5], [winix_loadavg_15]
{req_per_sec}[winix_req_per_sec_now], [winix_req_per_sec_1], [winix_req_per_sec_5], [winix_req_per_sec_15]
-- 2.44.0 From 22a45697fa9e9f3398a6e25a56b3fd40585ad921 Mon Sep 17 00:00:00 2001 From: Tomasz Sowa Date: Tue, 9 Feb 2021 18:48:48 +0100 Subject: [PATCH 47/67] added uikit markup for subject winix function --- winixd/html/fun_subject.html | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/winixd/html/fun_subject.html b/winixd/html/fun_subject.html index 0a98641..3325521 100644 --- a/winixd/html/fun_subject.html +++ b/winixd/html/fun_subject.html @@ -3,18 +3,22 @@

{subject_header}

-
+ -
- - +
+ +
+ +
[if winix_function_param_is "postredirect"] [end] - +
+ +
-- 2.44.0 From ae8637d4553ba60ae522fc902fe7fb263db17b3f Mon Sep 17 00:00:00 2001 From: Tomasz Sowa Date: Fri, 12 Feb 2021 18:57:14 +0100 Subject: [PATCH 48/67] added uikit markup for: createthread, reply, showthreads and thread winix functions --- winixd/html/dir_last_info.html | 2 +- winixd/html/fun_ckeditor.html | 6 +-- winixd/html/fun_createthread.html | 46 +++++++++++------ winixd/html/fun_emacs.html | 6 +-- winixd/html/fun_reply.html | 73 ++++++++++++++++----------- winixd/html/fun_run.html | 10 +--- winixd/html/fun_showthreads.html | 12 ++--- winixd/html/fun_thread.html | 35 ++++++++----- winixd/html/fun_tinymce.html | 6 +-- winixd/html/fun_vim.html | 6 +-- winixd/html/item_info.html | 2 +- winixd/html/item_tab_info.html | 2 +- winixd/html/thread_sort_tab_info.html | 2 +- winixd/locale/en | 1 - winixd/locale/pl | 9 ++-- 15 files changed, 123 insertions(+), 95 deletions(-) diff --git a/winixd/html/dir_last_info.html b/winixd/html/dir_last_info.html index 967c84c..ec1619f 100644 --- a/winixd/html/dir_last_info.html +++ b/winixd/html/dir_last_info.html @@ -1,4 +1,4 @@ -

+

{added_by}: [dir_last_user], [dir_last_date_creation_nice] [if not dir_last_dates_equal] diff --git a/winixd/html/fun_ckeditor.html b/winixd/html/fun_ckeditor.html index c07180d..1b81443 100644 --- a/winixd/html/fun_ckeditor.html +++ b/winixd/html/fun_ckeditor.html @@ -6,14 +6,14 @@ [if one [mount_type_is "cms"] [any [mount_type_is "thread"] [thread_mount_arg_is "subject"]]]

- +
- +
@@ -40,7 +40,7 @@ [if not user_logged]
- +
diff --git a/winixd/html/fun_createthread.html b/winixd/html/fun_createthread.html index a310c53..4108bf4 100644 --- a/winixd/html/fun_createthread.html +++ b/winixd/html/fun_createthread.html @@ -3,27 +3,40 @@

{create_thread_header}

- -
-
- {form_thread_legend} + -

{title}:

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

{suggested_url}:

- +
+ +
+ +
+
[end] [include "fun_emacs_post.html"] [if not user_logged] -

{nick}:

- - -

{rebus_how_is_it} [rebus_question]?

- +
+ +
+ +
+
+ +
+ +
+ +
+
[include "antispam.html"] [end] @@ -31,9 +44,12 @@ [if winix_function_param_is "postredirect"] [end] + - -
+
+ +
+
diff --git a/winixd/html/fun_emacs.html b/winixd/html/fun_emacs.html index f57771f..9cc60f0 100644 --- a/winixd/html/fun_emacs.html +++ b/winixd/html/fun_emacs.html @@ -7,14 +7,14 @@
- +
- +
@@ -24,7 +24,7 @@ [if not user_logged]
- +
diff --git a/winixd/html/fun_reply.html b/winixd/html/fun_reply.html index ce19acc..c5c5bb6 100644 --- a/winixd/html/fun_reply.html +++ b/winixd/html/fun_reply.html @@ -3,30 +3,37 @@

{thread_header_reply}

- + [if thread_mount_arg_is "subject"] -
- - +
+ +
+ +
-
- - +
+ +
+ +
[end] - - -
- [if mount_type_is "thread"][end] - + + +
+ [if mount_type_is "thread"][end] + +
+ +
- - -
- - [if user_can_use_html][end] @@ -34,20 +41,24 @@ [if user_can_use_other][end]
- - - + + + [if not user_logged] -
- - +
+ +
+ +
- -
-