changed version to 0.7.2

warning: 'Winix::FileLog::init' hides overloaded virtual function [-Woverloaded-virtual]

winixd/Makefile

@@ -27,7 +27,7 @@ endif
 #	CXX = g++-4.8
 
 ifndef CXXFLAGS
-CXXFLAGS = -Wall -O0 -g -fPIC -pthread -std=c++17 -I/usr/local/include -I/usr/include/postgresql -DEZC_HAS_SPECIAL_STREAM
+CXXFLAGS = -Wall -O0 -g -fPIC -pthread -std=c++20 -I/usr/local/include -I/usr/include/postgresql -DEZC_HAS_SPECIAL_STREAM
 endif
 
 ifndef AR

winixd/core/basethread.cpp

@@ -254,6 +254,7 @@ void * BaseThread::StartRoutine(void * this_object)
 		}
 	}
 
+	base->save_log();
 	pthread_exit(0);
 	return 0;
 }

winixd/core/filelog.h

@@ -5,7 +5,7 @@
  */
 
 /*
- * Copyright (c) 2018, Tomasz Sowa
+ * Copyright (c) 2018-2021, Tomasz Sowa
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -58,6 +58,10 @@ public:
 
 	void set_synchro(Synchro * synchro);
 
+	// using PT::FileLog::init to suppress clang warning:
+	// warning: 'Winix::FileLog::init' hides overloaded virtual function [-Woverloaded-virtual]
+	using PT::FileLog::init;
+
 	void init(const std::wstring & log_file, bool log_stdout, int log_level, bool save_each_line, size_t log_time_zone_id);
 
 	void set_time_zones(TimeZones * time_zones);

winixd/core/image.cpp

@@ -581,6 +581,8 @@ void Image::CreateImage()
 				<< ", 'convert' process returned: " << res << logend;
 		}
 	}
+
+	log << logsave;
 }
 
 

winixd/core/mounts.cpp

@@ -5,7 +5,7 @@
  */
 
 /* 
- * Copyright (c) 2009-2018, Tomasz Sowa
+ * Copyright (c) 2009-2021, Tomasz Sowa
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
@@ -222,6 +222,11 @@ void Mounts::ReadMounts(const std::wstring & mounts)
 	mount_parser.Parse(mounts, mount_tab);
 
 	CalcCurMount();
+
+	// IMPROVE ME
+	// cur->mount is pointing to the empty mount (it is set in functions.cpp in CheckSpecialFile method)
+	// may would be better to call WINIX_FSTAB_CHANGED after the cur->mount is set?
+	// some plugins are using 'cur' object
 	plugin->Call((Session*)0, WINIX_FSTAB_CHANGED);
 }
 

winixd/core/threadmanager.cpp

@@ -186,6 +186,10 @@ void ThreadManager::StopAll()
 		item.object->WaitForThread();
 		log << log4 << "TM: thread " << id << " terminated" << logend;
 
+		// the thread is stopped and we can set the thread log buffer pointing to
+		// the main log buffer (from the main thread)
+		item.object->set_log_buffer(log.GetLogBuffer());
+
 		delete item.thread_item_data;
 		id += 1;
 	}

winixd/core/timezone.cpp

@@ -259,7 +259,7 @@ bool TimeZone::SetTzDst(PT::Space & year)
 
 	int year_int = Toi(year.name);
 
-	if( year_int < 1970 && year_int > 10000 )
+	if( year_int < 1970 || year_int > 10000 )
 		return false;
 
 	dst.has_dst = year.Bool(L"has_dst", false);

winixd/core/version.h

@@ -42,7 +42,7 @@ namespace Winix
 
 #define WINIX_VER_MAJOR		0
 #define WINIX_VER_MINOR		7
-#define WINIX_VER_REVISION	1
+#define WINIX_VER_REVISION	2
 
 
 

winixd/core/winixbase.cpp

@@ -5,7 +5,7 @@
  */
 
 /*
- * Copyright (c) 2018, Tomasz Sowa
+ * Copyright (c) 2018-2021, Tomasz Sowa
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -90,6 +90,13 @@ void WinixBase::set_dependency(WinixBase * winix_base)
 
 
 
+void WinixBase::save_log()
+{
+	log << logsave;
+}
+
+
+
 }
 
 

winixd/core/winixbase.h

@@ -5,7 +5,7 @@
  */
 
 /*
- * Copyright (c) 2018, Tomasz Sowa
+ * Copyright (c) 2018-2021, Tomasz Sowa
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -65,6 +65,8 @@ public:
 
 	void set_dependency(WinixBase * winix_base);
 
+	void save_log();
+
 
 protected:
 

winixd/functions/functions.cpp

@@ -168,7 +168,9 @@ Error Functions::CheckSpecialFile(const Item & item)
 	{
 		log << log3 << "Functions: reloading mount points" << logend;
 
+		cur->mount = system->mounts.GetEmptyMount();
 		system->mounts.ReadMounts(item.content);
+		cur->mount = system->mounts.pmount;
 		templates->ReadNewIndexTemplates();
 		templates->ReadNewChangeTemplates();
 

winixd/html/dir_last_info.html

@@ -1,4 +1,4 @@
-<p class="winix_iteminfo">
+<p class="uk-text-meta">
 	{added_by}: [dir_last_user], [dir_last_date_creation_nice]
 	
 	[if not dir_last_dates_equal]

winixd/html/fun_ckeditor.html

@@ -6,14 +6,14 @@
 	
 	[if one [mount_type_is "cms"] [any [mount_type_is "thread"] [thread_mount_arg_is "subject"]]]
 	<div class="uk-margin">
-		<label class="uk-form-label" for="winix_title_id">{title}:</label>
+		<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>
+		<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>
@@ -40,7 +40,7 @@
 
 	[if not user_logged]
 		<div class="uk-margin">
-			<label class="uk-form-label" for="winix_nick_id">{nick}:</label>
+			<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>

winixd/html/fun_createthread.html

@@ -3,27 +3,40 @@
 <h1>{create_thread_header}</h1>
 
 
-
+<form class="uk-form-stacked" method="post" action="[doc_base_url][dir]createthread">
-<form id="additem" method="post" action="[doc_base_url][dir]createthread">
-<fieldset>
-	<legend>{form_thread_legend}</legend>
 	
-	<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]">
+		</div>
+	</div>
 	
 	[if thread_mount_arg_is "subject"]
-		<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]
 	
 	[include "fun_emacs_post.html"]
 		
 	[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">
-		<p class="withnext">{rebus_how_is_it} [rebus_question]?</p>
+				<input class="uk-input" id="winix_nick_id" type="text" name="guestname" value="[item_guest_name]">
-		<input class="edit" type="text" name="rebus">
+			</div>
+		</div>
+
+		<div class="uk-margin">
+			<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]
@@ -31,9 +44,12 @@
 	[if winix_function_param_is "postredirect"]
 		<input type="hidden" name="postredirect" value="[winix_function_param_value "postredirect"]">
 	[end]
+
 	
-	<input class="submit" type="submit" value="{button_thread_submit}">
+	<div class="uk-margin">
-</fieldset>
+		<input class="uk-button uk-button-primary" type="submit" value="{button_thread_submit}">
+	</div>
+
 </form>
 
 </div>

winixd/html/fun_createticket.html

@@ -8,116 +8,180 @@
 
 
 
-<form method="post" action="[doc_base_url][dir][if item_is][item_url]/editticket[else]createticket[end]" enctype="multipart/form-data">
+<form class="uk-form-stacked" method="post" action="[doc_base_url][dir][if item_is][item_url]/editticket[else]createticket[end]" enctype="multipart/form-data">
 
 
-<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]">
+	<div class="uk-form-controls">
+		<input class="uk-input" id="winix_title_id" type="text" name="subject" value="[item_subject]">
+	</div>
 </div>
 
 
 [if ticket_tab]
-	<table class="winix_create_ticket">
+
 	
 	[for ticket_tab]
-	
-		<tr>
-		<th>[filter fil_firstup][ticket_tab_param_name]:[end]</th>
-	
-		<td>
 		
 		[if ticket_tab_type_is "select"]
-			<select name="ticketparam[ticket_tab_param_id]">
+			<div class="uk-margin">
-			[for ticket_tab_select_tab]
+				<label class="uk-form-label" for="winix_ticket_select_id_[ticket_tab_param_id]">[filter fil_firstup][ticket_tab_param_name][end]</label>
-				<option [if ticket_tab_select_tab_is_selected]selected [end]value="[ticket_tab_select_tab_id]">[ticket_tab_select_tab_name]</option>
+
-			[end]
+				<div class="uk-form-controls">
-			</select>
+					<select class="uk-select" id="winix_ticket_select_id_[ticket_tab_param_id]" name="ticketparam[ticket_tab_param_id]">
+					[for ticket_tab_select_tab]
+						<option [if ticket_tab_select_tab_is_selected]selected [end]value="[ticket_tab_select_tab_id]">[ticket_tab_select_tab_name]</option>
+					[end]
+					</select>
+				</div>
+			</div>
 		[end]
 	
 	
 		[if one [ticket_tab_type_is "integer"] [ticket_tab_type_is "progress"] [ticket_tab_type_is "string"]]
-			<input type="text" name="ticketparam[ticket_tab_param_id]" value="[ticket_tab_value]">
+			<div class="uk-margin">
+				<label class="uk-form-label" for="winix_ticket_input_id_[ticket_tab_param_id]">[filter fil_firstup][ticket_tab_param_name][end]</label>
+
+				<div class="uk-form-controls">
+					<input class="uk-input" id="winix_ticket_input_id_[ticket_tab_param_id]" type="text" name="ticketparam[ticket_tab_param_id]" value="[ticket_tab_value]">
+				</div>
+			</div>
 		[end]
 
 	
 		[if ticket_tab_type_is "multistring"]
-			<textarea name="ticketparam[ticket_tab_param_id]" rows="10" cols="60">[ticket_tab_value]</textarea>
+			<div class="uk-margin">
+				<label class="uk-form-label" for="winix_ticket_textarea_id_[ticket_tab_param_id]">[filter fil_firstup][ticket_tab_param_name][end]</label>
+
+				<div class="uk-form-controls">
+					<textarea class="uk-textarea" id="winix_ticket_textarea_id_[ticket_tab_param_id]" name="ticketparam[ticket_tab_param_id]" rows="10" cols="60">[ticket_tab_value]</textarea>
+				</div>
+			</div>
 		[end]
 
 
 		[if ticket_tab_type_is "images"]
-			[for ticket_tab_file_tab]
+			<div class="uk-margin">
-			<div class="winix_create_ticket_file_row">
+				<label class="uk-form-label" for="winix_ticket_images_id_[ticket_tab_param_id]">[filter fil_firstup][ticket_tab_param_name][end]</label>
-				<img src="[doc_base_url][ticket_tab_file_tab_path]/-/thumb" alt="[ticket_tab_file_tab_path]" height="150">
+
-				<input type="submit" name="ticketdeletefile_[ticket_tab_file_tab_itemid]" value="{ticket_delete_file}">
+				<div uk-form-custom="target: true">
+					<input type="file" id="winix_ticket_images_id_[ticket_tab_param_id]" name="ticketparam[ticket_tab_param_id]" multiple>
+					<input class="uk-input" type="text" placeholder="{form_ticket_select_file}" disabled>
+				</div>
+
+				<button class="uk-button uk-button-default" type="submit" name="fileuploadsubmit">{add}</button>
 			</div>
-			[end]
+
+
+			<div class="uk-margin">
+				<div class="uk-child-width-1-3@m" uk-grid uk-lightbox="animation: slide">
+				[for ticket_tab_file_tab]
+					<div class="uk-inline">
+						<a class="uk-inline" href="[doc_base_url][ticket_tab_file_tab_path]" data-caption="[ticket_tab_file_tab_path]">
+							<img src="[doc_base_url][ticket_tab_file_tab_path]/-/thumb" alt="[ticket_tab_file_tab_path]">
+						</a>
+
+						<button class="uk-button uk-button-default uk-button-small uk-position-small uk-position-top-right uk-overlay uk-overlay-default uk-padding-small uk-padding-remove-top uk-padding-remove-bottom"
+							    type="submit"
+							    name="ticketdeletefile_[ticket_tab_file_tab_itemid]"
+							    data-uk-tooltip="title: {ticket_delete_file}">
+
+							<span uk-icon="trash"></span>
+						</button>
+					</div>
+				[end]
+				</div>
+
+			</div>
+
 			
-			<input size="30" type="file" name="ticketparam[ticket_tab_param_id]" multiple>
-			<input type="submit" name="fileuploadsubmit" value="{add}">
 		[end]
 
 
 		[if ticket_tab_type_is "files"]
+			<div class="uk-margin">
+				<label class="uk-form-label" for="winix_ticket_files_id_[ticket_tab_param_id]">[filter fil_firstup][ticket_tab_param_name][end]</label>
+
+				<div uk-form-custom="target: true">
+					<input type="file" id="winix_ticket_files_id_[ticket_tab_param_id]" name="ticketparam[ticket_tab_param_id]" multiple>
+					<input class="uk-input" type="text" placeholder="{form_ticket_select_file}" disabled>
+				</div>
+
+				<button class="uk-button uk-button-default" type="submit" name="fileuploadsubmit">{add}</button>
+			</div>
+
 			[if ticket_tab_file_tab]
+			<div class="uk-margin">
 				<ul>
 				[for ticket_tab_file_tab]
 					<li>
 						<a href="[doc_base_url][ticket_tab_file_tab_path]/download">[ticket_tab_file_tab_path]</a>
-						[# !! CHECK ME how this look like -- css was not set]
+						<button class="uk-button uk-button-default uk-button-small"
-						<input type="submit" name="ticketdeletefile_[ticket_tab_file_tab_itemid]" value="{ticket_delete_file}">
+								type="submit"
+								name="ticketdeletefile_[ticket_tab_file_tab_itemid]"
+								value="{ticket_delete_file}"
+								data-uk-tooltip="title: {ticket_delete_file}">
+
+								<span uk-icon="trash"></span>
+						</button>
 					</li>
 				[end]
 				</ul>
+			</div>
 			[end]
-		
-			<input size="30" type="file" name="ticketparam[ticket_tab_param_id]" multiple>
-			<input type="submit" name="fileuploadsubmit" value="{add}">
 		[end]
 
 		[if any_not [ticket_tab_type_is "images"] [ticket_tab_type_is "files"] ticket_is_creating_new ticket_tab_has_value]
-			{ticket_value_not_set}
+		<div class="uk-alert-warning" uk-alert>
+			<p>{ticket_value_not_set}</p>
+		</div>
 		[end]
 
-		</td>
-		</tr>
-		
 	[end]
-	
+
-	</table>
 [end]
 
 
 [# FIXME !! change names form_emacs_content_thread and form_emacs_content_ticket]
-<div class="winix_input_a">
+<div class="uk-margin">
-<label for="winix_content_id">{form_emacs_content_ticket}</label>
+	<label for="winix_content_id">{form_emacs_content_ticket}</label>
-<textarea id="winix_content_id" rows="10" cols="60" name="itemcontent">[item_content]</textarea>
+
+	<div class="uk-form-controls">
+		<textarea class="uk-textarea" id="winix_content_id" rows="10" cols="60" name="itemcontent">[item_content]</textarea>
+	</div>
 </div>
 
 
-<div class="winix_input_a">
+<div class="uk-margin">
-<label for="winix_content_type_id">{form_emacs_content_type}</label>
+	<label for="winix_content_type_id">{form_emacs_content_type}</label>
-<select id="winix_content_type_id" name="contenttype">
+
-	<option[if item_content_type_is "text"] selected[end] value="0">{form_emacs_content_type_text}</option>
+	<div class="uk-form-controls">
-	<option[if item_content_type_is "formatted text"] selected[end] value="1">{form_emacs_content_type_formatted_text}</option>
+		<select class="uk-select" id="winix_content_type_id" name="contenttype">
-	[if user_can_use_html]<option[if item_content_type_is "html"] selected[end] value="2">{form_emacs_content_type_html}</option>[end]
+			<option[if item_content_type_is "text"] selected[end] value="0">{form_emacs_content_type_text}</option>
-	[if user_can_use_bbcode]<option[if item_content_type_is "bbcode"] selected[end] value="3">{form_emacs_content_type_bbcode}</option>[end]
+			<option[if item_content_type_is "formatted text"] selected[end] value="1">{form_emacs_content_type_formatted_text}</option>
-	[if user_can_use_other]<option[if item_content_type_is "other"] selected[end] value="4">{form_emacs_content_type_other}</option>[end]
+			[if user_can_use_html]<option[if item_content_type_is "html"] selected[end] value="2">{form_emacs_content_type_html}</option>[end]
-</select>
+			[if user_can_use_bbcode]<option[if item_content_type_is "bbcode"] selected[end] value="3">{form_emacs_content_type_bbcode}</option>[end]
+			[if user_can_use_other]<option[if item_content_type_is "other"] selected[end] value="4">{form_emacs_content_type_other}</option>[end]
+		</select>
+	</div>
 </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"]
@@ -128,8 +192,9 @@
 	<input type="hidden" name="postredirect" value="[winix_function_param_value "postredirect"]">
 [end]
 
-
+<div class="uk-margin">
-<input type="submit" value="[if item_is]{form_ticket_edit_submit}[else]{form_ticket_create_submit}[end]">
+	<input class="uk-button uk-button-primary" type="submit" value="[if item_is]{form_ticket_edit_submit}[else]{form_ticket_create_submit}[end]">
+</div>
 
 
 </form>

winixd/html/fun_emacs.html

@@ -7,14 +7,14 @@
 <form class="uk-form-stacked" method="post" action="[doc_base_url][dir][if item_is][item_url]/[end]emacs">
 
 	<div class="uk-margin">
-		<label class="uk-form-label" for="winix_title_id">{title}:</label>
+		<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>
+		<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>
@@ -24,7 +24,7 @@
 	
 	[if not user_logged]
 		<div class="uk-margin">
-			<label class="uk-form-label" for="winix_nick_id">{nick}:</label>
+			<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>

winixd/html/fun_export.html

@@ -11,17 +11,20 @@
 
 
 
-<form action="[doc_base_url][dir][if item_is][item_url]/[end]export" method="post">
+<form class="uk-form-stacked" action="[doc_base_url][dir][if item_is][item_url]/[end]export" method="post">
 
-	<input type="checkbox" name="staticfilestoo" id="nonstaticfiles"><label for="nonstaticfiles">{export_checkbox_static_file_too}</label>
+	<div class="uk-margin">
-
+		<label><input class="uk-checkbox uk-margin-small-right" type="checkbox" name="staticfilestoo">{export_checkbox_static_file_too}</label>
-	<br><br>
+	</div>
-	<input type="submit" value="Export">
 
 	[if winix_function_param_is "postredirect"]
 		<input type="hidden" name="postredirect" value="[winix_function_param_value "postredirect"]">
 	[end]
 
+	<div class="uk-margin">
+		<button class="uk-button uk-button-primary" type="submit">{export_button}</button>
+	</div>
+
 </form>
 
 

winixd/html/fun_gallery.html

@@ -4,12 +4,14 @@
 [if mount_page_arg_is "info"][include "dir_last_info.html"][end]
 
 
-[if one gallery_has_not_mount_type [gallery_mount_type_arg_is "lightbox"]]
+[if one gallery_has_not_mount_type [gallery_mount_type_arg_is "uikit"]]
 
 	[if gallery_tab]
-		<ul class="galleryimages">
+		<ul class="uk-child-width-1-2@s uk-child-width-1-3@m uk-child-width-1-4@l uk-grid" data-uk-lightbox="animation: slide">
 		[for gallery_tab]
-			<li><a rel="lightbox\[gallery\]" href="[gallery_tab_link]"><img src="[gallery_tab_link]/-/thumb" alt="[gallery_tab_subject]"></a></li>
+			<li class="uk-margin-small">
+				<a href="[gallery_tab_link]"><img src="[gallery_tab_link]/-/thumb" alt="[gallery_tab_subject]"></a>
+			</li>
 		[end]
 		</ul>
 	[end]
@@ -17,7 +19,24 @@
 [end]
 
 
-[if gallery_mount_type_arg_is "galleria"]
+[if gallery_mount_type_arg_is "lightbox"]
+[# https://lokeshdhakar.com/projects/lightbox2/ ]
+
+	[if gallery_tab]
+		<ul class="uk-child-width-1-2@s uk-child-width-1-3@m uk-child-width-1-4@l uk-grid">
+		[for gallery_tab]
+			<li class="uk-margin-small">
+				<a href="[gallery_tab_link]" data-lightbox="gallery"><img src="[gallery_tab_link]/-/thumb" alt="[gallery_tab_subject]"></a>
+			</li>
+		[end]
+		</ul>
+	[end]
+
+[end]
+
+
+[if gallery_mount_type_arg_is "galleriajs"]
+[# https://galleriajs.github.io/]
 
 	[if gallery_tab]
 		<ul class="galleryimages" style="width: [gallery_width]; height: [gallery_height];">
@@ -25,21 +44,30 @@
 			<li><a href="[gallery_tab_link]"><img src="[gallery_tab_link]/-/thumb" alt="[gallery_tab_subject]"></a></li>
 		[end]
 		</ul>
-		
+
-		[if gallery_mount_theme_arg_is "transparent"]
+
-			<script type="text/javascript">Galleria.loadTheme('[doc_base_url_common]/aino-galleria/themes/transparent/galleria.transparent.js');</script>
+		[if gallery_mount_theme_arg_is "azur"]
+			<script type="text/javascript">Galleria.loadTheme('[doc_base_url_common]/galleriajs/1.6.1/dist/themes/azur/galleria.azur.min.js');</script>
 		[else]
-			[if gallery_mount_theme_arg_is "white"]
+			[if gallery_mount_theme_arg_is "twelve"]
-				<script type="text/javascript">Galleria.loadTheme('[doc_base_url_common]/aino-galleria/themes/white/galleria.white.js');</script>
+				<script type="text/javascript">Galleria.loadTheme('[doc_base_url_common]/galleriajs/1.6.1/dist/themes/twelve/galleria.twelve.min.js');</script>
 			[else]
-				<script type="text/javascript">Galleria.loadTheme('[doc_base_url_common]/aino-galleria/themes/classic/galleria.classic.js');</script>
+				[if gallery_mount_theme_arg_is "folio"]
+					<script type="text/javascript">Galleria.loadTheme('[doc_base_url_common]/galleriajs/1.6.1/dist/themes/folio/galleria.folio.min.js');</script>
+				[else]
+					[if gallery_mount_theme_arg_is "fullscreen"]
+						<script type="text/javascript">Galleria.loadTheme('[doc_base_url_common]/galleriajs/1.6.1/dist/themes/fullscreen/galleria.fullscreen.min.js');</script>
+					[else]
+						<script type="text/javascript">Galleria.loadTheme('[doc_base_url_common]/galleriajs/1.6.1/dist/themes/classic/galleria.classic.min.js');</script>
+					[end]
+				[else]
 			[end]
 		[end]
 
+
 		[if not [winix_function_param_is "image"]]
 			<script type="text/javascript">$('.galleryimages').galleria();</script>
 		[else]
-			[# !! IMPROVE ME add this javascript code to the rest of galleria types]
 			<script type="text/javascript">var url = window.document.URL.toString(); var num = 0; var re = /\/image:(\d+)/; var numarr = re.exec(url); if( numarr && numarr.length == 2 ) \{var num = numarr\[1\];\}; $('.galleryimages').galleria(\{show: num\});</script>
 		[end]
 	[end]
@@ -47,120 +75,4 @@
 [end]
 
 
-[if gallery_mount_type_arg_is "galleria1.2.9"]
-
-	[if gallery_tab]
-
-		<ul class="galleryimages" style="width: [gallery_width]; height: [gallery_height];">
-		[for gallery_tab]
-			<li><a href="[gallery_tab_link]"><img src="[gallery_tab_link]/-/thumb" alt="[gallery_tab_subject]"></a></li>
-		[end]
-		</ul>
-
-
-		[if gallery_mount_theme_arg_is "transparent"]
-			<script type="text/javascript">Galleria.loadTheme('[doc_base_url_common]/galleria/themes/transparent/galleria.transparent.js');</script>
-
-			[if not [winix_function_param_is "image"]]
-				<script type="text/javascript">Galleria.configure(\{showInfo:false\}); Galleria.run('.galleryimages');</script>
-			[else]
-				<script type="text/javascript">Galleria.configure(\{showInfo:false, show: [winix_function_param_value "image"]\}); Galleria.run('.galleryimages');</script>
-			[end]
-
-		[else]
-			[if gallery_mount_theme_arg_is "transparentinfo"]
-				<script type="text/javascript">Galleria.loadTheme('[doc_base_url_common]/galleria/themes/transparentinfo/galleria.transparent.js');</script>
-
-				[if not [winix_function_param_is "image"]]
-					<script type="text/javascript">Galleria.configure(\{\}); Galleria.run('.galleryimages');</script>
-				[else]
-					<script type="text/javascript">Galleria.configure(\{show: [winix_function_param_value "image"]\}); Galleria.run('.galleryimages');</script>
-				[end]
-			[else]
-				<script type="text/javascript">Galleria.loadTheme('[doc_base_url_common]/galleria/themes/classic/galleria.classic.js');</script>
-
-				[if not [winix_function_param_is "image"]]
-					<script type="text/javascript">Galleria.configure(\{\}); Galleria.run('.galleryimages');</script>
-				[else]
-					<script type="text/javascript">Galleria.configure(\{show: [winix_function_param_value "image"]\}); Galleria.run('.galleryimages');</script>
-				[end]
-			[end]
-		[end]
-	
-	[end]
-
-[end]
-
-
-[if gallery_mount_type_arg_is "galleriathumb"]
-
-	[if not [winix_function_param_is "image"]]
-		[if gallery_tab]
-			<ul class="galleryimages">
-			[for gallery_tab]
-				<li><a href="[doc_base_url][dir]-/image:[gallery_tab_index]"><img src="[gallery_tab_link]/-/thumb" alt="[gallery_tab_subject]"></a></li>
-			[end]
-			</ul>
-		[end]
-	[else]
-		[if gallery_tab]
-			<ul class="galleryimages" style="width: [gallery_width]; height: [gallery_height];">
-			[for gallery_tab]
-				<li><a href="[gallery_tab_link]"><img src="[gallery_tab_link]/-/thumb" alt="[gallery_tab_subject]"></a></li>
-			[end]
-			</ul>
-			
-			[if gallery_mount_theme_arg_is "white"]
-				<script type="text/javascript">Galleria.loadTheme('[doc_base_url_common]/aino-galleria/themes/white/galleria.white.js');</script>
-			[else]
-				<script type="text/javascript">Galleria.loadTheme('[doc_base_url_common]/aino-galleria/themes/classic/galleria.classic.js');</script>
-			[end]
-			
-			<script type="text/javascript">$('.galleryimages').galleria(\{show_info:false, show: [winix_function_param_value "image"]\});</script>
-
-		[end]
-	[end]
-
-[end]
-
-
-
-[if gallery_mount_type_arg_is "galleriathumb1.2.9"]
-
-
-	[if not [winix_function_param_is "image"]]
-		[if gallery_tab]
-			<ul class="galleryimages">
-			[for gallery_tab]
-				<li><a href="[doc_base_url][dir]-/image:[gallery_tab_index]"><img src="[gallery_tab_link]/-/thumb" alt="[gallery_tab_subject]"></a></li>
-			[end]
-			</ul>
-		[end]
-	[else]
-
-		[if gallery_tab]
-
-			<ul class="galleryimages" style="width: [gallery_width]; height: [gallery_height];">
-			[for gallery_tab]
-				<li><a href="[gallery_tab_link]"><img src="[gallery_tab_link]/-/thumb" alt="[gallery_tab_subject]"></a></li>
-			[end]
-			</ul>
-
-			[if gallery_mount_theme_arg_is "transparent"]
-				<script type="text/javascript">Galleria.loadTheme('[doc_base_url_common]/galleria/themes/transparent/galleria.transparent.js');</script>
-				<script type="text/javascript">Galleria.configure(\{showInfo:false, show: [winix_function_param_value "image"]\}); Galleria.run('.galleryimages');</script>
-			[else]
-				[if gallery_mount_theme_arg_is "transparentinfo"]
-					<script type="text/javascript">Galleria.loadTheme('[doc_base_url_common]/galleria/themes/transparentinfo/galleria.transparent.js');</script>
-					<script type="text/javascript">Galleria.configure(\{show: [winix_function_param_value "image"]\}); Galleria.run('.galleryimages');</script>
-				[end]
-			[end]
-		
-		[end]
-
-	[end]
-
-[end]
-
-
 </div>

winixd/html/fun_imgcrop.html

@@ -1,22 +1,22 @@
 <div class="winix">
 
 
-<h1>Kadrowanie obrazów</h1>
+<h1>{imgcrop_header}</h1>
 
 [if item_is]
 
-	[if winix_function_param_is "thumb"]
-	<p>Kadruj miniaturę zdjęcia, obraz oryginalny (duży) nie zostanie zmodyfikowany.</p>.
-	[else]
-		[if winix_function_param_is "newthumb"]
-			<p>Zaznacz myszką kadr na zdjęciu, z tej części zostanie stworzona nowa miniatura, obraz oryginalny (duży) nie zostanie zmodyfikowany.</p>.
-		[else]
-			<p>Kadruj oryginalny obraz (miniatura nie zostanie zmodyfikowana).</p>.
-		[end]
-	[end]
-
 	[if any item_is item_filetype_is_image]
 
+		[if winix_function_param_is "thumb"]
+			<p>{imgcrop_crop_only_thumb_info}</p>
+		[else]
+			[if winix_function_param_is "newthumb"]
+				<p>{imgcrop_create_new_thumb_info}</p>
+			[else]
+				<p>{imgcrop_crop_only_original_img_info}</p>
+			[end]
+		[end]
+
 		<script type="text/javascript">
 		var winix_jcrop;
 		</script>
@@ -31,12 +31,11 @@
 
 			[if any_not [winix_function_param_is "thumb"] [winix_function_param_is "newthumb"]]
 
-	[if false]
+				[if false] [# !! IMPROVE ME not implemented yet]
-			<div class="winix_input_b">
+				<div class="uk-margin">
-				<input type="checkbox" name="createthumbtoo" id="winix_createthumbtooid">
+					<label><input class="uk-checkbox uk-margin-small-right" type="checkbox" name="createthumbtoo">{imgcrop_create_new_thumb_too_info}</label>
-				<label for="winix_createthumbtooid">Stwórz także nową miniaturę</label>
+				</div>
-			</div>
+				[end]
-	[end]
 
 			[end]
 
@@ -44,12 +43,15 @@
 				<input type="hidden" name="postredirect" value="[winix_function_param_value "postredirect"]">
 			[end]
 
-			<input type="submit" value="Kadruj">
+			<div class="uk-margin">
+				<input class="uk-button uk-button-primary" type="submit" value="Kadruj">
+			</div>
+
 		</form>
 
 
 	[else]
-		<p>To nie jest obrazek.</p>
+		<p>{imgcrop_no_image_info}</p>
 	[end]
 
 
@@ -72,33 +74,35 @@
 [else]
 
 	[if item_tab]
-		<ul class="winix_imgcrop_list">
+		<table class="uk-table uk-table-responsive uk-table-divider uk-table-justify">
-		[for item_tab]
+			[for item_tab]
+				<tr>
 
-			<li>
+					<td data-uk-lightbox="animation: slide">
-
+						<a href="[item_tab_link]">
-			<div class="winix_imgcrop_list_image">
+							<img src="[item_tab_link][if item_tab_has_thumb]/-/thumb[end]" alt="[item_tab_subject]">
-				<img src="[item_tab_link][if item_tab_has_thumb]/-/thumb[end]" alt="[item_tab_subject]">
+						</a>
-			</div>
+					</td>
-
-			<div class="winix_imgcrop_list_imageurl">
-				[item_tab_url]
-			</div>
-
-			<div class="winix_imgcrop_list_options">
-
-				<ul>
-					<li><a href="[item_tab_link]/imgcrop/postredirect:[filter fil_urlencode][doc_base_url][dir]imgcrop[end]">Kadruj zdjęcie</a></li>
-					<li><a href="[item_tab_link]/imgcrop/thumb/postredirect:[filter fil_urlencode][doc_base_url][dir]imgcrop[end]">Kadruj miniature</a></li>
-					<li><a href="[item_tab_link]/imgcrop/newthumb/postredirect:[filter fil_urlencode][doc_base_url][dir]imgcrop[end]">Kadruj i stwórz nową miniature</a></li>
-				</ul>
-			</div>
 
 
-			</li>
+					<td>
+						[item_tab_url]
+					</td>
 
-		[end]
+					<td>
-		</ul>
+
+						<ul class="uk-nav uk-width-medium">
+							<li class="uk-margin-small"><a class="uk-button uk-button-default uk-button-small uk-text-small" href="[item_tab_link]/imgcrop/postredirect:[filter fil_urlencode][doc_base_url][dir]imgcrop[end]">{imgcrop_table_option_crop_image}</a></li>
+							<li class="uk-margin-small"><a class="uk-button uk-button-default uk-button-small uk-text-small" href="[item_tab_link]/imgcrop/thumb/postredirect:[filter fil_urlencode][doc_base_url][dir]imgcrop[end]">{imgcrop_table_option_crop_thumb}</a></li>
+							<li class="uk-margin-small"><a class="uk-button uk-button-default uk-button-small uk-text-small" href="[item_tab_link]/imgcrop/newthumb/postredirect:[filter fil_urlencode][doc_base_url][dir]imgcrop[end]">{imgcrop_table_option_create_new_thumb}</a></li>
+						</ul>
+
+					</td>
+
+
+				</tr>
+			[end]
+		</table>
 	[end]
 
 

winixd/html/fun_ipban.html

@@ -4,7 +4,7 @@
 
 [if ipban_tab]
 
-	<table class="ipban_table">
+	<table class="uk-table uk-table-divider uk-table-small">
 
 	<tr>
 		<th>{ipban_col_id}</th>
@@ -35,15 +35,15 @@
 		<td>[if ipban_tab_has_active_flag]{ipban_has_active_flag}[end]</td>
 		<td>[ipban_tab_last_used]</td>
 		<td>[ipban_tab_expires]</td>
-		<td><a href="[doc_base_url][dir][if item_is][item_url]/[end]ipban/removeip:[ipban_tab_ip]">{ipban_remove_ip}</a></td>
+		<td><a class="uk-button uk-button-default uk-button-small" href="[doc_base_url][dir][if item_is][item_url]/[end]ipban/removeip:[ipban_tab_ip]">{ipban_remove_ip}</a></td>
 	</tr>
 
 	[end]
 	</table>
 
-	<p>
+	<div class="uk-margin">
-		<a href="[doc_base_url][dir][if item_is][item_url]/[end]ipban/removeip:all">{ipban_remove_all_ip}</a>
+		<a class="uk-button uk-button-default" href="[doc_base_url][dir][if item_is][item_url]/[end]ipban/removeip:all">{ipban_remove_all_ip}</a>
-	</p>
+	</div>
 
 [else]
 	<p>{ipban_ban_list_empty}</p>

winixd/html/fun_last.html

@@ -1,9 +1,9 @@
 <div class="winix">
 
-<h1 class="simple">{last_header}</h1>
+<h1>{last_header}</h1>
 
 [if last_tab]
-	<table>
+	<table class="uk-table uk-table-divider uk-table-small uk-table-responsive">
 	<tr><th>{last_tab_login}</th><th>{last_tab_ip}</th><th>{last_tab_login_date}</th><th>{last_tab_logout_date}</th></tr>
 	[for last_tab]
 		<tr><td>[last_tab_name]</td><td>[last_tab_ip]</td><td>[last_tab_start]</td><td>[last_tab_end]</td></tr>

winixd/html/fun_login.html

@@ -9,7 +9,7 @@
 		</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>
+			<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-width-small">{login_logout_button}</a>
 		</div>
 	</div>
 [else]
@@ -21,45 +21,44 @@
 		</div>
 	[else]
 
-
+		[# login template: https://zzseba78.github.io/Kick-Off/login.html, a little modified: removed pills from borders ]
 		<div class="uk-width-medium uk-padding-small">
 			<!-- 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>
-					<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: lock"></span>
-							<input class="uk-input uk-border-pill" required placeholder="{login_password}" type="password" name="password">
-						</div>
-					</div>
 
-					[if login_should_use_captcha]
+				<div class="uk-margin-small">
-					<div class="uk-margin-small">
+					<div class="uk-inline uk-width-1-1">
-						<div class="uk-inline uk-width-1-1">
+						<span class="uk-form-icon uk-form-icon-flip" data-uk-icon="icon: user"></span>
-							<span class="uk-form-icon uk-form-icon-flip" data-uk-icon="icon: lifesaver"></span>
+						<input class="uk-input" required placeholder="{login_username}" type="text" name="login">
-							<input class="uk-input uk-border-pill" required placeholder="{rebus_how_is_it} [rebus_question]?" type="text" name="rebus">
-						</div>
 					</div>
-					[end]
+				</div>
-
+				<div class="uk-margin-small">
-					<div class="uk-margin-small">
+					<div class="uk-inline uk-width-1-1">
-						<label><input class="uk-checkbox" type="checkbox" name="rememberme"> {login_remember_me}</label>
+						<span class="uk-form-icon uk-form-icon-flip" data-uk-icon="icon: lock"></span>
+						<input class="uk-input" required placeholder="{login_password}" type="password" name="password">
 					</div>
-					<div class="uk-margin-bottom">
+				</div>
-						<button type="submit" class="uk-button uk-button-primary uk-border-pill uk-width-1-1">{login_button}</button>
+
+				[if login_should_use_captcha]
+				<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: lifesaver"></span>
+						<input class="uk-input" required placeholder="{rebus_how_is_it} [rebus_question]?" type="text" name="rebus">
 					</div>
+				</div>
+				[end]
 
-					[if winix_function_param_is "postredirect"]
+				<div class="uk-margin-small">
-						<input type="hidden" name="postredirect" value="[winix_function_param_value "postredirect"]">
+					<label><input class="uk-checkbox uk-margin-small-right" type="checkbox" name="rememberme">{login_remember_me}</label>
-					[end]
+				</div>
+				<div class="uk-margin-bottom">
+					<button type="submit" class="uk-button uk-button-primary 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 -->
 
@@ -69,11 +68,11 @@
 				<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">
+						<input class="uk-input" 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>
+					<button type="submit" class="uk-button uk-button-primary uk-width-1-1">{login_forgot_password_button}</button>
 				</div>
 			</form>
 			<!-- /recover password -->

winixd/html/fun_ls.html

@@ -131,7 +131,7 @@
 				[end]
 				</ul>
 			[end]
-			[# !! IMPROVE ME those two lists (above and below) can be combined together
+			[# !! IMPROVE ME those two lists (above and below) can be combined together]
 			[if item_tab]
 				<ul class="uk-list uk-list-disc uk-list-collapse">
 					[for item_tab]
@@ -144,7 +144,7 @@
 
 	[else]
 	
-		[!! improve me: may it would be better to not use a list here?]
+		[#!! 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_man.html

@@ -4,29 +4,23 @@
 
 <h2>{man_winix_funcions}</h2>
 
-<table>
+<ul class="uk-list uk-list-disc">
 
 [for man_winixfun_tab]
-	<tr>
+	<li>[man_winixfun_tab_name]</li>
-	<td>[man_winixfun_tab_index]</td>
-	<td>[man_winixfun_tab_name]</td>
-	</tr>
 [end]
 
-</table>
+</ul>
 
 
 <h2>{man_ezc_functions}</h2>
 
-<table>
+<ul class="uk-list uk-list-disc">
 
 [for man_ezcfun_tab]
-	<tr>
+	<li>[man_ezcfun_tab_name]</li>
-	<td>[man_ezcfun_tab_index]</td>
-	<td>[man_ezcfun_tab_name]</td>
-	</tr>
 [end]
 
-</table>
+</ul>
 
 </div>

winixd/html/fun_pw.html

@@ -1,9 +1,9 @@
 <div class="winix">
 
-<h1>Pw</h1>
+<h1>{pw_header}</h1>
 
 [if user_tab]
-	<table class="tablec">
+	<table class="uk-table uk-table-divider uk-table-small uk-table-responsive">
 	<tr>
 	<th>{pw_table_no}</th>
 	<th>{pw_table_login}</th>
@@ -14,7 +14,7 @@
 	</tr>
 	
 	[for user_tab]
-		<tr class="[if index "odd"]roweven[else]rowodd[end]">
+		<tr>
 		<td>[user_tab_index]</td>
 		<td>[user_tab_name]</td>
 		<td>[if user_tab_is_super_user]{pw_table_yes}[end]</td>

winixd/html/fun_reply.html

@@ -3,30 +3,37 @@
 <h1>{thread_header_reply}</h1>
 
 
-<form method="post" action="[doc_base_url][dir][item_url]/reply">
+<form class="uk-form-stacked" method="post" action="[doc_base_url][dir][item_url]/reply">
 
 	[if thread_mount_arg_is "subject"]
-		<div class="winix_input_a">
+		<div class="uk-margin">
-		<label for="">{title}:</label>
+			<label class="uk-form-label" for="winix_title_id">{title}</label>
-		<input type="text" name="subject" value="">
+			<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="">{suggested_url}:</label>
+			<label class="uk-form-label" for="winix_url_id">{suggested_url}</label>
-		<input type="text" name="url" value="">
+			<div class="uk-form-controls">
+				<input class="uk-input" id="winix_url_id" type="text" name="url" value="[item_url]">
+			</div>
 		</div>
 	[end]
-	
+
-	
+
-	<div class="winix_input_a">
+	<div class="uk-margin">
-	[if mount_type_is "thread"]<label for="winix_content_id">{form_emacs_content_thread}</label>[end]
+		[if mount_type_is "thread"]<label for="winix_content_id">{form_emacs_content_thread}</label>[end]
-	<textarea id="winix_content_id" rows="10" cols="60" name="itemcontent"></textarea>
+
+		<div class="uk-form-controls">
+			<textarea class="uk-textarea" id="winix_content_id" rows="10" cols="60" name="itemcontent"></textarea>
+		</div>
 	</div>
-	
+
-	
+
-	<div class="winix_input_a">
+	<div class="uk-margin">
-	<label for="">{form_emacs_content_type}</label>
+	<label class="uk-form-label" for="winix_contenttype_id">{form_emacs_content_type}</label>
-	<select name="contenttype">
+	<select class="uk-select" name="contenttype" id="winix_contenttype_id">
 		<option value="0">{form_emacs_content_type_text}</option>
 		<option selected value="1">{form_emacs_content_type_formatted_text}</option>
 		[if user_can_use_html]<option value="2">{form_emacs_content_type_html}</option>[end]
@@ -34,20 +41,24 @@
 		[if user_can_use_other]<option value="4">{form_emacs_content_type_other}</option>[end]
 	</select>
 	</div>
-	
+
-	
+
-	
+
 	[if not user_logged]
-		<div class="winix_input_a">
+		<div class="uk-margin">
-		<label for="">{nick}:</label>
+			<label class="uk-form-label" for="winix_nick_id">{nick}</label>
-		<input type="text" name="guestname" value="">
+			<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="">{rebus_how_is_it} [rebus_question]?</p>
+			<label class="uk-form-label" for="winix_rebus_id">{rebus_how_is_it} [rebus_question]?</label>
-		<input 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]
 
@@ -55,8 +66,10 @@
 		<input type="hidden" name="postredirect" value="[winix_function_param_value "postredirect"]">
 	[end]
 
-	
+
-	<input type="submit" value="{add}">
+	<div class="uk-margin">
+		<input class="uk-button uk-button-primary" type="submit" value="{add}">
+	</div>
 
 </form>
 

winixd/html/fun_rmuser.html

@@ -4,18 +4,20 @@
 
 [if user_logged]
 
-	<form id="additem" method="post" action="[doc_base_url][dir][if item_is][item_url]/[end]rmuser">
+	<form class="uk-form-stacked" method="post" action="[doc_base_url][dir][if item_is][item_url]/[end]rmuser">
-	<fieldset>
-		<legend>{rmuser_legend}</legend>
 
 		[if user_super_user]
 
-			<p class="withnext">{rmuser_selectuser}:</p>
+			<div class="uk-margin">
-			<select name="userid">
+				<label class="uk-form-label" for="winix_select_user_id">{rmuser_selectuser}</label>
-			[for user_tab]
+				<div class="uk-form-controls">
-				<option value="[user_tab_id]">[user_tab_name]</option>
+					<select class="uk-select uk-width-1-2@s" id="winix_select_user_id" name="userid">
-			[end]
+					[for user_tab]
-			</select>
+						<option value="[user_tab_id]">[user_tab_name]</option>
+					[end]
+					</select>
+				</div>
+			</div>
 		
 		[else]
 			<p>{rmuser_removecurrent}</p>
@@ -26,8 +28,10 @@
 			<input type="hidden" name="postredirect" value="[winix_function_param_value "postredirect"]">
 		[end]
 		
-		<input type="submit" value="{rmuser_submit}">
+		<div class="uk-margin">
-	</fieldset>
+			<input class="uk-button uk-button-primary" type="submit" value="{rmuser_submit}">
+		</div>
+
 	</form>
 
 [end]

winixd/html/fun_run.html

@@ -3,15 +3,7 @@
 	<div>
 	
 		[if mount_page_arg_is "subject"]
-			[if mount_page_arg_is "info"]
+			<h1>[item_subject]</h1>
-				<h1 class="withinfo">
-			[else]
-				<h1>
-			[end]
-			
-			[item_subject]
-			</h1>
-			
 		[end]
 		
 		[if mount_page_arg_is "info"]

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">
-	</div>
+			<input class="uk-input" id="winix_title_id" type="text" name="subject" value="[item_subject]" autofocus>
-	
+		</div>
-	<div class="winix_input_a">
-	<label for="winix_description_id">{seo_description}:</label>
-	<input id="winix_description_id" type="text" name="description" value="[item_meta "seo" "description"]">
 	</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_description_id">{seo_description}</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_description_id" type="text" name="description" value="[item_meta "seo" "description"]">
+		</div>
+	</div>
+
+	<div class="uk-margin">
+		<label class="uk-form-label" for="winix_keywords_id">{seo_keywords}</label>
+		<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_showthreads.html

@@ -5,22 +5,20 @@
 
 
 [if thread_can_create]
-	<div class="winix_itemoptions_b">
+	<div class="uk-margin">
-	<ul>
+		<a class="uk-button uk-button-primary" href="[doc_base_url][dir]createthread" rel="nofollow">{thread_create_new}</a>
-		<li><a href="[doc_base_url][dir]createthread" rel="nofollow">{thread_create_new}</a></li>
-	</ul>
 	</div>
 [end]
 
 
 [if thread_sort_tab]
-	<table class="winix_forum">
+	<table class="uk-table uk-table-divider uk-table-small uk-table-responsive">
 	<tr><th>{thread_tab_title}</th><th>{thread_tab_author}</th><th>{thread_tab_replies}</th><th>{thread_tab_last_post}</th></tr>
 	[for thread_sort_tab]
 		<tr>
 		<td><a href="[doc_base_url][dir][thread_sort_tab_url]">[thread_sort_tab_subject]</a></td> [# dodac sprawdzanie subject empty]
-		<td class="smallfont">[thread_sort_tab_user]</td><td class="smallfont">[thread_sort_tab_replies]</td>
+		<td>[thread_sort_tab_user]</td><td class="smallfont">[thread_sort_tab_replies]</td>
-		<td class="smallfont">[thread_sort_tab_last_item_date_modification_nice] ([thread_sort_tab_last_item_user])</td>
+		<td>[thread_sort_tab_last_item_date_modification_nice] ([thread_sort_tab_last_item_user])</td>
 		</tr>
 	[end]
 	</table>

winixd/html/fun_showtickets.html

@@ -5,16 +5,15 @@
 
 
 [if ticket_can_create]
-	<div class="winix_itemoptions_b">
+	<div class="uk-margin">
-		<ul>
+		<a class="uk-button uk-button-primary" href="[doc_base_url][dir]createticket" rel="nofollow">{ticket_create_new}</a>
-		<li><a href="[doc_base_url][dir]createticket" rel="nofollow">{ticket_create_new}</a></li>
-		</ul>
 	</div>
 [end]
 
 
 [if tickets_tab]
-	<table class="winix_tickets_tab">
+<div class="uk-overflow-auto">
+	<table class="uk-table uk-table-divider uk-table-small uk-table-responsive uk-text-small">
 	
 	<tr>
 		<th>{tickets_header_name}</th>
@@ -33,7 +32,7 @@
 	
 	[for tickets_tab]
 		<tr>
-		<td class="winix_tickets_tab_title"><a href="[doc_base_url][dir][tickets_tab_url]">[if not tickets_tab_subject_empty][tickets_tab_subject][else]&lt;[tickets_tab_url]&gt;[end]</a></td>
+		<td><a href="[doc_base_url][dir][tickets_tab_url]">[if not tickets_tab_subject_empty][tickets_tab_subject][else]&lt;[tickets_tab_url]&gt;[end]</a></td>
 		[for tickets_tab_conf_tab]
 			[if any_not [tickets_tab_conf_tab_type_is "images"] [tickets_tab_conf_tab_type_is "files"]]
 				[if tickets_tab_conf_tab_type_is "progress"]
@@ -54,6 +53,7 @@
 	[end]
 	
 	</table>
+</div>
 [end]
 
 

winixd/html/fun_stat.html

@@ -2,7 +2,7 @@
 
 <h1 class="simple">{stat_header}</h1>
 
-<table class="withoutborder">
+<table class="uk-table uk-table-small uk-table-divider uk-width-1-2@m">
 
 <tr><th>{stat_item_type}:</th>	<td>
 [if stat_item_type_is_file]{stat_item_type_file}[end]

winixd/html/fun_subject.html

@@ -3,18 +3,22 @@
 <h1>{subject_header}</h1>
 
 
-<form method="post" action="[doc_base_url][dir][if item_is][item_url]/[end]subject">
+<form class="uk-form-stacked" method="post" action="[doc_base_url][dir][if item_is][item_url]/[end]subject">
 	
-	<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="[if item_is][item_subject][else][dir_last_subject][end]">
+		<div class="uk-form-controls">
+			<input class="uk-input" id="winix_title_id" type="text" name="subject" value="[if item_is][item_subject][else][dir_last_subject][end]">
+		</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">
+		<input class="uk-button uk-button-primary" type="submit" value="{change}">
+	</div>
 
 </form>
 

winixd/html/fun_thread.html

@@ -1,45 +1,56 @@
 <div class="winix">
 
 [if mount_page_arg_is "subject"]<h1[if mount_page_arg_is "info"] class="winix_withinfo"[end]>[item_subject]</h1>[end]
+[if false]
 [if mount_page_arg_is "info"][include "item_info.html"][end]
-
-
-[if thread_can_reply]
-	<div class="winix_itemoptions_b">
-	<ul>
-		<li><a href="[doc_base_url][dir][item_url]/reply" rel="nofollow">{thread_reply_in_this_thread}</a></li>
-	</ul>
-	</div>
 [end]
 
 [if not [thread_mount_arg_is "sort_desc"]]
-	<div class="winix_threadbox">
+	<div class="uk-margin">
-		[if item_can_write]<a class="winix_threadedit" href="[item_link]/emacs" rel="nofollow">\[{edit}\]</a>[end]
+		[if item_can_write]<a class="uk-button uk-button-default uk-button-small" href="[item_link]/emacs" rel="nofollow">{edit}</a>[end]
 		[if thread_mount_arg_is "subject"]<h2[if thread_mount_arg_is "info"] class="winix_withinfo"[end]>[item_subject]</h2>[end]
 		[if thread_mount_arg_is "info"][include "item_info.html"][end]
 		[item_print_content]
 	</div>
 [end]
 
+[if thread_mount_arg_is "sort_desc"]
+	[if thread_can_reply]
+		<div class="uk-margin">
+			<a class="uk-button uk-button-primary" href="[doc_base_url][dir][item_url]/reply" rel="nofollow">{thread_reply_in_this_thread}</a>
+		</div>
+	[end]
+[end]
+
 
 [for thread_sort_tab]
-	<div class="winix_threadbox[if index "even"] winix_threadboxcolor[end]">
+	<div class="uk-margin [if index "odd"]uk-tile-default[else]uk-tile-muted uk-padding-small[end]">
-		[if thread_sort_tab_can_write]<a class="winix_threadedit" href="[thread_sort_tab_link]/emacs" rel="nofollow">\[{edit}\]</a>[end]
+		[if thread_sort_tab_can_write]<a class="uk-button uk-button-default uk-button-small" href="[thread_sort_tab_link]/emacs" rel="nofollow">{edit}</a>[end]
 		[if thread_mount_arg_is "subject"]<h2[if thread_mount_arg_is "info"] class="winix_withinfo"[end]>[thread_sort_tab_subject]</h2>[end]
 		[if thread_mount_arg_is "info"][include "thread_sort_tab_info.html"][end]
 		[thread_sort_tab_print_content]
 	</div>
 [end]
 
+
+
+
 [if thread_mount_arg_is "sort_desc"]
-	<div class="winix_threadbox">
+	<div class="uk-margin">
-		[if item_can_write]<a class="winix_threadedit" href="[item_link]/emacs" rel="nofollow">\[{edit}\]</a>[end]
+		[if item_can_write]<a class="uk-button uk-button-default uk-button-small" href="[item_link]/emacs" rel="nofollow">{edit}</a>[end]
 		[if thread_mount_arg_is "subject"]<h2[if thread_mount_arg_is "info"] class="winix_withinfo"[end]>[item_subject]</h2>[end]
 		[if thread_mount_arg_is "info"][include "item_info.html"][end]
 		[item_print_content]
 	</div>
 [end]
 
+[if not [thread_mount_arg_is "sort_desc"]]
+	[if thread_can_reply]
+		<div class="uk-margin">
+			<a class="uk-button uk-button-primary" href="[doc_base_url][dir][item_url]/reply" rel="nofollow">{thread_reply_in_this_thread}</a>
+		</div>
+	[end]
+[end]
 
 </div>
 

winixd/html/fun_ticket.html

@@ -5,22 +5,24 @@
 
 
 
-<div class="winix_ticket">
+<div class="uk-section uk-section-muted uk-padding">
 	[if ticket_can_edit]<p class="winix_ticket_edit"><a href="[doc_base_url][dir][item_url]/editticket" rel="nofollow">\[{edit}\]</a></p>[end]
-	<table>
+	<table class="uk-table uk-table-small">
 		[for ticket_tab]
 		[if ticket_tab_has_value]
 
 			<tr>
-			<th>[filter fil_firstup][ticket_tab_param_name]:[end]</th>
+			<th class="uk-width-auto">[filter fil_firstup][ticket_tab_param_name]:[end]</th>
-			<td>
+			<td class="uk-width-expand">
 			
 				[if ticket_tab_type_is "images"]
-					[for ticket_tab_file_tab]
+					<div class="uk-child-width-1-3@m" uk-grid uk-lightbox="animation: slide">
-					<a href="[doc_base_url][ticket_tab_file_tab_path]" rel="lightbox\[a\]">
+						[for ticket_tab_file_tab]
-					<img src="[doc_base_url][ticket_tab_file_tab_path]/-/thumb" alt="[ticket_tab_file_tab_path]" height="150">
+						<a class="uk-inline" href="[doc_base_url][ticket_tab_file_tab_path]" data-caption="[ticket_tab_file_tab_path]">
-					</a>
+							<img src="[doc_base_url][ticket_tab_file_tab_path]/-/thumb" alt="[ticket_tab_file_tab_path]">
-					[end]
+						</a>
+						[end]
+					</div>
 				[end]
 		
 				[if ticket_tab_type_is "files"]
@@ -47,16 +49,9 @@
 
 
 [if winix_has_plugin "thread"]
-
-	[if thread_can_reply]
-		<ul class="winix_itemoptions_b">
-			<li><a href="[doc_base_url][dir][item_url]/reply" rel="nofollow">{thread_reply_in_this_thread}</a></li>
-		</ul>
-	[end]
-	
 	
 	[for thread_sort_tab]
-		<div class="threadbox[if index "odd"] threadboxcolor[end]">
+		<div class="uk-margin [if index "even"]uk-tile-default[else]uk-tile-muted uk-padding-small[end]">
 			[if thread_sort_tab_can_write]<a class="threadedit" href="[thread_sort_tab_link]/emacs" rel="nofollow">\[{edit}\]</a>[end]
 			[if thread_mount_arg_is "subject"]<h2[if thread_mount_arg_is "info"] class="withinfo"[end]>[thread_sort_tab_subject]</h2>[end]
 			[if thread_mount_arg_is "info"][include "thread_sort_tab_info.html"][end]
@@ -64,6 +59,12 @@
 		</div>
 	[end]
 
+	[if thread_can_reply]
+		<div class="uk-margin">
+			<a class="uk-button uk-button-primary" href="[doc_base_url][dir][item_url]/reply" rel="nofollow">{thread_reply_in_this_thread}</a>
+		</div>
+	[end]
+
 [end]
 
 

winixd/html/fun_tinymce.html

@@ -6,14 +6,14 @@
 
 	[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>
+		<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>
+		<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>
@@ -36,7 +36,7 @@
 	
 	[if not user_logged]
 		<div class="uk-margin">
-			<label class="uk-form-label" for="winix_nick_id">{nick}:</label>
+			<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>

winixd/html/fun_uname.html

@@ -6,11 +6,12 @@
 
 [if sys_plugin_tab]
 
-	{uname_available_plugins}:
+	<h2>{uname_available_plugins}</h2>
-	<ul>
+
-	
+	<ul class="uk-list">
+
 	[for sys_plugin_tab]
-	<li>[if sys_plugin_tab_has_name][sys_plugin_tab_name][else]&lt;{uname_plugin_unknown}&gt;[end]</li>
+		<li>[if sys_plugin_tab_has_name][sys_plugin_tab_name][else]&lt;{uname_plugin_unknown}&gt;[end]</li>
 	[end]
 
 	</ul>

winixd/html/fun_uptime.html

@@ -2,20 +2,40 @@
 
 <h1>{uptime_header}</h1>
 
-<p>{uptime_current_time}: [winix_cur_time]<br>
+<table class="uk-table uk-table-divider uk-table-small uk-table-justify uk-width-2-3@s uk-width-1-2@m">
-{uptime_up}:
 
+<tr>
+<th>{uptime_current_time}</th><td>[winix_cur_time]</td>
+</tr>
+
+<tr>
+<th>{uptime_up}</th>
+<td>
 [if uptime_more_than_one_day]
 	[uptime_days] {uptime_days}
 [else]
 	[uptime_hours]
 [end]
-<br>
+</td>
-{uptime_how_many_sessions}: [winix_how_many_sessions]<br>
+</tr>
-{uptime_users_logged}: [winix_users_logged]<br>
+
-{load_avg}: [winix_loadavg_now], [winix_loadavg_1], [winix_loadavg_5], [winix_loadavg_15]<br>
+<tr>
-{req_per_sec}: [winix_req_per_sec_now], [winix_req_per_sec_1], [winix_req_per_sec_5], [winix_req_per_sec_15]
+<th>{uptime_how_many_sessions}</th><td>[winix_how_many_sessions]</td>
-</p>
+</tr>
+
+<tr>
+<th>{uptime_users_logged}</th><td>[winix_users_logged]</td>
+</tr>
+
+<tr>
+<th>{load_avg}</th><td>[winix_loadavg_now], [winix_loadavg_1], [winix_loadavg_5], [winix_loadavg_15]</td>
+</tr>
+
+<tr>
+<th>{req_per_sec}</th><td>[winix_req_per_sec_now], [winix_req_per_sec_1], [winix_req_per_sec_5], [winix_req_per_sec_15]</td>
+</tr>
+
+</table>
 
 
 </div>

winixd/html/fun_vim.html

@@ -8,14 +8,14 @@
 
 	[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>
+		<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>
+		<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>
@@ -40,7 +40,7 @@
 	
 	[if not user_logged]
 		<div class="uk-margin">
-			<label class="uk-form-label" for="winix_nick_id">{nick}:</label>
+			<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>

winixd/html/fun_who.html

@@ -4,7 +4,7 @@
 
 
 [if who_tab]
-	<table class="who">
+	<table class="uk-table uk-table-divider uk-table-small uk-table-justify uk-table-responsive">
 	<tr><th>{who_tab_index}</th><th>{user}</th><th>{who_tab_start}</th><th>{who_tab_last_active}</th></tr>
 	[for who_tab]
 		<tr><td>[who_tab_lp]</td><td>[who_tab_user]</td><td>[who_tab_time]</td><td>[who_tab_last_time]</td></tr>

winixd/html/index.html

@@ -1,40 +1,31 @@
 <!DOCTYPE html>
 [# minimalistic template]
 
-<html lang="{language}">
+<html lang="{winix_html_lang_attr}">
 
 <head>
-	[include "index_head_functions_add.html"]
+	[include "index_head_adder.html"]
-	<meta charset="UTF-8">
 	<title>[doc_title]</title>
 </head>
 
-[if winix_function_is "login"]
+<body>
-[# 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-container uk-container-small">
 
+		<div class="uk-margin-top" data-uk-height-viewport="expand: true">
+			[include "slog.html"]
+			[content]
+		</div>
+
+		<div class="uk-margin-top uk-margin-bottom uk-text-center">
+			<span class="uk-text-small uk-text-muted">
+				© [current_year] [doc_base_url] - <a href="https://gitea.ttmath.org/tomasz.sowa/winix" title="{winix_backend_tooltip}" target="_blank" data-uk-tooltip>{winix_backend_info} [sys_ver_major].[sys_ver_minor].[sys_ver_revision]</a>
+				| {winix_frontend_info} <a href="http://getuikit.com" title="{winix_frontend_tooltip}" target="_blank" data-uk-tooltip><span data-uk-icon="uikit"></span></a>
+			</span>
+		</div>
 
-	<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"]
+	[include "index_bottom_adder.html"]
-
-	[# each winix function has div.winix in its template defined -- only functions: cat and run don't have div.winix]
-	[# so you can easly use 'content' with your own template]
-	[# and when using other winix functions you automatically get proper styling]
-	[content]
-</div>
-
-[include "index_bottom_adder.html"]
 </body>
 </html>

winixd/html/index_generic.html

@@ -1,11 +1,10 @@
 <!DOCTYPE html>
 [# minimalistic template]
 
-<html lang="{language}">
+<html lang="{winix_html_lang_attr}">
 
 <head>
-	[include "index_head_functions_add.html"]
+	[include "index_head_adder.html"]
-	<meta charset="UTF-8">
 	<title>[doc_title]</title>
 </head>
 

winixd/html/index_head_adder.html

@@ -1,15 +1,17 @@
-[# rename me to index_head_adder.html]
-
-
 [def winix_has_uikit "true"]
 [def winix_has_jquery "false"]
 
+
+[# IMPROME ME we can add some conditionales such as 'do_not_set_charset']
+<meta charset="UTF-8">
+<meta name="viewport" content="width=device-width, initial-scale=1">
+
 [# UIkit CSS]
-<link rel="stylesheet" href="[doc_base_url_common]/uikit/uikit-3.6.14/css/uikit.min.css">
+<link rel="stylesheet" href="[doc_base_url_common]/uikit/uikit-3.6.16/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.16/js/uikit.min.js"></script>
-<script src="[doc_base_url_common]/uikit/uikit-3.6.14/js/uikit-icons.min.js"></script>
+<script src="[doc_base_url_common]/uikit/uikit-3.6.16/js/uikit-icons.min.js"></script>
 
 
 
@@ -144,37 +146,25 @@ cm.save()
 
 
 
-[if winix_function_is "ticket"]
-[# !! dodac lightboxa tylko jesli tickety zawieraja obrazki ]
-<!--
-[# warning: prototype doesn't work with jquery in clock tickets (in client panel)]
-	<link rel="stylesheet" href="[doc_base_url_common]/lightbox/lightbox.css" type="text/css" media="screen">
-	<script src="[doc_base_url_common]/lightbox/js/prototype.js" type="text/javascript"></script>
-	<script src="[doc_base_url_common]/lightbox/js/scriptaculous.js?load=effects,builder" type="text/javascript"></script>
-	<script src="[doc_base_url_common]/lightbox/js/lightbox.js" type="text/javascript"></script>
--->
-[end]
-
 
 [if winix_function_is "gallery"]
 
-	[if one gallery_has_not_mount_type [gallery_mount_type_arg_is "lightbox"]]
+	[if gallery_mount_type_arg_is "lightbox"]
-		<link rel="stylesheet" href="[doc_base_url_common]/lightbox/lightbox.css" type="text/css" media="screen">
+		[# https://lokeshdhakar.com/projects/lightbox2/ ]
-		<script src="[doc_base_url_common]/lightbox/js/prototype.js" type="text/javascript"></script>
+
-		<script src="[doc_base_url_common]/lightbox/js/scriptaculous.js?load=effects,builder" type="text/javascript"></script>
+		[def winix_has_jquery "true"]
-		<script src="[doc_base_url_common]/lightbox/js/lightbox.js" type="text/javascript"></script>
+		<script type="text/javascript" src="[doc_base_url_common]/jquery/1.12.4/jquery.min.js"></script>
+		<link rel="stylesheet" href="[doc_base_url_common]/lightbox/2.11.3/dist/css/lightbox.min.css" type="text/css">
+		<script src="[doc_base_url_common]/lightbox/2.11.3/dist/js/lightbox.min.js" type="text/javascript"></script>
 	[end]
 
-	[if one [gallery_mount_type_arg_is "galleria"] [gallery_mount_type_arg_is "galleriathumb"]]
+	[if gallery_mount_type_arg_is "galleriajs"]
+		[# https://galleriajs.github.io/ ]
+		[# formerly called aino-gallery ]
+		
 		[def winix_has_jquery "true"]
-		<script type="text/javascript" src="[doc_base_url_common]/jquery-1.4.4.min.js"></script>
+		<script type="text/javascript" src="[doc_base_url_common]/jquery/1.12.4/jquery.min.js"></script>
-		<script src="[doc_base_url_common]/aino-galleria/galleria-1.2.2.min.js" type="text/javascript"></script>
+		<script src="[doc_base_url_common]/galleriajs/1.6.1/dist/galleria.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]
 	
 [end]
@@ -267,9 +257,9 @@ cm.save()
 
 [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]/jquery/1.12.4/jquery.min.js"></script>
-	<script type="text/javascript" src="[doc_base_url_common]/jcrop-0.9.12/js/jquery.Jcrop.js"></script>
+	<script type="text/javascript" src="[doc_base_url_common]/jcrop/0.9.15/js/jquery.Jcrop.min.js"></script>
-	<link type="text/css" rel="stylesheet" href="[doc_base_url_common]/jcrop-0.9.12/css/jquery.Jcrop.css">
+	<link type="text/css" rel="stylesheet" href="[doc_base_url_common]/jcrop/0.9.15/css/jquery.Jcrop.min.css">
 [end]
 
 

winixd/html/item_info.html

@@ -1,4 +1,4 @@
-<p class="winix_iteminfo">
+<p class="uk-text-meta">
 	{added_by}: [item_user], [item_date_creation_nice][if not item_dates_equal], 
 		{last_modified}[if item_users_different] {by}: [item_modification_user],[else]:[end]
 		[item_date_modification_nice][end]

winixd/html/item_options.html

@@ -1,39 +0,0 @@
-[if not [winix_function_param_is "fullscreen"]]
-[if dir_can_write item_can_write]
-	<div class="winix_itemoptions_a">
-	
-		[if dir_can_write]
-			<h2>{add_page}</h2>
-			<ul>
-			<li><a href="[doc_base_url][dir]emacs">{admin_emacs_add}</a></li>
-			[if user_can_use_html]
-				<li><a href="[doc_base_url][dir]ckeditor">{admin_ckeditor_add}</a></li>
-				<li><a href="[doc_base_url][dir]nicedit">{admin_nicedit_add}</a></li>
-				<li><a href="[doc_base_url][dir]tinymce">{admin_tinymce_add}</a></li>
-			[end]
-			</ul>
-		[end]
-	
-		[if item_is item_can_write]
-			<h2>{edit_page}</h2>
-			<ul>
-			<li><a href="[doc_base_url][dir][item_url]/emacs">{admin_emacs_edit}</a></li>
-			[if user_can_use_html]
-				<li><a href="[doc_base_url][dir][item_url]/ckeditor">{admin_ckeditor_edit}</a></li>
-				<li><a href="[doc_base_url][dir][item_url]/nicedit">{admin_nicedit_edit}</a></li>
-				<li><a href="[doc_base_url][dir][item_url]/tinymce">{admin_tinymce_edit}</a></li>
-			[end]
-			</ul>
-		[end]
-	
-		<h2>{admin_options}:</h2>
-		<ul>
-		<li><a href="[doc_base_url][dir]ls">{admin_ls}</a></li>
-		[if dir_can_write]<li><a href="[doc_base_url][dir]mkdir">{admin_mkdir}</a></li>[end]
-		[if dir_can_write]<li><a href="[doc_base_url][dir]upload">{admin_upload}</a></li>[end]
-		[if not item_is]<li><a href="[doc_base_url][dir]sort">{admin_sort}</a></li>[end]
-		[if any item_is item_can_remove]<li><a href="[doc_base_url][dir][item_url]/rm">{admin_rm}</a></li>[end]
-		</ul>
-	</div>
-[end]
-[end]

winixd/html/item_tab_info.html

@@ -1,4 +1,4 @@
-<p class="[if index "odd"]winix_itemtabinfo[else][if thread_mount_arg_is "subject"]winix_itemtabinfo[else]winix_itemtabinfo2[end][end]">
+<p class="uk-text-meta">
 
 	{added_by}: [item_tab_user], [item_tab_date_creation_nice][if not item_tab_dates_equal],
 		{last_modified}[if item_tab_users_different] {by}: [item_tab_modification_user],[else]:[end]

winixd/html/thread_sort_tab_info.html

@@ -1,4 +1,4 @@
-<p class="[if index "even"]winix_itemtabinfo[else][if thread_mount_arg_is "subject"]winix_itemtabinfo[else]winix_itemtabinfo2[end][end]">
+<p class="uk-text-meta">
 
 	{added_by}: [thread_sort_tab_user], [thread_sort_tab_date_creation_nice][if not thread_sort_tab_dates_equal],
 		{last_modified}[if thread_sort_tab_users_different] {by}: [thread_sort_tab_modification_user],[else]:[end]

winixd/locale/en

@@ -1,8 +1,12 @@
 winix_locale_id = "0"
 locale_name = "english"
 
-language = en
+winix_html_lang_attr = en
-charset = UTF-8
+
+winix_backend_info = Powered by winix
+winix_backend_tooltip = Winix - a web framework
+winix_frontend_info = Built with
+winix_frontend_tooltip = Visit UIkit 3 site
 
 logged_as = logged as
 
@@ -37,7 +41,7 @@ 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
 export_checkbox_static_file_too = "Export static files too (images etc.)"
-
+export_button = Export
 
 code_expired = The code has expired
 password_cannot_be_changed = The password cannot be changed, please contact with the system administrator
@@ -82,7 +86,6 @@ cat_file_url = File url
 
 
 create_thread_header = Create thread
-form_thread_legend = Thread form
 button_thread_submit = Create thread
 
 url = Url
@@ -128,6 +131,7 @@ form_ticket_progress = "Progress (0-100)"
 form_ticket_create_submit = Create a new ticket
 form_ticket_edit_submit = Edit a ticket
 
+form_ticket_select_file = Select file
 
 env_header = Environment variables for a user
 env_change_env_for_user = Change environment variables for user
@@ -199,6 +203,16 @@ ipban_remove_all_ip = Remove all IP's from the list
 ipban_ban_list_empty = There are not any IP addresses banned at the moment.
 ipban_your_ip_is_banned = Your IP address is banned on this server until to:
 
+imgcrop_header = Image cropping
+imgcrop_crop_only_thumb_info = "Crop the thumbnail of the photo, the original (large) image will not be modified."
+imgcrop_create_new_thumb_info = "Select a frame on the photo with the mouse, a new thumbnail will be created from this part, the original (large) image will not be modified."
+imgcrop_crop_only_original_img_info = "Crop the original image (the thumbnail will not be modified)."
+imgcrop_create_new_thumb_too_info = Also create a new thumbnail
+imgcrop_no_image_info = imgcrop can only be applied to image files.
+imgcrop_table_option_crop_image = Image cropping
+imgcrop_table_option_crop_thumb = Thumbnail cropping
+imgcrop_table_option_create_new_thumb = Create a new thumbnail
+
 
 man_header = Man
 man_winix_funcions = Winix functions
@@ -244,7 +258,8 @@ pw_table_is_active = Is active
 pw_table_is_suspended = Is suspended
 pw_table_is_banned = Is banned
 pw_table_yes = yes
-pw_table_no = no
+
+# !! is it used anymore?
 pw_password_changed = Your password has been changed
 
 
@@ -274,8 +289,7 @@ rm_content_use_r_option = Content of a directory can be removed only with 'r' pa
 
 
 rmuser_header = Remove user
-rmuser_legend = Remove user form
+rmuser_selectuser = Choose a user to delete
-rmuser_selectuser = Select a user
 rmuser_submit = Remove
 rmuser_removecurrent = Are you really want to remove your account from our service? 
 

winixd/locale/pl

@@ -1,9 +1,12 @@
 winix_locale_id = "1"
 locale_name = "polski"
 
+winix_html_lang_attr = pl
 
-language = pl
+winix_backend_info = Napędzany przez Winix
-charset = UTF-8
+winix_backend_tooltip = Winix - www framework
+winix_frontend_info = Zbudowany z 
+winix_frontend_tooltip = Odwiedź stronę UIkit 3
 
 logged_as = zalogowany jako    
 
@@ -39,7 +42,7 @@ export_header = Export
 export_transer_file_info = Wciśnij przycisk Export aby wysłać ten plik na zewnętrzny serwer ftp
 export_transer_dir_info = Wciśnij przycisk Export aby wysłać podany katalog na zewnętrzny serwer ftp
 export_checkbox_static_file_too = "Wyślij także pliki statyczne (zdjęcia itp.)"
-
+export_button = Export
 
 code_expired = Ten kod stracił już swoją ważność
 password_cannot_be_changed = Niestety nie możemy zmienić hasła dla tego konta, proszę skontaktować się z administratorem
@@ -87,7 +90,6 @@ cat_file_url = Adres pliku
 
 
 create_thread_header = Załóż wątek
-form_thread_legend = Wypełnij wszystkie pozycje formularza
 button_thread_submit = Załóż wątek
 
 url = Url
@@ -134,6 +136,8 @@ form_ticket_progress = "Postęp prac (0-100)"
 form_ticket_create_submit = Załóż zgłoszenie
 form_ticket_edit_submit = Edytuj zgłoszenie
 
+form_ticket_select_file = Wybierz plik
+
 env_header = Zmienne środowiskowe
 env_change_env_for_user = Zmień zmienne środowiskowe dla użytkownika
 env_change_admin_env_for_user = Zmień zmienne środowiskowe administracyjne dla użytkownika
@@ -152,11 +156,11 @@ ln_make_redirect = "Wykonaj przekierowanie (jedynie dla linków symbolicznych)"
 
 
 
-form_emacs_content_cms = Zawartość:
+form_emacs_content_cms = Zawartość
-form_emacs_content_thread = Post:
+form_emacs_content_thread = Post
-form_emacs_content_ticket = Opis:
+form_emacs_content_ticket = Opis
 
-form_emacs_content_type = Rodzaj wiadomości:
+form_emacs_content_type = Rodzaj wiadomości
 
 form_emacs_content_type_text = text
 form_emacs_content_type_formatted_text = sformatowany text
@@ -203,6 +207,15 @@ ipban_remove_all_ip = Usuń wszystkie adresy IP z listy
 ipban_ban_list_empty = W tej chwili nie ma żadnych zbanowanych adresów IP.
 ipban_your_ip_is_banned = Twój adres IP jest zablokowany aż do:
 
+imgcrop_header = Kadrowanie obrazów
+imgcrop_crop_only_thumb_info = "Kadruj miniaturę zdjęcia, obraz oryginalny (duży) nie zostanie zmodyfikowany."
+imgcrop_create_new_thumb_info = "Zaznacz myszką kadr na zdjęciu, z tej części zostanie stworzona nowa miniatura, obraz oryginalny (duży) nie zostanie zmodyfikowany."
+imgcrop_crop_only_original_img_info = "Kadruj oryginalny obraz (miniatura nie zostanie zmodyfikowana)."
+imgcrop_create_new_thumb_too_info = Stwórz także nową miniaturę
+imgcrop_no_image_info = imgcrop może być zastosowany tylko do plików graficznych.
+imgcrop_table_option_crop_image = Kadruj zdjęcie
+imgcrop_table_option_crop_thumb = Kadruj miniature
+imgcrop_table_option_create_new_thumb = Stwórz nową miniature
 
 meta_header = Meta
 meta_admin_header = Admin meta
@@ -267,7 +280,8 @@ pw_table_is_active = Aktywny
 pw_table_is_suspended = Wstrzymany
 pw_table_is_banned = Zbanowany
 pw_table_yes = tak
-pw_table_no = nie
+
+# !! is it used anymore?
 pw_password_changed = Twoje hasło zostało zmienione
 
 
@@ -296,8 +310,7 @@ rm_cannot_remove_root_dir = Nie możesz usunąć głównego katalogu
 rm_content_use_r_option = Zawartość katalogu może zostać usunięta tylko z użyciem parametru 'r'
 
 rmuser_header = Usuń użytkownika
-rmuser_legend = Formularz usunięcia użytkownika
+rmuser_selectuser = Wybierz użytkownika do usunięcia
-rmuser_selectuser = Wybierz użytkownika
 rmuser_submit = Usuń
 rmuser_removecurrent = Naprawdę chcesz usunąć swoje konto z naszego serwisu?