Merge remote-tracking branch 'origin/devel'

aarpon · Jan 27, 2017 · 47a4ecd · 47a4ecd
2 parents 88ff6ea + 15bf7ec
commit 47a4ecd
Show file tree

Hide file tree

Showing 5 changed files with 40 additions and 38 deletions.
diff --git a/css/default.css b/css/default.css
@@ -1316,21 +1316,27 @@ a.filled {
     font-size: 9px;
 }
 
+#password_reset {
+    text-align: right;
+}
+
+#password_reset label {
+
+}
+
+#password_reset input {
+    width: 300px;
+}
+
 #account {
     text-align: right;
 }
 
 #account label {
-    vertical-align: top;
-    display: inline-block;
 }
 
 #account input {
-    display: inline-block;
-    vertical-align: top;
     width: 300px;
-    margin-left: 10px;
-    margin-bottom: 3px;
 }
 
 #adduser {
@@ -1343,23 +1349,15 @@ a.filled {
 }
 
 #adduser label {
-  vertical-align: top;
-  display: inline-block;
 }
 
 #adduser input {
-    display: inline-block;
-    vertical-align: top;
-    width: 400px;
-    margin-left: 10px;
-    margin-bottom: 3px;
+    width: 300px;
 }
 
 #adduser textarea {
     width: 300px;
     height: 100px;
-    margin-left: 10px;
-    margin-bottom: 10px;
 }
 
 #addanotherfile {

diff --git a/css/default_ie.css b/css/default_ie.css
@@ -1292,21 +1292,27 @@ a.filled {
     font-size: 9px;
 }
 
+#password_reset {
+    text-align: right;
+}
+
+#password_reset label {
+
+}
+
+#password_reset input {
+    width: 300px;
+}
+
 #account {
     text-align: right;
 }
 
 #account label {
-    vertical-align: top;
-    display: inline-block;
 }
 
 #account input {
-    display: inline-block;
-    vertical-align: top;
     width: 300px;
-    margin-left: 10px;
-    margin-bottom: 3px;
 }
 
 #adduser {
@@ -1319,23 +1325,15 @@ a.filled {
 }
 
 #adduser label {
-  vertical-align: top;
-  display: inline-block;
 }
 
 #adduser input {
-    display: inline-block;
-    vertical-align: top;
-    width: 400px;
-    margin-left: 10px;
-    margin-bottom: 3px;
+    width: 300px;
 }
 
 #adduser textarea {
     width: 300px;
     height: 100px;
-    margin-left: 10px;
-    margin-bottom: 10px;
 }
 
 #addanotherfile {

diff --git a/inc/user/proxy/AbstractProxy.php b/inc/user/proxy/AbstractProxy.php
@@ -83,8 +83,10 @@ abstract public function getGroup($username);
      * @override
      */
     public function isActive($username) {
-        return (UserManager::getUserStatus($username) == UserConstants::STATUS_ACTIVE ||
-            UserManager::getUserStatus($username) == UserConstants::STATUS_OUTDATED);
+        return (
+            UserManager::getUserStatus($username) == UserConstants::STATUS_ACTIVE ||
+            UserManager::getUserStatus($username) == UserConstants::STATUS_OUTDATED ||
+            UserManager::getUserStatus($username) == UserConstants::STATUS_PASSWORD_RESET);
     }
 
     /**

diff --git a/registration.php b/registration.php
@@ -2,13 +2,11 @@
 // This file is part of the Huygens Remote Manager
 // Copyright and license notice: see license.txt
 
-use hrm\DatabaseConnection;
 use hrm\Mail;
 use hrm\Nav;
 use hrm\user\UserConstants;
 use hrm\user\UserManager;
 use hrm\Validator;
-use hrm\Util;
 
 require_once dirname(__FILE__) . '/inc/bootstrap.php';
 
@@ -239,11 +237,11 @@
                 </div>
 
                 <div>
-                    <label for="note">Request message:</label>
                 <textarea name="note"
+                          placeholder="Request message (optional)..."
                           id="note"
                           rows="3"
-                          cols="30"><?php echo $clean["note"] ?>
+                          cols="30"><?php if ($clean["note"] != "") { echo($clean["note"]); } ?>
                 </textarea>
                 </div>
 

diff --git a/reset_password.php b/reset_password.php
@@ -213,7 +213,7 @@
 
 <div id="content">
 
-    <h3><img alt="Account" src="./images/forgot_pwd.png"
+    <h3><img alt="Reset your password" src="./images/forgot_pwd.png"
              width="40"/>&nbspReset your password</h3>
 
     <?php
@@ -230,7 +230,7 @@
 
         <form method="post" action="" id="askforusername">
 
-            <div id="adduser">
+            <div id="password_reset">
                 <label for="username">Enter your user name:</label>
                 <input name="username" id="username" type="text" value=""/>
                 <input name="requestusername" type="hidden" value="requestusername"/>
@@ -329,6 +329,12 @@ class="icon save"
         <h3>Quick help</h3>
 
         <p>Here you can change your password.</p>
+        <p>Please notice that this is possible only if the
+            authentication method assigned to you allows the
+            HRM to change the password.</p>
+        <p>If it is not possible, you will be informed.
+            In that case, please contact your institution's
+            IT or Human Resources department.</p>
 
     </div>