Merge branch 'master' of github.com:tracim/tracim

API.md

        ]
     }
 
-## Calendars
+## Users
+
+### List
+
+    GET /api/users/
+
+Return list of all users of the tracim instance
+
+#### Response
+
+    {
+      "value_list": [
+        {
+          "id": 0,
+          "name": "Georges Abitbol",
+          "email": "g.abitbol@laclasse.com",
+          "canCreateWs": true,
+          "isAdmin": true,
+          "config": {
+            "sendEmailNotif": true
+          }
+        }, {
+          "id": 145,
+          "name": "Peter",
+          "email": "peter@laclasse.com",
+          "canCreateWs": false,
+          "isAdmin": false,
+          "config": {
+            "sendEmailNotif": false
+        }
+      ]
+    }
+
+## Users_Workspace (Role)
+
+### List
+
+    GET /api/users_workspace/
+
+Return list of all roles of all workspaces the connected user has access to
+
+#### Response
+
+    {
+      "value_list": [
+        {
+          "userId": 0,
+          "workspaceId": 1,
+          "roleId": 8,
+          "subscribedNotif": true
+        }, {
+          "userId": 2,
+          "workspaceId": 2,
+          "roleId": 2,
+          "subscribedNotif": true
+        }, {
+          "userId": 5,
+          "workspaceId": 3,
+          "roleId": 4,
+          "subscribedNotif": false
+        }
+      ]
+    }
+
+## Timezone
+
+### List
+
+    GET /api/timezone/
+
+Return list of all timezone available when creating a user
+
+#### Response
+
+    {
+      "value_list": [
+        "Africa/Abidjan",
+        "Africa/Accra",
+        "Africa/Addis_Ababa",
+        "Africa/Algiers",
+        "Africa/Asmara",
+        ...
+      ]
+    }
+
+## Calendars
 
 ### List
 

tracim/tracim/public/assets/css/dashboard.css

     color: #DDD;
 }
 
+.navbar-brand {
+  padding: 0 0 0 5px;
+}
+
 /*
  * Sidebar
  */
 .sidebar {
   display: none;
 }
-@media (min-width: 768px) {
-  .sidebar {
-    position: fixed;
-    top: 51px;
-    bottom: 0;
-    left: 0;
-    width: 260px;
-    z-index: 1000;
-    display: block;
-    padding: 20px;
-    overflow-x: hidden;
-    overflow-y: auto; /* Scrollable contents if viewport is shorter than content. */
-/*    background-color: #333;
-      color: #FFF;*/
-    background-color: #555;
-      color: #DDD;
-    border-right: 1px solid #CCC;
 
-  }
+.content__wrapper {
+  width: auto;
+  margin: 0;
 }
+
 .fixed-width-sidebar {
-  width: auto;
+  width: auto !important;
   min-width: 260px;
   max-width: 50%;
 }
 
-.content__wrapper {
-  width: auto;
-  margin: 0 260px; /* When changing this value, also change the corresponding in main.js */
-}
 .content__data {
   padding: 0 15px;
 }
   right: 0;
   overflow-x: visible;
   overflow-y: auto;
-    background-color: #F5F5F5;
-    border-left: 1px solid #CCC;
+  background-color: #F5F5F5;
+  border-left: 1px solid #CCC;
 }
 .navbar-right {
   margin-right: 0px;
 }
+.dropdown-toggle {
+  margin-right: 15px;
+}
 
 /* Sidebar navigation */
 .nav-sidebar {
 .header__navbar__switch-mode {
   float: right;
   display: inline-block;
-  padding: 15px;
   cursor: pointer;
 }
 .header__navbar__switch-mode > i {
   font-size: 14px;
 }
 
-.content__home {
-  padding: 0 15px;
-}
-
 .workspace__wrapper {
   padding: 0 15px;
 }
   border-bottom-width: 0px;
   border-top-left-radius: 5px;
   border-top-right-radius: 5px;
+  max-width: 36%;
   text-align: center;
   font-weight: bold;
   vertical-align: bottom;
   background-color: #bce8f1;
   color: #31708f;
 }
+
+@media (max-width: 999px) {
+  body {
+    padding-top: 40px;
+  }
+  .navbar {
+    min-height: 40px;
+  }
+  .navbar, .navbar-brand > img {
+    height: 40px;
+  }
+  #search-form {
+    margin: 0;
+    padding: 8px 5px;
+  }
+  #search-form input {
+    padding: 3px 10px;
+    line-height: 15px;
+    font-size: 13px;
+    height: auto;
+  }
+  .navbar-nav > li > a, .header__navbar__switch-mode {
+    padding: 10px 5px;
+    font-size: 13px;
+    line-height: 20px;
+  }
+  #sidebar-right .btn {
+    font-size: 13px;
+    padding: 5px;
+  }
+  .content__home__tab__item, .content__home__tab__item.active {
+    max-width: 165px;
+  }
+  .content__home__tab__item-news {
+    right: -20px;
+  }
+}
+
+@media (max-width: 767px) {
+  .navbar-brand {
+    height: auto;
+  }
+  .navbar-toggle {
+    margin: 0;
+  }
+  .navbar-collapse {
+    background-color: #555;
+  }
+  .navbar-nav > li > a {
+    padding: 3px 10px;
+  }
+  #search-form {
+    padding: 8px 10px 0px 10px;
+  }
+  .navbar-nav .open .dropdown-menu > li > a {
+    color: #ddd;
+  }
+  .navbar-toggle {
+    margin-right: 15px;
+  }
+  .navbar-right {
+    margin-right: -15px;
+  }
+  .content__wrapper {
+    margin: 0;
+  }
+  .content__wrapper {
+    margin: 0;
+  }
+  .content__title__subtitle-home-hidden-xs > div > p { /* remove the "welcome username" msg from homepage  */
+    display: none;
+  }
+  .content__home__tab__item {
+    display: block;
+    width: auto;
+    max-width: 100%;
+    padding: 10px 25px;
+    border-radius: 0px;
+    text-align: left;
+  }
+  .content__home__tab__item, .content__home__tab__item.active {
+    max-width: 100%;
+    padding: 10px 25px;
+    border: 0px;
+  }
+  .content__home__tab-wrapper {
+    border: 10px solid;
+    border-width: 0px 0px 0px 10px;
+  }
+  .content__home__tab-wrapper.recent_activity {
+    border-color: #faebcc;
+  }
+  .content__home__tab-wrapper.unread {
+    border-color: #d6e9c6;
+  }
+  .content__home__tab-wrapper.workspace {
+    border-color: #bce8f1;
+  }
+  .panel-warning, .panel-success, .panel-info {
+    border-top-width: 0px;
+    border-left-width: 10px;
+  }
+}
+
+@media (min-width: 768px) {
+  .sidebar {
+    display: block;
+    position: fixed;
+    top: 41px;
+    bottom: 0;
+    left: 0;
+    width: 130px;
+    padding: 10px;
+    z-index: 1000;
+    overflow-x: hidden;
+    overflow-y: auto; /* Scrollable contents if viewport is shorter than content. */
+    background-color: #555;
+    color: #DDD;
+    border-right: 1px solid #CCC;
+  }
+  .content__wrapper.edit-mode-margin {
+    margin: 0 130px;
+  }
+  .fixed-width-sidebar {
+    min-width: 130px;
+  }
+  .content__home {
+    padding: 0 5px;
+  }
+}
+@media (min-width: 1000px) {
+  .sidebar {
+    width: 170px;
+    top: 51px;
+  }
+  .content__wrapper.edit-mode-margin {
+    margin: 0 170px;
+  }
+  .fixed-width-sidebar {
+    min-width: 170px;
+  }
+  #sidebar-right .btn {
+    font-size: 16px;
+    padding: 10px;
+  }
+  .content__home {
+    padding: 0 5px;
+  }
+  .header__navbar__switch-mode {
+    padding: 15px;
+  }
+}
+@media (min-width: 1200px) {
+  .sidebar {
+    width: 260px;
+    padding: 20px;
+  }
+  #sidebar-right .btn {
+    font-size: 1.2em;
+    padding: 10px;
+  }
+  .content__wrapper.edit-mode-margin {
+    margin: 0 260px;
+  }
+  .fixed-width-sidebar {
+    min-width: 260px;
+  }
+  .content__home {
+    padding: 0 15px;
+  }
+}

tracim/tracim/public/assets/js/main.js

     $('.content__home__tab__item.unread, .content__home__tab__item.recent_activity, .content__home__tab__item.workspace').removeClass('active')
     homeTabList.forEach(function (item) { $(item).css('display', 'none') })
   })
-  $('.content__home__tab__item.unread').click(function () {
-    $(this).addClass('active')
-    $('#unread-content-panel').css('display', 'block') })
   $('.content__home__tab__item.recent_activity').click(function () {
-    $(this).addClass('active')
+    $(this).addClass('active').parent().removeClass('unread recent_activity workspace').addClass('recent_activity')
     $('#recent-activity-panel').css('display', 'block')
   })
+  $('.content__home__tab__item.unread').click(function () {
+    $(this).addClass('active').parent().removeClass('unread recent_activity workspace').addClass('unread')
+    $('#unread-content-panel').css('display', 'block')
+  })
   $('.content__home__tab__item.workspace').click(function () {
-    $(this).addClass('active')
+    $(this).addClass('active').parent().removeClass('unread recent_activity workspace').addClass('workspace')
     $('#workspaces-panel').css('display', 'block')
   })
 
   $('.header__navbar').on('click', '.header__navbar__switch-mode.switch-read-mode', function () {
     $(this).removeClass('switch-read-mode').addClass('switch-work-mode').html('<i class="fa fa-edit fa-fw"></i> ' + __('btnWorkMode'))
     $('#sidebar-left, #sidebar-right').hide()
-    $('.content__wrapper').css({margin: '0'})
+    $('.content__wrapper').removeClass('edit-mode-margin')
   })
   $('.header__navbar').on('click', '.header__navbar__switch-mode.switch-work-mode', function () {
     $(this).removeClass('switch-work-mode').addClass('switch-read-mode').html('<i class="fa fa-eye fa-fw"></i> ' + __('btnReadMode'))
     $('#sidebar-left, #sidebar-right').show()
-    $('.content__wrapper').css({margin: '0 260px'})
+    $('.content__wrapper').addClass('edit-mode-margin')
   })
 
   // add select2 for admin/workspace/<id> for user selection

tracim/tracim/templates/home.mak

 
 <%def name="TITLE_ROW()">
     <div class="content__title">
-        ${ROW.TITLE_ROW(_('My Dashboard'), 'fa-home', '', 't-user-color', _('Welcome to your home, {username}.').format(username=fake_api.current_user.name))}
+        ${ROW.TITLE_ROW(_('My Dashboard'), 'fa-home', 'content__title__subtitle-home-hidden-xs', 't-user-color', _('Welcome to your home, {username}.').format(username=fake_api.current_user.name))}
     </div>
 </%def>
 
 </%def>
 
 <div class="content__home">
-    <div class="content__home__tab-wrapper">
+    <div class="content__home__tab-wrapper recent_activity">
         <div class="content__home__tab__item recent_activity active">
             <i class="fa fa-fw fa-line-chart"></i>${_('Recent Activity')}
-            % if fake_api.last_actives.contents[0]:
-              <span class="content__home__tab__item-lastactivity">[${fake_api.last_actives.contents[0].last_activity.delta}]</span>
+            % if fake_api.last_actives.contents:
+                % if fake_api.last_actives.contents[0]:
+                  <span class="content__home__tab__item-lastactivity">[${fake_api.last_actives.contents[0].last_activity.delta}]</span>
+                % endif
             % endif
         </div>
         <div class="content__home__tab__item unread">
-            <i class="fa fa-fw fa-eye-slash"></i>${_('Not Read')}
             % if fake_api.last_unread.nb > 0:
               <div class="content__home__tab__item-news fa-stack">
                 <i class="fa fa-bookmark fa-stack-1x"></i>
                 </i>
               </div>
             % endif
+            <i class="fa fa-fw fa-eye-slash"></i>${_('Not Read')}
         </div>
         <div class="content__home__tab__item workspace">
             <i class="fa fa-bank"></i>${_('My workspaces')}

tracim/tracim/templates/index.mak

             </div>
 
             <div class="row">
-                <div class="col-sm-offset-3 col-sm-2">
+                <div class="col-sm-offset-3 col-sm-2 hidden-xs">
                     <a class="thumbnail">
                         <img src="${CFG.WEBSITE_HOME_IMAGE_URL}" alt="">
                     </a>
                     <p>${CFG.WEBSITE_HOME_TAG_LINE|n}</p>
-                    
+
 
                 </div>
                 <div class="col-sm-4">

tracim/tracim/templates/master_anonymous.mak

         <div class="container-fluid">
             ${self.main_menu()}
             ${self.content_wrapper()}
-            <div id="tracim-footer-separator"></div>
+            <div id="tracim-footer-separator hidden-xs"></div>
         </div>
         ${self.footer()}
 
 <%def name="title()"></%def>
 
 <%def name="footer()">
-    <div class="pod-footer footer hidden-tablet hidden-phone text-center">
+    <div class="pod-footer footer hidden-tablet hidden-phone text-center hidden-xs">
         <p>
             <a href="http://trac.im">${_('Create your own collaborative workspace on trac.im')}</a> &mdash;
             copyright &copy; 2013 - ${h.current_year()} tracim project.
     <div class="navbar navbar-fixed-top navbar-fixed-top-transparent" role="navigation">
         <div class="container-fluid">
             <div class="navbar-header">
-                <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target=".navbar-collapse">
-                    <span class="sr-only">Toggle navigation</span>
-                    <span class="icon-bar"></span>
-                    <span class="icon-bar"></span>
-                    <span class="icon-bar"></span>
-                </button>
+                <!--button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target=".navbar-collapse">
+                    <i class="fa fa-bars"></i>
+                </button-->
                 <a class="navbar-brand" href="${tg.url('/')}">
-                  <img src="${tg.url('/assets/img/logo.png')}" class="pull-left" style="margin: -13px 0.5em 0 -13px;"/>
+                  <img src="${tg.url('/assets/img/logo.png')}" class="pull-left" />
                 </a>
             </div>
         </div>

tracim/tracim/templates/master_authenticated.mak

 <%def name="title()">  </%def>
 
 <%def name="footer()">
-    <div class="pod-footer footer hidden-tablet hidden-phone text-center">
+    <div class="pod-footer footer hidden-tablet hidden-phone text-center hidden-xs">
         <p>
             <a href="http://trac.im">${_('Create your own collaborative workspace on trac.im')}</a> &mdash;
             copyright &copy; 2013 - ${h.current_year()} tracim project.
 
         <div class="">
             <div class="navbar-header">
-                <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target=".navbar-collapse">
-                    <span class="sr-only">Toggle navigation</span>
-                    <span class="icon-bar"></span>
-                    <span class="icon-bar"></span>
-                    <span class="icon-bar"></span>
+                <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
+                    <i class="fa fa-bars"></i>
                 </button>
                 <a class="navbar-brand" href="${tg.url('/')}">
-##                  <img src="${tg.url('/assets/img/tracim.png')}" class="pull-left" style="border: 1px solid #F5F5F5; height: 48px; margin: -13px 0.5em 0 0;"/>
-                  <img src="${tg.url('/assets/img/logo.png')}" class="pull-left" style="height: 48px; margin: -13px 0.5em 0 -13px;"/>
+                  <img src="${tg.url('/assets/img/logo.png')}" class="pull-left" />
                 </a>
             </div>
 
                             <a href="${tg.url('/home')}">${TIM.FA('fa-home fa-lg')} ${_('My Home')}</a>
                         </li>
                         <li class="header__navbar__list__item">
-                            <a href="${tg.url('/calendar')}">${TIM.FA('fa-calendar')} ${_('Calendar')}</a>
+                            <a href="${tg.url('/calendar')}">${TIM.FA('fa-calendar fa-fw')} ${_('Calendar')}</a>
                         </li>
                         ${NAVBAR_MENU.ADMIN_ITEMS()}
                     </ul>
 
                         <form id="search-form" class="navbar-form navbar-left" role="search" action="${tg.url('/search?')}">
                             <div class="form-group">
-                                <input type="text" class="form-control" placeholder="${_('Search for...')}" name="keywords" value="${','.join(search.keywords) if search else ''}">
-                                <i class="fa fa-search t-less-visible" style="margin-left: -2em;" onclick="$('#search-form').submit()"></i>
+                                <input type="text" class="form-control" placeholder="${_('Search for...')}" name="keywords" value="${','.join(search.keywords) if search else ''}" />
+                                <i class="fa fa-search t-less-visible hidden-xs" style="margin-left: -2em;" onclick="$('#search-form').submit()"></i>
                             </div>
                             ## <button type="submit" class="btn btn-default">${_('Search')}</button>
                         </form>
 
                         % if fake_api.current_user.profile.id>=8: #2:
                             <li class="dropdown">
-                              <a href="#" class="dropdown-toggle" data-toggle="dropdown">${TIM.FA('fa-lg fa-cogs')} ${_('Admin')} <b class="caret"></b></a>
+                              <a href="#" class="dropdown-toggle" data-toggle="dropdown">${TIM.FA('fa-lg fa-cogs fa-fw')} ${_('Admin')} <b class="caret"></b></a>
                               <ul class="dropdown-menu">
-                                <li><a href="${tg.url('/admin/users')}">${TIM.FA('fa-users tracim-less-visible')} ${_('Users')}</a></li>
-                                <li><a href="${tg.url('/admin/workspaces')}">${TIM.FA('fa-bank tracim-less-visible')} ${_('Workspaces')}</a></li>
+                                <li><a href="${tg.url('/admin/users')}">${TIM.FA('fa-users fa-fw tracim-less-visible')} ${_('Users')}</a></li>
+                                <li><a href="${tg.url('/admin/workspaces')}">${TIM.FA('fa-bank fa-fw tracim-less-visible')} ${_('Workspaces')}</a></li>
 ## TODO - D.A. - 2014-10-20 - Restore global configuration screen
 ##                                <li class="divider" role="presentation"></li>
 ##                                <li><a href="${tg.url('/admin/configuration')}">${TIM.ICO(16, 'categories/preferences-system')} ${_('Global configuration')}</a></li>
 
                         % if False and h.is_debug_mode():
                             <li class="dropdown text-danger" >
-                                <a href="#" class="dropdown-toggle" data-toggle="dropdown">${TIM.FA('fa-warning t-orange')} Debug <b class="caret"></b></a>
+                                <a href="#" class="dropdown-toggle" data-toggle="dropdown">${TIM.FA('fa-warning t-orange fa-fw')} Debug <b class="caret"></b></a>
                                 <ul class="dropdown-menu">
                                     <li><a class="text-danger" href=""><strong>${_('you MUST desactivate debug in production')}</strong></a></li>
                                     <li class="divider" role="presentation"></li>
                                     <li><a href="${tg.url('/debug/environ')}">${TIM.FA('fa-globe fa-fw t-less-visible')} request.environ</a></li>
                                     <li><a href="${tg.url('/debug/identity')}">${TIM.FA('fa-user fa-fw t-less-visible')} request.identity</a></li>
                                     <li class="divider" role="presentation"></li>
-                                    <li><a href="${tg.url('/debug/iconset-fa')}">${TIM.FA('fa-file-image-o t-less-visible')} Icon set - Font Awesome</a></li>
-                                    <li><a href="${tg.url('/debug/iconset-tango')}">${TIM.FA('fa-file-image-o t-less-visible')} Icon set - Tango Icons</a></li>
+                                    <li><a href="${tg.url('/debug/iconset-fa')}">${TIM.FA('fa-file-image-o fa-fw t-less-visible')} Icon set - Font Awesome</a></li>
+                                    <li><a href="${tg.url('/debug/iconset-tango')}">${TIM.FA('fa-file-image-o fa-fw t-less-visible')} Icon set - Tango Icons</a></li>
                                 </ul>
                             </li>
                         % endif
                         <li class="dropdown">
                             <a href="#" class="dropdown-toggle" data-toggle="dropdown">
-                                ${TIM.FA('fa-lg fa-user')} ${fake_api.current_user.name}
+                                ${TIM.FA('fa-lg fa-fw fa-user')} ${fake_api.current_user.name}
 
                             </a>
                             <ul class="dropdown-menu pull-right">
 ##                    </li>
                 </ul>
 
-                <div class="header__navbar__switch-mode switch-read-mode">
-                    ${TIM.FA('fa-eye')} ${_('Read mode')}
+                <div class="header__navbar__switch-mode switch-read-mode hidden-xs">
+                    ${TIM.FA('fa-eye fa-fw')} ${_('Read mode')}
                 </div>
 
             </div>

tracim/tracim/templates/master_authenticated_left_treeview.mak

     </div> <!-- # End of side bar right -->
     ## SIDEBAR RIGHT [END]
 
-    <div class="content__wrapper">
+    <div class="content__wrapper edit-mode-margin">
         ${self.TITLE_ROW()}
         ${self.body()}
     </div>

tracim/tracim/templates/master_authenticated_left_treeview_right_toolbar.mak

     </div> <!-- # End of side bar right -->
     ## SIDEBAR RIGHT [END]
 
-    <div class="content__wrapper">
+    <div class="content__wrapper edit-mode-margin">
         ${self.TITLE_ROW()}
         ${self.body()}
     </div>

tracim/tracim/templates/master_no_toolbar_no_login.mak

 <%def name="title()">  </%def>
 
 <%def name="footer()">
-    <div class="footer hidden-tablet hidden-phone text-center">
+    <div class="footer hidden-tablet hidden-phone text-center hidden-xs">
         <p class="pod-blue">
             <i>pod &mdash; ${_("collaborate today, capitalize for tomorrow")}</i>
 
         <div class="container-fluid">
             <div class="navbar-header">
                 <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target=".navbar-collapse">
-                    <span class="sr-only">Toggle navigation</span>
-                    <span class="icon-bar"></span>
-                    <span class="icon-bar"></span>
-                    <span class="icon-bar"></span>
+                    <i class="fa fa-bars"></i>
                 </button>
                 <a class="navbar-brand" href="#">
-                  <img src="${tg.url('/assets/img/logo.png')}" class="pull-left" style="border: 1px solid #F5F5F5; height: 48px; margin: -13px 0.5em 0 0;"/>
+                  <img src="${tg.url('/assets/img/logo.png')}" class="pull-left" />
                 </a>
             </div>
             <div class="navbar-collapse collapse">

tracim/tracim/templates/user_toolbars.mak

 
 <%def name="USER_ME(current_user)">
     ## SIDEBAR RIGHT
-    <div>
-        <div class="btn-group btn-group-vertical">
-            <%
-                user_edit_url = tg.url('/user/{}/edit'.format(current_user.id), {'next_url': '/home'})
-                user_password_edit_url = tg.url('/user/{}/password/edit'.format(current_user.id))
-            %>
-            <a title="${_('Edit my profile')}" class="btn btn-default edit-profile-btn" data-toggle="modal" data-target="#user-edit-modal-dialog" data-remote="${user_edit_url}" >${ICON.FA('fa-edit t-less-visible')} ${_('Edit my profile')}</a>
-
-            % if tmpl_context.auth_is_internal:
-                <a title="${_('Change password')}" class="btn btn-default change-password-btn" data-toggle="modal" data-target="#user-edit-password-modal-dialog" data-remote="${user_password_edit_url}" >${ICON.FA('fa-key t-less-visible')} ${_('Password')}</a>
-            % endif
-
-        </div>
-        <p></p>
-        <h3 class="t-spacer-above" style="margin-top: 1em;">
-            <i class="fa fa-flash"></i> ${_('Go to...')}
-        </h3>
-
-        <div class="btn-group btn-group-vertical">
-            <%
-                user_edit_url = tg.url('/user/{}/edit'.format(current_user.id), {'next_url': '/home'})
-                user_password_edit_url = tg.url('/user/{}/password/edit'.format(current_user.id))
-            %>
-            <a title="${_('Not read')}" class="btn btn-default" href="#unread-content-panel" >${ICON.FA('fa-fw fa-eye-slash t-less-visible')} ${_('Not Read')}</a>
-            <a title="${_('Recent Activity')}" class="btn btn-default" href="#recent-activity-panel" >${ICON.FA('fa-fw fa-line-chart t-less-visible')} ${_('Activity')}</a>
-            <a title="${_('My Workspaces')}" class="btn btn-default" href="#workspaces-panel" >${ICON.FA('fa-fw fa-bank t-less-visible')} ${_('Spaces')}</a>
-        </div>
-        <p></p>
-    </div> <!-- # End of side bar right -->
+    <div class="btn-group btn-group-vertical">
+        <%
+            user_edit_url = tg.url('/user/{}/edit'.format(current_user.id), {'next_url': '/home'})
+            user_password_edit_url = tg.url('/user/{}/password/edit'.format(current_user.id))
+        %>
+        <a title="${_('Edit my profile')}" class="btn btn-default edit-profile-btn" data-toggle="modal" data-target="#user-edit-modal-dialog" data-remote="${user_edit_url}" >${ICON.FA('fa-edit t-less-visible')} ${_('Edit my profile')}</a>
+
+        % if tmpl_context.auth_is_internal:
+            <a title="${_('Change password')}" class="btn btn-default change-password-btn" data-toggle="modal" data-target="#user-edit-password-modal-dialog" data-remote="${user_password_edit_url}" >${ICON.FA('fa-key t-less-visible')} ${_('Password')}</a>
+        % endif
+    </div><!-- # End of side bar right -->
     ## SIDEBAR RIGHT [END]
 </%def>