Merge branch 'master' into locked-user

README.md

@@ -1,5 +1,3 @@
-[![Tests](https://github.com/Keitaro/ckanext-password-policy/workflows/Tests/badge.svg?branch=main)](https://github.com/Keitaro/ckanext-password-policy/actions)
-
 # CKAN password policy 
 
 CKAN extension that adds password policy for all the users. With this extension You can set up minimum password length and password complexity (password must consist capital and small letters, number and special characters). A user lock on defined time period after x number of failed logins is also implemented
@@ -46,14 +44,26 @@ To install ckanext-password-policy:
 
 ## Config settings
 
+1. The following setting needs to be done in who.ini
+
+   	```
+	[plugin:friendlyform]
+	use = ckanext.password_policy.views:FriendlyFormPlugin_
+  	```
+
+
+2. These are the settings for production.ini
+
+   	```
 	Minimum length of the user password. Default is 12
 	ckan.password_policy.password_length = 12
 
 	Number of failed logins before the user is locked. Default is 3
-	ckan.password_policy.failed_logins = 3
+ 	ckan.password_policy.failed_logins = 3
 
 	Time after the locked user is allowed to log in again in seconds. Default is 600 
 	ckan.password_policy.user_locked_time = 600
+	```
 
 
 

ckanext/password_policy/templates/user/locked.html

@@ -7,8 +7,10 @@
 {% endblock %}
 
 {% block primary_content %}
+
 <br>
 {{ h.lockout_time()  }}
+
 {% endblock %}
 
 {% block secondary_content %}

ckanext/password_policy/views.py

@@ -246,7 +246,7 @@ def logged_in():
         return me()
     else:
 
-        err = _(u'Login failed. Bad username or password overwriten.')
+        err = _(u'Login failed. Bad username or password')
         h.flash_error(err)
         return custom_login()