# HG changeset patch
# User Marcin Kuzminski <marcin@rhodecode.com>
# Date 2017-01-12 00:45:46
# Node ID db67235733866adc7473cc5ceea2a163f3bb0719
# Parent  de699d5ea155e93b4d267a6feaa45e61b8cc4634

user-sessions: fix other backend expired count, and fixed some helper text.

diff --git a/rhodecode/lib/user_sessions.py b/rhodecode/lib/user_sessions.py
--- a/rhodecode/lib/user_sessions.py
+++ b/rhodecode/lib/user_sessions.py
@@ -40,7 +40,7 @@ class BaseAuthSessions(object):
     def get_count(self):
         raise NotImplementedError
 
-    def get_expired_count(self):
+    def get_expired_count(self, older_than_seconds=None):
         raise NotImplementedError
 
     def clean_sessions(self, older_than_seconds=None):
@@ -73,7 +73,7 @@ class FileAuthSessions(BaseAuthSessions)
     def get_count(self):
         return 'NOT AVAILABLE'
 
-    def get_expired_count(self):
+    def get_expired_count(self, older_than_seconds=None):
         return self.get_count()
 
     def clean_sessions(self, older_than_seconds=None):
@@ -90,7 +90,7 @@ class MemcachedAuthSessions(BaseAuthSess
     def get_count(self):
         return 'NOT AVAILABLE'
 
-    def get_expired_count(self):
+    def get_expired_count(self, older_than_seconds=None):
         return self.get_count()
 
     def clean_sessions(self, older_than_seconds=None):
@@ -103,7 +103,7 @@ class MemoryAuthSessions(BaseAuthSession
     def get_count(self):
         return 'NOT AVAILABLE'
 
-    def get_expired_count(self):
+    def get_expired_count(self, older_than_seconds=None):
         return self.get_count()
 
     def clean_sessions(self, older_than_seconds=None):
diff --git a/rhodecode/templates/admin/settings/settings_sessions.mako b/rhodecode/templates/admin/settings/settings_sessions.mako
--- a/rhodecode/templates/admin/settings/settings_sessions.mako
+++ b/rhodecode/templates/admin/settings/settings_sessions.mako
@@ -30,10 +30,22 @@
     <div class="panel-body">
         ${h.secure_form(h.url('admin_settings_sessions_cleanup'), method='post')}
 
-            <div style="margin: 0 0 20px 0" class="fake-space">
-            ${_('Cleanup all sessions that were not active during choosen time frame')} <br/>
-            ${_('Picking All will log-out all users in the system, and each user will be required to log in again.')}
-            </div>
+            <p>
+            ${_('Cleanup user sessions that were not active during chosen time frame.')} <br/>
+            ${_('After performing this action users whose session will be removed will be required to log in again.')} <br/>
+            <strong>${_('Picking `All` will log-out you, and all users in the system.')}</strong>
+           </p>
+
+            <script type="text/javascript">
+              $(document).ready(function() {
+                  $('#expire_days').select2({
+                      containerCssClass: 'drop-menu',
+                      dropdownCssClass: 'drop-menu-dropdown',
+                      dropdownAutoWidth: true,
+                      minimumResultsForSearch: -1
+                  });
+              });
+            </script>
             <select id="expire_days" name="expire_days">
                 % for n in [60, 90, 30, 7, 0]:
                     <option value="${n}">${'{} days'.format(n) if n != 0 else 'All'}</option>
@@ -48,13 +60,3 @@
 </div>
 
 
-<script type="text/javascript">
-  $(document).ready(function() {
-      $('#expire_days').select2({
-          containerCssClass: 'drop-menu',
-          dropdownCssClass: 'drop-menu-dropdown',
-          dropdownAutoWidth: true,
-          minimumResultsForSearch: -1
-      });
-  });
-</script>
\ No newline at end of file