[Openfirst-cvscommit] www/htdocs/bugzilla/account cancel-token.txt.tmpl,1.1,1.2 create.html.tmpl,1.1,1.2 created.html.tmpl,1.1,1.2 exists.html.tmpl,1.1,1.2

[Tim G. <xt...@us...>]

Update of /cvsroot/openfirst/www/htdocs/bugzilla/account
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28397/account

Modified Files:
	cancel-token.txt.tmpl create.html.tmpl created.html.tmpl 
	exists.html.tmpl 
Log Message:
Bring templates up to date for Bugzilla 2.18.1

Index: create.html.tmpl
===================================================================
RCS file: /cvsroot/openfirst/www/htdocs/bugzilla/account/create.html.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** create.html.tmpl	28 Jun 2004 00:47:15 -0000	1.1
--- create.html.tmpl	15 May 2005 14:38:18 -0000	1.2
***************
*** 1,3 ****
! <!-- 1....@bu... -->
  [%# The contents of this file are subject to the Mozilla Public
    # License Version 1.1 (the "License"); you may not use this file
--- 1,3 ----
! [%# 1....@bu... %]
  [%# The contents of this file are subject to the Mozilla Public
    # License Version 1.1 (the "License"); you may not use this file
***************
*** 20,32 ****
    #%]
  
! [% PROCESS global/header.html.tmpl 
!   title = "Create a new Bugzilla account"
! %]
  
  <p>
!   To create a Bugzilla account, all that you need to do is to enter a
!   legitimate e-mail address.  The account will be created, and its
!   password will be mailed to you. Optionally you may enter your real name 
!   as well.
  </p>
  
--- 20,49 ----
    #%]
  
! [%# INTERFACE
!   # none
!   # 
!   # Param("maintainer") is used to display the maintainer's email.
!   # Param("emailsuffix") is used to pre-fill the email field.
!   #%]
! 
! [% PROCESS global/variables.none.tmpl %]
! 
! [% title = BLOCK %]
! Create a new [% terms.Bugzilla %] account
! [% END %]
! [% PROCESS global/header.html.tmpl %]
  
  <p>
!   To create a [% terms.Bugzilla %] account, all you need to do is
!   enter a legitimate e-mail address. The account will be created, and
!   its password will be mailed to you. <b>You will not be able to log
!   in until you receive the password.</b> If it doesn't arrive within a
!   reasonable amount of time, you can contact the maintainer of
!   this [% terms.Bugzilla %] installation
!   at <a href="mailto:[% Param("maintainer") %]">[% Param("maintainer") %]</a>.
! </p>
! 
! <p>
!   Optionally you may enter your real name as well.
  </p>
  
***************
*** 42,46 ****
        </td>
      </tr>
!     
      <tr>
        <td align="right">
--- 59,63 ----
        </td>
      </tr>
! 
      <tr>
        <td align="right">
***************
*** 56,58 ****
  </form>
  
! [% PROCESS global/footer.html.tmpl %] 
--- 73,75 ----
  </form>
  
! [% PROCESS global/footer.html.tmpl %]

Index: cancel-token.txt.tmpl
===================================================================
RCS file: /cvsroot/openfirst/www/htdocs/bugzilla/account/cancel-token.txt.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** cancel-token.txt.tmpl	28 Jun 2004 00:47:15 -0000	1.1
--- cancel-token.txt.tmpl	15 May 2005 14:38:18 -0000	1.2
***************
*** 18,31 ****
    #
    # Contributor(s):     John Vandenberg <ze...@nu...>
    #%]
  From: bugzilla-admin-daemon
  To: [% emailaddress %]
! Subject: [% tokentype %] token cancelled
  
! A token was cancelled from [% remoteaddress %].  
! If you did not request this, it could be either an honest 
! mistake or the result of a malicious hack attempt.  
  
! Take a look at the information below and forward this email 
  to [% maintainer %] if you suspect foul play.
  
--- 18,36 ----
    #
    # Contributor(s):     John Vandenberg <ze...@nu...>
+   #                     Tobias Burnus <bu...@ne...>
    #%]
+ 
+ [% PROCESS global/variables.none.tmpl %]
+ 
  From: bugzilla-admin-daemon
  To: [% emailaddress %]
! Subject: [% PROCESS subject %]
  
! A request was cancelled from [% remoteaddress %].
  
! If you did not request this, it could be either an honest
! mistake or someone attempting to break into your [% terms.Bugzilla %] account.
! 
! Take a look at the information below and forward this email
  to [% maintainer %] if you suspect foul play.
  
***************
*** 35,39 ****
         Issue Date: [% issuedate %]
         Event Data: [% eventdata %]
! Cancelled Because: [% cancelaction %]
  
  
--- 40,98 ----
         Issue Date: [% issuedate %]
         Event Data: [% eventdata %]
! Cancelled Because:
! [% PROCESS cancelactionmessage %]
  
+ [% BLOCK subject %]
+   [% IF tokentype == 'password' %]
+     Password change request cancelled
+   [% ELSIF tokentype == 'emailnew' OR tokentype == 'emailold' %]
+     Email change request cancelled
+   [% ELSE %]
+     [% tokentype %] token cancelled
+   [% END %]
+ [% END %]
+ 
+ [% BLOCK cancelactionmessage %]
+   [% IF    cancelaction == 'account_exists' %]
+     Account [% email %] already exists.
+ 
+   [% ELSIF cancelaction == 'email_change_cancelled' %]
+     The request to change the email address for
+     the [% old_email %] account to [% new_email %] has
+     been cancelled.
  
+   [% ELSIF cancelaction == 'email_change_cancelled_reinstated' %]
+     The request to change the email address for your account
+     to [% new_email %] has been cancelled. Your old account
+     settings have been reinstated.
+ 
+   [% ELSIF cancelaction == 'emailold_change_cancelled' %]
+     The request to change the email address for your account
+     to [% new_email %] has been cancelled.
+ 
+   [% ELSIF cancelaction == 'password_change_cancelled' %]
+     You have requested cancellation.
+ 
+   [% ELSIF cancelaction == 'user_logged_in' %]
+     You have logged in.
+ 
+   [% ELSIF cancelaction == 'wrong_token_for_changing_passwd' %]
+     You have tried to use the token to change the password.
+ 
+   [% ELSIF cancelaction == 'wrong_token_for_cancelling_email_change' %]
+     You have tried to use the token to cancel the email address change.
+ 
+   [% ELSIF cancelaction == 'wrong_token_for_confirming_email_change' %]
+     You have tried to use the token to confirm the email address change.
+ 
+   [% ELSE %]
+     [%# Give sensible error if the cancel-token function is used incorrectly.
+       #%]
+     You are using [% terms.Bugzilla %]'s cancel-token function incorrectly. You
+     passed in the string '[% cancelaction %]'. The correct use is to pass
+     in a tag, and define that tag in the file cancel-token.txt.tmpl.
+ 
+     If you are a [% terms.Bugzilla %] end-user seeing this message, please forward this
+     email to [% Param('maintainer') %].
+   [% END %]
+ [% END %]

Index: exists.html.tmpl
===================================================================
RCS file: /cvsroot/openfirst/www/htdocs/bugzilla/account/exists.html.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** exists.html.tmpl	28 Jun 2004 00:47:15 -0000	1.1
--- exists.html.tmpl	15 May 2005 14:38:18 -0000	1.2
***************
*** 1,3 ****
! <!-- 1....@bu... -->
  [%# The contents of this file are subject to the Mozilla Public
    # License Version 1.1 (the "License"); you may not use this file
--- 1,3 ----
! [%# 1....@bu... %]
  [%# The contents of this file are subject to the Mozilla Public
    # License Version 1.1 (the "License"); you may not use this file
***************
*** 24,28 ****
    #%]
  
! [% PROCESS global/header.html.tmpl 
    title = "Account Exists"
  %]
--- 24,30 ----
    #%]
  
! [% PROCESS global/variables.none.tmpl %]
! 
! [% PROCESS global/header.html.tmpl
    title = "Account Exists"
  %]
***************
*** 31,36 ****
    <input type="hidden" name="a" value="reqpw">
    <input type="hidden" name="loginname" value="[% login FILTER html %]">
!   A Bugzilla account for <tt>[% login FILTER html %]</tt> already exists. If you
!   are the account holder and have forgotten your password, 
    <input type="submit" value="submit a request to change it">.
  </form>
--- 33,38 ----
    <input type="hidden" name="a" value="reqpw">
    <input type="hidden" name="loginname" value="[% login FILTER html %]">
!   A [% terms.Bugzilla %] account for <tt>[% login FILTER html %]</tt> already exists. If you
!   are the account holder and have forgotten your password,
    <input type="submit" value="submit a request to change it">.
  </form>

Index: created.html.tmpl
===================================================================
RCS file: /cvsroot/openfirst/www/htdocs/bugzilla/account/created.html.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** created.html.tmpl	28 Jun 2004 00:47:15 -0000	1.1
--- created.html.tmpl	15 May 2005 14:38:18 -0000	1.2
***************
*** 1,3 ****
! <!-- 1....@bu... -->
  [%# The contents of this file are subject to the Mozilla Public
    # License Version 1.1 (the "License"); you may not use this file
--- 1,3 ----
! [%# 1....@bu... %]
  [%# The contents of this file are subject to the Mozilla Public
    # License Version 1.1 (the "License"); you may not use this file