Add help text to be shown on form based login page

Signed-off-by: Simo Sorce <simo@redhat.com>

diff --git a/ipsilon/login/authpam.py b/ipsilon/login/authpam.py
index ce60f39..d5ab428 100755 (executable)
--- a/ipsilon/login/authpam.py
+++ b/ipsilon/login/authpam.py
@@ -41,6 +41,7 @@ class Pam(LoginPageBase):
         return self._template('login/pam.html', title='Login',
                               action='%s/login/pam' % self.basepath,
                               service_name=self.lm.service_name,
         return self._template('login/pam.html', title='Login',
                               action='%s/login/pam' % self.basepath,
                               service_name=self.lm.service_name,

+                              help_text=self.lm.help_text,

                               username_text=self.lm.username_text,
                               password_text=self.lm.password_text)
 
                               username_text=self.lm.username_text,
                               password_text=self.lm.password_text)
 


@@ -85,6 +86,11 @@ for authentication. """
                 'string',
                 'remote'
             ],
                 'string',
                 'remote'
             ],

+            'help text': [
+                """ The text shown to guide the user at login time. """,
+                'string',
+                'Insert your Username and Password and then submit.'
+            ],

             'username text': [
                 """ The text shown to ask for the username in the form. """,
                 'string',
             'username text': [
                 """ The text shown to ask for the username in the form. """,
                 'string',


@@ -101,6 +107,10 @@ for authentication. """
     def service_name(self):
         return self.get_config_value('service name')
 
     def service_name(self):
         return self.get_config_value('service name')
 

+    @property
+    def help_text(self):
+        return self.get_config_value('help text')
+

     @property
     def username_text(self):
         return self.get_config_value('username text')
     @property
     def username_text(self):
         return self.get_config_value('username text')

diff --git a/templates/login/pam.html b/templates/login/pam.html
index 4e490fe..0e83f12 100644 (file)
--- a/templates/login/pam.html
+++ b/templates/login/pam.html
@@ -12,6 +12,9 @@
             <p>Ipsilon</p>
         </div>
         <div id="login">
             <p>Ipsilon</p>
         </div>
         <div id="login">

+            <p>
+                {{ help_text }}
+            </p>

             <form id="login_form" action="{{ action }}" method="post" enctype="application/x-www-form-urlencoded">
                 <p>
                     <label for="username">{{ username_text }}</label>
             <form id="login_form" action="{{ action }}" method="post" enctype="application/x-www-form-urlencoded">
                 <p>
                     <label for="username">{{ username_text }}</label>