From bbe2bd48d8efbcc4e826d3c794b30d2e7ae6fc80 Mon Sep 17 00:00:00 2001
From: Tomasz Sowa <t.sowa@ttmath.org>
Date: Thu, 28 Jan 2021 11:49:10 +0100
Subject: [PATCH] added uikit markup for meta winix function

WIP: #2
---
 winixd/functions/meta.cpp |  4 +-
 winixd/html/fun_meta.html | 88 +++++++++++++++++----------------------
 winixd/locale/en          |  4 ++
 winixd/locale/pl          |  4 ++
 4 files changed, 50 insertions(+), 50 deletions(-)

diff --git a/winixd/functions/meta.cpp b/winixd/functions/meta.cpp
index d1c2af5..2ca7be4 100644
--- a/winixd/functions/meta.cpp
+++ b/winixd/functions/meta.cpp
@@ -5,7 +5,7 @@
  */
 
 /* 
- * Copyright (c) 2011-2018, Tomasz Sowa
+ * Copyright (c) 2011-2021, Tomasz Sowa
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
@@ -127,6 +127,8 @@ return false;
 
 void Meta::ChangeAdminMeta()
 {
+	// IMPROVE ME we need to show an error msg if the user is not an admin
+
 	if( cur->session->puser && cur->session->puser->super_user )
 	{
 		const std::wstring & meta_str = cur->request->PostVar(L"itemmeta");
diff --git a/winixd/html/fun_meta.html b/winixd/html/fun_meta.html
index 580ee4c..e94a4fa 100644
--- a/winixd/html/fun_meta.html
+++ b/winixd/html/fun_meta.html
@@ -1,62 +1,52 @@
 <div class="winix">
 
-[if winix_function_param_is "a"]
-	<h1>{meta_admin_header}</h1>
-
-	[if item_is]
-		<form method="post" action="[doc_base_url][dir][item_url]/meta/a">
-
-			<textarea class="multitext" rows="30" cols="60" name="itemmeta">[item_admin_meta_str]</textarea>
-			<input class="submit" type="submit" value="{change}">
-
-			[if winix_function_param_is "postredirect"]
-				<input type="hidden" name="postredirect" value="[winix_function_param_value "postredirect"]">
-			[end]
-
-		</form>
+<h1>
+	[if winix_function_param_is "a"]
+		{meta_admin_header}
 	[else]
-		<form method="post" action="[doc_base_url][dir]meta/a">
+		{meta_header}
+	[end]
+</h1>
 
-			<textarea class="multitext" rows="30" cols="60" name="itemmeta">[dir_last_admin_meta_str]</textarea>
-			<input class="submit" type="submit" value="{change}">
 
-			[if winix_function_param_is "postredirect"]
-				<input type="hidden" name="postredirect" value="[winix_function_param_value "postredirect"]">
+<form class="uk-form-stacked" method="post" action="[doc_base_url][dir][if item_is][item_url]/[end]meta[if winix_function_param_is "a"]/a[end]">
+
+	<div class="uk-margin">
+		<label class="uk-form-label" for="winix_meta_textarea">
+		[if winix_function_param_is "a"]
+			[if item_is]
+				{meta_admin_for_page}:
+			[else]
+				{meta_admin_for_dir}:
 			[end]
+		[else]
+			[if item_is]
+				{meta_for_page}:
+			[else]
+				{meta_for_dir}:
+			[end]
+		[end]
 
-		</form>
+		[# !! IMPROVE ME give some message if there is a root directory]
+		[item_url]
+
+		</label>
+
+		<div class="uk-form-controls">
+			<textarea class="uk-textarea" id="winix_meta_textarea" rows="20" name="itemmeta">[if winix_function_param_is "a"][if item_is][item_admin_meta_str][else][dir_last_admin_meta_str][end][else][if item_is][item_meta_str][else][dir_last_meta_str][end][end]</textarea>
+		</div>
+	</div>
+
+	<div class="uk-margin">
+		<input class="uk-button uk-button-primary" type="submit" value="{change}">
+	</div>
+
+	[if winix_function_param_is "postredirect"]
+		<input type="hidden" name="postredirect" value="[winix_function_param_value "postredirect"]">
 	[end]
 
+</form>
 
-[else]
-
-	<h1>{meta_header}</h1>
-
-	[if item_is]
-		<form method="post" action="[doc_base_url][dir][item_url]/meta">
-
-			<textarea class="multitext" rows="30" cols="60" name="itemmeta">[item_meta_str]</textarea>
-			<input class="submit" type="submit" value="{change}">
-
-			[if winix_function_param_is "postredirect"]
-				<input type="hidden" name="postredirect" value="[winix_function_param_value "postredirect"]">
-			[end]
-
-		</form>
-	[else]
-		<form method="post" action="[doc_base_url][dir]meta">
-
-			<textarea class="multitext" rows="30" cols="60" name="itemmeta">[dir_last_meta_str]</textarea>
-			<input class="submit" type="submit" value="{change}">
-
-			[if winix_function_param_is "postredirect"]
-				<input type="hidden" name="postredirect" value="[winix_function_param_value "postredirect"]">
-			[end]
-
-		</form>
-	[end]
-
-[end]
 
 
 </div>
diff --git a/winixd/locale/en b/winixd/locale/en
index 05c5981..5b489a1 100644
--- a/winixd/locale/en
+++ b/winixd/locale/en
@@ -207,6 +207,10 @@ man_ezc_functions = EZC templates functions
 
 meta_header = Meta
 meta_admin_header = Admin meta
+meta_for_dir = Additional information for directory
+meta_for_page = Additional information for page
+meta_admin_for_dir = Additional administrative information for directory
+meta_admin_for_page = Additional administrative information for page
 
 
 mkdir_header = Make directory
diff --git a/winixd/locale/pl b/winixd/locale/pl
index fcb56c3..e46e67a 100644
--- a/winixd/locale/pl
+++ b/winixd/locale/pl
@@ -206,6 +206,10 @@ ipban_your_ip_is_banned = Twój adres IP jest zablokowany aż do:
 
 meta_header = Meta
 meta_admin_header = Admin meta
+meta_for_dir = Dodatkowe informacje dla katalogu
+meta_for_page = Dodatkowe informacje dla strony
+meta_admin_for_dir = Dodatkowe informacje administracyjne dla katalogu
+meta_admin_for_page = Dodatkowe informacje administracyjne dla strony
 
 
 man_header = Man