ENG refs #291 Fixed dashboard

Author: Charles Ma

core/AppController.php

@@ -174,7 +174,7 @@ public function preDispatch()
 
           $this->view->recentItems = $recentItems;
           $check = $this->_getParam('checkRecentItem');
-          }      
+          }
         }
       else
         {
@@ -200,10 +200,10 @@ public function preDispatch()
       }
 
     $this->view->lang = Zend_Registry::get('configGlobal')->application->lang;
-    
+
     $this->view->isStartingGuide = $this->isStartingGuide();
-    $this->view->isDynamicHelp = $this->isDynamicHelp();   
-    
+    $this->view->isDynamicHelp = $this->isDynamicHelp();
+
     //create a global javascript json array
     $jsonGlobal = array(
       "webroot" => $this->view->webroot,
@@ -254,14 +254,14 @@ public function preDispatch()
 
     $this->view->json = array(
       "global" => $jsonGlobal, "login" => $login, 'feed' => $feed, "browse" => $browse);
-    
+
     // Init Dynamic Help (the order makes sense for the animation)
     if($this->isDemoMode())
       {
       $this->addDynamicHelp('.loginLink', "<b>Authenticate.</b><br/><br/>Demo Administrator:<br/>- Login: admin@kitware.com<br/>- Password: admin<br/><br/>
-                            Demo User:<br/>-Login: user@kitware.com<br/>-Password: useryour information.", 'bottom left', 'top right');
+                            Demo User:<br/>-Login: user@kitware.com<br/>-Password: user", 'bottom left', 'top right');
       }
-    
+
     if($this->logged)
       {
       $this->addDynamicHelp('#startingGuideLink', 'Show the <b>Starting Guide</b>. You can disable these messages from this panel.');
@@ -270,11 +270,11 @@ public function preDispatch()
       {
       $this->addDynamicHelp('.HeaderLogo', 'The <b>MIDAS Platform</b> integrates multimedia server technology with open-source data analysis and visualization clients.');
       }
-      
-        
+
+
     $this->addDynamicHelp('.HeaderSearch', '<b>Quick search</b>. Use this tool to quickly find information and data.');
     $this->addDynamicHelp('li.uploadFile a', '<b>Upload</b> files, data using this button.');
-    
+
     if($this->logged)
       {
       $this->addDynamicHelp('#topUserName', '<b>Manage</b> your information.', 'bottom left', 'top right');
@@ -283,12 +283,12 @@ public function preDispatch()
       {
       $this->addDynamicHelp('.registerLink', '<b>Register</b> to create your personnal space.', 'bottom left', 'top right');
       }
-    
+
     $this->addDynamicHelp('.SideBar ul:first', '<b>Navigation menu</b>. Browse, explore and manage data.');
-    
+
     Zend_Loader::loadClass("JsonComponent", BASE_PATH.'/core/controllers/components');
     } // end preDispatch()
-    
+
   /** show dynamic help ? */
   function isDynamicHelp()
     {
@@ -305,13 +305,13 @@ function isDynamicHelp()
         }
       return $dynamichelp == 1;
       }
-    catch (Zend_Exception $exc)
+    catch(Zend_Exception $exc)
       {
       $this->getLogger()->warn($exc->getMessage());
       return false;
       }
     }
-    
+
   /** show starting guide ? */
   function isStartingGuide()
     {
@@ -323,7 +323,7 @@ function isStartingGuide()
         }
       return false;
       }
-    catch (Zend_Exception $exc)
+    catch(Zend_Exception $exc)
       {
       $this->getLogger()->warn($exc->getMessage());
       return false;
@@ -362,11 +362,11 @@ public function isTestingEnv()
    * @param type $selector (javascript selector)
    * @param type $text
    * @param type $location
-   * @param type $arrow 
+   * @param type $arrow
    */
   public function addDynamicHelp($selector, $text, $location = 'bottom right', $arrow = 'top left')
     {
-    $this->view->json['dynamicHelp'][] = array('selector' => $selector, 'text' => htmlspecialchars($text) , 'my' => $arrow, 'at' => $location);
+    $this->view->json['dynamicHelp'][] = array('selector' => $selector, 'text' => htmlspecialchars($text), 'my' => $arrow, 'at' => $location);
     }
   /** check if demo mode is set */
   public function isDemoMode()

core/controllers/CommunityController.php

@@ -241,7 +241,7 @@ function indexAction()
     $communities = $this->Component->Sortdao->arrayUniqueDao($communities);
 
     $this->view->userCommunities = $communities;
-    
+
     $this->addDynamicHelp('.communityList:first', 'List of current projects/communities hosted on MIDAS.', 'top right', 'bottom left');
     $this->addDynamicHelp('.createCommunity', 'Manage your own community or project.');
     }//end index
@@ -322,12 +322,12 @@ function viewAction()
 
     $this->view->customJSs = Zend_Registry::get('notifier')->callback('CALLBACK_CORE_GET_COMMUNITY_VIEW_JSS', array());
     $this->view->customCSSs = Zend_Registry::get('notifier')->callback('CALLBACK_CORE_GET_COMMUNITY_VIEW_CSSS', array());
-    
+
     $this->addDynamicHelp('#tabDataLink', 'Public and Private Data hosted by the community.');
     $this->addDynamicHelp('#tabFeedLink', 'What\'s new?');
     $this->addDynamicHelp('#tabInfoLink', 'Description of the community.');
     $this->addDynamicHelp('#tabSharedLink', 'Data shared to the member of the community.');
-    
+
     } //end index
 
   /** Delete a community*/

core/controllers/FeedController.php

@@ -46,7 +46,7 @@ public function indexAction()
         }
       setcookie('newFeed'.$this->userSession->Dao->getKey(), strtotime("now"), time() + 60 * 60 * 24 * 300, '/'); //30 days
       }
-      
+
     $this->addDynamicHelp('.feedContainer', 'The <b>Feed</b> shows recent actions and events.', 'top right', 'bottom left');
     }
 

core/controllers/UserController.php

@@ -177,7 +177,7 @@ function registerAction()
     $this->view->jsonRegister = JsonComponent::encode(array(
       'MessageNotValid' => $this->t('The e-mail is not valid'), 'MessageNotAvailable' => $this->t('This e-mail is not available'), 'MessagePassword' => $this->t('Password too short'), 'MessagePasswords' => $this->t('The passwords are not the same'), 'MessageLastname' => $this->t('Please set your lastname'), 'MessageTerms' => $this->t('Please validate the terms of service'), 'MessageFirstname' => $this->t('Please set your firstname')
     ));
-   
+
     } //end register
 
   /** Login action */