changed html markup for tinymce and added support for 5.6.2 version

will be used at the bottom of an index template - before </body> tag

.gitignore

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

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_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_login.html

@@ -1,47 +1,92 @@
 <div class="winix">
 
-<h1>{login_header}</h1>
-
 [if user_logged]
-	<p>{logged_as_long}: [user_name]<br>
+	<div class="uk-width-large uk-padding-small">
-	<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>
+		<h1>{login_header}</h1>
+
+		<p class="uk-margin-top">
+		{login_currently_logged_as} <strong>[user_name]</strong>
+		</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_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/index.html

@@ -4,20 +4,35 @@
 <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>
-[include "slog.html"]
+[else]
+<body class="uk-flex uk-flex-center">
+<div class="uk-width-2xlarge">
+[end]
 
-[# each winix function has div.winix in its template defined -- only functions: cat and run don't have div.winix]
+
-[# so you can easly use 'content' with your own template]
+
-[# and when using other winix functions you automatically get proper styling]
+	<div class="uk-position-fixed uk-position-bottom-center uk-position-small uk-visible@m uk-position-z-index">
-[content]
+		<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]
+	[# so you can easly use 'content' with your own template]
+	[# and when using other winix functions you automatically get proper styling]
+	[content]
 </div>
 
 </body>

winixd/html/index_bottom_adder.html

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

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.13/css/uikit.min.css">
+
+[# UIkit JS]
+<script src="[doc_base_url_common]/uikit/uikit-3.6.13/js/uikit.min.js"></script>
+<script src="[doc_base_url_common]/uikit/uikit-3.6.13/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,16 +104,22 @@ 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]
 
 
@@ -159,6 +133,7 @@ cm.save()
 [# this editor doesn't work on different domains by default, solution: http://forum.wymeditor.org/forum/viewtopic.php?f=2&t=731&p=2507#p2504 ]
 [# you should add one file to winix: wymiframe.html ]
 
+	[def winix_has_jquery "true"]
 	<script type="text/javascript" src="[doc_base_url_common]/jquery-1.4.2.min.js"></script>
 	<script type="text/javascript" src="[doc_base_url_common]/wymeditor/jquery.wymeditor.min.js"></script>
 	<script type="text/javascript" src="[doc_base_url_common]/wymeditor/lang/en.js"></script>
@@ -192,11 +167,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 +183,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 +192,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,6 +261,7 @@ cm.save()
 
 [if winix_function_is "sort"]
 	[if not item_is]
+	[def winix_has_jquery "true"]
 	<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]/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>
@@ -304,6 +270,7 @@ 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]/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/locale/en

@@ -5,7 +5,6 @@ language = en
 charset = UTF-8
 
 logged_as = logged as
-logged_as_long = You are logged as
 
 display_guest_name = guest
 unknown = unknown
@@ -40,7 +39,6 @@ email_sent_to = An email has been sent to:
 logout = logout
 
 
-remember_me = Remember me
 
 home_page = Home page   
 
@@ -104,6 +102,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
@@ -304,7 +308,10 @@ upload_button_cancel_upload = Cancel upload
 upload_button_delete = Delete
 upload_button_processing = Processing...
 upload_button_download = Download
+upload_button_edit = Edit
 upload_error = Error:
+upload_processing = Processing...
+
 
 who_header = Sessions
 who_tab_index = Ind.
@@ -340,7 +347,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
@@ -453,6 +469,8 @@ stat_template_from_mount_point = from the mount point
 subject_header = Edit subject
 
 
+tinymce_update_button = Update
+tinymce_update_progressbar_img_alt = Progressbar
 
 uname_header = Uname
 uname_available_plugins = Available plugins

winixd/locale/pl

@@ -6,7 +6,6 @@ language = pl
 charset = UTF-8
 
 logged_as = zalogowany jako    
-logged_as_long = Aktualnie jesteś zalogowany jako
 
 display_guest_name = gość
 unknown = nie znany
@@ -45,7 +44,6 @@ email_sent_to = Wiadomość została wysłana do:
 logout = wyloguj
 
 
-remember_me = Zapamiętaj mnie
 
 home_page = Strona główna   
 
@@ -110,6 +108,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
@@ -326,7 +331,9 @@ upload_button_cancel_upload = Przerwij wysyłanie
 upload_button_delete = Usuń
 upload_button_processing = Wysyłanie...
 upload_button_download = Ściągnij
+upload_button_edit = Edytuj
 upload_error = Błąd:
+upload_processing = Przygotowywanie...
 
 who_header = Lista sesji
 who_tab_index = L.p.
@@ -361,6 +368,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
@@ -473,6 +490,9 @@ stat_template_from_mount_point = z punktu montowania
 subject_header = Zmień tytuł
 
 
+tinymce_update_button = Aktualizuj
+tinymce_update_progressbar_img_alt = Progressbar
+
 uname_header = Nazwa systemu
 uname_available_plugins = Dostępne pluginy
 uname_plugin_unknown = Plugin nie ustawił swojej nazwy