added: to 'sort' winix function: 'renumerate' button if 'index' param is present

WIP: #2

winixd/html/fun_sort.html

@@ -1,54 +1,71 @@
-<div class="winix">
+<div class="winix">
-
+
-<h1>{sort_header}</h1>
+<h1>{sort_header}</h1>
-
+
-
+
-[if item_is]
+[if item_is]
-
+
-
+	<form class="uk-form-stacked" id="winix_sortable_form" action="[doc_base_url][dir][item_url]/sort" method="post">
-
+
-	<form class="winix_sortable_form" action="[doc_base_url][dir][item_url]/sort" method="post">
+		<div class="uk-margin">
-
+			<label class="uk-form-label" for="winix_sort_index">{sort_current_sortindex}</label>
-		<div class="winix_input_b">
+			<div class="uk-form-controls">
-			<label for="">{sort_current_sortindex}:</p>
+				<input class="uk-input" id="winix_sort_index" type="text" name="sortindex" value="[item_sort]">
-			<input type="text" name="sortindex" value="[item_sort]">
+			</div>
-		</div>
+		</div>
-
+
-		<input type="submit" value="{change}">
+		<div class="uk-margin">
-
+			<input class="uk-button uk-button-primary" type="submit" value="{change}">
-		[if winix_function_param_is "postredirect"]
+		</div>
-			<input type="hidden" name="postredirect" value="[winix_function_param_value "postredirect"]">
+
-		[end]
+		[if winix_function_param_is "postredirect"]
-
+			<input type="hidden" name="postredirect" value="[winix_function_param_value "postredirect"]">
-	</form>
+		[end]
-
+
-[else]
+	</form>
-
+
-	<p>{sort_info_multi}</p>
+[else]
-
+
-	[if item_tab]
+	<p>
-	<form class="winix_sortable_form" action="[doc_base_url][dir]sort" method="post">
+		[if winix_function_param_is "index"]
-		<ul id="winix_sort_items">
+			{sort_info_multi_index}
-		[for item_tab]
+		[else]
-			<li id="winix_sort_item_[item_tab_index]">
+			{sort_info_multi}
-			<input type="text" name="sort[item_tab_id]" value="[item_tab_sort]">
+		[end]
-
+	</p>
-			[# is it correct? may give this 'if' only to /-/thumb param? ]
+
-			[if item_tab_has_thumb]<img src="[item_tab_link]/-/thumb" alt="[item_tab_subject]">[end]
+	[if item_tab]
-
+	<form class="uk-form-stacked" id="winix_sortable_form" action="[doc_base_url][dir]sort" method="post">
-			[item_tab_url] [if not [is item_tab_subject ""]]<span class="winix_sort_item_title">({sort_item_subject}: [item_tab_subject])</span>[end]
+		<ul class="uk-list" id="winix_sort_items" data-uk-sortable>
-			</li>
+		[for item_tab]
-		[end]
+			<li class="uk-tile uk-tile-muted uk-padding-small uk-padding-remove-top uk-padding-remove-bottom" id="winix_sort_item_[item_tab_index]" style="cursor: move;">
-		</ul>
+				<input class="[if not [winix_function_param_is "index"]]uk-hidden [end]uk-input uk-width-1-6 uk-margin-small-right" type="text" name="sort[item_tab_id]" value="[item_tab_sort]">
-
+
-		[if winix_function_param_is "postredirect"]
+				[# is it correct? may give this 'if' only to /-/thumb param? ]
-			<input type="hidden" name="postredirect" value="[winix_function_param_value "postredirect"]">
+				[if item_tab_has_thumb]<img src="[item_tab_link]/-/thumb" alt="[item_tab_subject]">[end]
-		[end]
+
-
+				[item_tab_url][if item_tab_type_is_dir]/[end] [if not [is item_tab_subject ""]]<span class="uk-text-meta">({sort_item_subject}: [item_tab_subject])</span>[end]
-		<input type="submit" value="{change}">
+			</li>
-	</form>
+		[end]
-	[end]
+		</ul>
-
+
-[end]
+		[if winix_function_param_is "postredirect"]
-
+			<input type="hidden" name="postredirect" value="[winix_function_param_value "postredirect"]">
-</div>
+		[end]
+
+		[if winix_function_param_is "index"]
+			<div class="uk-margin">
+				<button class="uk-button uk-button-default auk-button-primary" type="button" id="winix_sort_renumerate">renumeruj</button>
+			</div>
+		[end]
+
+		<div class="uk-margin">
+			<input class="uk-button uk-button-primary" type="submit" value="{change}">
+		</div>
+
+	</form>
+	[end]
+
+[end]
+
+</div>

winixd/html/index_head_functions_add.html

@@ -260,10 +260,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]/winix/winix_sort.js"></script>
-	<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>
 	[end]
 [end]
 

winixd/locale/en

@@ -457,6 +457,7 @@ slog_turn_over = Session's log turned over due to size greater than
 sort_header = Sort
 sort_current_sortindex = Current sort index
 sort_info_multi = Set an order of items by using the mouse.
+sort_info_multi_index = Set an order of items by providing an index number. You can also set an order of items by using the mouse and then clicking the renumerate button.
 sort_item_subject = Subject:
 
 stat_header = Stat

winixd/locale/pl

@@ -475,6 +475,7 @@ slog_turn_over = Log sesji wyczyszczony w związku z przekroczeniem wielkości
 sort_header = Sortuj
 sort_current_sortindex = Bieżący indeks sortowania
 sort_info_multi = Ustaw kolejność elementów przeciągając je przy pomocy myszki.
+sort_info_multi_index = Ustaw kolejność elementów podająć ich indeks. Możesz także ustawić kolejność elementów przeciągając je przy pomocy myszki i następnie kliknąć przycisk Renumeruj.
 sort_item_subject = Tytuł:
 
 stat_header = Stat