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

tracim/tracim/templates/admin/user_getall.mak

@@ -65,7 +65,7 @@
                                         <input type="checkbox" class="checkbox" checked name="send_email" id="send-email"> ${_('Send email to user')}
                                       </label>
                                     </div>
-                                        
+
                                     <span class="pull-right" style="margin-top: 0.5em;">
                                         <button type="submit" class="btn btn-small btn-success" title="Add first comment"><i class=" fa fa-check"></i> ${_('Validate')}</button>
                                     </span>

tracim/tracim/templates/master_authenticated_left_treeview.mak

@@ -21,7 +21,7 @@
 <%def name="content_wrapper()">
     <div class="container-fluid">
         <div class="row-fluid">
-        
+
             ## SIDEBAR LEFT
             <div id="sidebar-left" class="fixed-width-sidebar col-sm-3 sidebar" >
                 <div class="btn-group" style="position: absolute; right: 2px; top: 4px; ">
@@ -39,13 +39,12 @@
 
             <div>
                 ${self.TITLE_ROW()}
-                ${TIM.FLASH_MSG('col-sm-8 col-sm-offset-3')}
                 ${self.body()}
             </div>
         </div>
     </div>
     ${self.REQUIRED_DIALOGS()}
-    
+
     ###########################################
     ##
     ## GENERIC STUFF LIKE SCRIPTS
@@ -62,7 +61,7 @@
               if (sidebar.hasClass('fixed-width-sidebar')) {
                 sidebar.removeClass('fixed-width-sidebar')
                 sidebar.removeClass('col-sm-3');
-                
+
                 buttonIcon.removeClass('fa-angle-double-right');
                 buttonIcon.addClass('fa-angle-double-left');
               } else {

tracim/tracim/templates/pod.mak

@@ -10,7 +10,7 @@
 <%def name="HELP_MODAL_DIALOG(help_page)"><div id="help-modal-dialog-${help_page}" class="modal" tabindex="-1" role="dialog" aria-labelledby="myLargeModalLabel" aria-hidden="true"><div class="modal-dialog"><div class="modal-content"></div></div></div></%def>
 
 <%def name="NO_CONTENT_INFO(message)"><div class="alert alert-warning" role="alert">${ICO(32, 'status/dialog-information')} ${message|n}</div></%def>
-                
+
 <%def name="ICO_ACTION(icon_size, icon_path, title, link_url, current_user, required_profile_id)">
     % if current_user.profile.id>=required_profile_id:
         <a href="${link_url}">${ICO_TOOLTIP(icon_size, icon_path, title)}</a>
@@ -79,7 +79,9 @@
                 $('.alert-error').removeClass('alert-error').addClass('alert-danger');
 
                 window.setTimeout(function() {
-                    $("#flash-message-to-fade-out").fadeTo(2000, 0.75).fadeTo(2000, 0.5).fadeTo(8000, 0);
+                    $("#flash-message-to-fade-out").fadeTo(8000, 0, 'linear', function () {
+                        $(this).hide()
+                    });
                 }, 2000);
             });
         </script>