added uikit markup for seo winix function

WIP: #2

.gitignore

@@ -1,3 +1,6 @@
 .cproject
 .project
 .settings/
+*.o
+*.so
+winixd/winix

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);
 

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;

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();
 }
 
 

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;
 
 
 	/*

winixd/core/winixrequest.cpp

@@ -94,11 +94,9 @@ void WinixRequest::set_dependency(WinixSystem * winix_system)
 void WinixRequest::set_dependency(WinixRequest * winix_request)
 {
 	WinixSystem::set_dependency(winix_request);
-	cur = winix_request->cur;
+	set_cur(winix_request->cur);
-	locale = winix_request->locale;
+	set_locale(winix_request->locale);
-	session_manager = winix_request->session_manager;
+	set_session_manager(winix_request->session_manager);
-
-	// CHECK ME what about slog
 }
 
 

winixd/functions/adduser.cpp

@@ -264,6 +264,11 @@ void AddUser::MakePost()
 	const std::wstring & email		= cur->request->PostVar(L"email");
 	bool autoactivate				= false;
 
+	// for slog and locale from fun_passwd to work correctly
+	// but in the future IsPasswordCorrect will be moved to User class
+	// or some other place
+	functions->fun_passwd.set_dependency(this);
+
 	if( !IsLoginCorrect(login, true) ||
 		!IsEmailCorrect(email, true) || 
 		!functions->fun_passwd.IsPasswordCorrect(pass, conf_pass, true) )

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;

winixd/functions/functions.cpp

@@ -5,7 +5,7 @@
  */
 
 /* 
- * Copyright (c) 2010-2018, Tomasz Sowa
+ * Copyright (c) 2010-2021, Tomasz Sowa
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
@@ -118,6 +118,13 @@ FunctionBase * Functions::Find(const std::wstring & function_name)
 	if( i == table.end() )
 		return 0;
 
+	FunctionBase * fun = i->second;
+
+	// this is to set 'cur' and 'locale' for slog, but in the future slog will be moved to Session
+	fun->set_cur(cur);
+	fun->set_locale(locale);
+	//
+
 return i->second;
 }
 

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->html_template = config->templates_index_generic;
+	}
+
 	if( !cur->request->is_item )
 	{
 		DbItemQuery iq;

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");

winixd/functions/mv.cpp

@@ -584,14 +584,18 @@ 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
 	}
 
+	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);
 }
 

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;

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() )

winixd/html/fun_account.html

@@ -1,20 +1,56 @@
 <div class="winix">
 
-<h1>Account</h1>
+<h1>{account_header}</h1>
 
 [if user_logged]
-	<p>You are logged as: [user_name]<br>
+
+	<table class="uk-table uk-table-divider uk-table-small uk-table-justify">
+		<tbody>
+			<tr>
+				<td class="uk-width-1-4">{account_logged_as}</td>
+				<td>[user_name]</td>
+				<td></td>
+			</tr>
+
 			[if user_super_user]
-	You are the root
+			<tr>
+				<td>{account_admin}</td>
+				<td>{account_admin_yes}</td>
+				<td></td>
+			</tr>
 			[end]
-	[# !! IMPROVE ME add info about groups, may other parameters like time zone, language?]
+
-	</p>
+			[if false]
+			[# improve me]
+			<tr>
+				<td>{account_groups}</td>
+				<td>html, www, foo</td>
+				<td></td>
+			</tr>
+			[end]
+
+			<tr>
+				<td>{account_timezone}</td>
+				<td>[user_time_zone_name]</td>
+				<td>
+				<a href="[dir]timezone" class="uk-button uk-button-default uk-button-small">{change}</a>
+				</td>
+			</tr>
+
+			<tr>
+				<td>{account_language}</td>
+				<td>[user_locale_name]</td>
+				<td>
+				<a href="[dir]locale" class="uk-button uk-button-default uk-button-small">{change}</a>
+				</td>
+			</tr>
+		</tbody>
+	</table>
+
+
 [else]
-	<p>You are not logged in.</p>
+	<p>{account_not_logged}</p>
 [end]
 
 
-
-
-
 </div>

winixd/html/fun_adduser.html

@@ -2,39 +2,62 @@
 
 <h1>[if user_logged]{adduser_header_add}[else]{adduser_header_register}[end]</h1>
 
-<form id="additem" method="post" action="[doc_base_url][dir]adduser">
+<form class="uk-form-stacked" method="post" action="[doc_base_url][dir]adduser">
-<fieldset>
-	<legend>{adduser_form_legend}</legend>
 
-	<p class="withnext">{adduser_login}:</p>
+	<div class="uk-margin">
-	<input class="edit" type="text" name="login" value="[adduser_last_login]">
+		<label class="uk-form-label" for="winix_adduser_login">{adduser_login}</label>
 
-	<p class="withnext">{adduser_password}:</p>
+		<div class="uk-form-controls">
-	<input class="edit" type="password" name="password" value="">
+			<input class="uk-input" id="winix_adduser_login" type="text" name="login" value="[adduser_last_login]">
+		</div>
+	</div>
 
-	<p class="withnext">{adduser_confirm_password}:</p>
+	<div class="uk-margin">
-	<input class="edit" type="password" name="passwordconfirm" value="">
+		<label class="uk-form-label" for="winix_adduser_password">{adduser_password}</label>
 
+		<div class="uk-form-controls">
+			<input class="uk-input" id="winix_adduser_password" type="password" name="password" value="">
+		</div>
+	</div>
+
+	<div class="uk-margin">
+		<label class="uk-form-label" for="winix_adduser_confirm_password">{adduser_confirm_password}</label>
+
+		<div class="uk-form-controls">
+			<input class="uk-input" id="winix_adduser_confirm_password" type="password" name="passwordconfirm" value="">
+		</div>
+	</div>
+
+	<div class="uk-margin">
 		[if winix_account_need_email_verification]
-		<p class="withnext">{adduser_need_email}<br>{adduser_need_email2}:</p>
+			<label class="uk-form-label" for="winix_adduser_email">{adduser_need_email}</label>
 		[else]
-		<p class="withnext">{adduser_email}:</p>
+			<label class="uk-form-label" for="winix_adduser_email">{adduser_email}</label>
 		[end]
-	<input class="edit" type="text" name="email" value="[adduser_last_email]">
+
+		<div class="uk-form-controls">
+			<input class="uk-input" id="winix_adduser_email" type="text" name="email" value="[adduser_last_email]">
+		</div>
+	</div>
 
 	[if user_super_user]
-	<p>
+	<div class="uk-margin">
-		<input type="checkbox" name="autoactivate" id="autoactivate"><label style="display: inline;" for="autoactivate">{adduser_auto_activate}</label>
+		<div class="uk-form-controls">
-	</p>
+			<label><input class="uk-checkbox uk-margin-small-right" type="checkbox" name="autoactivate" id="autoactivate">{adduser_auto_activate}</label>
+		</div>
+	</div>
 	[end]
 
 	[if winix_function_param_is "postredirect"]
 		<input type="hidden" name="postredirect" value="[winix_function_param_value "postredirect"]">
 	[end]
 
+	<div class="uk-margin">
+		<div class="uk-form-controls">
+			<input class="uk-button uk-button-primary" type="submit" value="[if user_logged]{adduser_submit}[else]{register_user_submit}[end]">
+		</div>
+	</div>
 
-	<input class="submit" type="submit" value="[if user_logged]{adduser_submit}[else]{register_user_submit}[end]">
-</fieldset>
 </form>
 
 </div>

winixd/html/fun_ckeditor.html

@@ -2,74 +2,79 @@
 
 [if item_is]<h1>{edit}</h1>[else]<h1>{add}</h1>[end]
 
-	[if mount_type_is "cms"]
+<form class="uk-form-stacked">
-		<div class="winix_input_a">
+	
-		<label for="winix_title_id">{title}:</label>
+	[if one [mount_type_is "cms"] [any [mount_type_is "thread"] [thread_mount_arg_is "subject"]]]
-		<input id="winix_title_id" type="text" name="subject" value="[item_subject]">
+	<div class="uk-margin">
+		<label class="uk-form-label" for="winix_title_id">{title}:</label>
+		<div class="uk-form-controls">
+			<input class="uk-input" id="winix_title_id" type="text" name="subject" value="[item_subject]" [if not item_is]autofocus [end]>
+		</div>
 	</div>
 
-		<div class="winix_input_a">
+	<div class="uk-margin">
-		<label for="winix_url_id">{suggested_url}:</label>
+		<label class="uk-form-label" for="winix_url_id">{suggested_url}:</label>
-		<input id="winix_url_id" type="text" name="url" value="[item_url]">
+		<div class="uk-form-controls">
+			<input class="uk-input" id="winix_url_id" type="text" name="url" value="[item_url]">
+		</div>
 	</div>
 	[end]
 	
-	[if any [mount_type_is "thread"] [thread_mount_arg_is "subject"]]
-		<div class="winix_input_a">
-		<label for="winix_title_id">{title}:</label>
-		<input id="winix_title_id" type="text" name="subject" value="[item_subject]">
-		</div>
 	
-		<div class="winix_input_a">
+	<div class="uk-margin">
-		<label for="winix_url_id">{suggested_url}:</label>
+	[if mount_type_is "cms"]<label class="uk-form-label" for="winix_content_id">{form_emacs_content_cms}</label>[end]
-		<input id="winix_url_id" type="text" name="url" value="[item_url]">
+	[if mount_type_is "thread"]<label class="uk-form-label" for="winix_content_id">{form_emacs_content_thread}</label>[end]
-		</div>
+	[if mount_type_is "ticket"]<label class="uk-form-label" for="winix_content_id">{form_emacs_content_ticket}</label>[end]
-	[end]
-	
-	<div class="winix_input_a">
-	[if mount_type_is "cms"]<label for="winix_content_id">{form_emacs_content_cms}</label>[end]
-	[if mount_type_is "thread"]<label for="winix_content_id">{form_emacs_content_thread}</label>[end]
-	[if mount_type_is "ticket"]<label for="winix_content_id">{form_emacs_content_ticket}</label>[end]
 	
 	[# template fun_ls.html uses the name: itemcontent to refer to this textarea item]
 
-
+	<div class="uk-form-controls">
 		<div style="border-top: 1px solid #dadada; border-bottom: 1px solid #dadada; padding: 0.2em 0 0.2em 0; margin: 1em 0 1em 0;" id="winix-editor-content" data-winix-post-name="itemcontent">[item_print_content]</div>
-
+	</div>
 	
 	</div>
 
+	<div class="uk-form-controls">
 		<input id="contenttype" type="hidden" name="contenttype" value="2">
-	
+	</div>
 
 	[if not user_logged]
-		<div class="winix_input_a">
+		<div class="uk-margin">
-		<label for="winix_nick_id">{nick}:</label>
+			<label class="uk-form-label" for="winix_nick_id">{nick}:</label>
-		<input id="winix_nick_id" type="text" name="guestname" value="[item_guest_name]">
+			<div class="uk-form-controls">
+				<input class="uk-input" id="winix_nick_id" type="text" name="guestname" value="[item_guest_name]">
+			</div>
 		</div>
 
-		<div class="winix_input_a">
+		<div class="uk-margin">
-		<label for="winix_rebus_id">{rebus_how_is_it} [rebus_question]?</p>
+			<label class="uk-form-label" for="winix_rebus_id">{rebus_how_is_it} [rebus_question]?</label>
-		<input id="winix_rebus_id" type="text" name="rebus">
+			<div class="uk-form-controls">
+				<input class="uk-input" id="winix_rebus_id" type="text" name="rebus">
+			</div>
 		</div>
 		
 		[include "antispam.html"]
 	[end]
 	
 
-	<div class="winix-update-button-container">
+	<div class="uk-margin">
-		<button class="winix_update_button" data-winix-function-path="[doc_base_url][dir][if item_is][item_url]/[end]ckeditor"
+		<div class="uk-form-controls uk-inline">
+
+			<button class="uk-button uk-button-primary winix_update_button"
+				data-winix-function-path="[doc_base_url][dir][if item_is][item_url]/[end]ckeditor"
 				data-winix-content-ckeditor-instances="winix-editor-content"
 				data-winix-content-inputs="winix_url_id,winix_title_id,contenttype"
 				data-winix-progressbar-id="winix-editor-progressbar"
 				data-winix-messages-status-success-id="winix-editor-messages-status-success"
 				data-winix-messages-status-error-id="winix-editor-messages-status-error"
 				>
-			Aktualizuj
+				{ckeditor_update_button}
 			</button>
 
-		<div id="winix-editor-progressbar" class="winix-progressbar">
+			<div id="winix-editor-progressbar" class="uk-invisible uk-position-center-right-out uk-margin-small-left">
-			<img src="[doc_base_url_common]/progressbars/progressbar_fading_lines_16x16.gif" alt="progress bar">
+				<img src="[doc_base_url_common]/progressbars/progressbar_fading_lines_16x16.gif" alt="{ckeditor_update_progressbar_img_alt}">
+			</div>
+
 		</div>
 
 		<div id="winix-editor-messages-status-success" class="winix-editor-messages-status-success">
@@ -88,4 +93,6 @@
 	[ckeditor_old_browsers_support]
 	[ckeditor "winix-editor-content"]
 
+</form>
+
 </div>

winixd/html/fun_cp.html

@@ -2,38 +2,52 @@
 
 <h1>{cp_header}</h1>
 
-
-<form id="additem" method="post" action="[doc_base_url][dir][if item_is][item_url]/[end]cp[if not item_is]/r[end]">
-<fieldset>
-	<legend>{cp_form_legend}</legend>
-	
 <p>
-	[if item_is]{cp_page} "[item_url]":[else]{cp_dir} "[dir_without_slash]"[end]
+	[if item_is]{cp_page} [item_url] [else]{cp_dir} [dir_without_slash][end]
 </p>
 
 
-	<p class="withnext">{suggested_url}</p>
+<form class="uk-form-stacked uk-width-1-2@s" method="post" action="[doc_base_url][dir][if item_is][item_url]/[end]cp[if not item_is]/r[end]">
-	<input class="edit" type="text" name="to" value="[dir_without_slash][if item_is]/[item_url][end]">
 
-	<p>
+	<div class="uk-margin">
-	<label><input type="checkbox" name="preserveattr">{cp_preserve_attr}</label>
+		<label class="uk-form-label" for="winix_url">{suggested_url}</label>
+
+		<div class="uk-form-controls">
+			<input class="uk-input" id="winix_url" type="text" name="to" value="[dir_without_slash][if item_is]/[item_url][end]">
+		</div>
+	</div>
+
+	<div class="uk-margin">
+		<div class="uk-margin-small-top">
+			<label><input class="uk-checkbox uk-margin-small-right" type="checkbox" name="preserveattr">{cp_preserve_attr}</label>
+		</div>
 
 		[if not item_is]
-	<label><input type="checkbox" name="onlycontent">{cp_only_content}</label>
+
-	<label><input type="checkbox" name="removedefaults" checked="checked">{cp_remove_defaults}</label>
+			<div class="uk-margin-small-top">
-	<label><input type="checkbox" name="followsymlinks" checked="checked">{cp_follow_symlinks}</label>
+				<label><input class="uk-checkbox uk-margin-small-right" type="checkbox" name="onlycontent">{cp_only_content}</label>
+			</div>
+
+			<div class="uk-margin-small-top">
+				<label><input class="uk-checkbox uk-margin-small-right" type="checkbox" name="removedefaults" checked="checked">{cp_remove_defaults}</label>
+			</div>
+
+			<div class="uk-margin-small-top">
+				<label><input class="uk-checkbox uk-margin-small-right" type="checkbox" name="followsymlinks" checked="checked">{cp_follow_symlinks}</label>
+			</div>
+
 		[end]
-	</p>
+	</div>
 
 	[if winix_function_param_is "postredirect"]
 		<input type="hidden" name="postredirect" value="[winix_function_param_value "postredirect"]">
 	[end]
 
 	
-	<input class="submit" type="submit" value="{copy}">
+	<div class="uk-margin">
-</fieldset>
+		<input class="uk-button uk-button-primary" type="submit" value="{copy}">
+	</div>
+
 </form>
 
-
-
 </div>

winixd/html/fun_default.html

@@ -3,22 +3,28 @@
 <h1>{default_header}</h1>
 
 
-<form id="additem" method="post" action="[doc_base_url][dir]default">
+<form class="uk-form-stacked uk-width-1-2@s" method="post" action="[doc_base_url][dir]default">
-<fieldset>
-	<legend>{form_default_legend}</legend>
-	{url}:<br>
-	<input class="edit" type="text" name="linkto" value="[dir_last_link_to]">
 
-	<p>	
+	<div class="uk-margin">
-	<label><input class="" type="checkbox" name="makeredirect"[if dir_last_is_link_redirect] checked="checked"[end]>{default_make_redirect}</label>
+		<label class="uk-form-label" for="winix_url">{url}</label>
-	</p>
+
+		<div class="uk-form-controls">
+			<input class="uk-input" id="winix_url" type="text" name="linkto" value="[dir_last_link_to]">
+		</div>
+	</div>
+
+	<div class="uk-margin">
+		<label><input class="uk-checkbox uk-margin-small-right" type="checkbox" name="makeredirect"[if dir_last_is_link_redirect] checked="checked"[end]>{default_make_redirect}</label>
+	</div>
 
 	[if winix_function_param_is "postredirect"]
 		<input type="hidden" name="postredirect" value="[winix_function_param_value "postredirect"]">
 	[end]
 	
-	<input class="submit" type="submit" value="{change}">
+	<div class="uk-margin">
-</fieldset>
+		<input class="uk-button uk-button-primary" type="submit" value="{change}">
+	</div>
+
 </form>
 
 

winixd/html/fun_emacs.html

@@ -4,39 +4,51 @@
 
 
 
-<form method="post" action="[doc_base_url][dir][if item_is][item_url]/[end]emacs">
+<form class="uk-form-stacked" method="post" action="[doc_base_url][dir][if item_is][item_url]/[end]emacs">
 
-	<div class="winix_input_a">
+	<div class="uk-margin">
-	<label for="winix_title_id">{title}:</label>
+		<label class="uk-form-label" for="winix_title_id">{title}:</label>
-	<input id="winix_title_id" type="text" name="subject" value="[item_subject]" [if not item_is]autofocus [end]>
+		<div class="uk-form-controls">
+			<input class="uk-input" id="winix_title_id" type="text" name="subject" value="[item_subject]" [if not item_is]autofocus [end]>
+		</div>
 	</div>
 
-	<div class="winix_input_a">
+	<div class="uk-margin">
-	<label for="winix_url_id">{suggested_url}:</label>
+		<label class="uk-form-label" for="winix_url_id">{suggested_url}:</label>
-	<input id="winix_url_id" type="text" name="url" value="[item_url]">
+		<div class="uk-form-controls">
+			<input class="uk-input" id="winix_url_id" type="text" name="url" value="[item_url]">
+		</div>
 	</div>
 	
 	[include "fun_emacs_post.html"]
 	
 	[if not user_logged]
-		<div class="winix_input_a">
+		<div class="uk-margin">
-		<label for="winix_nick_id">{nick}:</label>
+			<label class="uk-form-label" for="winix_nick_id">{nick}:</label>
-		<input id="winix_nick_id" type="text" name="guestname" value="[item_guest_name]">
+			<div class="uk-form-controls">
+				<input class="uk-input" id="winix_nick_id" type="text" name="guestname" value="[item_guest_name]">
+			</div>
 		</div>
 		
-		<div class="winix_input_a">
+		<div class="uk-margin">
-		<label for="winix_rebus_id">{rebus_how_is_it} [rebus_question]?</label>
+			<label class="uk-form-label" for="winix_rebus_id">{rebus_how_is_it} [rebus_question]?</label>
-		<input id="winix_rebus_id" type="text" name="rebus">
+			<div class="uk-form-controls">
+				<input class="uk-input" id="winix_rebus_id" type="text" name="rebus">
+			</div>
 		</div>
 
 		[include "antispam.html"]
 	[end]
 
 	[if winix_function_param_is "postredirect"]
+	<div class="uk-form-controls">
 		<input type="hidden" name="postredirect" value="[winix_function_param_value "postredirect"]">
+	</div>
 	[end]
 	
-	<input type="submit" value="[if item_is]{change}[else]{add}[end]">
+	<div class="uk-margin uk-form-controls">
+		<input class="uk-button uk-button-primary" type="submit" value="[if item_is]{change}[else]{add}[end]">
+	</div>
 
 </form>
 

winixd/html/fun_emacs_post.html

@@ -1,21 +1,24 @@
 
-<div class="winix_input_a">
+<div class="uk-margin">
 
 [if winix_function_is "upload"]
-	<label for="winix_content_id">{upload_content}</label>
+	<label class="uk-form-label" for="winix_content_id">{upload_content}</label>
 [else]
-	[if mount_type_is "cms"]<label for="winix_content_id">{form_emacs_content_cms}</label>[end]
+	[if mount_type_is "cms"]<label class="uk-form-label" for="winix_content_id">{form_emacs_content_cms}</label>[end]
-	[if mount_type_is "thread"]<label for="winix_content_id">{form_emacs_content_thread}</label>[end]
+	[if mount_type_is "thread"]<label class="uk-form-label" for="winix_content_id">{form_emacs_content_thread}</label>[end]
-	[if mount_type_is "ticket"]<label for="winix_content_id">{form_emacs_content_ticket}</label>[end]
+	[if mount_type_is "ticket"]<label class="uk-form-label" for="winix_content_id">{form_emacs_content_ticket}</label>[end]
 [end]
 
-<textarea [if item_is]autofocus [end]id="winix_content_id" rows="[if winix_function_is "upload"]7[else][if mount_type_is "cms"]30[else]10[end][end]" cols="60" name="itemcontent">[item_content]</textarea>
+<div class="uk-form-controls">
+	[# CodeMirror doesn't work correctly inside fieldset tag -- horizontal scroll is broken]
+	<textarea class="uk-textarea" [if item_is]autofocus [end]id="winix_content_id" rows="[if winix_function_is "upload"]7[else][if mount_type_is "cms"]30[else]10[end][end]" cols="60" name="itemcontent">[item_content]</textarea>
+</div>
 </div>
 
 
-<div class="winix_input_a">
+<div class="uk-margin">
-<label for="winix_contenttype_id">{form_emacs_content_type}</label>
+<label class="uk-form-label" for="winix_contenttype_id">{form_emacs_content_type}</label>
-<select name="contenttype" id="winix_contenttype_id">
+<select class="uk-select" name="contenttype" id="winix_contenttype_id">
 	<option[if item_content_type_is "text"] selected[end] value="0">{form_emacs_content_type_text}</option>
 	<option[if item_content_type_is "formatted text"] selected[end] value="1">{form_emacs_content_type_formatted_text}</option>
 	[if user_can_use_html]<option[if item_content_type_is "html"] selected[end] value="2">{form_emacs_content_type_html}</option>[end]

winixd/html/fun_env.html

@@ -5,31 +5,36 @@
 
 [if user_super_user]
 
+	<form class="uk-form-stacked uk-width-1-2@s" method="post" action="[doc_base_url][dir][if item_is][item_url]/[end]env[if winix_function_param_is "a"]/a[end]">
+
+		<div class="uk-margin">
+			<label class="uk-form-label" for="winix_env_user_select">
 				[if winix_function_param_is "a"]
-		<p class="withnext">{env_change_admin_env_for_user}:</p>
+					{env_change_admin_env_for_user}
 				[else]
-		<p class="withnext">{env_change_env_for_user}:</p>
+					{env_change_env_for_user}
 				[end]
+			</label>
 
-	<form class="envchangeuser" method="post" action="[doc_base_url][dir][if item_is][item_url]/[end]env[if winix_function_param_is "a"]/a[end]">
+			<div class="uk-form-controls">
-	<fieldset>
+				<select class="uk-select" id="winix_env_user_select" name="userid">
-		<legend>{form_env_legend}</legend>
-		
-		<select name="userid">
 					[for env_user_tab]
 						<option value="[env_user_tab_id]" [if env_user_tab_is_current]selected="selected"[end]>[env_user_tab_name]</option>
 					[end]
 				</select>
+			</div>
+		</div>
 
 		<input type="hidden" name="changeuser">
-		<input class="submit" type="submit" value="{env_change_user}">
+
+		<div class="uk-margin">
+			<input class="uk-button uk-button-primary" type="submit" value="{env_change_user}">
+		</div>
 
 		[if winix_function_param_is "postredirect"]
 			<input type="hidden" name="postredirect" value="[winix_function_param_value "postredirect"]">
 		[end]
 
-
-	</fieldset>
 	</form>
 
 [end]
@@ -37,19 +42,24 @@
 
 
 
-<form id="additem" method="post" action="[doc_base_url][dir][if item_is][item_url]/[end]env[if winix_function_param_is "a"]/a[end]">
+<form class="uk-margin-medium uk-form-stacked" method="post" action="[doc_base_url][dir][if item_is][item_url]/[end]env[if winix_function_param_is "a"]/a[end]">
-<fieldset>
+
-	<legend>{form_env_legend}</legend>
+	<div class="uk-margin">
+		<div class="uk-form-controls">
+			<textarea class="uk-textarea" rows="20" name="envvar">[if winix_function_param_is "a"][env_user_admin_env_str][else][env_user_env_str][end]</textarea>
+		</div>
+	</div>
 	
-		<textarea class="multitext" rows="30" cols="60" name="envvar">[if winix_function_param_is "a"][env_user_admin_env_str][else][env_user_env_str][end]</textarea>
 	<input type="hidden" name="userid" value="[env_user_id]">
-		<input class="submit" type="submit" value="{change}">
+
+	<div class="uk-margin">
+		<input class="uk-button uk-button-primary" type="submit" value="{change}">
+	</div>
 
 	[if winix_function_param_is "postredirect"]
 		<input type="hidden" name="postredirect" value="[winix_function_param_value "postredirect"]">
 	[end]
 
-</fieldset>
 </form>
 
 

winixd/html/fun_ln.html

@@ -2,35 +2,50 @@
 
 <h1>{ln_header}</h1>
 
-
-<form id="additem" method="post" action="[doc_base_url][dir]ln">
-<fieldset>
-	<legend>{form_ln_legend}</legend>
-
 <p>{ln_info}: [dir]</p>
 
-	<p class="withnext">{suggested_url}</p>
-	<input class="edit" type="text" name="url" value="">
 
-	<p class="withnext">{ln_to}</p>
+<form class="uk-form-stacked uk-width-1-2@s" method="post" action="[doc_base_url][dir]ln">
-	<input class="edit" type="text" name="linkto" value="[dir][if item_is][item_url][end]">
 
-	<p>
-	<label><input id="radiohard" type="radio" name="linktype" checked="checked" value="0">{ln_hardlink}</label>
-	<label><input id="radiosymb" type="radio" name="linktype" value="1">{ln_symlink}</label>
-	</p>
 
-	<p>
+	<div class="uk-margin">
-	<label><input class="" type="checkbox" name="makeredirect">{ln_make_redirect}</label>
+		<label class="uk-form-label" for="winix_suggested_url">{suggested_url}</label>
-	</p>
+
+		<div class="uk-form-controls">
+			<input class="uk-input" id="winix_suggested_url" type="text" name="url" value="">
+		</div>
+	</div>
+
+
+	<div class="uk-margin">
+		<label class="uk-form-label" for="winix_link_to">{ln_to}</label>
+
+		<div class="uk-form-controls">
+			<input class="uk-input" id="winix_link_to" type="text" name="linkto" value="[dir][if item_is][item_url][end]">
+		</div>
+	</div>
+
+
+	<div class="uk-margin-small">
+		<label><input class="uk-radio uk-margin-small-right" type="radio" name="linktype" checked="checked" value="0">{ln_hardlink}</label>
+	</div>
+	
+	<div class="uk-margin-small">
+		<label><input class="uk-radio uk-margin-small-right" type="radio" name="linktype" value="1">{ln_symlink}</label>
+	</div>
+	
+	<div class="uk-margin">
+		<label><input class="uk-checkbox uk-margin-small-right" type="checkbox" name="makeredirect">{ln_make_redirect}</label>
+	</div>
 
 	[if winix_function_param_is "postredirect"]
 		<input type="hidden" name="postredirect" value="[winix_function_param_value "postredirect"]">
 	[end]
 
+	<div class="uk-margin">
+		<input class="uk-button uk-button-primary" type="submit" value="{change}">
+	</div>
 
-	<input class="submit" type="submit" value="{change}">
-</fieldset>
 </form>
 
 

winixd/html/fun_locale.html

@@ -9,26 +9,27 @@
 [end]
 
 
-<form id="additem" method="post" action="[doc_base_url][dir][if item_is][item_url]/[end]locale">
+<form class="uk-form-stacked uk-width-1-2@s" method="post" action="[doc_base_url][dir][if item_is][item_url]/[end]locale">
-<fieldset>
+	<div class="uk-margin">
-	<legend>{locale_form_legend}</legend>
+		<label class="uk-form-label" for="winix_locale_select">{locale_select}:</label>
 
-	<p class="withnext">{locale_select}:</p>
+		<div class="uk-form-controls">
-	
+			<select id="winix_locale_select" name="localeid" class="uk-select">
-	[# add to styles]
-	<select name="localeid" style="width: 250px;">
 			[for winix_locale_tab]
 				<option value="[winix_locale_tab_id]" [if cmp user_locale_id winix_locale_tab_id]selected="selected"[end]>[winix_locale_tab_name]</option>
 			[end]
 			</select>
+		</div>
 
 		[if winix_function_param_is "postredirect"]
 			<input type="hidden" name="postredirect" value="[winix_function_param_value "postredirect"]">
 		[end]
 	
+		<div class="uk-margin uk-form-controls">
+			<input class="uk-button uk-button-primary" type="submit" value="{change}">
+		</div>
 
-	<input class="submit" type="submit" value="{change}">
+	</div>
-</fieldset>
 </form>
 
 

winixd/html/fun_login.html

@@ -1,47 +1,92 @@
 <div class="winix">
 
+[if user_logged]
+	<div class="uk-width-large uk-padding-small">
 		<h1>{login_header}</h1>
 
-[if user_logged]
+		<p class="uk-margin-top">
-	<p>{logged_as_long}: [user_name]<br>
+		{login_currently_logged_as} <strong>[user_name]</strong>
-	<a href="[doc_base_url][if dir_can_read_exec][dir][if any item_is item_can_read][item_url]/[end][else]/[end]logout">{logout}</a></p>
+		</p>
+
+		<div class="uk-margin-top">
+			<a href="[doc_base_url][if dir_can_read_exec][dir][if any item_is item_can_read][item_url]/[end][else]/[end]logout" class="uk-button uk-button-primary uk-border-pill uk-width-small">{login_logout_button}</a>
+		</div>
+	</div>
 [else]
 
 	[if not ipban_is_login_allowed_from_this_ip]
+		<div class="uk-width-1-1 uk-padding-small uk-alert-danger">
 			<p>{login_cannot_login_from_this_ip}<br>
 			{login_cannot_login_available} [ipban_current_ip_expires_time]</p>
+		</div>
 	[else]
 
-		<form method="post" action="[login_path]login">
 
-		<div class="winix_input_b">
+		<div class="uk-width-medium uk-padding-small">
-			<input type="text" name="login">
+			<!-- login -->
+			<form class="toggle-class" action="[login_path]login" method="POST">
+				<fieldset class="uk-fieldset">
+					<div class="uk-margin-small">
+						<div class="uk-inline uk-width-1-1">
+							<span class="uk-form-icon uk-form-icon-flip" data-uk-icon="icon: user"></span>
+							<input class="uk-input uk-border-pill" required placeholder="{login_username}" type="text" name="login">
 						</div>
-
-		<div class="winix_input_b">
-			<input type="password" name="password">
 					</div>
-
+					<div class="uk-margin-small">
-		<div class="winix_input_b">
+						<div class="uk-inline uk-width-1-1">
-			<input id="winix_login_rememberme_id" type="checkbox" name="rememberme">
+							<span class="uk-form-icon uk-form-icon-flip" data-uk-icon="icon: lock"></span>
-			<label for="winix_login_rememberme_id">{remember_me}</label>
+							<input class="uk-input uk-border-pill" required placeholder="{login_password}" type="password" name="password">
+						</div>
 					</div>
 
 					[if login_should_use_captcha]
-			<div class="winix_input_a">
+					<div class="uk-margin-small">
-			<label for="winix_rebus_id">{rebus_how_is_it} [rebus_question]?</label>
+						<div class="uk-inline uk-width-1-1">
-			<input id="winix_rebus_id" type="text" name="rebus">
+							<span class="uk-form-icon uk-form-icon-flip" data-uk-icon="icon: lifesaver"></span>
+							<input class="uk-input uk-border-pill" required placeholder="{rebus_how_is_it} [rebus_question]?" type="text" name="rebus">
+						</div>
 					</div>
 					[end]
 
-		<input type="submit" value="{button_login}">
+					<div class="uk-margin-small">
+						<label><input class="uk-checkbox" type="checkbox" name="rememberme"> {login_remember_me}</label>
+					</div>
+					<div class="uk-margin-bottom">
+						<button type="submit" class="uk-button uk-button-primary uk-border-pill uk-width-1-1">{login_button}</button>
+					</div>
 
 					[if winix_function_param_is "postredirect"]
 						<input type="hidden" name="postredirect" value="[winix_function_param_value "postredirect"]">
 					[end]
 
-
+				</fieldset>
 			</form>
+			<!-- /login -->
+
+
+			<!-- recover password -->
+			<form class="toggle-class" action="#[# not implemented yet]" hidden>
+				<div class="uk-margin-small">
+					<div class="uk-inline uk-width-1-1">
+						<span class="uk-form-icon uk-form-icon-flip" data-uk-icon="icon: mail"></span>
+						<input class="uk-input uk-border-pill" placeholder="{login_forgot_password_email}" required type="text">
+					</div>
+				</div>
+				<div class="uk-margin-bottom">
+					<button type="submit" class="uk-button uk-button-primary uk-border-pill uk-width-1-1">{login_forgot_password_button}</button>
+				</div>
+			</form>
+			<!-- /recover password -->
+
+			<!-- action buttons -->
+			<div>
+				<div class="uk-text-center">
+					<a class="uk-link-reset uk-text-small toggle-class" data-uk-toggle="target: .toggle-class ;animation: uk-animation-fade">{login_forgot_password_question}</a>
+					<a class="uk-link-reset uk-text-small toggle-class" data-uk-toggle="target: .toggle-class ;animation: uk-animation-fade" hidden><span data-uk-icon="arrow-left"></span> {login_back_to_login_form}</a>
+				</div>
+			</div>
+			<!-- action buttons -->
+		</div>
 
 	[end]
 

winixd/html/fun_ls.html

@@ -1,24 +1,40 @@
-<div class="winix">
+<div class="winix"[if winix_function_param_is "ckeditor_browse"] style="padding: 1.5em;"[end]>
-
 
 
+[# !! IMPROVE ME: move this html code to a ckeditor template]
 [if winix_function_param_is "ckeditor_browse"]
 	<script type="text/javascript">function select(link) \{ window.opener.CKEDITOR.tools.callFunction([ls_ckeditor_funnum_browse], link); window.close(); \} </script>
 
-	<div id="winix_ls_browse_leftcolumn">
+	<div class="uk-margin">
+		<ul class="uk-breadcrumb">
+		[for dir_tab]
+			<li>
+				<a href="[doc_base_url][dir_tab_link]ls/ckeditor_browse/CKEditor:itemcontent/CKEditorFuncNum:[ls_ckeditor_funnum_browse]">
+				[if cmp dir_tab_url ""]
+					[# !! IMPROVE ME it would be better to have a flag of some kind to indicate that this is a root dir]
+					{ls_root_dir_name}
+				[else]
+					[dir_tab_url]
+				[end]
+				</a>
+			</li>
+		[end]
+		</ul>
+	</div>
+
+	<div class="uk-flex uk-margin-medium">
+	<div class="uk-width-1-4">
 	
 		[if dir_childs_tab "with_parent"]
-			<h2>[for dir_tab]<a href="[doc_base_url][dir_tab_link]ls/ckeditor_browse/fullscreen/CKEditor:itemcontent/CKEditorFuncNum:[ls_ckeditor_funnum_browse]">[dir_tab_url]/</a>[end]</h2>
+			<ul class="uk-list uk-list-disc uk-list-collapse">
-			
-			<ul>
 			[for dir_childs_tab "with_parent"]
 				<li>
 				[if dir_childs_is_parent]
 				[# make sure the name of the textarea in fun_ckeditor.html is called: itemcontent]
 				[# is it needed?]
-					<a href="[doc_base_url][dir_parent]ls/ckeditor_browse/fullscreen/CKEditor:itemcontent/CKEditorFuncNum:[ls_ckeditor_funnum_browse]">../</a>
+					<a href="[doc_base_url][dir_parent]ls/ckeditor_browse/CKEditor:itemcontent/CKEditorFuncNum:[ls_ckeditor_funnum_browse]">../</a>
 				[else]
-					<a href="[doc_base_url][dir][dir_childs_tab_url]/ls/ckeditor_browse/fullscreen/CKEditor:itemcontent/CKEditorFuncNum:[ls_ckeditor_funnum_browse]">[dir_childs_tab_url]/</a>
+					<a href="[doc_base_url][dir][dir_childs_tab_url]/ls/ckeditor_browse/CKEditor:itemcontent/CKEditorFuncNum:[ls_ckeditor_funnum_browse]">[dir_childs_tab_url]/</a>
 				[end]
 				</li>
 			[end]
@@ -27,15 +43,14 @@
 
 	</div>
 	
-	<div id="winix_ls_browse_rightcolumn">
+	<div class="">
 		
 		[if item_tab]
 
-			<h2>{ls_pictures_in_dir} [dir]</h2>
+			<ul class="uk-list uk-list-collapse" data-uk-grid>
-			<ul>
 			
 			[for item_tab]
-				<li><a href="javascript:select('[item_tab_link]')"><img src="[item_tab_link]/-/thumb" alt="[item_tab_subject]" height="120"></a></li>
+				<li><a href="javascript:select('[item_tab_link]')"><img data-src="[item_tab_link]/-/thumb" alt="[item_tab_subject]" height="120" data-uk-img></a></li>
 			[end]
 			
 			</ul>
@@ -44,11 +59,12 @@
 		[end]
 
 	</div>
-	
+	</div>
 [else]
 
 	<h1>{ls_header}</h1>
 
+	[# !! 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]
 
-				<table>
+				<table class="uk-table uk-table-divider uk-table-small uk-table-justify uk-table-responsive">
+				<tr>
+					<th>{ls_type}</th>
+					<th>{ls_permissions}</th>
+					<th>{ls_owner}</th>
+					<th>{ls_group}</th>
+					<th>{ls_name}</th>
+				</tr>
+				
 				[for dir_childs_tab]
 					<tr>
 						<td>d</td>
@@ -95,7 +119,7 @@
 			[dir_childs_tab "with_parent"]
 
 			[if dir_childs_tab]
-				<ul>
+				<ul class="uk-list uk-list-disc uk-list-collapse">
 				[for dir_childs_tab]
 					<li>
 					[if dir_childs_is_parent]
@@ -107,9 +131,9 @@
 				[end]
 				</ul>
 			[end]
-					
+			[# !! IMPROVE ME those two lists (above and below) can be combined together
 			[if item_tab]
-				<ul>
+				<ul class="uk-list uk-list-disc uk-list-collapse">
 					[for item_tab]
 						<li><a href="[doc_base_url][dir][item_tab_url]">[item_tab_url]</a></li>
 					[end]
@@ -120,7 +144,8 @@
 
 	[else]
 	
-		<ul>
+		[!! improve me: may it would be better to not use a list here?]
+		<ul class="uk-list uk-list-disc uk-list-collapse">
 			<li><a href="[doc_base_url][dir][item_url]">[item_url]</a></li>
 		</ul>
 

winixd/html/fun_meta.html

@@ -1,62 +1,52 @@
 <div class="winix">
 
+<h1>
 	[if winix_function_param_is "a"]
-	<h1>{meta_admin_header}</h1>
+		{meta_admin_header}
+	[else]
+		{meta_header}
+	[end]
+</h1>
 
+
+<form class="uk-form-stacked" method="post" action="[doc_base_url][dir][if item_is][item_url]/[end]meta[if winix_function_param_is "a"]/a[end]">
+
+	<div class="uk-margin">
+		<label class="uk-form-label" for="winix_meta_textarea">
+		[if winix_function_param_is "a"]
 			[if item_is]
-		<form method="post" action="[doc_base_url][dir][item_url]/meta/a">
+				{meta_admin_for_page}:
-
-			<textarea class="multitext" rows="30" cols="60" name="itemmeta">[item_admin_meta_str]</textarea>
-			<input class="submit" type="submit" value="{change}">
-
-			[if winix_function_param_is "postredirect"]
-				<input type="hidden" name="postredirect" value="[winix_function_param_value "postredirect"]">
-			[end]
-
-		</form>
 			[else]
-		<form method="post" action="[doc_base_url][dir]meta/a">
+				{meta_admin_for_dir}:
-
-			<textarea class="multitext" rows="30" cols="60" name="itemmeta">[dir_last_admin_meta_str]</textarea>
-			<input class="submit" type="submit" value="{change}">
-
-			[if winix_function_param_is "postredirect"]
-				<input type="hidden" name="postredirect" value="[winix_function_param_value "postredirect"]">
 			[end]
-
-		</form>
-	[end]
-
-
 		[else]
-
-	<h1>{meta_header}</h1>
-
 			[if item_is]
-		<form method="post" action="[doc_base_url][dir][item_url]/meta">
+				{meta_for_page}:
-
-			<textarea class="multitext" rows="30" cols="60" name="itemmeta">[item_meta_str]</textarea>
-			<input class="submit" type="submit" value="{change}">
-
-			[if winix_function_param_is "postredirect"]
-				<input type="hidden" name="postredirect" value="[winix_function_param_value "postredirect"]">
-			[end]
-
-		</form>
 			[else]
-		<form method="post" action="[doc_base_url][dir]meta">
+				{meta_for_dir}:
+			[end]
+		[end]
 
-			<textarea class="multitext" rows="30" cols="60" name="itemmeta">[dir_last_meta_str]</textarea>
+		[# !! IMPROVE ME give some message if there is a root directory]
-			<input class="submit" type="submit" value="{change}">
+		[item_url]
+
+		</label>
+
+		<div class="uk-form-controls">
+			<textarea class="uk-textarea" id="winix_meta_textarea" rows="20" name="itemmeta">[if winix_function_param_is "a"][if item_is][item_admin_meta_str][else][dir_last_admin_meta_str][end][else][if item_is][item_meta_str][else][dir_last_meta_str][end][end]</textarea>
+		</div>
+	</div>
+
+	<div class="uk-margin">
+		<input class="uk-button uk-button-primary" type="submit" value="{change}">
+	</div>
 
 	[if winix_function_param_is "postredirect"]
 		<input type="hidden" name="postredirect" value="[winix_function_param_value "postredirect"]">
 	[end]
 
 </form>
-	[end]
 
-[end]
 
 
 </div>

winixd/html/fun_mkdir.html

@@ -2,22 +2,33 @@
 
 <h1>{mkdir_header}</h1>
 
+<form class="uk-form-stacked uk-width-1-2@s" method="post" action="[doc_base_url][dir]mkdir">
+
+	<div class="uk-margin">
+		<label class="uk-form-label" for="winix_title">{title}</label>
+
+		<div class="uk-form-controls">
+			<input class="uk-input" id="winix_title" type="text" name="subject" value="">
+		</div>
+	</div>
 
 
-<form id="additem" method="post" action="[doc_base_url][dir]mkdir">
+	<div class="uk-margin">
-<fieldset>
+		<label class="uk-form-label" for="winix_url">{suggested_url}</label>
-	<legend>{mkdir_form_legend}</legend>
+
-	<p class="withnext">{title}</p>
+		<div class="uk-form-controls">
-	<input class="edit" type="text" name="subject" value="">
+			<input class="uk-input" id="winix_url" type="text" name="url" value="">
-	<p class="withnext">{suggested_url}</p>
+		</div>
-	<input class="edit" type="text" name="url" value="">
+	</div>
 
 	[if winix_function_param_is "postredirect"]
 		<input type="hidden" name="postredirect" value="[winix_function_param_value "postredirect"]">
 	[end]
 
-	<input class="submit" type="submit" value="{add}">
+	<div class="uk-margin">
-</fieldset>
+		<input class="uk-button uk-button-primary" type="submit" value="{add}">
+	</div>
+
 </form>
 
 </div>

winixd/html/fun_mount.html

@@ -3,9 +3,12 @@
 <h1>{mount_header}</h1>
 
 
-<h2>{mount_current}:</h2>
+<h2>{mount_current}</h2>
+
+
+
+<table class="uk-table uk-table-divider uk-table-small uk-table-responsive">
 
-<table class="winix_mountpoints">
 	<tr>
 	<th>{mount_type}</th>
 	<th>{mount_dir}</th>
@@ -25,10 +28,11 @@
 
 
 
-<h2>{mount_table}:</h2>
+<h2>{mount_table}</h2>
 
 [if mount_tab]
-<table class="winix_mountpoints">
+<table class="uk-table uk-table-divider uk-table-small uk-table-responsive">
+
 
 	<tr>
 	<th>{mount_type}</th>

winixd/html/fun_mv.html

@@ -2,30 +2,36 @@
 
 <h1>{mv_header}</h1>
 
-
-<form id="additem" method="post" action="[doc_base_url][dir][if item_is][item_url]/[end]mv">
-<fieldset>
-	<legend>{mv_form_legend}</legend>
-	
 <p>
-	[if item_is]{mv_page} [item_url]:[else]{mv_dir} [dir][end]
+	[if item_is]{mv_page} [item_url]:[else]{mv_dir} [dir_without_slash][end]
 </p>
 
 
-	<p class="withnext">{suggested_url}</p>
+<form class="uk-form-stacked uk-width-1-2@s" method="post" action="[doc_base_url][dir][if item_is][item_url]/[end]mv">
-	<input class="edit" type="text" name="dst_path" value="[dir_without_slash][if item_is]/[item_url][end]">
+
+	<div class="uk-margin">
+		<label class="uk-form-label" for="winix_url">{suggested_url}</label>
+
+		<div class="uk-form-controls">
+			<input class="uk-input" id="winix_url" type="text" name="dst_path" value="[dir_without_slash][if item_is]/[item_url][end]">
+		</div>
+	</div>
 	
 	
 	[if not item_is]
-	<label><input type="checkbox" name="c"[if winix_function_param_is "c"]checked="checked"[end]>{mv_only_content}</label>
+	<div class="uk-margin">
+		<label><input class="uk-checkbox uk-margin-small-right" type="checkbox" name="c"[if winix_function_param_is "c"] checked="checked"[end]>{mv_only_content}</label>
+	</div>
 	[end]
 
 	[if winix_function_param_is "postredirect"]
 		<input type="hidden" name="postredirect" value="[winix_function_param_value "postredirect"]">
 	[end]
 	
-	<input class="submit" type="submit" value="{move}">
+	<div class="uk-margin">
-</fieldset>
+		<input class="uk-button uk-button-primary" type="submit" value="{move}">
+	</div>
+
 </form>
 
 </div>

winixd/html/fun_nicedit.html

@@ -3,51 +3,57 @@
 [if item_is]<h1>{edit}</h1>[else]<h1>{add}</h1>[end]
 
 
-<form id="additem" method="post" action="[doc_base_url][dir][if item_is][item_url]/[end]nicedit">
+<form class="uk-form-stacked" method="post" action="[doc_base_url][dir][if item_is][item_url]/[end]nicedit">
-<fieldset>
-	<legend>{form_emacs_legend}</legend>
 
-	[if mount_type_is "cms"]
+	[if one [mount_type_is "cms"] [any [mount_type_is "thread"] [thread_mount_arg_is "subject"]]]
-		<p class="withnext">{title}:</p>
+	<div class="uk-margin">
-		<input class="edit" type="text" name="subject" value="[item_subject]">
+		<label class="uk-form-label" for="winix_title_id">{title}</label>
+		<div class="uk-form-controls">
+			<input class="uk-input" id="winix_title_id" type="text" name="subject" value="[item_subject]" [if not item_is]autofocus [end]>
+		</div>
+	</div>
 
-		<p class="withnext">{suggested_url}:</p>
+	<div class="uk-margin">
-		<input class="edit" type="text" name="url" value="[item_url]">
+		<label class="uk-form-label" for="winix_url_id">{suggested_url}</label>
+		<div class="uk-form-controls">
+			<input class="uk-input" id="winix_url_id" type="text" name="url" value="[item_url]">
+		</div>
+	</div>
 	[end]
 
-	[if any [mount_type_is "thread"] [thread_mount_arg_is "subject"]]
+	<div class="uk-margin">
-		<p class="withnext">{title}:</p>
+		[if mount_type_is "cms"]<label class="uk-form-label" for="winix_content_id">{form_emacs_content_cms}</label>[end]
-		<input class="edit" type="text" name="subject" value="[item_subject]">
+		[if mount_type_is "thread"]<label class="uk-form-label" for="winix_content_id">{form_emacs_content_thread}</label>[end]
+		[if mount_type_is "ticket"]<label class="uk-form-label" for="winix_content_id">{form_emacs_content_ticket}</label>[end]
 	
-		<p class="withnext">{suggested_url}:</p>
+		<div class="uk-form-controls">
-		<input class="edit" type="text" name="url" value="[item_url]">
+			<textarea class="uk-textarea" rows="[if mount_type_is "cms"]30[else]10[end]" cols="60" name="itemcontent" id="winix_nicedit">[item_content]</textarea>
-	[end]
+		</div>
-	
+	</div>
-	[if mount_type_is "cms"]<p class="withnext">{form_emacs_content_cms}</p>[end]
-	[if mount_type_is "thread"]<p class="withnext">{form_emacs_content_thread}</p>[end]
-	[if mount_type_is "ticket"]<p class="withnext">{form_emacs_content_ticket}</p>[end]
-	
-	<textarea class="multitext" rows="[if mount_type_is "cms"]30[else]10[end]" cols="60" name="itemcontent" id="nicarea">[item_content]</textarea>
 	
+	<div class="uk-form-controls">
 		<input type="hidden" name="contenttype" value="2">
-	
+	</div>
 	
 	<script type="text/javascript">
-	new nicEditor(\{fullPanel:true, iconsPath:'[doc_base_url_common]/nicedit/nicEditorIcons.gif', uploadURI:'[doc_base_url][dir]upload/' \}).panelInstance('nicarea');
+		new nicEditor(\{fullPanel:true, iconsPath:'[doc_base_url_common]/nicedit/0.9_r25/nicEditorIcons.gif', uploadURI:'[doc_base_url][dir]upload/' \}).panelInstance('winix_nicedit');
 	</script>
 	
-	[if winix_function_param_is "full"]
-
-	[else]
-
-	[end]
 	
 	[if not user_logged]
-		<p class="withnext">{nick}:</p>
+		<div class="uk-margin">
-		<input class="edit" type="text" name="guestname" value="[item_guest_name]">
+			<label class="uk-form-label" for="winix_nick_id">{nick}</label>
+			<div class="uk-form-controls">
+				<input class="uk-input" id="winix_nick_id" type="text" name="guestname" value="[item_guest_name]">
+			</div>
+		</div>
 
-		<p class="withnext">{rebus_how_is_it} [rebus_question]?</p>
+		<div class="uk-margin">
-		<input class="edit" type="text" name="rebus">
+			<label class="uk-form-label" for="winix_rebus_id">{rebus_how_is_it} [rebus_question]?</label>
+			<div class="uk-form-controls">
+				<input class="uk-input" id="winix_rebus_id" type="text" name="rebus">
+			</div>
+		</div>
 		
 		[include "antispam.html"]
 	[end]
@@ -56,8 +62,10 @@
 		<input type="hidden" name="postredirect" value="[winix_function_param_value "postredirect"]">
 	[end]
 	
-	<input class="submit" type="submit" value="[if item_is]{change}[else]{add}[end]">
+	<div class="uk-margin">
-</fieldset>
+		<input class="uk-button uk-button-primary" type="submit" value="[if item_is]{change}[else]{add}[end]">
+	</div>
+
 </form>
 
 

winixd/html/fun_passwd.html

@@ -5,63 +5,92 @@
 
 [if winix_function_param_is "resetpassword"]
 
-	<form id="additem" method="post" action="[doc_base_url][dir]passwd/resetpassword">
+	<form class="uk-form-stacked" method="post" action="[doc_base_url][dir]passwd/resetpassword">
-	<fieldset>
-		<legend>{passwd_form_legend}</legend>
 
+		<div class="uk-margin">
 			<input type="hidden" name="login" value="[passwd_resetpass_login]">
 			<input type="hidden" name="code" value="[passwd_resetpass_code]">
 
-		<p class="withnext">{passwd_new_password}:</p>
+			<div class="uk-margin">
-		<input class="edit" type="password" name="passwordnew" value="">
+				<label class="uk-form-label" for="winix_password_new">{passwd_new_password}</label>
 
-		<p class="withnext">{passwd_confirm_new_password}:</p>
+				<div class="uk-form-controls">
-		<input class="edit" type="password" name="passwordconfirm" value="">
+					<input class="uk-input" id="winix_password_new" type="password" name="passwordnew" value="">
+				</div>
+			</div>
 
-		<input class="submit" type="submit" value="{passwd_submit}">
+			<div class="uk-margin">
+				<label class="uk-form-label" for="winix_password_confirm">{passwd_confirm_new_password}</label>
+
+				<div class="uk-form-controls">
+					<input class="uk-input" id="winix_password_confirm" type="password" name="passwordconfirm" value="">
+				</div>
+			</div>
+
+			<div class="uk-margin">
+				<div class="uk-form-controls">
+					<input class="uk-button uk-button-primary" type="submit" value="{passwd_submit}">
+				</div>
+			</div>
 
 			[if winix_function_param_is "postredirect"]
 				<input type="hidden" name="postredirect" value="[winix_function_param_value "postredirect"]">
 			[end]
 
-	</fieldset>
+		</div>
 	</form>
 
 [else]
 
-	<form method="post" action="[doc_base_url][dir]passwd">
+	<form class="uk-form-stacked" method="post" action="[doc_base_url][dir]passwd">
 
 		[if user_super_user]
-			<div class="winix_input_a">
+			<div class="uk-margin">
-				<label for="winix_users_id">{passwd_login}:</label>
+				<label class="uk-form-label" for="winix_user_login">{passwd_login}</label>
-				<select name="login" id="winix_users_id">
+
+				<div class="uk-form-controls">
+					<select class="uk-select" id="winix_user_login" name="login">
 					[for user_tab]
 						<option [if user_tab_is_current]selected[end]>[user_tab_name]</option>
 					[end]
-			</div>
 					</select>
+				</div>
+			</div>
 		[else]
-			<div class="winix_input_a">
+			<div class="uk-margin">
-				<label for="winix_current_pass_id">{passwd_current_password}:</label>
+				<label class="uk-form-label" for="winix_current_password">{passwd_current_password}:</label>
-				<input id="winix_current_pass_id" type="password" name="passwordcur" value="">
+
+				<div class="uk-form-controls">
+					<input class="uk-input" id="winix_current_password" type="password" name="passwordcur" value="">
+				</div>
 			</div>
 		[end]
 		
-		<div class="winix_input_a">
+		<div class="uk-margin">
-			<label for="winix_pass_new_id">{passwd_new_password}:</label>
+			<label class="uk-form-label" for="winix_new_password">{passwd_new_password}:</label>
-			<input id="winix_pass_new_id" type="password" name="passwordnew" value="">
+
+			<div class="uk-form-controls">
+				<input class="uk-input" id="winix_new_password" type="password" name="passwordnew" value="">
+			</div>
 		</div>
 
-		<div class="winix_input_a">
+		<div class="uk-margin">
-			<label for="winix_pass_new_confirm_id">{passwd_confirm_new_password}:</label>
+			<label class="uk-form-label" for="winix_new_password_confirm">{passwd_confirm_new_password}:</label>
-			<input id="winix_pass_new_confirm_id" type="password" name="passwordconfirm" value="">
+
+			<div class="uk-form-controls">
+				<input class="uk-input" id="winix_new_password_confirm" type="password" name="passwordconfirm" value="">
+			</div>
 		</div>
 
 		[if winix_function_param_is "postredirect"]
 			<input type="hidden" name="postredirect" value="[winix_function_param_value "postredirect"]">
 		[end]
 
-		<input type="submit" value="{passwd_submit}">
+		<div class="uk-margin">
+			<div class="uk-form-controls">
+				<input class="uk-button uk-button-primary" type="submit" value="{passwd_submit}">
+			</div>
+		</div>
 
 	</form>
 

winixd/html/fun_priv.html

@@ -2,126 +2,172 @@
 
 [# this template is for following functions: priv, chmod, chown]
 
-
 <h1>{priv_header}</h1>
 
+[if winix_function_param_is "r"]
+	<p>{priv_change_in_dir}: [dir]</p>
+[end]
 
 
 [if not [winix_function_param_is "r"]]
 
-<form id="additem" method="post" action="[doc_base_url][dir][if item_is][item_url]/[end][winix_function]">
+<form class="uk-form-stacked uk-width-1-2@s" method="post" action="[doc_base_url][dir][if item_is][item_url]/[end][winix_function]">
-<fieldset>
-	<legend>{priv_form_legend}</legend>
-	
-	<table class="withoutborder">
 	
 	[if priv_show_form_chown]
 
-		<tr><th>{user}:</th><td>
+		<div class="uk-margin">
-		<select name="user" class="users">
+			<label class="uk-form-label" for="winix_user_select">{user}</label>
+
+			<div class="uk-form-controls">
+				<select class="uk-select" id="winix_user_select" name="user">
 				[for priv_user_tab]
 					<option[if priv_user_tab_isdefault] selected[end]>[priv_user_tab_name]</option>
 				[end]
 				</select>
-		</td></tr>
+			</div>
+		</div>
 
-		<tr><th>{group}: </th><td>
+		
-		<select name="group" class="groups">
+		<div class="uk-margin">
+			<label class="uk-form-label" for="winix_group_select">{group}</label>
+
+			<div class="uk-form-controls">
+				<select class="uk-select" id="winix_group_select" name="group">
 				[for priv_group_tab]
 					<option[if priv_group_tab_isdefault] selected[end]>[priv_group_tab_name]</option>
 				[end]
 				</select>
-		</td></tr>
+			</div>
+		</div>
 
 	[end]
 		
 	[if priv_show_form_chmod]
-		<tr><th>{permissions}:</th><td><input class="privileges" type="text" name="privileges" value="[priv_privileges]"></td></tr>
+		<div class="uk-margin">
+			<label class="uk-form-label" for="winix_user_permissions">{permissions}</label>
+
+			<div class="uk-form-controls">
+				<input class="uk-input" id="winix_user_permissions" type="text" name="privileges" value="[priv_privileges]">
+			</div>
+		</div>
 	[end]
 		
-	</table>
+
 
 	[if winix_function_param_is "postredirect"]
 		<input type="hidden" name="postredirect" value="[winix_function_param_value "postredirect"]">
 	[end]
 	
-	<input class="submit" type="submit" value="{change}">
+	<div class="uk-margin">
-</fieldset>
+		<input class="uk-button uk-button-primary" type="submit" value="{change}">
+	</div>
+
 </form>
 
 [else]
 
-<form id="additem" method="post" action="[doc_base_url][dir][winix_function]/r">
+<form class="uk-form-stacked uk-width-1-2@s" method="post" action="[doc_base_url][dir][winix_function]/r">
-<fieldset>
-	<legend>{priv_form_legend}</legend>
-	<p class="withnext">{priv_change_in_dir}: [dir]</p>
 	
-	<h2>{priv_for_all_files}:</h2>
+	<h2>{priv_for_all_files}</h2>
-	<table class="withoutborder">
 	
 	[if priv_show_form_chown]
-		<tr><th>{user}:</th><td>
+		<div class="uk-margin">
-		<select name="userfile" class="users">
+			<label class="uk-form-label" for="winix_files_user_select">{user}</label>
+
+			<div class="uk-form-controls">
+				<select class="uk-select" id="winix_files_user_select" name="userfile">
 				[for priv_user_tab]
 					<option[if priv_user_tab_isdefault] selected[end]>[priv_user_tab_name]</option>
 				[end]
 				</select>
-		</td></tr>
+			</div>
+		</div>
 
-		<tr><th>{group}: </th><td>
+		
-		<select name="groupfile" class="groups">
+		<div class="uk-margin">
+			<label class="uk-form-label" for="winix_files_group_select">{group}</label>
+
+			<div class="uk-form-controls">
+				<select class="uk-select" id="winix_files_group_select" name="groupfile">
 				[for priv_group_tab]
 					<option[if priv_group_tab_isdefault] selected[end]>[priv_group_tab_name]</option>
 				[end]
 				</select>
-		</td></tr>
+			</div>
+		</div>
 	[end]
 	
 	[if priv_show_form_chmod]
-		<tr><th>{permissions}:</th><td><input class="privileges" type="text" name="privilegesfile" value="[priv_privileges_for_files]"></td></tr>
+		<div class="uk-margin">
+			<label class="uk-form-label" for="winix_files_permissions">{permissions}</label>
+
+			<div class="uk-form-controls">
+				<input class="uk-input" id="winix_files_permissions" type="text" name="privilegesfile" value="[priv_privileges_for_files]">
+			</div>
+		</div>
 	[end]
 	
-	</table>
 	
 
-	<h2>{priv_for_all_dirs}:</h2>
+	<h2>{priv_for_all_dirs}</h2>
-	<table class="withoutborder">
 	
 	[if priv_show_form_chown]
-		<tr><th>{user}:</th><td>
+		<div class="uk-margin">
-		<select name="userdir" class="users">
+			<label class="uk-form-label" for="winix_dirs_user_select">{user}</label>
+
+			<div class="uk-form-controls">
+				<select class="uk-select" id="winix_dirs_user_select" name="userdir">
 				[for priv_user_tab]
 					<option[if priv_user_tab_isdefault] selected[end]>[priv_user_tab_name]</option>
 				[end]
 				</select>
-		</td></tr>
+			</div>
+		</div>
 
-		<tr><th>{group}: </th><td>
+		
-		<select name="groupdir" class="groups">
+		<div class="uk-margin">
+			<label class="uk-form-label" for="winix_dirs_group_select">{group}</label>
+
+			<div class="uk-form-controls">
+				<select class="uk-select" id="winix_dirs_group_select" name="groupdir">
 				[for priv_group_tab]
 					<option[if priv_group_tab_isdefault] selected[end]>[priv_group_tab_name]</option>
 				[end]
 				</select>
-		</td></tr>
+			</div>
+		</div>
 	[end]
 	
 	[if priv_show_form_chmod]
-		<tr><th>{permissions}:</th><td><input class="privileges" type="text" name="privilegesdir" value="[priv_privileges_for_dirs]"></td></tr>
+		<div class="uk-margin">
+			<label class="uk-form-label" for="winix_dirs_permissions">{permissions}</label>
+
+			<div class="uk-form-controls">
+				<input class="uk-input" id="winix_dirs_permissions" type="text" name="privilegesdir" value="[priv_privileges_for_dirs]">
+			</div>
+		</div>
 	[end]
 	
 
-	</table>
+	<div class="uk-margin-medium-top">
+		<div class="uk-form-controls">
+			<label><input class="uk-checkbox uk-margin-small-right" type="checkbox" name="changesubdirs">{priv_change_all}</label>
+		</div>
 
-	<label><input class="check" type="checkbox" name="changesubdirs">{priv_change_all}</label>
+		<div class="uk-form-controls uk-margin-small-top">
-	<label><input class="check" type="checkbox" name="changecurrentdir">{priv_change_current_dir}: [dir_without_slash]</label>
+			[# !! improve me: for root directory dir_without_slash returns nothing, may would be better to show a slash?]
+			<label><input class="uk-checkbox uk-margin-small-right" type="checkbox" name="changecurrentdir">{priv_change_current_dir}: [dir_without_slash]</label>
+		</div>
+	</div>
 
 	[if winix_function_param_is "postredirect"]
 		<input type="hidden" name="postredirect" value="[winix_function_param_value "postredirect"]">
 	[end]
 
-	<input class="submit" type="submit" value="{change}">
+	<div class="uk-margin-medium-top">
+		<input class="uk-button uk-button-primary" type="submit" value="{change}">
+	</div>
 
-</fieldset>
 </form>
 
 [end]

winixd/html/fun_rm.html

@@ -2,10 +2,6 @@
 
 <h1>{rm_header}</h1>
 
-<form id="additem" method="post" action="[doc_base_url][dir][if item_is][item_url]/[end]rm[if not item_is]/r[end]">
-<fieldset>
-	<legend>{rm_form_legend}</legend>
-	
 <p>
 [if item_is]
 
@@ -18,6 +14,7 @@
 [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]
@@ -27,19 +24,22 @@
 </p>
 
 
+
+<form class="uk-form-stacked" method="post" action="[doc_base_url][dir][if item_is][item_url]/[end]rm[if not item_is]/r[end]">
+	
 	[if not item_is]
-	<p>
+		<label><input class="uk-checkbox uk-margin-small-right" type="checkbox" name="c" [if winix_function_param_is "c"]checked="checked"[end]>{rm_only_content}</label>
-	<label><input type="checkbox" name="c" [if winix_function_param_is "c"]checked="checked"[end]>{rm_only_content}</label>
-	</p>
 	[end]
 
 	[if winix_function_param_is "postredirect"]
 		<input type="hidden" name="postredirect" value="[winix_function_param_value "postredirect"]">
 	[end]
 	
-	<input class="submit" type="submit" value="{rm_submit}">
+	<div class="uk-margin">
+		<input class="uk-button uk-button-primary" type="submit" value="{rm_submit}">
+	</div>
+	
 
-</fieldset>
 </form>
 
 </div>

winixd/html/fun_seo.html

@@ -3,28 +3,36 @@
 <h1>{seo_title}</h1>
 
 
-<form method="post" action="[doc_base_url][dir][if item_is][item_url]/[end]seo">
+<form class="uk-form-stacked" method="post" action="[doc_base_url][dir][if item_is][item_url]/[end]seo">
 	
-	<div class="winix_input_a">
+	<div class="uk-margin">
-	<label for="winix_title_id">{title}:</label>
+		<label class="uk-form-label" for="winix_title_id">{title}</label>
-	<input id="winix_title_id" type="text" name="subject" value="[item_subject]" autofocus>
+		<div class="uk-form-controls">
+			<input class="uk-input" id="winix_title_id" type="text" name="subject" value="[item_subject]" autofocus>
+		</div>
 	</div>
 
-	<div class="winix_input_a">
+	<div class="uk-margin">
-	<label for="winix_description_id">{seo_description}:</label>
+		<label class="uk-form-label" for="winix_description_id">{seo_description}</label>
-	<input id="winix_description_id" type="text" name="description" value="[item_meta "seo" "description"]">
+		<div class="uk-form-controls">
+			<input class="uk-input" id="winix_description_id" type="text" name="description" value="[item_meta "seo" "description"]">
+		</div>
 	</div>
 
-	<div class="winix_input_a">
+	<div class="uk-margin">
-	<label for="winix_keywords_id">{seo_keywords}:</label>
+		<label class="uk-form-label" for="winix_keywords_id">{seo_keywords}</label>
-	<input id="winix_keywords_id" type="text" name="keywords" value="[item_meta "seo" "keywords"]">
+		<div class="uk-form-controls">
+			<input class="uk-input" id="winix_keywords_id" type="text" name="keywords" value="[item_meta "seo" "keywords"]">
+		</div>
 	</div>
 
 	[if winix_function_param_is "postredirect"]
 		<input type="hidden" name="postredirect" value="[winix_function_param_value "postredirect"]">
 	[end]
 	
-	<input type="submit" value="{change}">
+	<div class="uk-margin">
+		<input class="uk-button uk-button-primary" type="submit" value="{change}">
+	</div>
 
 </form>
 

winixd/html/fun_sort.html

@@ -5,16 +5,18 @@
 
 [if item_is]
 
+	<form class="uk-form-stacked" id="winix_sortable_form" action="[doc_base_url][dir][item_url]/sort" method="post">
 
-
+		<div class="uk-margin">
-	<form class="winix_sortable_form" action="[doc_base_url][dir][item_url]/sort" method="post">
+			<label class="uk-form-label" for="winix_sort_index">{sort_current_sortindex}</label>
-
+			<div class="uk-form-controls">
-		<div class="winix_input_b">
+				<input class="uk-input" id="winix_sort_index" type="text" name="sortindex" value="[item_sort]">
-			<label for="">{sort_current_sortindex}:</p>
+			</div>
-			<input type="text" name="sortindex" value="[item_sort]">
 		</div>
 
-		<input type="submit" value="{change}">
+		<div class="uk-margin">
+			<input class="uk-button uk-button-primary" type="submit" value="{change}">
+		</div>
 
 		[if winix_function_param_is "postredirect"]
 			<input type="hidden" name="postredirect" value="[winix_function_param_value "postredirect"]">
@@ -24,19 +26,25 @@
 
 [else]
 
-	<p>{sort_info_multi}</p>
+	<p>
+		[if winix_function_param_is "index"]
+			{sort_info_multi_index}
+		[else]
+			{sort_info_multi}
+		[end]
+	</p>
 
 	[if item_tab]
-	<form class="winix_sortable_form" action="[doc_base_url][dir]sort" method="post">
+	<form class="uk-form-stacked" id="winix_sortable_form" action="[doc_base_url][dir]sort" method="post">
-		<ul id="winix_sort_items">
+		<ul class="uk-list" id="winix_sort_items" data-uk-sortable>
 		[for item_tab]
-			<li id="winix_sort_item_[item_tab_index]">
+			<li class="uk-tile uk-tile-muted uk-padding-small uk-padding-remove-top uk-padding-remove-bottom" id="winix_sort_item_[item_tab_index]" style="cursor: move;">
-			<input type="text" name="sort[item_tab_id]" value="[item_tab_sort]">
+				<input class="[if not [winix_function_param_is "index"]]uk-hidden [end]uk-input uk-width-1-6 uk-margin-small-right" type="text" name="sort[item_tab_id]" value="[item_tab_sort]">
 
 				[# is it correct? may give this 'if' only to /-/thumb param? ]
 				[if item_tab_has_thumb]<img src="[item_tab_link]/-/thumb" alt="[item_tab_subject]">[end]
 
-			[item_tab_url] [if not [is item_tab_subject ""]]<span class="winix_sort_item_title">({sort_item_subject}: [item_tab_subject])</span>[end]
+				[item_tab_url][if item_tab_type_is_dir]/[end] [if not [is item_tab_subject ""]]<span class="uk-text-meta">({sort_item_subject}: [item_tab_subject])</span>[end]
 			</li>
 		[end]
 		</ul>
@@ -45,7 +53,16 @@
 			<input type="hidden" name="postredirect" value="[winix_function_param_value "postredirect"]">
 		[end]
 
-		<input type="submit" value="{change}">
+		[if winix_function_param_is "index"]
+			<div class="uk-margin">
+				<button class="uk-button uk-button-default auk-button-primary" type="button" id="winix_sort_renumerate">renumeruj</button>
+			</div>
+		[end]
+
+		<div class="uk-margin">
+			<input class="uk-button uk-button-primary" type="submit" value="{change}">
+		</div>
+
 	</form>
 	[end]
 

winixd/html/fun_template.html

@@ -44,13 +44,14 @@
 
 
 
-<form id="additem" method="post" action="[doc_base_url][dir][if item_is][item_url]/[end]template">
+<form class="uk-form-stacked uk-width-1-2@s" method="post" action="[doc_base_url][dir][if item_is][item_url]/[end]template">
-<fieldset>
-	<legend>{template_form_legend}</legend>
 
-	{template_form_info}:
 
-	<select name="template" class="template">
+	<div class="uk-margin">
+		<label class="uk-form-label" for="winix_select_template">{template_form_info}</label>
+
+		<div class="uk-form-controls">
+			<select class="uk-select" id="winix_select_template" name="template">
 
 			[# the first should be an empty string (value="") which means: a first template from the mount point]
 			<option value="-1">({template_form_from_mount_point})</option>
@@ -59,13 +60,17 @@
 				<option value="[template_tab_index]"[if template_tab_isdefault] selected[end]>[template_tab_file_name]</option>
 			[end]
 			</select>
+		</div>
+	</div>
 
 	[if winix_function_param_is "postredirect"]
 		<input type="hidden" name="postredirect" value="[winix_function_param_value "postredirect"]">
 	[end]
 	
-	<input class="submit" type="submit" value="{change}">
+	<div class="uk-margin">
-</fieldset>
+		<input class="uk-button uk-button-primary" type="submit" value="{change}">
+	</div>
+
 </form>
 
 

winixd/html/fun_timezone.html

@@ -9,25 +9,26 @@
 [end]
 
 
-<form id="additem" method="post" action="[doc_base_url][dir][if item_is][item_url]/[end]timezone">
+<form class="uk-form-stacked" method="post" action="[doc_base_url][dir][if item_is][item_url]/[end]timezone">
-<fieldset>
+	<div class="uk-margin">
-	<legend>{timezone_form_legend}</legend>
+		<label class="uk-form-label" for="winix_timezone_select">{timezone_select}:</label>
 
-	<p class="withnext">{timezone_select}:</p>
+		<div class="uk-form-controls">
-	
+			<select id="winix_timezone_select" name="timezoneid" class="uk-select">
-	[# add to styles]
-	<select name="timezoneid" style="width: 250px;">
 			[for winix_tz_tab]
 				<option value="[winix_tz_tab_id]" [if cmp user_time_zone_id winix_tz_tab_id]selected="selected"[end]>UTC[winix_tz_tab_offset_hour_min] [winix_tz_tab_name]</option>
 			[end]
 			</select>
+		</div>
 
 		[if winix_function_param_is "postredirect"]
 			<input type="hidden" name="postredirect" value="[winix_function_param_value "postredirect"]">
 		[end]
 	
-	<input class="submit" type="submit" value="{change}">
+		<div class="uk-margin uk-form-controls">
-</fieldset>
+			<input class="uk-button uk-button-primary" type="submit" value="{change}">
+		</div>
+	</div>
 </form>
 
 

winixd/html/fun_tinymce.html

@@ -2,43 +2,52 @@
 
 [if item_is]<h1>{edit}</h1>[else]<h1>{add}</h1>[end]
 
+<form class="uk-form-stacked">
 
+	[if one [mount_type_is "cms"] [any [mount_type_is "thread"] [thread_mount_arg_is "subject"]]]
+	<div class="uk-margin">
+		<label class="uk-form-label" for="winix_title_id">{title}:</label>
+		<div class="uk-form-controls">
+			<input class="uk-input" id="winix_title_id" type="text" name="subject" value="[item_subject]" [if not item_is]autofocus [end]>
+		</div>
+	</div>
 
-<form id="additem" method="post" action="[doc_base_url][dir][if item_is][item_url]/[end]tinymce">
+	<div class="uk-margin">
-<fieldset>
+		<label class="uk-form-label" for="winix_url_id">{suggested_url}:</label>
-	<legend>{form_emacs_legend}</legend>
+		<div class="uk-form-controls">
-	
+			<input class="uk-input" id="winix_url_id" type="text" name="url" value="[item_url]">
-	[if mount_type_is "cms"]
+		</div>
-		<p class="withnext">{title}:</p>
+	</div>
-		<input class="edit" type="text" name="subject" value="[item_subject]">
-		
-		<p class="withnext">{suggested_url}:</p>
-		<input class="edit" type="text" name="url" value="[item_url]">
 	[end]
 	
-	[if any [mount_type_is "thread"] [thread_mount_arg_is "subject"]]
+	<div class="uk-margin">
-		<p class="withnext">{title}:</p>
+	[if mount_type_is "cms"]<label class="uk-form-label" for="winix_content_id">{form_emacs_content_cms}</label>[end]
-		<input class="edit" type="text" name="subject" value="[item_subject]">
+	[if mount_type_is "thread"]<label class="uk-form-label" for="winix_content_id">{form_emacs_content_thread}</label>[end]
+	[if mount_type_is "ticket"]<label class="uk-form-label" for="winix_content_id">{form_emacs_content_ticket}</label>[end]
 	
-		<p class="withnext">{suggested_url}:</p>
+	<div class="uk-form-controls">
-		<input class="edit" type="text" name="url" value="[item_url]">
+		<div style="border-top: 1px solid #dadada; border-bottom: 1px solid #dadada; padding: 0.2em 0 0.2em 0; margin: 1em 0 1em 0;" id="winix-editor-content" data-winix-post-name="itemcontent">[item_print_content]</div>
-	[end]
+	</div>
+	</div>
 	
-
+	<div class="uk-form-controls">
-	[if mount_type_is "cms"]<p class="withnext">{form_emacs_content_cms}</p>[end]
+		<input id="contenttype" type="hidden" name="contenttype" value="2">
-	[if mount_type_is "thread"]<p class="withnext">{form_emacs_content_thread}</p>[end]
+	</div>
-	[if mount_type_is "ticket"]<p class="withnext">{form_emacs_content_ticket}</p>[end]
-	
-	<textarea class="multitext" rows="[if mount_type_is "cms"]30[else]10[end]" cols="60" name="itemcontent">[item_content]</textarea>
-	
-	<input type="hidden" name="contenttype" value="2">
 	
 	[if not user_logged]
-		<p class="withnext">{nick}:</p>
+		<div class="uk-margin">
-		<input class="edit" type="text" name="guestname" value="[item_guest_name]">
+			<label class="uk-form-label" for="winix_nick_id">{nick}:</label>
+			<div class="uk-form-controls">
+				<input class="uk-input" id="winix_nick_id" type="text" name="guestname" value="[item_guest_name]">
+			</div>
+		</div>
 
-		<p class="withnext">{rebus_how_is_it} [rebus_question]?</p>
+		<div class="uk-margin">
-		<input class="edit" type="text" name="rebus">
+			<label class="uk-form-label" for="winix_rebus_id">{rebus_how_is_it} [rebus_question]?</label>
+			<div class="uk-form-controls">
+				<input class="uk-input" id="winix_rebus_id" type="text" name="rebus">
+			</div>
+		</div>
 	
 		[include "antispam.html"]
 	[end]
@@ -47,8 +56,35 @@
 		<input type="hidden" name="postredirect" value="[winix_function_param_value "postredirect"]">
 	[end]
 	
-	<input class="submit" type="submit" value="[if item_is]{change}[else]{add}[end]">
+	<div class="uk-margin">
-</fieldset>
+		<div class="uk-form-controls uk-inline">
+
+			<button class="uk-button uk-button-primary winix_update_button"
+				data-winix-function-path="[doc_base_url][dir][if item_is][item_url]/[end]tinymce"
+				data-winix-content-tinymce-instances="winix-editor-content"
+				data-winix-content-inputs="winix_url_id,winix_title_id,contenttype"
+				data-winix-progressbar-id="winix-editor-progressbar"
+				data-winix-messages-status-success-id="winix-editor-messages-status-success"
+				data-winix-messages-status-error-id="winix-editor-messages-status-error"
+				>
+				{tinymce_update_button}
+			</button>
+
+			<div id="winix-editor-progressbar" class="uk-invisible uk-position-center-right-out uk-margin-small-left">
+				<img src="[doc_base_url_common]/progressbars/progressbar_fading_lines_16x16.gif" alt="{tinymce_update_progressbar_img_alt}">
+			</div>
+
+		</div>
+
+		<div id="winix-editor-messages-status-success" class="winix-editor-messages-status-success">
+		</div>
+
+		<div id="winix-editor-messages-status-error" class="winix-editor-messages-status-error">
+		</div>
+
+	</div>
+
+
 </form>
 
 

winixd/html/fun_upload.html

@@ -19,65 +19,133 @@
     <noscript><input type="hidden" name="redirect" value="https://blueimp.github.io/jQuery-File-Upload/"></noscript>
     [end]
 
-	[# The fileupload-buttonbar contains buttons to add/delete files and start/cancel the upload]
+        <div class="row fileupload-buttonbar">
-    <div class="fileupload-buttonbar">
+          <div class="col-lg-7">
-        <div class="fileupload-buttons">
+            <!-- The fileinput-button span is used to style the file input field as button -->
-            [# The fileinput-button span is used to style the file input field as button]
+            <span class="btn btn-success fileinput-button">
-            <span class="fileinput-button">
+              <i class="glyphicon glyphicon-plus"></i>
               <span>{upload_button_add_files}</span>
-                <input type="file" name="files\[\]" multiple>
+              <input type="file" name="files\[\]" multiple />
             </span>
-            <button type="submit" class="start">{upload_button_start_upload}</button>
+            <button type="submit" class="btn btn-primary start">
-            <button type="reset" class="cancel">{upload_button_cancel_upload}</button>
+              <i class="glyphicon glyphicon-upload"></i>
-            <button type="button" class="delete">{upload_button_delete}</button>
+              <span>{upload_button_start_upload}</span>
-            <input type="checkbox" class="toggle">
+            </button>
-            [# The global file processing state]
+            <button type="reset" class="btn btn-warning cancel">
+              <i class="glyphicon glyphicon-ban-circle"></i>
+              <span>{upload_button_cancel_upload}</span>
+            </button>
+            <button type="button" class="btn btn-danger delete">
+              <i class="glyphicon glyphicon-trash"></i>
+              <span>{upload_button_delete}</span>
+            </button>
+
+            [# to the checkbox added form-check-input class and style element]
+            <input type="checkbox" class="toggle form-check-input" style="transform: none;">
+
+            <!-- The global file processing state -->
             <span class="fileupload-process"></span>
           </div>
-        [# The global progress state]
+          <!-- The global progress state -->
-        <div class="fileupload-progress fade" style="display:none">
+          <div class="col-lg-5 fileupload-progress fade">
-            [# The global progress bar]
+            <!-- The global progress bar -->
-            <div class="progress" role="progressbar" aria-valuemin="0" aria-valuemax="100"></div>
+            <div
-            [# The extended global progress state]
+              class="progress progress-striped active"
+              role="progressbar"
+              aria-valuemin="0"
+              aria-valuemax="100"
+            >
+              <div
+                class="progress-bar progress-bar-success"
+                style="width: 0%;"
+              ></div>
+            </div>
+            <!-- The extended global progress state -->
             <div class="progress-extended">&nbsp;</div>
           </div>
         </div>
-    [# The table listing the files available for upload/download]
+
-    <table role="presentation"><tbody class="files"></tbody></table>
+        <!-- The table listing the files available for upload/download -->
+        <table role="presentation" class="table table-striped">
+          <tbody class="files"></tbody>
+        </table>
 </form>
 
+
 [# The blueimp Gallery widget]
-<div id="blueimp-gallery" class="blueimp-gallery blueimp-gallery-controls" data-filter=":even">
+<div
-    <div class="slides"></div>
+  id="blueimp-gallery"
+  class="blueimp-gallery blueimp-gallery-controls"
+  aria-label="image gallery"
+  aria-modal="true"
+  role="dialog"
+  data-filter=":even"
+>
+  <div class="slides" aria-live="polite"></div>
   <h3 class="title"></h3>
-    <a class="prev">‹</a>
+  <a
-    <a class="next">›</a>
+	class="prev"
-    <a class="close">×</a>
+	aria-controls="blueimp-gallery"
-    <a class="play-pause"></a>
+	aria-label="previous slide"
+	aria-keyshortcuts="ArrowLeft"
+  ></a>
+  <a
+	class="next"
+	aria-controls="blueimp-gallery"
+	aria-label="next slide"
+	aria-keyshortcuts="ArrowRight"
+  ></a>
+  <a
+	class="close"
+	aria-controls="blueimp-gallery"
+	aria-label="close"
+	aria-keyshortcuts="Escape"
+  ></a>
+  <a
+	class="play-pause"
+	aria-controls="blueimp-gallery"
+	aria-label="play slideshow"
+	aria-keyshortcuts="Space"
+	aria-pressed="false"
+	role="button"
+  ></a>
   <ol class="indicator"></ol>
 </div>
 
+
 [# The template to display files available for upload]
 <script id="template-upload" type="text/x-tmpl">
       \{% for (var i=0, file; file=o.files\[i\]; i++) \{ %\}
-				<tr class="template-upload fade">
+          <tr class="template-upload fade\{%=o.options.loadImageFileTypes.test(file.type)?' image':''%\}">
               <td>
                   <span class="preview"></span>
               </td>
               <td>
                   <p class="name">\{%=file.name%\}</p>
-						<strong class="error"></strong>
+                  <strong class="error text-danger"></strong>
               </td>
               <td>
-						<p class="size">Processing...</p>
+                  <p class="size">{upload_processing}</p>
-						<div class="progress"></div>
+                  <div class="progress progress-striped active" role="progressbar" aria-valuemin="0" aria-valuemax="100" aria-valuenow="0"><div class="progress-bar progress-bar-success" style="width:0%;"></div></div>
               </td>
               <td>
+                  \{% if (!o.options.autoUpload && o.options.edit && o.options.loadImageFileTypes.test(file.type)) \{ %\}
+                    <button class="btn btn-success edit" data-index="\{%=i%\}" disabled>
+                        <i class="glyphicon glyphicon-edit"></i>
+                        <span>{upload_button_edit}</span>
+                    </button>
+                  \{% \} %\}
                   \{% if (!i && !o.options.autoUpload) \{ %\}
-							<button class="start" disabled>Start</button>
+                      <button class="btn btn-primary start" disabled>
+                          <i class="glyphicon glyphicon-upload"></i>
+                          <span>{upload_button_start_upload}</span>
+                      </button>
                   \{% \} %\}
                   \{% if (!i) \{ %\}
-							<button class="cancel">Cancel</button>
+                      <button class="btn btn-warning cancel">
+                          <i class="glyphicon glyphicon-ban-circle"></i>
+                          <span>{upload_button_cancel_upload}</span>
+                      </button>
                   \{% \} %\}
               </td>
           </tr>
@@ -86,7 +154,7 @@
 [# The template to display files available for download]
 <script id="template-download" type="text/x-tmpl">
       \{% for (var i=0, file; file=o.files\[i\]; i++) \{ %\}
-				<tr class="template-download fade">
+          <tr class="template-download fade\{%=file.thumbnailUrl?' image':''%\}">
               <td>
                   <span class="preview">
                       \{% if (file.thumbnailUrl) \{ %\}
@@ -96,18 +164,40 @@
               </td>
               <td>
                   <p class="name">
+                      \{% if (file.url) \{ %\}
                           <a href="\{%=file.url%\}" title="\{%=file.name%\}" download="\{%=file.name%\}" \{%=file.thumbnailUrl?'data-gallery':''%\}>\{%=file.name%\}</a>
+                      \{% \} else \{ %\}
+                          <span>\{%=file.name%\}</span>
+                      \{% \} %\}
                   </p>
                   \{% if (file.error) \{ %\}
-							<div><span class="error">Error</span> \{%=file.error%\}</div>
+                      <div><span class="label label-danger">{upload_error}</span> \{%=file.error%\}</div>
                   \{% \} %\}
               </td>
               <td>
                   <span class="size">\{%=o.formatFileSize(file.size)%\}</span>
               </td>
               <td>
-						<button class="delete" data-type="\{%=file.deleteType%\}" data-url="\{%=file.deleteUrl%\}"\{% if (file.deleteWithCredentials) \{ %\} data-xhr-fields='\{"withCredentials":true\}'\{% \} %\}>Delete</button>
+                  \{% if (file.deleteUrl) \{ %\}
-						<input type="checkbox" name="delete" value="1" class="toggle">
+
+					[# added one div to inline the button with the checkbox]
+					[# to the checkbox added form-check-input class and style element]
+
+					<div class="form-inline" style="white-space: nowrap;">
+                      <button class="btn btn-danger delete" data-type="\{%=file.deleteType%\}" data-url="\{%=file.deleteUrl%\}"\{% if (file.deleteWithCredentials) \{ %\} data-xhr-fields='\{"withCredentials":true\}'\{% \} %\}>
+                          <i class="glyphicon glyphicon-trash"></i>
+                          <span>{upload_button_delete}</span>
+                      </button>
+                      <input type="checkbox" name="delete" value="1" class="toggle form-check-input" style="transform: none;">
+                    </div>
+
+
+                  \{% \} else \{ %\}
+                      <button class="btn btn-warning cancel">
+                          <i class="glyphicon glyphicon-ban-circle"></i>
+                          <span>{upload_button_cancel}</span>
+                      </button>
+                  \{% \} %\}
               </td>
           </tr>
       \{% \} %\}</script>
@@ -129,8 +219,6 @@
 			    '/cors/result.html?%s'
             ));
 
-			$("div.winix #fileupload button.cancel").css('display','inline');
-
             [# loading existing files]
             [# copied from common/fileupload/js/main.js]
             $('#fileupload').addClass('fileupload-processing');

winixd/html/fun_vim.html

@@ -3,44 +3,55 @@
 [if item_is]<h1>{edit}</h1>[else]<h1>{add}</h1>[end]
 
 
-<form id="additem" method="post" action="[doc_base_url][dir][if item_is][item_url]/[end]vim">
+<form class="uk-form-stacked" method="post" action="[doc_base_url][dir][if item_is][item_url]/[end]vim">
-<fieldset>
-	<legend>{form_emacs_legend}</legend>
 
-	[if mount_type_is "cms"]
-		<p class="withnext">{title}:</p>
-		<input class="edit" type="text" name="subject" value="[item_subject]">
 
-		<p class="withnext">{suggested_url}:</p>
+	[if one [mount_type_is "cms"] [any [mount_type_is "thread"] [thread_mount_arg_is "subject"]]]
-		<input class="edit" type="text" name="url" value="[item_url]">
+	<div class="uk-margin">
+		<label class="uk-form-label" for="winix_title_id">{title}:</label>
+		<div class="uk-form-controls">
+			<input class="uk-input" id="winix_title_id" type="text" name="subject" value="[item_subject]" [if not item_is]autofocus [end]>
+		</div>
+	</div>
+
+	<div class="uk-margin">
+		<label class="uk-form-label" for="winix_url_id">{suggested_url}:</label>
+		<div class="uk-form-controls">
+			<input class="uk-input" id="winix_url_id" type="text" name="url" value="[item_url]">
+		</div>
+	</div>
 	[end]
 
-	[if any [mount_type_is "thread"] [thread_mount_arg_is "subject"]]
+	<div class="uk-margin">
-		<p class="withnext">{title}:</p>
+	[if mount_type_is "cms"]<label class="uk-form-label" for="winix_content_id">{form_emacs_content_cms}</label>[end]
-		<input class="edit" type="text" name="subject" value="[item_subject]">
+	[if mount_type_is "thread"]<label class="uk-form-label" for="winix_content_id">{form_emacs_content_thread}</label>[end]
+	[if mount_type_is "ticket"]<label class="uk-form-label" for="winix_content_id">{form_emacs_content_ticket}</label>[end]
 
-		<p class="withnext">{suggested_url}:</p>
-		<input class="edit" type="text" name="url" value="[item_url]">
-	[end]
-	
-	[if mount_type_is "cms"]<p class="withnext">{form_emacs_content_cms}</p>[end]
-	[if mount_type_is "thread"]<p class="withnext">{form_emacs_content_thread}</p>[end]
-	[if mount_type_is "ticket"]<p class="withnext">{form_emacs_content_ticket}</p>[end]
 	
+		<div class="uk-form-controls">
 			<textarea class="multitext" rows="[if mount_type_is "cms"]30[else]10[end]" cols="60" name="itemcontent">[item_content]</textarea>
+		</div>
 
+	</div>
+	
+	<div class="uk-form-controls">
 		<input type="hidden" name="contenttype" value="2">
-	
+	</div>
-	[if winix_function_param_is "full"]
-	[else]
-	[end]
 	
 	[if not user_logged]
-		<p class="withnext">{nick}:</p>
+		<div class="uk-margin">
-		<input class="edit" type="text" name="guestname" value="[item_guest_name]">
+			<label class="uk-form-label" for="winix_nick_id">{nick}:</label>
+			<div class="uk-form-controls">
+				<input class="uk-input" id="winix_nick_id" type="text" name="guestname" value="[item_guest_name]">
+			</div>
+		</div>
 
-		<p class="withnext">{rebus_how_is_it} [rebus_question]?</p>
+		<div class="uk-margin">
-		<input class="edit" type="text" name="rebus">
+			<label class="uk-form-label" for="winix_rebus_id">{rebus_how_is_it} [rebus_question]?</label>
+			<div class="uk-form-controls">
+				<input class="uk-input" id="winix_rebus_id" type="text" name="rebus">
+			</div>
+		</div>
 		
 		[include "antispam.html"]
 	[end]
@@ -49,8 +60,10 @@
 		<input type="hidden" name="postredirect" value="[winix_function_param_value "postredirect"]">
 	[end]
 	
-	<input class="submit" type="submit" value="[if item_is]{change}[else]{add}[end]">
+	<div class="uk-form-controls">
-</fieldset>
+		<input class="uk-button uk-button-primary" type="submit" value="[if item_is]{change}[else]{add}[end]">
+	</div>
+
 </form>
 
 

winixd/html/index.html

@@ -4,14 +4,29 @@
 <html lang="{language}">
 
 <head>
+	[include "index_head_functions_add.html"]
 	<meta charset="UTF-8">
 	<title>[doc_title]</title>
-	[include "index_head_functions_add.html"]
 </head>
 
-<body>
+[if winix_function_is "login"]
-
+[# login template: https://zzseba78.github.io/Kick-Off/login.html ]
+<body class="uk-flex uk-flex-center uk-flex-middle uk-background-muted uk-height-viewport" data-uk-height-viewport>
 <div>
+[else]
+<body class="uk-flex uk-flex-center">
+<div class="uk-width-2xlarge">
+[end]
+
+
+
+	<div class="uk-position-fixed uk-position-bottom-center uk-position-small uk-visible@m uk-position-z-index">
+		<span class="uk-text-small uk-text-muted">
+			© [current_year] [doc_base_url] - <a href="https://gitea.ttmath.org/tomasz.sowa/winix" title="Winix - a web framework" target="_blank" data-uk-tooltip>Powered by winix [sys_ver_major].[sys_ver_minor].[sys_ver_revision]</a>
+			| Built with <a href="http://getuikit.com" title="Visit UIkit 3 site" target="_blank" data-uk-tooltip><span data-uk-icon="uikit"></span></a>
+		</span>
+	</div>
+
 	[include "slog.html"]
 
 	[# each winix function has div.winix in its template defined -- only functions: cat and run don't have div.winix]
@@ -20,5 +35,6 @@
 	[content]
 </div>
 
+[include "index_bottom_adder.html"]
 </body>
 </html>

winixd/html/index_bottom_adder.html

@@ -0,0 +1,2 @@
+
+

winixd/html/index_generic.html

@@ -0,0 +1,17 @@
+<!DOCTYPE html>
+[# minimalistic template]
+
+<html lang="{language}">
+
+<head>
+	[include "index_head_functions_add.html"]
+	<meta charset="UTF-8">
+	<title>[doc_title]</title>
+</head>
+
+<body>
+	[include "slog.html"]
+	[content]
+	[include "index_bottom_adder.html"]
+</body>
+</html>

winixd/html/index_head_functions_add.html

@@ -1,74 +1,42 @@
-[# other stuff needed by a specific function]
+[# rename me to index_head_adder.html]
+
+
+[def winix_has_uikit "true"]
+[def winix_has_jquery "false"]
+
+[# UIkit CSS]
+<link rel="stylesheet" href="[doc_base_url_common]/uikit/uikit-3.6.14/css/uikit.min.css">
+
+[# UIkit JS]
+<script src="[doc_base_url_common]/uikit/uikit-3.6.14/js/uikit.min.js"></script>
+<script src="[doc_base_url_common]/uikit/uikit-3.6.14/js/uikit-icons.min.js"></script>
+
 
-[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"]]
-	<link rel="stylesheet" href="[doc_base_url_common]/winix/winix.css" type="text/css">
-[end]
 
 
 [if winix_function_is "emacs"]
-	<script type="text/javascript" src="[doc_base_url_common]/codemirror-5.1/lib/codemirror.js"></script>
+	<script type="text/javascript" src="[doc_base_url_common]/codemirror/5.59.2/lib/codemirror.js"></script>
-	<link rel="stylesheet" href="[doc_base_url_common]/codemirror-5.1/lib/codemirror.css" type="text/css">
+	<link rel="stylesheet" href="[doc_base_url_common]/codemirror/5.59.2/lib/codemirror.css" type="text/css">
 
-	<script src="[doc_base_url_common]/codemirror-5.1/mode/css/css.js"></script>
+	<script src="[doc_base_url_common]/codemirror/5.59.2/mode/css/css.js"></script>
-	<script src="[doc_base_url_common]/codemirror-5.1/mode/javascript/javascript.js"></script>
+	<script src="[doc_base_url_common]/codemirror/5.59.2/mode/javascript/javascript.js"></script>
-	<script src="[doc_base_url_common]/codemirror-5.1/mode/xml/xml.js"></script>
+	<script src="[doc_base_url_common]/codemirror/5.59.2/mode/xml/xml.js"></script>
-	<script src="[doc_base_url_common]/codemirror-5.1/mode/htmlmixed/htmlmixed.js"></script>
+	<script src="[doc_base_url_common]/codemirror/5.59.2/mode/htmlmixed/htmlmixed.js"></script>
 
-	<!--<link rel="stylesheet" href="[doc_base_url_common]/codemirror-5.1/theme/base16-light.css" type="text/css">-->
+	<!--<link rel="stylesheet" href="[doc_base_url_common]/codemirror/5.59.2/theme/base16-light.css" type="text/css">-->
 
-	<script src="[doc_base_url_common]/codemirror-5.1/addon/display/fullscreen.js"></script>
+	<script src="[doc_base_url_common]/codemirror/5.59.2/addon/display/fullscreen.js"></script>
-	<link rel="stylesheet" href="[doc_base_url_common]/codemirror-5.1/addon/display/fullscreen.css" type="text/css">
+	<link rel="stylesheet" href="[doc_base_url_common]/codemirror/5.59.2/addon/display/fullscreen.css" type="text/css">
 
 [if false]
-	<script src="[doc_base_url_common]/codemirror-5.1/addon/search/search.js"></script>
+	<script src="[doc_base_url_common]/codemirror/5.59.2/addon/search/search.js"></script>
-	<link rel="stylesheet" href="[doc_base_url_common]/codemirror-5.1/addon/search/matchesonscrollbar.css" type="text/css">
+	<link rel="stylesheet" href="[doc_base_url_common]/codemirror/5.59.2/addon/search/matchesonscrollbar.css" type="text/css">
 [end]
 
-<script src="[doc_base_url_common]/codemirror-5.1/addon/fold/xml-fold.js"></script>
+<script src="[doc_base_url_common]/codemirror/5.59.2/addon/fold/xml-fold.js"></script>
-<script src="[doc_base_url_common]/codemirror-5.1/addon/edit/matchtags.js"></script>
+<script src="[doc_base_url_common]/codemirror/5.59.2/addon/edit/matchtags.js"></script>
 
-<script src="[doc_base_url_common]/codemirror-5.1/addon/selection/active-line.js"></script>
+<script src="[doc_base_url_common]/codemirror/5.59.2/addon/selection/active-line.js"></script>
 
 <style>
 
@@ -136,34 +104,40 @@ cm.save()
 
 
 [if winix_function_is "ckeditor"]
+	[def winix_has_jquery "true"]
 	<script type="text/javascript" src="[doc_base_url_common]/ckeditor_4.9.2/ckeditor.js"></script>
-	<script type="text/javascript" src="[doc_base_url_common]/jquery-1.9.1.min.js"></script>
+	<script type="text/javascript" src="[doc_base_url_common]/jquery/1.12.4/jquery.min.js"></script>
 	<script type="text/javascript" src="[doc_base_url_common]/winix/update_button.js"></script>
 [end]
 
 
 [if winix_function_is "tinymce"]
-	<!--<script type="text/javascript">document.domain = "www.slimaczek.pl";</script>-->
+	<script type="text/javascript" src="[doc_base_url]/common/tiny_mce/5.6.2/tinymce.min.js"></script>
-	<script type="text/javascript" src="[doc_base_url]/common/tiny_mce/tiny_mce.js"></script>
+
-	<script type="text/javascript" src="[doc_base_url]/var/tinymce.js"></script>
+	[# tinymce can use a special theme called 'mobile' - it is used when /mobile param is provided]
+	<script type="text/javascript" src="[doc_base_url]/var/tinymce.js[if winix_function_param_is "mobile"]/-/mobile[end]"></script>
+
+	[def winix_has_jquery "true"]
+	<script type="text/javascript" src="[doc_base_url_common]/jquery/1.12.4/jquery.min.js"></script>
+	<script type="text/javascript" src="[doc_base_url_common]/winix/update_button.js"></script>
 [end]
 
 
 [if winix_function_is "nicedit"]
-	<script type="text/javascript" src="[doc_base_url_common]/nicedit/nicEdit.js"></script>
+	<script type="text/javascript" src="[doc_base_url_common]/nicedit/0.9_r25/nicEdit.js"></script>
 [end]
 
 
 
 [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 ]
+
+	[# 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 ]
 
-	<script type="text/javascript" src="[doc_base_url_common]/jquery-1.4.2.min.js"></script>
+	[def winix_has_jquery "true"]
-	<script type="text/javascript" src="[doc_base_url_common]/wymeditor/jquery.wymeditor.min.js"></script>
+	<script type="text/javascript" src="[doc_base_url_common]/jquery/1.12.4/jquery.min.js"></script>
-	<script type="text/javascript" src="[doc_base_url_common]/wymeditor/lang/en.js"></script>
+	<script type="text/javascript" src="[doc_base_url_common]/wymeditor/1.1.1/wymeditor/jquery.wymeditor.min.js"></script>
-	<script type="text/javascript" src="[doc_base_url_common]/wymeditor/skins/default/skin.js"></script>
+	<link rel="stylesheet" type="text/css" href="[doc_base_url_common]/wymeditor/1.1.1/wymeditor/skins/default/skin.css">
-	<link rel="stylesheet" type="text/css" href="[doc_base_url_common]/wymeditor/skins/default/skin.css">
 	<script type="text/javascript">jQuery(function() \{ jQuery("textarea").wymeditor(\{ basePath: "[doc_base_url_common]/wymeditor/", iframeBasePath: "[doc_base_url]/var/", updateSelector : "form", updateEvent: 'submit' \}); \});</script>
 	
 [end]
@@ -192,11 +166,13 @@ cm.save()
 	[end]
 
 	[if one [gallery_mount_type_arg_is "galleria"] [gallery_mount_type_arg_is "galleriathumb"]]
+		[def winix_has_jquery "true"]
 		<script type="text/javascript" src="[doc_base_url_common]/jquery-1.4.4.min.js"></script>
 		<script src="[doc_base_url_common]/aino-galleria/galleria-1.2.2.min.js" type="text/javascript"></script>
 	[end]
 
 	[if one [gallery_mount_type_arg_is "galleria1.2.9"] [gallery_mount_type_arg_is "galleriathumb1.2.9"]]
+		[def winix_has_jquery "true"]
 		<script type="text/javascript" src="[doc_base_url_common]/jquery-1.9.1.min.js"></script>
 		<script src="[doc_base_url_common]/galleria/galleria-1.2.9.min.js" type="text/javascript"></script>
 	[end]
@@ -206,9 +182,8 @@ cm.save()
 
 
 [if winix_function_is "upload"]
-	[# http://blueimp.github.io/jQuery-File-Upload/jquery-ui.html]
+	[# https://blueimp.github.io/jQuery-File-Upload/]
 	[# https://github.com/blueimp/jQuery-File-Upload]
-	[# we are using the *jQuery UI version* of the plugin]
 
 	[# Force latest IE rendering engine or ChromeFrame if installed]
 	<!--\[if IE\]>
@@ -216,79 +191,68 @@ cm.save()
 	<!\[endif\]-->
 
 
-	<!-- jQuery UI styles -->
+    <link rel="stylesheet" href="[doc_base_url_common]/bootstrap/3.3.7/css/bootstrap.min.css">
-	<link rel="stylesheet" href="[doc_base_url_common]/jquery-file-upload/9.28.0/others/jquery-ui.css">
-
-	<!-- Generic page styles -->
-	<link rel="stylesheet" href="[doc_base_url_common]/jquery-file-upload/9.28.0/css/style.css">
-
-	[if false]
-	<style>
-	/* Adjust the jQuery UI widget font-size: */
-	.ui-widgetREMOVEME \{
-		font-size: 0.95em;
-	\}
-	</style>
-	[end]
 
+	[# in doc_base_url_common/jquery-file-upload/10.31.0_extra/blueimp-gallery/ is download_all_files.sh script in order to download all necessary files]
     <!-- blueimp Gallery styles -->
-	<link rel="stylesheet" href="[doc_base_url_common]/jquery-file-upload/9.28.0/others/blueimp-gallery.min.css">
+    <link rel="stylesheet" href="[doc_base_url_common]/jquery-file-upload/10.31.0_extra/blueimp-gallery/blueimp-gallery.min.css">
 
-	<!-- CSS to style the file input field as button and adjust the Bootstrap progress bars -->
+    [# CSS to style the file input field as button and adjust the Bootstrap progress bars]
-	<link rel="stylesheet" href="[doc_base_url_common]/jquery-file-upload/9.28.0/css/jquery.fileupload.css">
+    <link rel="stylesheet" href="[doc_base_url_common]/jquery-file-upload/10.31.0/css/jquery.fileupload.css">
-	<link rel="stylesheet" href="[doc_base_url_common]/jquery-file-upload/9.28.0/css/jquery.fileupload-ui.css">
+    <link rel="stylesheet" href="[doc_base_url_common]/jquery-file-upload/10.31.0/css/jquery.fileupload-ui.css">
 
-	<!-- CSS adjustments for browsers with JavaScript disabled -->
+    [# CSS adjustments for browsers with JavaScript disabled]
-	<noscript><link rel="stylesheet" href="[doc_base_url_common]/jquery-file-upload/9.28.0/css/jquery.fileupload-noscript.css"></noscript>
+    <noscript>
-	<noscript><link rel="stylesheet" href="[doc_base_url_common]/jquery-file-upload/9.28.0/css/jquery.fileupload-ui-noscript.css"></noscript>
+		<link rel="stylesheet" href="[doc_base_url_common]/jquery-file-upload/10.31.0/css/jquery.fileupload-noscript.css">
+		<link rel="stylesheet" href="[doc_base_url_common]/jquery-file-upload/10.31.0/css/jquery.fileupload-ui-noscript.css">
+	</noscript>
 
 
-	<!--
+	[def winix_has_jquery "true"]
-	[# it doesn't work with this jquery]
+    <script src="[doc_base_url_common]/jquery/1.12.4/jquery.min.js"></script>
-	<script src="[doc_base_url_common]/jquery/jquery-3.2.1.slim.min.js"></script>
-	-->
 
-	<script src="[doc_base_url_common]/jquery-file-upload/9.28.0/others/jquery.min.js"></script>
+
-	<script src="[doc_base_url_common]/jquery-file-upload/9.28.0/others/jquery-ui.min.js"></script>
+    <!-- The jQuery UI widget factory, can be omitted if jQuery UI is already included -->
+    <script src="[doc_base_url_common]/jquery-file-upload/10.31.0/js/vendor/jquery.ui.widget.js"></script>
 
     <!-- The Templates plugin is included to render the upload/download listings -->
-	<script src="[doc_base_url_common]/jquery-file-upload/9.28.0/others/tmpl.min.js"></script>
+    <script src="[doc_base_url_common]/jquery-file-upload/10.31.0_extra/tmpl.min.js"></script>
-
     <!-- The Load Image plugin is included for the preview images and image resizing functionality -->
-	<script src="[doc_base_url_common]/jquery-file-upload/9.28.0/others/load-image.all.min.js"></script>
+    <script src="[doc_base_url_common]/jquery-file-upload/10.31.0_extra/load-image.all.min.js"></script>
-
     <!-- The Canvas to Blob plugin is included for image resizing functionality -->
-	<script src="[doc_base_url_common]/jquery-file-upload/9.28.0/others/canvas-to-blob.min.js"></script>
+    <script src="[doc_base_url_common]/jquery-file-upload/10.31.0_extra/canvas-to-blob.min.js"></script>
-
     <!-- blueimp Gallery script -->
-	<script src="[doc_base_url_common]/jquery-file-upload/9.28.0/others/jquery.blueimp-gallery.min.js"></script>
+    <script src="[doc_base_url_common]/jquery-file-upload/10.31.0_extra/jquery.blueimp-gallery.min.js"></script>
 
     <!-- The Iframe Transport is required for browsers without support for XHR file uploads -->
-	<script src="[doc_base_url_common]/jquery-file-upload/9.28.0/js/jquery.iframe-transport.js"></script>
+    <script src="[doc_base_url_common]/jquery-file-upload/10.31.0/js/jquery.iframe-transport.js"></script>
-
     <!-- The basic File Upload plugin -->
-	<script src="[doc_base_url_common]/jquery-file-upload/9.28.0/js/jquery.fileupload.js"></script>
+    <script src="[doc_base_url_common]/jquery-file-upload/10.31.0/js/jquery.fileupload.js"></script>
-
     <!-- The File Upload processing plugin -->
-	<script src="[doc_base_url_common]/jquery-file-upload/9.28.0/js/jquery.fileupload-process.js"></script>
+    <script src="[doc_base_url_common]/jquery-file-upload/10.31.0/js/jquery.fileupload-process.js"></script>
-
     <!-- The File Upload image preview & resize plugin -->
-	<script src="[doc_base_url_common]/jquery-file-upload/9.28.0/js/jquery.fileupload-image.js"></script>
+    <script src="[doc_base_url_common]/jquery-file-upload/10.31.0/js/jquery.fileupload-image.js"></script>
-
     <!-- The File Upload audio preview plugin -->
-	<script src="[doc_base_url_common]/jquery-file-upload/9.28.0/js/jquery.fileupload-audio.js"></script>
+    <script src="[doc_base_url_common]/jquery-file-upload/10.31.0/js/jquery.fileupload-audio.js"></script>
-
     <!-- The File Upload video preview plugin -->
-	<script src="[doc_base_url_common]/jquery-file-upload/9.28.0/js/jquery.fileupload-video.js"></script>
+    <script src="[doc_base_url_common]/jquery-file-upload/10.31.0/js/jquery.fileupload-video.js"></script>
-
     <!-- The File Upload validation plugin -->
-	<script src="[doc_base_url_common]/jquery-file-upload/9.28.0/js/jquery.fileupload-validate.js"></script>
+    <script src="[doc_base_url_common]/jquery-file-upload/10.31.0/js/jquery.fileupload-validate.js"></script>
-
     <!-- The File Upload user interface plugin -->
-	<script src="[doc_base_url_common]/jquery-file-upload/9.28.0/js/jquery.fileupload-ui.js"></script>
+    <script src="[doc_base_url_common]/jquery-file-upload/10.31.0/js/jquery.fileupload-ui.js"></script>
 
-	<!-- The File Upload jQuery UI plugin -->
+    [if false]
-	<script src="[doc_base_url_common]/jquery-file-upload/9.28.0/js/jquery.fileupload-jquery-ui.js"></script>
+    [# the code to run the plugin we have in fun_upload.html]
+    <!-- The main application script -->
+	<!--
+    <script src="[doc_base_url_common]/jquery-file-upload/10.31.0/js/demo.js"></script>
+	-->
+	[end]
+
+    <!-- The XDomainRequest Transport is included for cross-domain file deletion for IE 8 and IE 9 -->
+    <!--\[if (gte IE 8)&(lt IE 10)\]>
+      <script src="[doc_base_url_common]/jquery-file-upload/10.31.0/js/cors/jquery.xdr-transport.js"></script>
+    <!\[endif\]-->
 
 [end]
 
@@ -296,14 +260,13 @@ cm.save()
 
 [if winix_function_is "sort"]
 	[if not item_is]
-	<script type="text/javascript" src="[doc_base_url_common]/jquery-1.6.1.min.js"></script>
+	<script type="text/javascript" src="[doc_base_url_common]/winix/winix_sort.js"></script>
-	<script type="text/javascript" src="[doc_base_url_common]/jquery-ui-1.8.13/js/jquery-ui-1.8.13.custom.min.js"></script>
-	<script type="text/javascript" src="[doc_base_url_common]/sort.js"></script>
 	[end]
 [end]
 
 
 [if winix_function_is "imgcrop"]
+	[def winix_has_jquery "true"]
 	<script type="text/javascript" src="[doc_base_url_common]/jquery-1.9.1.min.js"></script>
 	<script type="text/javascript" src="[doc_base_url_common]/jcrop-0.9.12/js/jquery.Jcrop.js"></script>
 	<link type="text/css" rel="stylesheet" href="[doc_base_url_common]/jcrop-0.9.12/css/jquery.Jcrop.css">

winixd/html/slog.html

@@ -1,10 +1,10 @@
 [if slog_tab]
-<table class="winix_slog">
 
 	[for slog_tab]
 
-		<tr>
+		<div class="uk-margin [if slog_tab_is_error] uk-alert-danger[end][if slog_tab_is_warning] uk-alert-warning[end][if slog_tab_is_info] uk-alert-success[end]" data-uk-alert>
-		<th class="[if slog_tab_is_error]winix_slogerror[end][if slog_tab_is_warning]winix_slogwarning[end][if slog_tab_is_info]winix_sloginfo[end]">
+		
+			<a class="uk-alert-close" data-uk-close></a>
 
 			[if slog_tab_is_info]
 			{slog_info}:
@@ -18,13 +18,10 @@
 			{slog_error}:
 			[end]
 
-		</th>
-		<td>
 			[slog_tab_print]
-		</td>
+
-		</tr>
+		</div>
 
 	[end]
 
-</table>
 [end]

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
@@ -24,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
@@ -40,7 +49,6 @@ email_sent_to = An email has been sent to:
 logout = logout
 
 
-remember_me = Remember me
 
 home_page = Home page   
 
@@ -104,6 +112,12 @@ create_ticket_header = Create a new ticket
 
 
 
+
+ckeditor_update_button = Update
+ckeditor_update_progressbar_img_alt = Progressbar
+
+
+
 form_ticket_type = Ticket type
 form_ticket_status = Status
 form_ticket_priority = Priority
@@ -116,14 +130,12 @@ 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
 
 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
@@ -131,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
+
 
 
 
@@ -158,8 +170,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
@@ -190,10 +207,13 @@ 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
-mkdir_form_legend = Make directory form
 
 html_lang_attr_value = "en"
 language_orphans = ()
@@ -210,7 +230,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
@@ -239,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
@@ -291,7 +309,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
 
@@ -304,7 +321,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.
@@ -331,7 +351,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
 
 
@@ -340,7 +359,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
@@ -350,15 +378,13 @@ 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_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_email = You have to provide your email address. We send you an email with an activation link
-adduser_need_email2 = 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.
@@ -387,7 +413,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
@@ -399,16 +424,15 @@ 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
-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
 
 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
@@ -433,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
@@ -453,6 +478,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

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
@@ -26,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
@@ -45,7 +53,6 @@ email_sent_to = Wiadomość została wysłana do:
 logout = wyloguj
 
 
-remember_me = Zapamiętaj mnie
 
 home_page = Strona główna   
 
@@ -110,6 +117,13 @@ create_ticket_header = Nowe zgłoszenie
 
 
 
+
+
+ckeditor_update_button = Aktualizuj
+ckeditor_update_progressbar_img_alt = Progressbar
+
+
+
 form_ticket_type = Rodzaj zgłoszenia
 form_ticket_status = Status
 form_ticket_priority = Priorytet
@@ -121,15 +135,13 @@ 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
 
 
-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
@@ -137,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ść:
@@ -162,9 +174,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.
@@ -190,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
@@ -198,7 +218,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"
 
@@ -233,7 +252,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
@@ -263,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
@@ -312,7 +329,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
 
@@ -326,7 +342,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 = Przygotowywanie...
 
 who_header = Lista sesji
 who_tab_index = L.p.
@@ -352,7 +370,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
 
 
@@ -361,6 +378,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
@@ -372,13 +399,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_email = Wymagamy abyś podał nam swój adres email, na ten adres wyślemy wiadomość z linkiem aktywacyjnym.
-adduser_need_email2 = 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.
@@ -393,7 +418,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
 
 
@@ -407,7 +432,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
@@ -419,17 +443,15 @@ 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_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
 
 
 cp_header = Kopiuj
-cp_form_legend = Formularz kopiowania
 cp_page = Kopiuj stronę
 cp_dir = Kopiuj katalog
 cp_only_content = Kopiuj tylko zawartość katalogu
@@ -453,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
@@ -473,6 +496,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

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);		// index: 0 (indices are used in template.cpp in functions) !! IMPROVE ME it should be done better
-	temp_tab.push_back(config->templates_index_raw);	// index: 1
+	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()];
 

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
 	{

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;