Skip to content

Commit

Permalink
Modified mail templates
Browse files Browse the repository at this point in the history
  • Loading branch information
@s2j1h
s2j1h committed Oct 22, 2010
1 parent 5735127 commit d7a7a42
Show file tree
Hide file tree
Showing 5 changed files with 104 additions and 5 deletions.
13 changes: 11 additions & 2 deletions app/views/notifier/feedback.html.erb
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,10 @@
<h1>Feedback from users</h1>
<!DOCTYPE html>
<html>
<head>
<meta content="text/html; charset=UTF-8" http-equiv="Content-Type" />
</head>
<body>
<h1>Feedback from users</h1>

<p>Dear site administrator,</p>
<p>
Expand All @@ -11,4 +17,7 @@ You're lucky today, you've got feedback from your users:
</br>
<b>Comment:</b></br>
<%=h @feedback.comment %>
</p>
</p>

</body>
</html>
13 changes: 11 additions & 2 deletions app/views/notifier/new_user.html.erb
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,10 @@
<h1>New user</h1>
<!DOCTYPE html>
<html>
<head>
<meta content="text/html; charset=UTF-8" http-equiv="Content-Type" />
</head>
<body>
<h1>New user</h1>

<p>Dear site administrator,</p>
<p>
Expand All @@ -8,4 +14,7 @@ You're lucky today, you've got a new user!
<b>User</b>: <%=h @user.username %>
<b>User's email</b>: <%=h @user.email %>
<b>Registered at</b>: <%= Time.now %>
</p>
</p>

</body>
</html>
11 changes: 10 additions & 1 deletion app/views/notifier/password_reset_instructions.html.erb
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,10 @@
<h1>Password Reset Instructions</h1>
<!DOCTYPE html>
<html>
<head>
<meta content="text/html; charset=UTF-8" http-equiv="Content-Type" />
</head>
<body>
<h1>Password Reset Instructions</h1>

<p>
A request to reset your password has been made. If you did not make
Expand All @@ -11,3 +17,6 @@
<p>
If the above URL does not work try copying and pasting it into your browser. If you continue to have problem please feel free to contact us at vauban@zeneffy.fr.
</p>

</body>
</html>
Binary file modified db/development.sqlite3
View file
Binary file not shown.
72 changes: 72 additions & 0 deletions log/development.log
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5917,3 +5917,75 @@ Processing IdentitiesController#index (for 127.0.0.1 at 2010-10-18 19:46:53) [GE
Rendering template within layouts/application
Rendering identities/index
Completed in 30ms (View: 8, DB: 1) | 200 OK [http://127.0.0.1/identities]


Processing ApplicationController#index (for 127.0.0.1 at 2010-10-22 15:06:15) [GET]
Parameters: {"action"=>"index", "controller"=>"application"}
Rendering template within layouts/application
Rendering application/index
Completed in 48ms (View: 46, DB: 0) | 200 OK [http://127.0.0.1/]


Processing UsersController#new (for 127.0.0.1 at 2010-10-22 15:06:17) [GET]
Parameters: {"action"=>"new", "controller"=>"users"}
Rendering template within layouts/application
Rendering users/new
Completed in 28ms (View: 13, DB: 0) | 200 OK [http://127.0.0.1/users/new]


Processing UsersController#create (for 127.0.0.1 at 2010-10-22 15:06:34) [POST]
Parameters: {"commit"=>"Submit", "action"=>"create", "authenticity_token"=>"CcX5zcJ6ClVt++Vi7CBpcyWZIDSHRvsZOqTA3mDlQpw=", "controller"=>"users", "user"=>{"password_confirmation"=>"[FILTERED]", "username"=>"[FILTERED]", "secretkey_confirmation"=>"[FILTERED]", "secretkey"=>"[FILTERED]", "password"=>"[FILTERED]", "email"=>"test7@fr.fr"}}
User Load (0.2ms) SELECT "users".id FROM "users" WHERE (LOWER("users"."email") = 'test7@fr.fr') LIMIT 1
User Load (0.1ms) SELECT "users".id FROM "users" WHERE (LOWER("users"."username") = 'test7') LIMIT 1
User Load (0.1ms) SELECT "users".id FROM "users" WHERE ("users"."persistence_token" = '2ec3ad08d0cd79ca53991f1a9cfeb5f8fe89f8d0d9cb71b4afc71ee788ef61215011e53d35afe4fc8df6c113815b92948a4e28f7bd71ef22758dd518490f89a3') LIMIT 1
Rendering template within layouts/application
Rendering users/new
Completed in 169ms (View: 25, DB: 0) | 200 OK [http://127.0.0.1/users]


Processing UsersController#create (for 127.0.0.1 at 2010-10-22 15:06:50) [POST]
Parameters: {"commit"=>"Submit", "action"=>"create", "authenticity_token"=>"CcX5zcJ6ClVt++Vi7CBpcyWZIDSHRvsZOqTA3mDlQpw=", "controller"=>"users", "user"=>{"password_confirmation"=>"[FILTERED]", "username"=>"[FILTERED]", "secretkey_confirmation"=>"[FILTERED]", "secretkey"=>"[FILTERED]", "password"=>"[FILTERED]", "email"=>"test8@fr.fr"}}
User Load (0.1ms) SELECT "users".id FROM "users" WHERE (LOWER("users"."email") = 'test8@fr.fr') LIMIT 1
User Load (0.1ms) SELECT "users".id FROM "users" WHERE (LOWER("users"."username") = 'test8') LIMIT 1
User Load (0.1ms) SELECT "users".id FROM "users" WHERE ("users"."persistence_token" = 'ef7e46fb8c9eb8bf2a9b3d4f8a405aef0427a618d3a54e45d1b08c19bc4e9937f3a7aaa62adb975c94bf2ca58a1bb0de5cf3108de117f27ee0a4157a07aca06d') LIMIT 1
User Create (0.3ms) INSERT INTO "users" ("created_at", "crypted_password", "updated_at", "perishable_token", "username", "password_salt", "persistence_token", "secretkey", "email") VALUES('2010-10-22 13:06:50', 'ad19e8308b6b5296d466b801dada0b77d2f86bb9cc6a84f38b5f72ebf9ecf51f916839832afdde0aa667c052ca7623065b4f5422fdf06eae61702281dc56712e', '2010-10-22 13:06:50', 'HEujClYVlaWrMOMlHPE', 'test8', 'o8y61dLZaCdBrSJtVsYH', 'ef7e46fb8c9eb8bf2a9b3d4f8a405aef0427a618d3a54e45d1b08c19bc4e9937f3a7aaa62adb975c94bf2ca58a1bb0de5cf3108de117f27ee0a4157a07aca06d', 'f2d81a260dea8a100dd517984e53c56a7523d96942a834b9cdc249bd4e8c7aa9', 'test8@fr.fr')
Sent mail to vauban@zeneffy.fr

Date: Fri, 22 Oct 2010 15:06:50 +0200
From: vauban@zeneffy.fr
To: vauban@zeneffy.fr
Subject: [Vauban.zeneffy.fr] New user!
Mime-Version: 1.0
Content-Type: text/plain; charset=utf-8

<!DOCTYPE html>
<html>
<head>
<meta content="text/html; charset=UTF-8" http-equiv="Content-Type" />
</head>
<body>
<h1>New user</h1>

<p>Dear site administrator,</p>
<p>
You're lucky today, you've got a new user!
</p>
<p>
<b>User</b>: test8
<b>User's email</b>: test8@fr.fr
<b>Registered at</b>: Fri Oct 22 15:06:50 +0200 2010
</p>

</body>
</html>
Redirected to http://127.0.0.1:3000/identities
Completed in 46ms (DB: 1) | 302 Found [http://127.0.0.1/users]


Processing IdentitiesController#index (for 127.0.0.1 at 2010-10-22 15:06:50) [GET]
Parameters: {"action"=>"index", "controller"=>"identities"}
User Load (0.2ms) SELECT * FROM "users" WHERE ("users"."persistence_token" = 'ef7e46fb8c9eb8bf2a9b3d4f8a405aef0427a618d3a54e45d1b08c19bc4e9937f3a7aaa62adb975c94bf2ca58a1bb0de5cf3108de117f27ee0a4157a07aca06d') LIMIT 1
Identity Load (0.2ms) SELECT * FROM "identities" WHERE ("identities".user_id = 6) ORDER BY name,created_at
Rendering template within layouts/application
Rendering identities/index
Completed in 31ms (View: 9, DB: 0) | 200 OK [http://127.0.0.1/identities]

0 comments on commit d7a7a42

Please sign in to comment.