Unidenitifed commits

snf-astakos-app/astakos/im/auth_providers.py

@@ -135,6 +135,18 @@ class LocalAuthProvider(AuthProvider):
     def extra_actions(self):
         return [(_('Change password'), reverse('password_change')), ]
 
+class LDAPAuthProvider(AuthProvider):
+    module = 'ldap'
+    title = _('LDAP credentials')
+    description = _('Allows you to login using your LDAP credentials')
+
+    one_per_user = True
+
+    login_template = 'im/auth/local_login_form.html'
+    login_prompt_template = 'im/auth/local_login_prompt.html'
+    signup_prompt_template = 'im/auth/local_signup_prompt.html'
+    details_tpl = _('You can login to your account using your'
+                    ' %(auth_backend)s password.')
 
 class ShibbolethAuthProvider(AuthProvider):
     module = 'shibboleth'

snf-astakos-app/astakos/im/synnefo_settings.py

@@ -83,7 +83,7 @@ static_files = {'astakos.im': ''}
 
 # The following settings will replace the default django settings
 AUTHENTICATION_BACKENDS = (
-#     'django_auth_ldap.backend.LDAPBackend',
+     'django_auth_ldap.backend.LDAPBackend',
 	'astakos.im.auth_backends.EmailBackend',
     'astakos.im.auth_backends.TokenBackend')
 LOGIN_URL = '/im'

snf-astakos-app/astakos/im/templates/im/resource_usage.html

@@ -11,15 +11,11 @@
 		 			<div class="img-wrap">&nbsp;</div>
 		 			<div class="info">
 						<h3>{{ rdata.report_desc }}</h3>
-						<p>
-						{{ rdata.ratio|floatformat }}% Used<br>
-						You are using 
 						{% if rdata.unit == 'bytes' %}
-							{{ rdata.currValue|sizeof_fmt  }} out of your {{ rdata.maxValue|sizeof_fmt }}
+							{{ rdata.currValue|sizeof_fmt  }} out of {{ rdata.maxValue|sizeof_fmt }}
 						{% else %}
-							{{ rdata.currValue }} {{ rdata.unit }} out of your {{ rdata.maxValue }} {{ rdata.unit }}
+							{{ rdata.currValue }} out of {{ rdata.maxValue }}
 						{% endif %}		
-						{% if rdata.is_abbreviation %}{{ rdata.verbose_name|upper }}{% else %}{{ rdata.verbose_name }}{% endif %}{% if rdata.maxValue|floatformat:"0" != "1" and not rdata.unit %}s {% endif  %}
 						</p>
 					</div>
 					<div class="bar">