modified login template - removed uk-border-pill class

WIP: #2

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,21 +21,21 @@
 		</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">
+						<input class="uk-input" 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">
+						<input class="uk-input" required placeholder="{login_password}" type="password" name="password">
 					</div>
 				</div>
 
@@ -43,23 +43,22 @@
 				<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 uk-border-pill" required placeholder="{rebus_how_is_it} [rebus_question]?" type="text" name="rebus">
+						<input class="uk-input" required placeholder="{rebus_how_is_it} [rebus_question]?" type="text" name="rebus">
 					</div>
 				</div>
 				[end]
 
 				<div class="uk-margin-small">
-						<label><input class="uk-checkbox" type="checkbox" name="rememberme"> {login_remember_me}</label>
+					<label><input class="uk-checkbox uk-margin-small-right" 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>
+					<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_showthreads.html

@@ -6,7 +6,7 @@
 
 [if thread_can_create]
 	<div class="uk-margin">
-		<a class="uk-button uk-button-default" href="[doc_base_url][dir]createthread" rel="nofollow">{thread_create_new}</a>
+		<a class="uk-button uk-button-primary" href="[doc_base_url][dir]createthread" rel="nofollow">{thread_create_new}</a>
 	</div>
 [end]
 

winixd/html/fun_thread.html

@@ -17,7 +17,7 @@
 [if thread_mount_arg_is "sort_desc"]
 	[if thread_can_reply]
 		<div class="uk-margin">
-			<a class="uk-button uk-button-default" href="[doc_base_url][dir][item_url]/reply" rel="nofollow">{thread_reply_in_this_thread}</a>
+			<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]
@@ -47,7 +47,7 @@
 [if not [thread_mount_arg_is "sort_desc"]]
 	[if thread_can_reply]
 		<div class="uk-margin">
-			<a class="uk-button uk-button-default" href="[doc_base_url][dir][item_url]/reply" rel="nofollow">{thread_reply_in_this_thread}</a>
+			<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/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"]
-	<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-position-fixed uk-position-bottom-center uk-position-small uk-visible@m uk-position-z-index">
+		<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 - a web framework" target="_blank" data-uk-tooltip>Powered by winix [sys_ver_major].[sys_ver_minor].[sys_ver_revision]</a>
+				© [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>
-			| Built with <a href="http://getuikit.com" title="Visit UIkit 3 site" target="_blank" data-uk-tooltip><span data-uk-icon="uikit"></span></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>
 
-	[include "slog.html"]
+	</div>
 
-	[# each winix function has div.winix in its template defined -- only functions: cat and run don't have div.winix]
+	[include "index_bottom_adder.html"]
-	[# 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"]
-	<meta charset="UTF-8">
 	<title>[doc_title]</title>
 </head>
 

winixd/html/index_head_functions_add.html

@@ -4,6 +4,11 @@
 [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.16/css/uikit.min.css">
 

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
 

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