Merge branch 'master' into feature/url-routing

Geeklog-Core · Jan 30, 2016 · 2f87876 · 2f87876
2 parents ec54ba0 + 5b8a292
commit 2f87876
Show file tree

Hide file tree

Showing 9 changed files with 499 additions and 9 deletions.
diff --git a/language/english.php b/language/english.php
@@ -564,11 +564,13 @@
     65 => 'Story',
     66 => 'Comment',
     67 => 'Show %d Results',
-    68 => 'Sort By',
+    68 => 'Sort by',
     69 => 'Titles Only',
     70 => 'Not available ...',
-    71 => 'asc',
-    72 => 'desc'
+    71 => 'Asc',
+    72 => 'Desc',
+    73 => 'Submit',
+    74 => 'Limit Results'
 );
 
 ###############################################################################

diff --git a/language/english_utf-8.php b/language/english_utf-8.php
@@ -564,11 +564,13 @@
     65 => 'Story',
     66 => 'Comment',
     67 => 'Show %d Results',
-    68 => 'Sort By',
+    68 => 'Sort by',
     69 => 'Titles Only',
     70 => 'Not available ...',
-    71 => 'asc',
-    72 => 'desc'
+    71 => 'Asc',
+    72 => 'Desc',
+    73 => 'Submit',
+    74 => 'Limit Results'
 );
 
 ###############################################################################

diff --git a/language/japanese_utf-8.php b/language/japanese_utf-8.php
@@ -576,7 +576,9 @@
     69 => 'タイトルのみ',
     70 => 'ありません ...',
     71 => '昇順',
-    72 => '降順'
+    72 => '降順',
+    73 => '実行',
+    74 => '件数'
 );
 
 ###############################################################################

diff --git a/public_html/layout/denim/lists/list_inline.thtml b/public_html/layout/denim/lists/list_inline.thtml
@@ -0,0 +1,56 @@
+{# start {templatelocation} #}
+
+{list_top}
+<form name="page_limit" action="{page_url}" method="get" class="uk-form">
+  <div class="admin-list-search">
+    {page_hidden}
+    <div class="search-part" style="{show_sort}">
+      <label for="search-results-order">{lang_sort}:</label>
+      <select id="search-results-order" name="order">
+        {page_sort}
+      </select>
+      <select name="direction">
+        {page_direction}
+      </select>
+    </div>
+    <div class="search-part" style="{show_limit}">
+      <label for="search-results-limit">{lang_limit}:</label>
+      <select id="search-results-limit" name="results">
+        {page_limit}
+      </select>
+    </div>
+    <div class="search-part">
+      <input type="submit" value="{lang_submit}"{xhtml}>
+    </div>
+  </div>
+</form>
+{item_row}
+{!if message}<p class="aligncenter" style="{show_message}"><strong>{message}</strong></p>{!endif}
+{google_paging}
+{list_bottom}
+
+{# end {templatelocation} #}
+
+<!-- BEGIN field -->
+{field_text}
+<!-- END field -->
+
+<!-- BEGIN row -->
+<div style="margin-bottom:15px">{item_field}</div>
+<!-- END row -->
+
+<!-- BEGIN limit -->
+<option{limit_selected} value="{limit_val}">{limit_text}</option>
+<!-- END limit -->
+
+<!-- BEGIN sort -->
+<option{sort_selected} value="{sort_val}">{sort_text}</option>
+<!-- END sort -->
+
+<!-- BEGIN direction -->
+<option{direction_selected} value="{direction_val}">{direction_text}</option>
+<!-- END direction -->
+
+<!-- BEGIN input_hidden -->
+<input type="hidden" name="{hidden_name}" value="{hidden_val}"{xhtml}>
+<!-- END input_hidden -->
diff --git a/public_html/layout/denim/lists/list_table.thtml b/public_html/layout/denim/lists/list_table.thtml
@@ -0,0 +1,48 @@
+{# start {templatelocation} #}
+
+{list_top}
+<form name="page_limit" action="{page_url}" method="get" class="uk-form">
+  <div class="admin-list-search">
+    {page_hidden}
+    <div class="search-part" style="{show_limit}">
+      <label for="search-results-limit">{lang_limit}:</label>
+      <select id="search-results-limit" name="results">
+        {page_limit}
+      </select>
+      <input type="submit" value="{lang_submit}"{xhtml}>
+    </div>
+  </div>
+</form>
+<div class="table-wrapper">
+  <table class="admin-list-table" style="{show_sort}">
+    <tr>
+      {page_sort}
+    </tr>
+    {item_row}
+  </table>
+</div>
+{!if message}<p class="aligncenter" style="{show_message}"><strong>{message}</strong></p>{!endif}
+{google_paging}
+{list_bottom}
+
+{# end {templatelocation} #}
+
+<!-- BEGIN field -->
+<td class="admin-list-field">{field_text}</td>
+<!-- END field -->
+
+<!-- BEGIN row -->
+<tr class="pluginRow{cssid}" onmouseover="className='pluginRollOver';" onmouseout="className='pluginRow{cssid}';">{item_field}</tr>
+<!-- END row -->
+
+<!-- BEGIN limit -->
+<option{limit_selected} value="{limit_val}">{limit_text}</option>
+<!-- END limit -->
+
+<!-- BEGIN sort -->
+<th class="admin-list-headerfield" onmouseover="this.style.cursor='pointer';" {sort_subtags}>{sort_text}{sort_selected}</th>
+<!-- END sort -->
+
+<!-- BEGIN input_hidden -->
+<input type="hidden" name="{hidden_name}" value="{hidden_val}"{xhtml}>
+<!-- END input_hidden -->
diff --git a/public_html/layout/modern_curve/lists/list_inline.thtml b/public_html/layout/modern_curve/lists/list_inline.thtml
@@ -0,0 +1,56 @@
+{# start {templatelocation} #}
+
+{list_top}
+<form name="page_limit" action="{page_url}" method="get" class="uk-form">
+  <div class="admin-list-search">
+    {page_hidden}
+    <div style="display:inline-block;{show_sort}">
+      <label for="search-results-order">{lang_sort}:</label>
+      <select id="search-results-order" name="order">
+        {page_sort}
+      </select>
+      <select name="direction">
+        {page_direction}
+      </select>
+    </div>
+    <div style="display:inline-block;{show_limit}">
+      <label for="search-results-limit">{lang_limit}:</label>
+      <select id="search-results-limit" name="results">
+        {page_limit}
+      </select>
+    </div>
+    <div style="display:inline-block;">
+      <input type="submit" value="{lang_submit}"{xhtml}>
+    </div>
+  </div>
+</form>
+{item_row}
+{!if message}<p class="aligncenter" style="{show_message}"><strong>{message}</strong></p>{!endif}
+{google_paging}
+{list_bottom}
+
+{# end {templatelocation} #}
+
+<!-- BEGIN field -->
+{field_text}
+<!-- END field -->
+
+<!-- BEGIN row -->
+<div style="margin-bottom:15px">{item_field}</div>
+<!-- END row -->
+
+<!-- BEGIN limit -->
+<option{limit_selected} value="{limit_val}">{limit_text}</option>
+<!-- END limit -->
+
+<!-- BEGIN sort -->
+<option{sort_selected} value="{sort_val}">{sort_text}</option>
+<!-- END sort -->
+
+<!-- BEGIN direction -->
+<option{direction_selected} value="{direction_val}">{direction_text}</option>
+<!-- END direction -->
+
+<!-- BEGIN input_hidden -->
+<input type="hidden" name="{hidden_name}" value="{hidden_val}"{xhtml}>
+<!-- END input_hidden -->
diff --git a/public_html/layout/modern_curve/lists/list_table.thtml b/public_html/layout/modern_curve/lists/list_table.thtml
@@ -0,0 +1,46 @@
+{# start {templatelocation} #}
+
+{list_top}
+<form name="page_limit" action="{page_url}" method="get" class="uk-form">
+  <div class="admin-list-search">
+    {page_hidden}
+    <div style="display:inline-block;{show_limit}">
+      <label for="search-results-limit">{lang_limit}:</label>
+      <select id="search-results-limit" name="results">
+        {page_limit}
+      </select>
+      <input type="submit" value="{lang_submit}"{xhtml}>
+    </div>
+  </div>
+</form>
+<table class="admin-list-table" style="{show_sort}">
+  <tr style="background:#FFFFFF;">
+    {page_sort}
+  </tr>
+  {item_row}
+</table>
+{!if message}<p class="aligncenter" style="{show_message}"><strong>{message}</strong></p>{!endif}
+{google_paging}
+{list_bottom}
+
+{# end {templatelocation} #}
+
+<!-- BEGIN field -->
+<td class="admin-list-field">{field_text}</td>
+<!-- END field -->
+
+<!-- BEGIN row -->
+<tr class="pluginRow{cssid}" onmouseover="className='pluginRollOver';" onmouseout="className='pluginRow{cssid}';">{item_field}</tr>
+<!-- END row -->
+
+<!-- BEGIN limit -->
+<option{limit_selected} value="{limit_val}">{limit_text}</option>
+<!-- END limit -->
+
+<!-- BEGIN sort -->
+<th class="admin-list-headerfield" onmouseover="this.style.cursor='pointer';" {sort_subtags}>{sort_text}{sort_selected}</th>
+<!-- END sort -->
+
+<!-- BEGIN input_hidden -->
+<input type="hidden" name="{hidden_name}" value="{hidden_val}"{xhtml}>
+<!-- END input_hidden -->