Some mods to dashboard, fixed bulk action no-having-the-template-in-source-control problem

git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@6048 c91229c3-7414-0410-bfa2-8a42b809f60b

Some mods to dashboard, fixed bulk action no-having-the-template-in-source-control problem
git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@6048 c91229c3-7414-0410-bfa2-8a42b809f60b
bryndivey
1 parent c28f0fb1
Showing 7 changed files with 41 additions and 11 deletions
config/siteMap.inc
dashboard2.php
plugins/ktcore/KTBulkActions.php
resources/css/kt-framing.css
resources/js/dashboard.js
resources/js/kt-utility.js
templates/ktcore/bulk_action_info.smarty
@@ -34,7 +34,7 @@ $default-&gt;siteMap = new SiteMap(false);
 $default->siteMap->addPage("login", "/login.php", "General", None, "");
 // dashboard
-$default->siteMap->addPage("ajaxdashboard", "/dashboard2.php", "General", Guest, "dashboard2");
+$default->siteMap->addPage("ajaxdashboard", "/dashboard2.php", "General", Guest, "ajaxdashboard");
 // old dashboard
 $default->siteMap->addPage("dashboard", "/dashboard.php", "General", Guest, "dashboard");
@@ -52,7 +52,7 @@ class DashboardDispatcher extends KTStandardDispatcher {
     function DashboardDispatcher() {
         $this->aBreadcrumbs = array(
-            array('action' => 'dashboard', 'name' => _kt('Dashboard')),
+            array('action' => 'ajaxdashboard', 'name' => _kt('Dashboard')),
         );
         return parent::KTStandardDispatcher();
     }
@@ -72,7 +72,7 @@ class KTBulkDeleteAction extends KTBulkAction {
         $this->store_lists();
         $this->get_lists();
 	$oTemplating =& KTTemplating::getSingleton();
-	$oTemplate = $oTemplating->loadTemplate('ktcore/move_bulk_action_info');
+	$oTemplate = $oTemplating->loadTemplate('ktcore/bulk_action_info');
         return $oTemplate->render(array('context' => $this,
                                         'form' => $this->form_collectinfo()));
     }
@@ -194,7 +194,7 @@ class KTBulkMoveAction extends KTBulkAction {
         $this->store_lists();
         $this->get_lists();
 	$oTemplating =& KTTemplating::getSingleton();
-	$oTemplate = $oTemplating->loadTemplate('ktcore/move_bulk_action_info');
+	$oTemplate = $oTemplating->loadTemplate('ktcore/bulk_action_info');
         return $oTemplate->render(array('context' => $this,
                                         'form' => $this->form_collectinfo()));
     }
@@ -1192,6 +1192,7 @@ hr {
 .dashboard_block_handle
 { 
+    cursor: pointer;
 }
 .dashboard_block.rolled-up .dashboard_block_body
@@ -54,6 +54,8 @@ KTDashboard.CLOSED = 2;
 KTDashboard.prototype = {
     'initialize' : function(dashboard) {
+        this.element = dashboard;
+
         var dashOpts = {
             'tag':'div',
             'dropOnEmpty':true,
@@ -62,8 +64,7 @@ KTDashboard.prototype = {
             'only' : ['dashboard_block'],
             'handle' : 'dashboard_block_handle'
         };
-
-        MochiKit.Sortable.Sortable.create(dashboard, dashOpts);
+        MochiKit.Sortable.Sortable.create(this.element, dashOpts);
         var self = this;
         map(function(e) {
@@ -73,14 +74,10 @@ KTDashboard.prototype = {
                 var d = new KTDashlet();
                 d.initialize(e, self);
                 self.dashlets[e.id] = { 'object' : d, 'state' : KTDashboard.OPEN };
-            }, getElementsByTagAndClassName('*', 'dashboard_block', dashboard));
+            }, getElementsByTagAndClassName('*', 'dashboard_block', this.element));
         this.addButton = $('add_dashlet');
         connect(this.addButton, 'onclick', this, 'onclickAdd');
-        //hideElement(this.addButton);
-
-        // alert(keys(this.dashlets));
-        // alert(values(this.dashlets));
     },
     'statusChange' : function(status) {
@@ -152,7 +149,28 @@ KTDashboard.prototype = {
         appendChildNodes(addDialog, closeLink);
         appendChildNodes(addDialogScreen, addDialog);
         appendChildNodes(document.body, addDialogScreen);
+    },
+
+    'serialize' : function() {
+        var self = this;
+        var cols = Set('left', 'right');
+        var ret = {};
+
+        for(var col in cols) {
+            ret[col] = [];
+            var container = $('dashboard-container-' + col);
+            forEach(getElementsByTagAndClassName('*', 'dashboard_block', container), function(e) {
+                        if(e.id != '') {                        
+                            ret[col].push({'id':e.id, 'state':self.dashlets[e.id]['state']});
+                        }
+                    });
+        }
+        
+        alert(ret);                        
+        
     }
+        
+
 }
@@ -167,6 +185,7 @@ addLoadEvent(
         } else {
             var dashboard = new KTDashboard();
             dashboard.initialize($('content'));
+            dashboard.serialize();
         }
     });
@@ -100,3 +100,10 @@ function checkKTError(res) {
     }
     return res;
 }
+
+// Sets
+function Set() {
+    var set = {};
+    forEach(arguments, function(k) { set[k] = 1; });
+    return set;
+}
+<h2>{$context->getDisplayName()}</h2>
+
+{$form->render()}