From 4c6b53b7dbdbacd60c9743a9fc2022af5167b185 Mon Sep 17 00:00:00 2001
From: "bugzilla%micropipes.com" <bugzilla%micropipes.com>
Date: Sun, 29 Jan 2006 06:47:24 +0000
Subject: [PATCH] Minor modifications to addon/login New templates: 
 createaccount.tpl recoverpassword.tpl resetpassword.tpl verifyaccount.tpl

---
 webtools/addons/public/tpl/addon.tpl          |  2 +-
 webtools/addons/public/tpl/createaccount.tpl  | 76 +++++++++++++++++++
 webtools/addons/public/tpl/login.tpl          |  2 +-
 .../addons/public/tpl/recoverpassword.tpl     | 19 +++++
 webtools/addons/public/tpl/resetpassword.tpl  | 22 ++++++
 webtools/addons/public/tpl/verifyaccount.tpl  | 19 +++++
 6 files changed, 138 insertions(+), 2 deletions(-)
 create mode 100644 webtools/addons/public/tpl/createaccount.tpl
 create mode 100644 webtools/addons/public/tpl/recoverpassword.tpl
 create mode 100644 webtools/addons/public/tpl/resetpassword.tpl
 create mode 100644 webtools/addons/public/tpl/verifyaccount.tpl

diff --git a/webtools/addons/public/tpl/addon.tpl b/webtools/addons/public/tpl/addon.tpl
index ab38d98e7f4e..c9f21dcfa55f 100644
--- a/webtools/addons/public/tpl/addon.tpl
+++ b/webtools/addons/public/tpl/addon.tpl
@@ -30,7 +30,7 @@ Requires: {$addon->AppName} {$addon->MinAppVer} - {$addon->MaxAppVer} <img src="
 
 <h3 id="user-comments">User Comments</h3>
 
-<p><strong><a href="./addcomment.php?id={$addon->ID}">Add your own comment &#187;</a></strong></p>
+<p><strong><a href="./addcomment.php?aid={$addon->ID}">Add your own comment &#187;</a></strong></p>
 
 <ul id="opinions">
 {section name=comments loop=$addon->Comments max=10}
diff --git a/webtools/addons/public/tpl/createaccount.tpl b/webtools/addons/public/tpl/createaccount.tpl
new file mode 100644
index 000000000000..a9a27fae4c60
--- /dev/null
+++ b/webtools/addons/public/tpl/createaccount.tpl
@@ -0,0 +1,76 @@
+<h1 class="first">{$title}</h1>
+<div class="front-section">
+{if $account_created}
+    <p>Your account has been created successfully. An e-mail has been sent to you
+    with instructions on how to activate your account so you can begin using it.</p>
+
+{else}
+    
+    {if $bad_input}
+        <p>Errors were found with your input.  Please review the messages below.</p>
+    {else}
+        <p>Joining Mozilla Update is easy!  Just fill out the form below and click the join button.</p>
+    {/if}
+
+    <form name="createaccount" method="post" action="">
+        <p>Your e-mail address is used as your username to login. You'll also receive a
+        confirmation e-mail to this address. In order for your account to be activated
+        succesfully, you must specify a valid e-mail address.</p>
+        {if $error_email_empty}
+            <p>E-Mail address is a required field.</p>
+        {/if}
+        {if $error_email_malformed}
+            <p>A valid E-Mail address is required.</p>
+        {/if}
+        {if $error_emailconfirm_nomatch}
+            <p>The E-Mail addresses do not match.</p>
+        {/if}
+        {if $error_email_duplicate}
+            <p>The E-Mail address you entered is already in use.  If this is your
+            account, you can <a href="recoverpassword.php?email={$email_value|escape:"url"}">
+            send yourself a password recovery e-mail</a>.</p>
+        {/if}
+        <label for="email">E-Mail Address:</label>
+        <input id="email" name="email" type="text" value="{$email_value|escape}"/>
+
+        <label for="emailconfirm">Confirm E-Mail:</label>
+        <input id="emailconfirm" name="emailconfirm" type="text" value="{$emailconfirm_value|escape}"/>
+
+        <p>How do you want to be known to visitors of Mozilla Update? This is your "author
+        name" and it will be shown with your extension/theme listings on the Mozilla Update
+        web site.</p>
+        {if $error_name_empty}
+            <p>Name is a required field.</p>
+        {/if}
+        <label for="name">Your Name</label>
+        <input id="name" name="name" type="text" value="{$name_value|escape}"/>
+
+        <p>If you have a website, enter the URL here. (including the http:// ) Your website
+        will be shown to site visitors on your author profile page. This field is optional;
+        if you don't have a website or don't want it linked to from Mozilla Update, leave 
+        this box blank.</p>
+        <label for="website">Your Website</label>
+        <input id="website" name="website" type="text" value="{$website_value|escape}"/>
+
+        <p>Your desired password. This along with your e-mail will allow you to login, so
+        make it something memorable but not easy to guess. Type it in both fields below.  The
+        two fields must match.</p>
+        {if $error_password_empty}
+            <p>Password is a required field.</p>
+        {/if}
+        {if $error_passwordconfirm_nomatch}
+            <p>The passwords do not match.</p>
+        {/if}
+        <label for="password">Password:</label>
+        <input id="password" name="password" type="password" />
+
+        <label for="passwordconfirm">Confirm Password:</label>
+        <input id="passwordconfirm" name="passwordconfirm" type="password" />
+
+        <p>Review what you entered above. If everything's correct, click the "Join Mozilla
+        Update" button. If you want to start over, click "Clear Form".</p>
+        <input name="submit" type="submit" value="Join Mozilla Update" />
+        <input name="reset" type="reset" value="Clear Form" />
+    </form>
+{/if}
+</div>
diff --git a/webtools/addons/public/tpl/login.tpl b/webtools/addons/public/tpl/login.tpl
index e9627e14cde6..32cf1a1eec81 100644
--- a/webtools/addons/public/tpl/login.tpl
+++ b/webtools/addons/public/tpl/login.tpl
@@ -14,7 +14,7 @@
         <label for="password" title="Password">Password:</label>
         <input id="password" name="password" type="password" accesskey="p" size="40">
         <input type="submit" value="Go">
-        </div>
+        </div><a href="createaccount.php">Create an account</a>
     </form>
 </div>
 
diff --git a/webtools/addons/public/tpl/recoverpassword.tpl b/webtools/addons/public/tpl/recoverpassword.tpl
new file mode 100644
index 000000000000..d71b7e93345c
--- /dev/null
+++ b/webtools/addons/public/tpl/recoverpassword.tpl
@@ -0,0 +1,19 @@
+
+<h1 class="first">{$title}</h1>
+<div class="front-section">
+{if $success}
+<p>An email has been sent.  Please follow the instructions included within it.</p>
+{else}
+<p>If you've forgotten your password, enter your e-mail address here and you will be
+sent an email to help you recover it.</p>
+<form id="recoverpassword" name="recoverpassword" method="post" action="">
+{if $bad_input}
+<p>Please verify your address is correct.</p>
+{/if}
+    <label for="email">E-Mail Address:</label>
+    <input id="email" name="email" type="text" value="{$email|escape}"/>
+    <input id="submit" name="submit" type="submit" value="Recover Password" />
+</form>
+{/if}
+</div>
+
diff --git a/webtools/addons/public/tpl/resetpassword.tpl b/webtools/addons/public/tpl/resetpassword.tpl
new file mode 100644
index 000000000000..bb0acb989d7e
--- /dev/null
+++ b/webtools/addons/public/tpl/resetpassword.tpl
@@ -0,0 +1,22 @@
+
+<h1 class="first">{$title}</h1>
+<div class="front-section">
+{if $success}
+<p>Your password has been reset.</p>
+<ul>
+<li><a href="login.php">Login to Mozilla Addons</a></li>
+</ul>
+{else}
+<form id="resetpassword" name="resetpassword" method="post" action="">
+{if $bad_input}
+<p>Your passwords did not match.  Please try again.</p>
+{/if}
+    <label for="password">New Password:</label>
+    <input id="password" name="password" type="password" />
+    <label for="passwordconfirm">Verify Password:</label>
+    <input id="passwordconfirm" name="passwordconfirm" type="password"/>
+    <input id="submit" name="submit" type="submit" value="Reset Password" />
+</form>
+{/if}
+</div>
+
diff --git a/webtools/addons/public/tpl/verifyaccount.tpl b/webtools/addons/public/tpl/verifyaccount.tpl
new file mode 100644
index 000000000000..e653147eaf89
--- /dev/null
+++ b/webtools/addons/public/tpl/verifyaccount.tpl
@@ -0,0 +1,19 @@
+
+<h1 class="first">{$title}</h1>
+<div class="front-section">
+{if $confirmed}
+<p>The account {$email|escape} has been activated successfully.</p>
+<ul>
+    <li><a href="login.php">Login to Mozilla Addons</a></li>
+</ul>
+
+{else}
+<p>There was an error activating {$email|escape}. If the account hasn't been
+registered yet, please register before activating.</p>
+<ul>
+    <li><a href="createaccount.php">Create a Mozilla Addons account</a></li>
+</ul>
+
+{/if}
+</div>
+