Redstoner/redstoner.com
Archived
0
Fork 0
Code Issues Pull Requests 2 Wiki Activity

a TON of bugfixes and new features

Browse Source
This commit is contained in:
jomo
2014-04-28 03:01:33 +02:00
parent a6ba503e73
commit 65f5adf65d
59 changed files with 1023 additions and 970 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/views/redstoner_mailer/register_info_mail.html.erb
+39 -29
View File
@@ -1,29 +1,39 @@
<p><%= @user.name %> has registered on redstoner.</p>
<p>
<table style="border: 1px solid black; border-collapse:collapse;">
<tr>
<td style="border:1px solid black;">IGN</td>
<td style="border:1px solid black;"><%= @user.ign %></td>
</tr>
<tr>
<td style="border:1px solid black;">email</td>
<td style="border:1px solid black;"><%= @user.email %></td>
</tr>
<tr>
<td style="border:1px solid black;">Time</td>
<td style="border:1px solid black;"><%= @user.created_at %></td>
</tr>
<tr>
<td style="border:1px solid black;">IP</td>
<td style="border:1px solid black;"><%= @user.last_ip %></td>
</tr>
</table>
</p>
<% if @mcpw %>
<p>
<font color="red">
<b>USER IS AN IDIOT!</b>
</font>
</p>
<% end %>
<h1>'<%= @user.name %>' has registered on redstoner.</h1>
<table style="border: 1px solid black; border-collapse:collapse;">
<tr>
<td style="border:1px solid black;">IGN</td>
<td style="border:1px solid black;"><%= @user.ign %></td>
</tr>
<tr>
<td style="border:1px solid black;">UUID</td>
<td style="border:1px solid black;"><%= @user.uuid %></td>
</tr>
<tr>
<td style="border:1px solid black;">email</td>
<td style="border:1px solid black;"><%= @user.email %></td>
</tr>
<tr>
<td style="border:1px solid black;">Time</td>
<td style="border:1px solid black;"><%= @user.created_at.strftime("%e. %b %Y, %H:%M") %></td>
</tr>
<tr>
<td style="border:1px solid black;">Role</td>
<td style="border:1px solid black;"><%= @user.role %></td>
</tr>
<tr>
<td style="border:1px solid black;">IP</td>
<td style="border:1px solid black;"><%= @user.last_ip %></td>
</tr>
<tr>
<td style="border:1px solid black;">Idiot</td>
<% if @mcpw %>
<td style="border:3px solid red; color: red; font-weight: bold">YES! (used his mc pass) &gt;_&lt;</td>
<% else %>
<td style="border:1px solid black;">no</td>
<% end %>
</tr>
</table>
<hr>
<% debug = @user.attributes.dup %>
<% debug.delete("password_digest") %>
<p><small style="font-size: 0.7em; color: #aaa;">Debug info:<br><%= debug %></small>
app/views/redstoner_mailer/register_mail.html.erb
+14 -14
View File
@@ -3,22 +3,17 @@
Hi <%= @user.name %>!
<p>Thank you for registering on Redstoner.com!</p>
<p>To use your account, you need to <%= link_to "confirm", confirm_user_path(@user, code: @user.email_token, only_path: false) %> your email address.</p>
<p>To use your account, you need to <%= link_to "confirm", confirm_user_path(@user, code: @user.email_token, only_path: false), style: "text-decoration: none; color: #4096EE;" %> your email address.</p>
<div>
<% if @mcpw %>
<div>
<p>
<font color="red">
<b>NEVER USE THE SAME PASSWORD TWICE!</b>
</font>
</p>
<p>
<font color="red">
You used your minecraft password on our website. <b>Do not do that</b>. It's just stupid.
</font>
</p>
<div style="background: #500; color: #f00; padding: 0.5em 1em;">
<h2>WARNING!</h2>
<p>Never use the same password on different sites, that is how accers gain access to accounts.</p>
<p>You have used your minecraft password on our website.<br>
<b>Don't do that</b>! It's stupid.</p>
<p>If you are using this password elsewhere, change it. Now.</p>
</div>
<% end %>
@@ -30,7 +25,7 @@
</div>
<p></p>
<p>If you have any questions or problems, just ask one of our <%= link_to "Staff", users_path(role: "staff", only_path: false) %> in-game.</p>
<p>If you have any questions or problems, just ask one of our <%= link_to "Staff", users_path(role: "staff", only_path: false), style: "text-decoration: none; color: #4096EE;" %> in-game.</p>
<p>Your Redstoner team</p>
</div>
@@ -38,6 +33,11 @@
<div style="background: none repeat scroll 0% 0% rgb(68, 68, 68); width: 100%; padding: 2em; color: rgb(255, 255, 255); margin:auto; text-align: center;">
<p><i>If you did not sign up on redstoner.com you can safely ignore this email!</i>
</p>
<p>You can contact us via: <%= link_to "Website", "root_path" %> | <%= link_to "Twitter", "https://twitter.com/RedstonerServer" %> | <%= link_to "Google+", "https://google.com/+Redstoner" %> | <%= link_to "Email", "mailto:redstonerserver+website@gmail.com" %></p>
<p>You can contact us via:
<%= link_to "Website", "root_path", style: "text-decoration: none; color: #4096EE;" %> |
<%= link_to "Twitter", "https://twitter.com/RedstonerServer", style: "text-decoration: none; color: #4096EE;" %> |
<%= link_to "Google+", "https://google.com/+Redstoner", style: "text-decoration: none; color: #4096EE;" %> |
<%= link_to "Email", "mailto:redstonerserver+website@gmail.com", style: "text-decoration: none; color: #4096EE;" %>
</p>
</div>
</div>