From 37da5e81c586e653e0f09c1a6af4a8e956ac8788 Mon Sep 17 00:00:00 2001
From: Tomasz Sowa <t.sowa@ttmath.org>
Date: Mon, 15 Feb 2021 19:52:03 +0100
Subject: [PATCH] added uikit markup for createticket, showtickets, ticket
 winix functions (plugin ticket)

WIP: #2
---
 winixd/html/fun_createticket.html | 177 ++++++++++++++++++++----------
 winixd/html/fun_showtickets.html  |  12 +-
 winixd/html/fun_ticket.html       |  35 +++---
 winixd/locale/en                  |   1 +
 winixd/locale/pl                  |   2 +
 5 files changed, 148 insertions(+), 79 deletions(-)

diff --git a/winixd/html/fun_createticket.html b/winixd/html/fun_createticket.html
index 638daa3..c1bd887 100644
--- a/winixd/html/fun_createticket.html
+++ b/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">
-<label for="winix_title_id">{title}:</label>
-<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]">
+	</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]">
-			[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 class="uk-margin">
+				<label class="uk-form-label" for="winix_ticket_select_id_[ticket_tab_param_id]">[filter fil_firstup][ticket_tab_param_name][end]</label>
+
+				<div class="uk-form-controls">
+					<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="winix_create_ticket_file_row">
-				<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 class="uk-margin">
+				<label class="uk-form-label" for="winix_ticket_images_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_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]
-						<input type="submit" name="ticketdeletefile_[ticket_tab_file_tab_itemid]" value="{ticket_delete_file}">
+						<button class="uk-button uk-button-default uk-button-small"
+								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">
-<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-margin">
+	<label for="winix_content_id">{form_emacs_content_ticket}</label>
+
+	<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">
-<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>
-	<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]
-	[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 class="uk-margin">
+	<label for="winix_content_type_id">{form_emacs_content_type}</label>
+
+	<div class="uk-form-controls">
+		<select class="uk-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>
+			<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]
+			[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">
-	<label for="winix_nick_id">{nick}:</label>
-	<input id="winix_nick_id" type="text" name="guestname" value="[item_guest_name]">
+	<div class="uk-margin">
+		<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>
-	
-	<div class="winix_input_a">
-	<label for="winix_rebus_id">{rebus_how_is_it} [rebus_question]?</p>
-	<input id="winix_rebus_id" type="text" name="rebus">
+
+	<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"]
@@ -128,8 +192,9 @@
 	<input type="hidden" name="postredirect" value="[winix_function_param_value "postredirect"]">
 [end]
 
-
-<input type="submit" value="[if item_is]{form_ticket_edit_submit}[else]{form_ticket_create_submit}[end]">
+<div class="uk-margin">
+	<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>
diff --git a/winixd/html/fun_showtickets.html b/winixd/html/fun_showtickets.html
index b16e7bd..4c53bb9 100644
--- a/winixd/html/fun_showtickets.html
+++ b/winixd/html/fun_showtickets.html
@@ -5,16 +5,15 @@
 
 
 [if ticket_can_create]
-	<div class="winix_itemoptions_b">
-		<ul>
-		<li><a href="[doc_base_url][dir]createticket" rel="nofollow">{ticket_create_new}</a></li>
-		</ul>
+	<div class="uk-margin">
+		<a class="uk-button uk-button-primary" href="[doc_base_url][dir]createticket" rel="nofollow">{ticket_create_new}</a>
 	</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]
 
 
diff --git a/winixd/html/fun_ticket.html b/winixd/html/fun_ticket.html
index 7ea6074..cb51e34 100644
--- a/winixd/html/fun_ticket.html
+++ b/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>
-			<td>
+			<th class="uk-width-auto">[filter fil_firstup][ticket_tab_param_name]:[end]</th>
+			<td class="uk-width-expand">
 			
 				[if ticket_tab_type_is "images"]
-					[for ticket_tab_file_tab]
-					<a href="[doc_base_url][ticket_tab_file_tab_path]" rel="lightbox\[a\]">
-					<img src="[doc_base_url][ticket_tab_file_tab_path]/-/thumb" alt="[ticket_tab_file_tab_path]" height="150">
-					</a>
-					[end]
+					<div class="uk-child-width-1-3@m" uk-grid uk-lightbox="animation: slide">
+						[for ticket_tab_file_tab]
+						<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>
+						[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]
 
 
diff --git a/winixd/locale/en b/winixd/locale/en
index db9f160..7baabe1 100644
--- a/winixd/locale/en
+++ b/winixd/locale/en
@@ -127,6 +127,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
diff --git a/winixd/locale/pl b/winixd/locale/pl
index 1306208..71d2d61 100644
--- a/winixd/locale/pl
+++ b/winixd/locale/pl
@@ -133,6 +133,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