- Half way fixing news..

- Half way fixing LI clickable session in login form

app/widgets/Login/_login_sessions.tpl

@@ -3,7 +3,7 @@
     <br />
     <ul class="active">
         {loop="$sessions"}
-        <li>
+        <li id="{$value->jid}">
             <div class="control">
                 <i onclick="Login.removeSession('{$value->jid}')" class="fa fa-times"></i>
             </div>

app/widgets/Login/login.js

@@ -25,6 +25,18 @@ var Login = {
             setTimeout("MovimWebsocket.unregister()", 7000);
         }
     },
+    
+    refresh: function(){
+        /*Add onclick listeners*/
+        var sessions = document.querySelectorAll('#sessions ul > li');
+        var i = 0;
+        console.log(sessions);
+        while(i < sessions.length)
+        {
+            sessions[i].onclick = function(e){Login.choose(e.target);};
+            i++;
+        }
+    },
 
     /**
      * @brief Save a jid in the local storage
@@ -46,15 +58,26 @@ var Login = {
      * @brief Choose a session to connect and show the login form
      * @param The jid to choose
      */
-    choose : function(jid) {
-        movim_remove_class('#login_widget', 'choose');
-        document.querySelector('#login').value = jid;
-        document.querySelector('#pass').value = "";
-        
-        if(jid != '') {
-            document.querySelector('#pass').focus();
-        } else {
-            document.querySelector('#login').focus();
+    choose : function(element) {
+        if(element.tagName == "LI" || element.tagName == "SPAN"){
+            jid = element.id;
+            movim_remove_class('#login_widget', 'choose');
+            document.querySelector('#login').value = jid;
+            document.querySelector('#pass').value = "";
+            
+            if(jid != '') {
+                document.querySelector('#pass').focus();
+            } else {
+                document.querySelector('#login').focus();
+            }
+        }
+        else{
+            console.log("NOT LI OR SPAN");
+            console.log(element);
+            while(element.tagName != "LI")
+                element = element.parentNode;
+            console.log(element);
+            Login.removeSession(element.id);
         }
     },
 
@@ -120,6 +143,7 @@ MovimWebsocket.attach(function()
 
     if(localStorage.getItem('previousSessions') != null) {
         movim_add_class('#login_widget', 'choose');
+        Login.refresh();
     }
 });
 

app/widgets/Menu/Menu.php

@@ -97,13 +97,15 @@ class Menu extends WidgetCommon
     }
 
     function prepareList($type = 'all', $server = null, $node = null, $page = 0) {
-        //movim_log(__METHOD__);
+        movim_log(__METHOD__);
         $view = $this->tpl();
         $pd = new \Modl\PostnDAO;
         $count = $pd->getCountSince(Cache::c('since'));
         
         // getting newer, not older
-        if($page == 0){
+        movim_log($page);
+        movim_log($page == "");
+        if($page == 0 || $page == ""){
             $count = 0;
             Cache::c('since', date(DATE_ISO8601, strtotime($pd->getLastDate())));
         }
@@ -114,22 +116,30 @@ class Menu extends WidgetCommon
             case 'all' :
                 $view->assign('history', $this->call('ajaxGetAll', $next));
                 $items  = $pd->getAllPosts(false, $page * $this->_paging + $count, $this->_paging);
-                //movim_log("ALL ".$page * $this->_paging + $count);
+                movim_log(__LINE__);
+                movim_log(" ALL ");
+                movim_log($page * $this->_paging + $count);
                 break;
             case 'news' :
                 $view->assign('history', $this->call('ajaxGetNews', $next));
                 $items  = $pd->getNews($page * $this->_paging + $count, $this->_paging);
-                //movim_log("NEWS ".$page * $this->_paging + $count);
+                movim_log(__LINE__);
+                movim_log(" NEWS ");
+                movim_log($page * $this->_paging + $count);
                 break;
             case 'feed' :
                 $view->assign('history', $this->call('ajaxGetFeed', $next));
                 $items  = $pd->getFeed($page * $this->_paging + $count, $this->_paging);
-                //movim_log("FEED ".$page * $this->_paging + $count);
+                movim_log(__LINE__);
+                movim_log(" FEED ");
+                movim_log($page * $this->_paging + $count);
                 break;
             case 'node' :
                 $view->assign('history', $this->call('ajaxGetNode', '"'.$server.'"', '"'.$node.'"', $next));
                 $items  = $pd->getNode($server, $node, $page * $this->_paging + $count, $this->_paging);
-                //movim_log("NODE ".$page * $this->_paging + $count);
+                movim_log(__LINE__);
+                movim_log(" NODE ");
+                movim_log($page * $this->_paging + $count);
                 break;
         }