From 03642985cbc5faecfeffcb7dacf31c8fee6e1658 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jaussoin=20Timoth=C3=A9e?= <edhelas@movim.eu>
Date: Tue, 20 Jan 2015 10:03:35 +0100
Subject: [PATCH 1/4] - Create the user directory on Login

---
 app/widgets/Login/Login.php |  2 ++
 system/User.php             | 10 +++++++++-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/app/widgets/Login/Login.php b/app/widgets/Login/Login.php
index 19017498e..5ec7057d1 100755
--- a/app/widgets/Login/Login.php
+++ b/app/widgets/Login/Login.php
@@ -53,6 +53,8 @@ class Login extends WidgetBase
 
     function onConfig($packet)
     {
+        $this->user->createDir();
+
         RPC::call('postLogin', $this->user->getLogin(), Route::urlize('root'));
     }
 
diff --git a/system/User.php b/system/User.php
index 740c4a807..ef30b38b6 100755
--- a/system/User.php
+++ b/system/User.php
@@ -29,7 +29,6 @@ class User {
     /**
      * Class constructor. Reloads the user's session or attempts to authenticate
      * the user.
-     * Note that the constructor is private. This class is a singleton.
      */
     function __construct()
     {
@@ -109,6 +108,15 @@ class User {
         Session::dispose();
     }
 
+    function createDir()
+    {
+        if(!is_dir($this->userdir)
+        && $this->userdir != '') {
+            mkdir($this->userdir);
+            touch($this->userdir.'index.html');
+        }
+    }
+
     function getLogin()
     {
         return $this->username;

From 6608324d8dcea2425edb1a9824c3166b8823e141 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jaussoin=20Timoth=C3=A9e?= <edhelas@movim.eu>
Date: Tue, 20 Jan 2015 18:25:47 +0100
Subject: [PATCH 2/4] - Fix the action CSS for the lists - New Presence widget
 system (with radio button)

---
 app/widgets/Header/_header_main.tpl           |   2 +-
 app/widgets/Login/_login_sessions.tpl         |   4 +-
 app/widgets/Navigation/Navigation.php         |   2 +-
 app/widgets/Navigation/navigation.tpl         |  12 +-
 app/widgets/Presence/Presence.php             |  86 +++++++--------
 app/widgets/Presence/_presence.tpl            |   4 +-
 app/widgets/Presence/_presence_list.tpl       | 104 ++++++++++++------
 app/widgets/Presence/presence.css             |  15 ++-
 app/widgets/Presence/presence.js              |  38 ++++++-
 .../PubsubSubscriptionConfig.php              |  16 +--
 app/widgets/Rooms/_rooms_add.tpl              |   6 +-
 app/widgets/Roster/roster.tpl                 |   3 +-
 app/widgets/Vcard4/_vcard4_form.tpl           |   2 +-
 themes/material/css/form.css                  |   6 +-
 themes/material/css/list.css                  |  54 +++------
 15 files changed, 200 insertions(+), 154 deletions(-)

diff --git a/app/widgets/Header/_header_main.tpl b/app/widgets/Header/_header_main.tpl
index 681d853c1..0afbb7b17 100644
--- a/app/widgets/Header/_header_main.tpl
+++ b/app/widgets/Header/_header_main.tpl
@@ -6,7 +6,7 @@
     </li>
 </ul>-->
 <span id="menu" class="on_mobile icon" onclick="MovimTpl.toggleMenu()"><i class="md md-menu"></i></span>
-<span class="on_desktop icon"><i class="md md-speaker-notes"></i></span>
+<span class="on_desktop icon"><i class="md md-view-list"></i></span>
 <form>
     <div>
         <div class="select">
diff --git a/app/widgets/Login/_login_sessions.tpl b/app/widgets/Login/_login_sessions.tpl
index 852e5ce30..bf64fd0f7 100755
--- a/app/widgets/Login/_login_sessions.tpl
+++ b/app/widgets/Login/_login_sessions.tpl
@@ -3,8 +3,8 @@
     <br />
     <ul class="active">
         {loop="$sessions"}
-        <li>
-            <div class="control">
+        <li class="action">
+            <div>
                 <i onclick="Login.removeSession('{$value->jid}')" class="fa fa-times"></i>
             </div>
             <span onclick="Login.choose('{$value->jid}')" class="icon bubble">
diff --git a/app/widgets/Navigation/Navigation.php b/app/widgets/Navigation/Navigation.php
index fa524e8b4..db7c1e983 100644
--- a/app/widgets/Navigation/Navigation.php
+++ b/app/widgets/Navigation/Navigation.php
@@ -4,10 +4,10 @@ class Navigation extends WidgetCommon
 {
     function load()
     {
-
     }
 
     function display()
     {
+        $this->view->assign('page', $this->_view);
     }
 }
diff --git a/app/widgets/Navigation/navigation.tpl b/app/widgets/Navigation/navigation.tpl
index d4653d090..322503e0a 100644
--- a/app/widgets/Navigation/navigation.tpl
+++ b/app/widgets/Navigation/navigation.tpl
@@ -1,27 +1,27 @@
 <ul class="active divided">
-    <li>
-        <div class="on_mobile control">
+    <li class="action">
+        <div class="on_mobile">
             <i onclick="MovimTpl.toggleMenu()" class="md md-arrow-back"></i>
         </div>
         <span class="icon bubble"><i class="md md-cloud-queue"></i></span>
-        Movim
+        <span>Movim</span>
     </li>
     <a class="classic" href="{$c->route('root')}">
-        <li>
+        <li {if="$page == 'main'"}class="active"{/if}>
             <span class="icon"><i class="md md-view-list"></i></span>
             <span data-key="news" class="counter"></span>
             <span>{$c->__('page.news')}</span>
         </li>
     </a>
     <a class="classic" href="{$c->route('contact')}">
-        <li>
+        <li {if="$page == 'contact'"}class="active"{/if}>
             <span class="icon"><i class="md md-people"></i></span>
             <span class="counter"></span>
             <span>{$c->__('page.contacts')}</span>
         </li>
     </a>
     <a class="classic" href="{$c->route('chat')}">
-        <li>
+        <li {if="$page == 'chat'"}class="active"{/if}>
             <span class="icon"><i class="md md-forum"></i></span>
             <span data-key="chat" class="counter"></span>
             <span>{$c->__('page.chats')}</span>
diff --git a/app/widgets/Presence/Presence.php b/app/widgets/Presence/Presence.php
index 32511c8c9..aa105544e 100755
--- a/app/widgets/Presence/Presence.php
+++ b/app/widgets/Presence/Presence.php
@@ -31,7 +31,7 @@ class Presence extends WidgetBase
     
     function load()
     {
-        //$this->addcss('presence.css');
+        $this->addcss('presence.css');
         $this->addjs('presence.js');
         $this->registerEvent('mypresence', 'onMyPresence');
     }
@@ -41,7 +41,7 @@ class Presence extends WidgetBase
         $html = $this->preparePresence();
         RPC::call('movim_fill', 'presence_widget', $html);
         Notification::append(null, $this->__('status.updated'));
-        RPC::call('setPresenceActions');
+        RPC::call('Presence.refresh');
         RPC::call('movim_remove_class', '#presence_widget', 'unfolded');
     }
 
@@ -51,59 +51,55 @@ class Presence extends WidgetBase
                        BASE_URI."index.php?q=disconnect");
     }
 
-    private function setPresence($show = false, $status = false)
+    function ajaxSet($form = false)
     {
-        Dialog::fill('');
-        // We update the cache with our status and presence
-        $presence = Cache::c('presence');
+        if($form == false) {
+            // We update the cache with our status and presence
+            $presence = Cache::c('presence');
 
-        if($show == false) $show = $presence['show'];
-        if($status == false) $status = $presence['status'];
+            $value = $presence['show'];
+            $status = $presence['status'];
 
-        if($presence == null || !isset($presence['show']) || $presence['show'] == '')
-            $show = 'chat';
+            if($presence == null || !isset($presence['show']) || $presence['show'] == '')
+                $value = 'chat';
 
-        if($presence == null|| !isset($presence['status']) || $presence['status'] == '')
-            $status = 'Online with Movim';
+            if($presence == null|| !isset($presence['status']) || $presence['status'] == '')
+                $status = 'Online with Movim';
+        } else {
+            $status = $form['status'];
+            $value = $form['value'];
+        }
+
+        if(in_array($value, array('chat', 'away', 'dnd', 'xa'))) {            
+            switch($value) {
+                case 'chat':
+                    $p = new Chat;
+                    $p->setStatus($status)->request();
+                    break;               
+                case 'away':             
+                    $p = new Away;       
+                    $p->setStatus($status)->request();
+                    break;               
+                case 'dnd':              
+                    $p = new DND;        
+                    $p->setStatus($status)->request();
+                    break;               
+                case 'xa':               
+                    $p = new XA;         
+                    $p->setStatus($status)->request();
+                    break;
+            }
+        }
 
         Cache::c(
             'presence', 
             array(
                 'status' => $status,
-                'show' => $show
+                'show' => $value
                 )
         );
-        
-        switch($show) {
-            case 'chat':
-                $p = new Chat;
-                $p->setStatus($status)->request();
-                break;               
-            case 'away':             
-                $p = new Away;       
-                $p->setStatus($status)->request();
-                break;               
-            case 'dnd':              
-                $p = new DND;        
-                $p->setStatus($status)->request();
-                break;               
-            case 'xa':               
-                $p = new XA;         
-                $p->setStatus($status)->request();
-                break;
-        }
-    }
-    
-    function ajaxSetPresence($show = false)
-    {
-        $this->setPresence($show, false);
     }
 
-    function ajaxSetStatus($status)
-    {
-        $this->setPresence(false, $status);
-    }
-    
     function ajaxLogout()
     {
         $session = \Sessionx::start();
@@ -143,7 +139,7 @@ class Presence extends WidgetBase
     function ajaxOpenDialog()
     {
         Dialog::fill($this->preparePresenceList());
-        RPC::call('setPresenceActions');
+        RPC::call('Presence.refresh');
     }
 
     function preparePresence()
@@ -196,10 +192,6 @@ class Presence extends WidgetBase
         $presencetpl->assign('p', $p);
         $presencetpl->assign('txt', $txt);
         $presencetpl->assign('txts', $txts);
-        $presencetpl->assign('callchat',    $this->call('ajaxSetPresence', "'chat'"));
-        $presencetpl->assign('callaway',    $this->call('ajaxSetPresence', "'away'"));
-        $presencetpl->assign('calldnd',     $this->call('ajaxSetPresence', "'dnd'"));
-        $presencetpl->assign('callxa',      $this->call('ajaxSetPresence', "'xa'"));
 
         $presencetpl->assign('calllogout',  $this->call('ajaxLogout'));
         $html = $presencetpl->draw('_presence_list', true);
diff --git a/app/widgets/Presence/_presence.tpl b/app/widgets/Presence/_presence.tpl
index bbe75e429..de245da4f 100644
--- a/app/widgets/Presence/_presence.tpl
+++ b/app/widgets/Presence/_presence.tpl
@@ -1,5 +1,5 @@
-<li onclick="{$dialog}" class="condensed">
-    <div class="control">
+<li onclick="{$dialog}" class="condensed action">
+    <div>
         <i class="md md-edit"></i>
     </div>
     <span class="icon bubble" style="background-image: url({$me->getPhoto('m')})"></span>
diff --git a/app/widgets/Presence/_presence_list.tpl b/app/widgets/Presence/_presence_list.tpl
index dad1b4ce0..2e08981df 100755
--- a/app/widgets/Presence/_presence_list.tpl
+++ b/app/widgets/Presence/_presence_list.tpl
@@ -1,45 +1,83 @@
 <section>
-    <ul class="active thin">
-        <li class="subheader">{$c->__('status.status')}</li>
-        <li>
-            <span class="icon"><i class="md md-mode-edit"></i></span>
-            <form>
-                <div>
-                    <textarea 
-                        class="status" 
-                        spellcheck="false"
-                        placeholder="{$c->__('status.here')}"
-                        onload="movim_textarea_autoheight(this);"
-                        onkeyup="movim_textarea_autoheight(this);">{if="isset($p)"}{$p->status}{/if}</textarea>
-                    <label>{$c->__('status.here')}</label>
-                </div>
-            </form>        
-        </li>
-        <li onclick="{$callchat}">
-            <span class="icon bubble color small green"></span>
-            {$txt[1]}
-        </li>
-        <li onclick="{$callaway}">
-            <span class="icon bubble color small orange"></span>
-            {$txt[2]}
-        </li>
-        <li onclick="{$calldnd}">
-            <span class="icon bubble color small red"></span>
-            {$txt[3]}
-        </li>
-        <li onclick="{$callxa}" >
-            <span class="icon bubble color small purple"></span>
-            {$txt[4]}
-        </li>
+    <form name="presence">
+        <h3>{$c->__('status.status')}</h3>
+
+        <div>
+            <textarea 
+                spellcheck="false"
+                name="status"
+                placeholder="{$c->__('status.here')}"
+            >{if="isset($p)"}{$p->status}{/if}</textarea>
+            <label>{$c->__('status.here')}</label>
+        </div>
+
+        <div>
+            <ul class="active">
+                <li class="action">
+                    <span class="icon bubble color small green"></span>
+                    <div>
+                        <div class="radio">
+                            <input type="radio" name="value" id="chat" value="chat" {if="$p->value == 1"}checked="checked"{/if}/>
+                            <label for="chat"></label>
+                        </div>
+                    </div>
+                    <span>{$txt[1]}</span>
+                </li>
+                <li class="action">
+                    <span class="icon bubble color small orange"></span>
+                    <div>
+                        <div class="radio">
+                            <input type="radio" name="value" id="away" value="away" {if="$p->value == 2"}checked="checked"{/if}/>
+                            <label for="away"></label>
+                        </div>
+                    </div>
+                    <span>{$txt[2]}</span>
+                </li>
+                <li class="action">
+                    <span class="icon bubble color small red"></span>
+                    <div>
+                        <div class="radio">
+                            <input type="radio" name="value" id="dnd" value="dnd" {if="$p->value == 3"}checked="checked"{/if}/>
+                            <label for="dnd"></label>
+                        </div>
+                    </div>
+                    <span>{$txt[3]}</span>
+                </li>
+                <li class="action">
+                    <span class="icon bubble color small purple"></span>
+                    <div>
+                        <div class="radio">
+                            <input type="radio" name="value" id="xa" value="xa" {if="$p->value == 4"}checked="checked"{/if}/>
+                            <label for="xa"></label>
+                        </div>
+                    </div>
+                    <span>{$txt[4]}</span>
+                </li>
+            </ul>
+        </div>
+    </form>
+    <ul class="active">
         <li class="subheader">{$c->__('status.disconnect')}</li>
         <li onclick="{$calllogout}">
             <span class="icon"><i class="md md-exit-to-app"></i></span>
-            {$c->__('status.disconnect')}
+            <span>{$c->__('status.disconnect')}</span>
         </li>
     </ul>
+                <!--
+        <div class="element large mini">
+            <label>{$c->__('chatroom.autojoin_label')}</label>
+            <div class="checkbox">
+                <input type="checkbox" id="autojoin" name="autojoin"/>
+                <label for="autojoin"></label>
+            </div>
+        </div>
+        -->
 </section>
 <div>
     <a onclick="Dialog.clear()" class="button flat">
         {$c->__('button.close')}
     </a>
+    <a onclick="Presence_ajaxSet(movim_parse_form('presence')); Dialog.clear();" class="button flat">
+        {$c->__('button.submit')}
+    </a>
 </div>
diff --git a/app/widgets/Presence/presence.css b/app/widgets/Presence/presence.css
index 9127edf6a..fa20eb3cd 100755
--- a/app/widgets/Presence/presence.css
+++ b/app/widgets/Presence/presence.css
@@ -1,4 +1,15 @@
-#presence_widget {
+form[name=presence] ul {
+    margin: 0 -2rem;
+}
+/*
+form[name=presence] li {
+    padding-left: 7rem;
+}
+
+form[name=presence] li span.icon {
+    left: 1rem;
+}*/
+/*#presence_widget {
     max-width: 15rem;
     position: fixed;
     top: 0;
@@ -145,4 +156,4 @@
     margin-top: 1em;
     position: initial;
 }
-
+*/
diff --git a/app/widgets/Presence/presence.js b/app/widgets/Presence/presence.js
index ed2e3193b..083ba8fe8 100644
--- a/app/widgets/Presence/presence.js
+++ b/app/widgets/Presence/presence.js
@@ -3,7 +3,7 @@ function postStart() {
         // We disable the notifications for a couple of seconds
         Notification.inhibit(10);
         
-        Presence_ajaxSetPresence();
+        Presence_ajaxSet();
         //Presence_ajaxConfigGet();
         Presence_ajaxServerCapsGet();
         Presence_ajaxBookmarksGet();
@@ -11,11 +11,12 @@ function postStart() {
         localStorage.postStart = 0;
     }
 }
-
+/*
 function setPresenceActions() {
     var textarea = document.querySelector('textarea.status');
 
     if(textarea != null) {
+        movim_textarea_autoheight(textarea);
         textarea.onkeypress = function(event) {
             if(event.keyCode == 13) {
                 Presence_ajaxSetStatus(this.value);
@@ -28,9 +29,40 @@ function setPresenceActions() {
         };
     }
 }
+*/
+var Presence = {
+    refresh : function() {
+        var textarea = document.querySelector('form[name=presence] textarea');
+
+        if(textarea != null) {
+            movim_textarea_autoheight(textarea);
+            /*textarea.onkeypress = function(event) {
+                if(event.keyCode == 13) {
+                    Presence_ajaxSetStatus(this.value);
+                    this.blur();
+                }
+            };*/
+
+            textarea.onkeydown = function(event) {
+                movim_textarea_autoheight(this);
+            };
+        }
+
+        var presences = document.querySelectorAll('form ul li');
+
+        var i = 0;
+        while(i < presences.length)
+        {
+            presences[i].onclick = function(e) {
+                this.querySelector('label').click();
+            }
+            i++;
+        }
+    }
+}
 
 MovimWebsocket.attach(function()
 {
-    setPresenceActions();
+    Presence.refresh();
     postStart();
 });
diff --git a/app/widgets/PubsubSubscriptionConfig/PubsubSubscriptionConfig.php b/app/widgets/PubsubSubscriptionConfig/PubsubSubscriptionConfig.php
index 69db2e574..eeeadd699 100755
--- a/app/widgets/PubsubSubscriptionConfig/PubsubSubscriptionConfig.php
+++ b/app/widgets/PubsubSubscriptionConfig/PubsubSubscriptionConfig.php
@@ -71,20 +71,20 @@ class PubsubSubscriptionConfig extends WidgetBase
                             "'".$name."'");
 
                 $listhtml .= '
-                    <li>
+                    <li class="action">
                         <span class="icon bubble color '.stringToColor($s->node).'">
                             '.firstLetterCapitalize($s->node).'
                         </span>
                         <form>
                             <div class="control padded">
                                 <div class="checkbox">
-                                <input
-                                    type="checkbox"
-                                    id="privacy'.$s->node.'"
-                                    name="privacy'.$s->node.'"
-                                    '.$checked.'
-                                    onchange="'.$switch.'"/>
-                                <label for="privacy'.$s->node.'"></label>
+                                    <input
+                                        type="checkbox"
+                                        id="privacy'.$s->node.'"
+                                        name="privacy'.$s->node.'"
+                                        '.$checked.'
+                                        onchange="'.$switch.'"/>
+                                    <label for="privacy'.$s->node.'"></label>
                                 </div>
                             </div>
                         </form>
diff --git a/app/widgets/Rooms/_rooms_add.tpl b/app/widgets/Rooms/_rooms_add.tpl
index 4770ed91a..d7ab4229b 100644
--- a/app/widgets/Rooms/_rooms_add.tpl
+++ b/app/widgets/Rooms/_rooms_add.tpl
@@ -3,16 +3,16 @@
         <h3>{$c->__('rooms.add')}</h3>
 
         <div>
-            <label>{$c->__('chatrooms.id')}</label>
             <input name="jid" placeholder="chatroom@server.com" type="email" required />
+            <label>{$c->__('chatrooms.id')}</label>
         </div>
         <div>
-            <label>{$c->__('chatrooms.name')}</label>
             <input name="name" placeholder="{$c->__('chatrooms.name_placeholder')}" required />
+            <label>{$c->__('chatrooms.name')}</label>
         </div>
         <div>
-            <label>{$c->__('chatrooms.nickname')}</label>
             <input name="nick" placeholder="{$me->getTrueName()}" value="{$me->getTrueName()}"/>
+            <label>{$c->__('chatrooms.nickname')}</label>
         </div>
         <!--
         <div class="element large mini">
diff --git a/app/widgets/Roster/roster.tpl b/app/widgets/Roster/roster.tpl
index d2fe035a7..a3aecbc06 100644
--- a/app/widgets/Roster/roster.tpl
+++ b/app/widgets/Roster/roster.tpl
@@ -22,13 +22,12 @@
                 ng-repeat="myjid in group.agroupitems"
                 ng-if="!myjid.tombstone"
                 id="{{::myjid.ajid}}"
-                class="{{myjid.ajiditems.rosterview.inactive}}"
+                class="{{myjid.ajiditems.rosterview.inactive}} action"
                 ng-attr-title="{{rosterCtrl.getContactTitle(myjid.ajiditems)}}"
                 ng-class="{condensed: myjid.ajiditems.status != '' && myjid.ajiditems.status != null }"
                 ng-class="rosterCtrl.getContactClient(myjid.ajiditems)" >
                 <div
                     ng-if="myjid.ajiditems.rosterview.tune != '' || myjid.ajiditems.rosterview.type != '' "
-                    class="control"
                     ng-switch on="myjid.ajiditems.rosterview.type">
                     <i ng-switch-when="handheld" class="md md-smartphone"></i>
                     <i ng-switch-when="web" class="md md-language"></i>
diff --git a/app/widgets/Vcard4/_vcard4_form.tpl b/app/widgets/Vcard4/_vcard4_form.tpl
index d36f6a082..973607b43 100755
--- a/app/widgets/Vcard4/_vcard4_form.tpl
+++ b/app/widgets/Vcard4/_vcard4_form.tpl
@@ -1,6 +1,6 @@
 <ul>
     <li class="subheader"> {$c->__('vcard.privacy_title')}</li>
-    <li class="condensed">
+    <li class="condensed action">
         <form>
             <div class="control">
                 <div class="checkbox">
diff --git a/themes/material/css/form.css b/themes/material/css/form.css
index 6d18ea7ac..0c244445e 100644
--- a/themes/material/css/form.css
+++ b/themes/material/css/form.css
@@ -117,10 +117,6 @@ form > div:not(.control) .checkbox {
     margin-top: 5.5rem;
 }
 
-form > div .radio {
-    padding-top: 5.5rem;
-}
-
 /* Checkbox element */
 
 form > div .checkbox > input[type="checkbox"],
@@ -135,6 +131,7 @@ form > div .checkbox {
     margin-left: 1rem;
     width: 5rem;
     background-color: #939393;
+    margin: 1.5rem 0;
 }
 
 form > div .checkbox:before {
@@ -186,6 +183,7 @@ form > div .radio > input[type="radio"] + label {
     border-style: solid;
     border-color: gray;
     transition: box-shadow 0.1s ease;
+    margin-top: 1.25rem;
 }
 
 form > div .radio > input[type="radio"] + label:hover {
diff --git a/themes/material/css/list.css b/themes/material/css/list.css
index 6a0bc940f..ec0d43842 100644
--- a/themes/material/css/list.css
+++ b/themes/material/css/list.css
@@ -66,6 +66,12 @@ ul.active li.active:not(.subheader) {
     cursor: pointer;
 }
 
+.dark ul.active li:hover:not(.subheader),
+.dark ul.active.all li:hover,
+.dark ul.active li.active:not(.subheader) {
+    background-color: rgba(255, 255, 255, 0.035);
+}
+
 ul li.condensed,
 ul.thin li.condensed,
 ul.thick li.condensed {
@@ -95,50 +101,20 @@ ul li span {
     white-space: nowrap;
 }
 
-ul > li > div.control,
-ul > li > form > div.control {
-    float: right;
-    text-align: right;
-    min-width: 5rem;
-    font-size: 3rem;
-    line-height: 6rem;
-}
-
-ul > li > form > div.control {
-    margin-top: 1.5rem;
+ul li.action {
+    padding-right: 7rem;
 }
 
-ul.thin > li > div.control {
-    line-height: 3rem;
-}
-
-ul.thick > li > div.control {
+ul li.action > div,
+ul li.action > form > div {
+    position: absolute;
+    top: 50%;
+    right: 2rem;
+    margin-top: -2.5rem;
+    height: 5rem;
     line-height: 5rem;
 }
 
-ul li > div.control > * {
-    margin-left: 2rem;
-}
-
-/*
-ul.thick li > div.control.bottom {
-    bottom: 2rem;
-}
-
-ul li > div.control + form,
-ul li > div.control + p {
-    padding-right: 6rem;
-}
-*/
-ul li > div.control {
-    float: right;
-    min-height: 0;
-}
-/*
-ul li div.control.padded {
-    padding-top: 2rem;
-}
-*/
 ul li span.info {
     float: right;
     margin-left: 1rem;

From 3abdeb148c7da24b1058564eb433577ea033ed16 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jaussoin=20Timoth=C3=A9e?= <edhelas@movim.eu>
Date: Tue, 20 Jan 2015 23:17:10 +0100
Subject: [PATCH 3/4] - Fix action CSS in the views

---
 app/widgets/Chat/_chat.tpl                                | 4 ++--
 app/widgets/Chat/chat.css                                 | 7 +++----
 app/widgets/Login/_login_sessions.tpl                     | 2 +-
 app/widgets/Login/login.css                               | 4 ++++
 app/widgets/Login/login.tpl                               | 4 ++--
 app/widgets/Presence/_presence.tpl                        | 2 +-
 app/widgets/Presence/_presence_list.tpl                   | 8 ++++----
 .../PubsubSubscriptionConfig/PubsubSubscriptionConfig.php | 2 +-
 app/widgets/Vcard4/_vcard4_form.tpl                       | 2 +-
 themes/material/css/list.css                              | 4 ++--
 10 files changed, 21 insertions(+), 18 deletions(-)

diff --git a/app/widgets/Chat/_chat.tpl b/app/widgets/Chat/_chat.tpl
index 2af19008c..24d85e12d 100644
--- a/app/widgets/Chat/_chat.tpl
+++ b/app/widgets/Chat/_chat.tpl
@@ -5,11 +5,11 @@
 </div>
 <div class="chat_box">
     <ul class="simple thin">
-        <li>
+        <li class="action">
             <span class="icon gray">
                 <i class="md md-create"></i>
             </span>
-            <div class="control" onclick="{$send}">
+            <div class="action" onclick="{$send}">
                 <i class="md md-send"></i>
             </div>
             <!--<div class="control" onclick="{$smiley}">
diff --git a/app/widgets/Chat/chat.css b/app/widgets/Chat/chat.css
index c0e2d3ba0..ac820fbf5 100644
--- a/app/widgets/Chat/chat.css
+++ b/app/widgets/Chat/chat.css
@@ -13,20 +13,19 @@
 }
 
 #chat_widget .chat_box form {
-    width: calc(100% - 5rem);
+    width: calc(100% - 1rem);
 }
 
 #chat_widget .chat_box form textarea {
     margin-bottom: 0;
 }
 
-#chat_widget .chat_box .control {
+#chat_widget .chat_box div.action {
     font-size: 4rem;
     color: gray;
-    margin-top: 3rem;
 }
 
-#chat_widget .chat_box .control:hover {
+#chat_widget .chat_box div.action:hover {
     cursor: pointer;
     color: #333;
 }
diff --git a/app/widgets/Login/_login_sessions.tpl b/app/widgets/Login/_login_sessions.tpl
index bf64fd0f7..f420836a5 100755
--- a/app/widgets/Login/_login_sessions.tpl
+++ b/app/widgets/Login/_login_sessions.tpl
@@ -4,7 +4,7 @@
     <ul class="active">
         {loop="$sessions"}
         <li class="action">
-            <div>
+            <div class="action">
                 <i onclick="Login.removeSession('{$value->jid}')" class="fa fa-times"></i>
             </div>
             <span onclick="Login.choose('{$value->jid}')" class="icon bubble">
diff --git a/app/widgets/Login/login.css b/app/widgets/Login/login.css
index 04492fa2f..1cbf82eff 100755
--- a/app/widgets/Login/login.css
+++ b/app/widgets/Login/login.css
@@ -46,6 +46,10 @@ body main {
     min-height: 0;
 }
 
+#login_widget form ul input {
+    margin: 0;
+}
+
 ul.admin {
     position: relative;
     text-align: center;
diff --git a/app/widgets/Login/login.tpl b/app/widgets/Login/login.tpl
index d90cfc125..721414fcf 100755
--- a/app/widgets/Login/login.tpl
+++ b/app/widgets/Login/login.tpl
@@ -25,8 +25,8 @@
                 </div>
                 <div>
                     <ul class="simple thin">
-                        <li>
-                            <div class="control">
+                        <li class="action">
+                            <div class="action">
                                 <input
                                     type="submit"
                                     disabled
diff --git a/app/widgets/Presence/_presence.tpl b/app/widgets/Presence/_presence.tpl
index de245da4f..24eeb3e66 100644
--- a/app/widgets/Presence/_presence.tpl
+++ b/app/widgets/Presence/_presence.tpl
@@ -1,5 +1,5 @@
 <li onclick="{$dialog}" class="condensed action">
-    <div>
+    <div class="action">
         <i class="md md-edit"></i>
     </div>
     <span class="icon bubble" style="background-image: url({$me->getPhoto('m')})"></span>
diff --git a/app/widgets/Presence/_presence_list.tpl b/app/widgets/Presence/_presence_list.tpl
index 2e08981df..ffa12e812 100755
--- a/app/widgets/Presence/_presence_list.tpl
+++ b/app/widgets/Presence/_presence_list.tpl
@@ -15,7 +15,7 @@
             <ul class="active">
                 <li class="action">
                     <span class="icon bubble color small green"></span>
-                    <div>
+                    <div class="action">
                         <div class="radio">
                             <input type="radio" name="value" id="chat" value="chat" {if="$p->value == 1"}checked="checked"{/if}/>
                             <label for="chat"></label>
@@ -25,7 +25,7 @@
                 </li>
                 <li class="action">
                     <span class="icon bubble color small orange"></span>
-                    <div>
+                    <div class="action">
                         <div class="radio">
                             <input type="radio" name="value" id="away" value="away" {if="$p->value == 2"}checked="checked"{/if}/>
                             <label for="away"></label>
@@ -35,7 +35,7 @@
                 </li>
                 <li class="action">
                     <span class="icon bubble color small red"></span>
-                    <div>
+                    <div class="action">
                         <div class="radio">
                             <input type="radio" name="value" id="dnd" value="dnd" {if="$p->value == 3"}checked="checked"{/if}/>
                             <label for="dnd"></label>
@@ -45,7 +45,7 @@
                 </li>
                 <li class="action">
                     <span class="icon bubble color small purple"></span>
-                    <div>
+                    <div class="action">
                         <div class="radio">
                             <input type="radio" name="value" id="xa" value="xa" {if="$p->value == 4"}checked="checked"{/if}/>
                             <label for="xa"></label>
diff --git a/app/widgets/PubsubSubscriptionConfig/PubsubSubscriptionConfig.php b/app/widgets/PubsubSubscriptionConfig/PubsubSubscriptionConfig.php
index eeeadd699..8beae76fa 100755
--- a/app/widgets/PubsubSubscriptionConfig/PubsubSubscriptionConfig.php
+++ b/app/widgets/PubsubSubscriptionConfig/PubsubSubscriptionConfig.php
@@ -76,7 +76,7 @@ class PubsubSubscriptionConfig extends WidgetBase
                             '.firstLetterCapitalize($s->node).'
                         </span>
                         <form>
-                            <div class="control padded">
+                            <div class="action">
                                 <div class="checkbox">
                                     <input
                                         type="checkbox"
diff --git a/app/widgets/Vcard4/_vcard4_form.tpl b/app/widgets/Vcard4/_vcard4_form.tpl
index 973607b43..4fe2d8b3d 100755
--- a/app/widgets/Vcard4/_vcard4_form.tpl
+++ b/app/widgets/Vcard4/_vcard4_form.tpl
@@ -2,7 +2,7 @@
     <li class="subheader"> {$c->__('vcard.privacy_title')}</li>
     <li class="condensed action">
         <form>
-            <div class="control">
+            <div class="control action">
                 <div class="checkbox">
                     <input
                         type="checkbox"
diff --git a/themes/material/css/list.css b/themes/material/css/list.css
index ec0d43842..8f16d6946 100644
--- a/themes/material/css/list.css
+++ b/themes/material/css/list.css
@@ -105,8 +105,8 @@ ul li.action {
     padding-right: 7rem;
 }
 
-ul li.action > div,
-ul li.action > form > div {
+ul li.action > div.action,
+ul li.action > form > div.action {
     position: absolute;
     top: 50%;
     right: 2rem;

From afaea090601ee84a9b6bd35516ccdb5cf785d733 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jaussoin=20Timoth=C3=A9e?= <edhelas@movim.eu>
Date: Tue, 20 Jan 2015 23:40:39 +0100
Subject: [PATCH 4/4] - Fixing other CSS mistakes

---
 app/widgets/Navigation/navigation.tpl | 2 +-
 app/widgets/Roster/roster.tpl         | 1 +
 themes/material/css/form.css          | 6 ------
 themes/material/css/list.css          | 1 +
 4 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/app/widgets/Navigation/navigation.tpl b/app/widgets/Navigation/navigation.tpl
index 322503e0a..d304bcc5c 100644
--- a/app/widgets/Navigation/navigation.tpl
+++ b/app/widgets/Navigation/navigation.tpl
@@ -1,6 +1,6 @@
 <ul class="active divided">
     <li class="action">
-        <div class="on_mobile">
+        <div class="action on_mobile">
             <i onclick="MovimTpl.toggleMenu()" class="md md-arrow-back"></i>
         </div>
         <span class="icon bubble"><i class="md md-cloud-queue"></i></span>
diff --git a/app/widgets/Roster/roster.tpl b/app/widgets/Roster/roster.tpl
index a3aecbc06..4ad6806e6 100644
--- a/app/widgets/Roster/roster.tpl
+++ b/app/widgets/Roster/roster.tpl
@@ -27,6 +27,7 @@
                 ng-class="{condensed: myjid.ajiditems.status != '' && myjid.ajiditems.status != null }"
                 ng-class="rosterCtrl.getContactClient(myjid.ajiditems)" >
                 <div
+                    class="action"
                     ng-if="myjid.ajiditems.rosterview.tune != '' || myjid.ajiditems.rosterview.type != '' "
                     ng-switch on="myjid.ajiditems.rosterview.type">
                     <i ng-switch-when="handheld" class="md md-smartphone"></i>
diff --git a/themes/material/css/form.css b/themes/material/css/form.css
index 0c244445e..dc721a54f 100644
--- a/themes/material/css/form.css
+++ b/themes/material/css/form.css
@@ -111,12 +111,6 @@ form > div > input:required {
     box-shadow: none;
 }
 
-/* Placing the checkbox and radio */
-
-form > div:not(.control) .checkbox {
-    margin-top: 5.5rem;
-}
-
 /* Checkbox element */
 
 form > div .checkbox > input[type="checkbox"],
diff --git a/themes/material/css/list.css b/themes/material/css/list.css
index 8f16d6946..2deccab3b 100644
--- a/themes/material/css/list.css
+++ b/themes/material/css/list.css
@@ -111,6 +111,7 @@ ul li.action > form > div.action {
     top: 50%;
     right: 2rem;
     margin-top: -2.5rem;
+    font-size: 3rem;
     height: 5rem;
     line-height: 5rem;
 }