[ros-diffs] [dgoette] 415: * fix lost password page (spotted by d0g) * add title attributes to login options (spotted by d0g) * fix headlines in profile pages

Author: dgoette
Date: Sun May 17 19:37:24 2009
New Revision: 415

URL: http://svn.reactos.org/svn/reactos?rev=415&view=rev
Log:
* fix lost password page (spotted by d0g)
* add title attributes to login options (spotted by d0g)
* fix headlines in profile pages

Modified:
    branches/danny-web/www/www.reactos.org/roscms/css/style.css
   
branches/danny-web/www/www.reactos.org/roscms/lib/view/HTML_User_LostPasswo…
   
branches/danny-web/www/www.reactos.org/roscms/lib/view/HTML_User_ProfileEdi…

Modified: branches/danny-web/www/www.reactos.org/roscms/css/style.css
URL:
http://svn.reactos.org/svn/reactos/branches/danny-web/www/www.reactos.org/r…
==============================================================================
--- branches/danny-web/www/www.reactos.org/roscms/css/style.css [iso-8859-1] (original)
+++ branches/danny-web/www/www.reactos.org/roscms/css/style.css [iso-8859-1] Sun May 17
19:37:24 2009
@@ -17,7 +17,9 @@
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
     */
 
-.contentSmallTitle { display: block; line-height: normal; font-size: 14px; font-weight:
bold; color: white; background-color: #5984C3; padding: 0px 0px 1px 10px; margin-top: 0px;
}
+H1, .contentSmallTitle { display: block; line-height: normal; font-size: 14px;
font-weight: bold; color: white; background-color: #5984C3; padding: 0px 0px 1px 10px;
margin-top: 0px; }
+H1 A, .contentSmallTitle A {display: inline; color: white; text-decoration: none; }
+H1 A:hover, .contentSmallTitle A:hover {text-decoration: underline; }
 BODY { font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 83%; margin: 0px
0px 1em 0px; padding: 0px; background: white url('../images/topbar.jpg') repeat-x
scroll top left; }
 
 

Modified:
branches/danny-web/www/www.reactos.org/roscms/lib/view/HTML_User_LostPasswo…
URL:
http://svn.reactos.org/svn/reactos/branches/danny-web/www/www.reactos.org/r…
==============================================================================
---
branches/danny-web/www/www.reactos.org/roscms/lib/view/HTML_User_LostPasswo…
[iso-8859-1] (original)
+++
branches/danny-web/www/www.reactos.org/roscms/lib/view/HTML_User_LostPasswo…
[iso-8859-1] Sun May 17 19:37:24 2009
@@ -143,76 +143,76 @@
       else {
         echo '<h2>Lost Username or Password?</h2>';
       }
-
-      if (strlen($activation_code) > 6) {
+    }
+
+    if (strlen($activation_code) > 6) {
+      echo_strip('
+        <div class="field">
+          <label for="userpwd1"'.(isset($_POST['registerpost'])
? ' style="color:red;"' : '').'>New
Password</label>
+          <input type="password" name="userpwd1"
tabindex="2" id="userpwd1" maxlength="50" />');
+
+      if ((isset($_POST['userpwd1']) &&
strlen($_POST['userpwd1']) > $config->limitUserNameMax())) {
         echo_strip('
-          <div class="field">
-            <label
for="userpwd1"'.(isset($_POST['registerpost']) ? '
style="color:red;"' : '').'>New Password</label>
-            <input type="password" name="userpwd1"
tabindex="2" id="userpwd1" maxlength="50" />');
-
-        if ((isset($_POST['userpwd1']) &&
strlen($_POST['userpwd1']) > $config->limitUserNameMax())) {
-          echo_strip('
-            <br />
-            <em>Please use a stronger password! At least
'.$config->limitPasswordMin().' characters, do not include common words or
names, and combine three of these character types: uppercase letters, lowercase letters,
numbers, or symbols (ASCII characters).</em>');
-        }
-        else {
-          echo_strip('
-            <br />
-            <div class="detail">uppercase letters, lowercase letters,
numbers, and symbols (ASCII characters)</div>');
-        }
-        
-        echo_strip('
-          </div>
-          <div class="field">
-            <label
for="userpwd2"'.(isset($_POST['registerpost']) ? '
style="color:red;"' : '').'>Re-type Password</label>
-            <input type="password" name="userpwd2"
tabindex="3" id="userpwd2" maxlength="50" />
-          </div>');
+          <br />
+          <em>Please use a stronger password! At least
'.$config->limitPasswordMin().' characters, do not include common words or
names, and combine three of these character types: uppercase letters, lowercase letters,
numbers, or symbols (ASCII characters).</em>');
       }
       else {
         echo_strip('
-          <div class="field">
-            <label
for="useremail"'.((isset($_POST['registerpost']) &&
(empty($_POST['useremail']) || !EMail::isValid($_POST['useremail']))) ?
' style="color:red;"' : '').'>E-Mail</label>
-            <input name="useremail" type="text"
tabindex="4" id="useremail"'.(isset($_POST['useremail']) ?
'value="'.$_POST['useremail'].'"' : '').'
maxlength="50" />
-          </div>');
-      }
-
-      echo_strip('
-        <div class="field">
-          <label
for="usercaptcha"'.(isset($_POST['registerpost'])? '
style="color:red;"' :'').'>Type the code shown</label>
-          <input type="text" name="usercaptcha"
tabindex="7" id="usercaptcha" maxlength="50" />');
-
-      echo '
-          <script type="text/javascript">
-          <!--'."
-            var BypassCacheNumber = 0;
-
-            function CaptchaReload()
-            {
-              ++BypassCacheNumber;
-              document.getElementById('captcha').src =
'".$config->pathInstance()."?page=captcha&nr=' +
BypassCacheNumber;
-            }
-
-            document.write('".'<br /><span
style="color:#817A71;">If you can\'t read this, try <a
href="javascript:CaptchaReload()">another
one</a>.</span>'."');
-          -->".'
-          </script>';
-      echo_strip('
-          <img id="captcha"
src="'.$config->pathInstance().'?page=captcha"
style="padding-top:10px;" alt="If you can\'t read this, try another one
or email '.$config->emailSupport().' for help." title="Are you
human?" />
-          <br />');
-
-      if (isset($_POST['registerpost'])) { 
-        echo_strip('
           <br />
-          <em>Captcha code is case insensitive. <br />If you can\'t read
it, try another one.</em>');
+          <div class="detail">uppercase letters, lowercase letters,
numbers, and symbols (ASCII characters)</div>');
       }
 
       echo_strip('
         </div>
         <div class="field">
-          <input name="registerpost" type="hidden"
id="registerpost" value="reg" />
-          <button type="submit"
name="submit">Send</button>
-          <button type="button"
onclick="'."window.location=".$config->pathInstance()."'".'"
style="color:#777777;">Cancel</button>
+          <label for="userpwd2"'.(isset($_POST['registerpost'])
? ' style="color:red;"' : '').'>Re-type
Password</label>
+          <input type="password" name="userpwd2"
tabindex="3" id="userpwd2" maxlength="50" />
         </div>');
     }
+    else {
+      echo_strip('
+        <div class="field">
+          <label
for="useremail"'.((isset($_POST['registerpost']) &&
(empty($_POST['useremail']) || !EMail::isValid($_POST['useremail']))) ?
' style="color:red;"' : '').'>E-Mail</label>
+          <input name="useremail" type="text"
tabindex="4" id="useremail"'.(isset($_POST['useremail']) ?
'value="'.$_POST['useremail'].'"' : '').'
maxlength="50" />
+        </div>');
+    }
+
+    echo_strip('
+      <div class="field">
+        <label
for="usercaptcha"'.(isset($_POST['registerpost'])? '
style="color:red;"' :'').'>Type the code shown</label>
+        <input type="text" name="usercaptcha"
tabindex="7" id="usercaptcha" maxlength="50" />');
+
+    echo '
+        <script type="text/javascript">
+        <!--'."
+          var BypassCacheNumber = 0;
+
+          function CaptchaReload()
+          {
+            ++BypassCacheNumber;
+            document.getElementById('captcha').src =
'".$config->pathInstance()."?page=captcha&nr=' +
BypassCacheNumber;
+          }
+
+          document.write('".'<br /><span
style="color:#817A71;">If you can\'t read this, try <a
href="javascript:CaptchaReload()">another
one</a>.</span>'."');
+        -->".'
+        </script>';
+    echo_strip('
+        <img id="captcha"
src="'.$config->pathInstance().'?page=captcha"
style="padding-top:10px;" alt="If you can\'t read this, try another one
or email '.$config->emailSupport().' for help." title="Are you
human?" />
+        <br />');
+
+    if (isset($_POST['registerpost'])) { 
+      echo_strip('
+        <br />
+        <em>Captcha code is case insensitive. <br />If you can\'t read
it, try another one.</em>');
+    }
+
+    echo_strip('
+      </div>
+      <div class="field">
+        <input name="registerpost" type="hidden"
id="registerpost" value="reg" />
+        <button type="submit"
name="submit">Send</button>
+        <button type="button"
onclick="'."window.location=".$config->pathInstance()."'".'"
style="color:#777777;">Cancel</button>
+      </div>');
 
     echo_strip('
           <div class="corner_BL">

Modified:
branches/danny-web/www/www.reactos.org/roscms/lib/view/HTML_User_ProfileEdi…
URL:
http://svn.reactos.org/svn/reactos/branches/danny-web/www/www.reactos.org/r…
==============================================================================
--- branches/danny-web/www/www.reactos.org/roscms/lib/view/HTML_User_ProfileEdi…
[iso-8859-1] (original)
+++ branches/danny-web/www/www.reactos.org/roscms/lib/view/HTML_User_ProfileEdi…
[iso-8859-1] Sun May 17 19:37:24 2009
@@ -330,13 +330,13 @@
         <fieldset>
           <legend style="color:#817A71;margin-bottom: 10px;">Login
Settings</legend>
           <input name="loginoption1" style="width:auto;"
type="checkbox" id="loginoption1"
value="true"'.(isset($_POST['loginoption1']) ||
(empty($_POST['registerpost']) && $profile['match_session'] ==
true) ? ' checked="checked"' : '').' tabindex="11"
/>
-          <label style="display:inline;"
for="loginoption1">Multisession</label>
+          <label style="display:inline;" for="loginoption1"
title="allows to be logged in at the same time with different
sessions">Multisession</label>
           <br />
           <input name="loginoption2" style="width:auto;"
type="checkbox" id="loginoption2"
value="true"'.(isset($_POST['loginoption2']) ||
(empty($_POST['registerpost']) && $profile['match_browseragent']
== true) ? ' checked="checked"' : '').'
tabindex="12" /> 
-          <label style="display:inline;"
for="loginoption2">Browser Agent Check</label>
+          <label style="display:inline;" for="loginoption2"
title="checks if your browser agent is the same for each login">Browser Agent
Check</label>
           <br />
           <input name="loginoption3" style="width:auto;"
type="checkbox" id="loginoption3"
value="true"'.((isset($_POST['loginoption3']) ||
(empty($_POST['registerpost']) && $profile['match_ip'] == true)) ?
' checked="checked"' : '').' tabindex="13" /> 
-          <label style="display:inline;" for="loginoption3">IP
Address Check</label>
+          <label style="display:inline;" for="loginoption3"
title="checks if you use the same ip address to log in">IP Address
Check</label>
         </fieldset>
 
         <div class="field">