- Add a header on the About page

- Add a link to the About page on the Login page
- Remove the XMPP Websocket test in AdminTest
- Re-enable the # for the tabs (test)

app/assets/js/movim_utils.js

@@ -137,8 +137,9 @@ function movim_textarea_autoheight(textbox) {
  * @param string the class to check 
  */
 function movim_has_class(element,classname) {
-    var element = movim_get_node(element);
-    return element.className.match(new RegExp('(\\s|^)'+classname+'(\\s|$)'));
+    var node = movim_get_node(element);
+    if(!node) console.log('Node ' + element + ' not found');
+    return node.className.match(new RegExp('(\\s|^)'+classname+'(\\s|$)'));
 }
 
 /**

app/views/about.tpl

@@ -1,4 +1,5 @@
 <main>
+    <?php $this->widget('Header'); ?>
     <section>
         <div>
             <?php $this->widget('Tabs');?>

app/widgets/AdminMain/adminmain.tpl

@@ -35,12 +35,12 @@
         </div>
     </div>
 
-
+    <!--
     <div>
         <input type="text" name="sizelimit" id="sizelimit" value="{$conf->sizelimit}" />
         <label for="sizelimit">{$c->__('general.limit')}</label>
     </div>
-
+    -->
     <div>
         <div class="select">
             <select id="loglevel" name="loglevel">

app/widgets/AdminTest/admintest.css

@@ -102,7 +102,7 @@ figure div.link#browser-daemon {
     top: 20%;
 }
 
-figure div.link#daemon-xmpp {
+figure div.link#xmpp-daemon {
     left: 60%;
     top: 20%;
 }

app/widgets/AdminTest/admintest.js

@@ -20,6 +20,7 @@ var AdminTest = {
 
         movim_remove_class('figure #browser-daemon', 'error');
         movim_add_class('figure #browser-daemon', 'success');
+        movim_add_class('div #xmpp-daemon', 'success');
         movim_remove_class('li.admindb', 'disabled');
 
         movim_get_node('#websocket_error').style.display = 'none';
@@ -36,7 +37,7 @@ var AdminTest = {
         this.movimOK = false;
 
         movim_add_class('figure #movim_block', 'error');
-    },
+    }/*,
 
     testXMPPWebsocket : function(url) {
         this.connection = new WebSocket(url, 'xmpp');
@@ -46,7 +47,7 @@ var AdminTest = {
             movim_add_class('figure #daemon-xmpp', 'success');
             movim_get_node('#xmpp_websocket_error').style.display = 'none';
         };
-    }
+    }*/
 }
 
 MovimWebsocket.attach(function() {

app/widgets/AdminTest/admintest.tpl

@@ -7,7 +7,7 @@
             <div id="movim-daemon" class="link vertical disabled"><i class="md md-settings"></i></div>
             <div id="movim-browser" class="link horizontal success"><i class="md md-open-in-browser"></i></div>
             <div id="browser-daemon" class="link horizontal error"><i class="md md-settings-ethernet"></i></div>
-            <div id="daemon-xmpp" class="link horizontal error"><i class="md md-import-export"></i></div>
+            <div id="xmpp-daemon" class="link horizontal"><i class="md md-import-export"></i></div>
             <div id="movim-database" class="link vertical {if="$dbconnected"}success {if="$dbinfos > 0"}warning{/if} {else}error{/if}">
                 <i class="md md-data-usage"></i>
             </div>
@@ -64,14 +64,14 @@
             </span> 
         </li>
         
-        <li id="xmpp_websocket_error">
+        <!--<li id="xmpp_websocket_error">
             <span class="icon bubble color red">
                 <i class="md md-settings-ethernet"></i>
             </span>
             <span>
                 {$c->__('compatibility.xmpp_websocket')} <code>{$websocketurl}</code>
             </span>
-        </li>
+        </li>-->
 
         {if="!$c->version()"}
             <li class="condensed">
@@ -127,5 +127,5 @@
             </li>
         {/if}
     </ul>
-    <script type="text/javascript">AdminTest.testXMPPWebsocket('{$websocketurl}');</script>
+    <!--<script type="text/javascript">AdminTest.testXMPPWebsocket('{$websocketurl}');</script>-->
 </div>

app/widgets/Header/_header_about.tpl

@@ -0,0 +1,6 @@
+<div>
+    <a href="{$c->route('main')}" class="classic">
+        <span id="menu" class="icon"><i class="md md-home"></i></span>
+    </a>
+    <h2>{$c->__('page.about')}</h2>
+</div>

app/widgets/Login/_login_sessions.tpl

@@ -3,7 +3,7 @@
     <br />
     <ul class="active">
         {loop="$sessions"}
-        <li id="{$value->jid}" class="action">
+        <li id="{$value->jid}" class="action condensed" title="{$value->jid}">
             <div class="action">
                 <i class="md md-close"></i>
             </div>
@@ -18,11 +18,15 @@
                 </span>
             {/if}
             <span>{$value->getTrueName()}</span>
+            <p>{$value->jid}</p>
         </li>
         {/loop}
     </ul>
 </section>
 <div>
+    <a class="button flat" href="{$c->route('about')}">
+        <i class="md md-help"></i>
+    </a>
     <a class="button flat" href="{$c->route('admin')}">
         <i class="md md-pages"></i>
     </a>

app/widgets/Tabs/tabs.js

@@ -24,13 +24,13 @@ var Tabs = {
         
         if(current != null){
             tab = current;	
-            menuTab = document.querySelector('li.'+current);	
+            menuTab = document.querySelector('li.'+current);
         }
         
         //if no tab is active, activate the first one
         else {
-            tab = document.querySelector('.tabelem').id;	
-            menuTab = document.querySelector('li.'+tab);	
+            tab = document.querySelector('.tabelem').id;
+            menuTab = document.querySelector('li.'+tab);
         }
 
         Tabs.change(menuTab, tab);
@@ -55,9 +55,8 @@ var Tabs = {
         // We show the selected div
         var tabOn = document.querySelector('#'+n);
         tabOn.style.display = "block";
-        /*var baseUrl = window.location.href.split('#')[0];
+        var baseUrl = window.location.href.split('#')[0];
         window.location.replace(baseUrl + '#' + n);
-        /*  */  
         //scroll(0,0);
     }
 }
@@ -71,4 +70,3 @@ function actDifferent(e){
     e.preventDefault();
     return false;
 }	
-

themes/material/css/form.css

@@ -231,7 +231,7 @@ form > div .radio > input[type="radio"]:checked + label:hover {
 
 .button,
 input[type=button] {
-    min-width: 8rem;
+    min-width: 5rem; /* 8rem ? */
     text-align: center;
     display: inline-block;
     box-sizing: border-box;