From 619b9ed53c4d864d95dbedcaaedf955289add0b2 Mon Sep 17 00:00:00 2001
From: Messerbill <ole.hoppe@gmx.de>
Date: Mon, 8 Jun 2015 22:00:52 +0200
Subject: [PATCH] UI: API sortierbare Tabelle

---
 lib/autoload.inc                              |  1 +
 lib/tinymce                                   |  2 +-
 .../saimod_sys_api/js/saimod_sys_api.js       |  3 ++
 sai/modules/saimod_sys_api/saimod_sys_api.php |  2 +-
 .../saimod_sys_api/tpl/delete_dialog.tpl      | 42 ++++++++++---------
 .../tpl/saimod_sys_api_list.tpl               | 26 +++++++-----
 6 files changed, 44 insertions(+), 32 deletions(-)

diff --git a/lib/autoload.inc b/lib/autoload.inc
index 504e3e8..378fbd4 100644
--- a/lib/autoload.inc
+++ b/lib/autoload.inc
@@ -4,5 +4,6 @@ require_once dirname(__FILE__).'/system/autoload.inc';
 require_once dirname(__FILE__).'/markdown/autoload.inc';
 require_once dirname(__FILE__).'/jquery/autoload.inc';
 require_once dirname(__FILE__).'/tablesort/autoload.inc';
+require_once dirname(__FILE__).'/tablesorter/autoload.inc';
 require_once dirname(__FILE__).'/bootstrap/autoload.inc';
 require_once dirname(__FILE__).'/tinymce/autoload.inc';
\ No newline at end of file
diff --git a/lib/tinymce b/lib/tinymce
index e8b11f1..50c2489 160000
--- a/lib/tinymce
+++ b/lib/tinymce
@@ -1 +1 @@
-Subproject commit e8b11f1d77cc3aa4187162dae17ca95211c2e567
+Subproject commit 50c248947ca1dbee5f85cc973a022914f4a0d900
diff --git a/sai/modules/saimod_sys_api/js/saimod_sys_api.js b/sai/modules/saimod_sys_api/js/saimod_sys_api.js
index 13c990b..3bb41ed 100644
--- a/sai/modules/saimod_sys_api/js/saimod_sys_api.js
+++ b/sai/modules/saimod_sys_api/js/saimod_sys_api.js
@@ -1,4 +1,5 @@
 function init_saimod_sys_api() {
+    $("#sai_mod_api_table").tablesorter();
     $('#tabs_api a').click(function (e) {
         $('#tabs_api li').each(function(){
             $(this).removeClass('active');});
@@ -35,8 +36,10 @@ function api_menu(){
         $('#menu_all').parent().addClass('active');}
 }
 function init_saimod_sys_api_list(){
+    $("#sai_mod_api_table").tablesorter();
     api_menu();}
 function init_saimod_sys_api_delete(){
+    $("#sai_mod_api_table").tablesorter();
     $('#del_api_del').click(function() {
         $.ajax({    url: './sai.php',
                     data: { sai_mod: '.SYSTEM.SAI.saimod_sys_api',
diff --git a/sai/modules/saimod_sys_api/saimod_sys_api.php b/sai/modules/saimod_sys_api/saimod_sys_api.php
index 8468953..4127d6d 100644
--- a/sai/modules/saimod_sys_api/saimod_sys_api.php
+++ b/sai/modules/saimod_sys_api/saimod_sys_api.php
@@ -79,5 +79,5 @@ class saimod_sys_api extends \SYSTEM\SAI\SaiModule {
     public static function css(){
         return array(\SYSTEM\WEBPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_api/css/saimod_sys_api.css'));}
     public static function js(){
-        return array(  \SYSTEM\WEBPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_api/js/saimod_sys_config.js'));}
+        return array(  \SYSTEM\WEBPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_api/js/saimod_sys_api.js'));}
 }
\ No newline at end of file
diff --git a/sai/modules/saimod_sys_api/tpl/delete_dialog.tpl b/sai/modules/saimod_sys_api/tpl/delete_dialog.tpl
index aaee966..604899b 100644
--- a/sai/modules/saimod_sys_api/tpl/delete_dialog.tpl
+++ b/sai/modules/saimod_sys_api/tpl/delete_dialog.tpl
@@ -1,25 +1,29 @@
 <div id="api_deletedialog">
 <h5>Api Call: ${ID}</h5>
 <hr>
-    <table class="table sai_table">
-        <tr>
-            <th>ID</th>
-            <th>Group</th>
-            <th>Type</th>
-            <th>ParentID</th>
-            <th>ParentValue</th>
-            <th>Name</th>
-            <th>Verify</th>
-        </tr>
-        <tr>
-            <td>${ID}</td>
-            <td>${group}</td>
-            <td>${type}</td>
-            <td>${parentID}</td>
-            <td>${parentValue}</td>
-            <td>${name}</td>
-            <td>${verify}</td>
-        </tr>
+    <table class="table sai_table tablesorter">
+        <thead>
+            <tr>
+                <th>ID</th>
+                <th>Group</th>
+                <th>Type</th>
+                <th>ParentID</th>
+                <th>ParentValue</th>
+                <th>Name</th>
+                <th>Verify</th>
+            </tr>
+        </thead>    
+        <tbody>
+            <tr>
+                <td>${ID}</td>
+                <td>${group}</td>
+                <td>${type}</td>
+                <td>${parentID}</td>
+                <td>${parentValue}</td>
+                <td>${name}</td>
+                <td>${verify}</td>
+            </tr>
+        </tbody>    
     </table>
 </div>
 <button type="button" class="btn btn-small btn-danger" id="del_api_del" api_id="${ID}" api_group="${group}">Delete</button>
diff --git a/sai/modules/saimod_sys_api/tpl/saimod_sys_api_list.tpl b/sai/modules/saimod_sys_api/tpl/saimod_sys_api_list.tpl
index ecdbde4..7e921f1 100644
--- a/sai/modules/saimod_sys_api/tpl/saimod_sys_api_list.tpl
+++ b/sai/modules/saimod_sys_api/tpl/saimod_sys_api_list.tpl
@@ -1,12 +1,16 @@
-<table class="table table-hover table-condensed" style="overflow: auto;">
-    <tr>
-        <th>ID</th>
-        <th>Group</th>
-        <th>Type</th>
-        <th>ParentID</th>
-        <th>ParentValue</th>
-        <th>Name</th>
-        <th>Verify</th>
-    </tr>
-    ${content}
+<table class="table table-hover table-condensed tablesorter" id="sai_mod_api_table" style="overflow: auto;">
+    <thead>
+        <tr>
+            <th>ID</th>
+            <th>Group</th>
+            <th>Type</th>
+            <th>ParentID</th>
+            <th>ParentValue</th>
+            <th>Name</th>
+            <th>Verify</th>
+        </tr>
+    </thead>
+    <tbody>
+        ${content}
+    </tbody>    
 </table>
\ No newline at end of file