c_meyer/thingspeak
1
0
Fork 0
Code Issues 3 Pull Requests Packages Projects Releases Wiki Activity

Updated views and styles

Browse Source
This commit is contained in:
iobridge
2011-03-30 00:08:19 -04:00
parent 15cd43d621
commit 524e13877d
9 changed files with 249 additions and 199 deletions
Download Patch File Download Diff File Expand all files Collapse all files

119
app/views/users/edit.html.erb
View File

@ -1,61 +1,62 @@
<h2><%= t(:account_edit) %></h2>
<br />
<h2>
<%= link_to t(:myaccount), account_path %> &raquo;
<%= t(:account_edit) %>
</h2>
<%= form_for @user, :url => account_path do |f| %>
<%= error_messages_for 'user', :header_message => t(:try_again), :message => t(:account_error_edit) %>
<input name='userlogin' class='userlogin' />
<table class="bigtable">
<tr>
<td class="left">
<div class="vcenter"><%= f.label :login, t(:userid) %></div>
</td>
<td class="right">
<%= f.text_field :login %>
</td>
</tr>
<tr>
<td class="left">
<div class="vcenter"><%= f.label t(:email) %></div>
</td>
<td class="right">
<%= f.text_field :email %>
</td>
</tr>
<tr>
<td><%= t(:time_zone) %></td>
<td><%= time_zone_select 'user', 'time_zone', nil, :default => 'Eastern Time (US & Canada)' %></td>
</tr>
<tr>
<td class="left">
<div class="vcenter"><%= f.label :password, raw(t(:password_change_raw)) %></div>
</td>
<td class="right">
<%= f.password_field :password %>
</td>
<tr>
<td class="left">
<%= f.label :password_confirmation, raw(t(:password_confirmation_raw)) %>
</td>
<td class="right">
<%= f.password_field :password_confirmation %>
</td>
</tr>
</table>
<br /><br />
<h3><%= t(:account_changes) %></h3>
<table class="bigtable">
<tr>
<td class="left">
<%= raw(t(:password_current_raw)) %>
</td>
<td class="right">
<input name="password_current" type="password" />
<br />
<%= t(:account_security) %>
</td>
</tr>
<tr>
<td class="left"></td>
<td class="right"><%= f.submit t(:account_edit_submit) %></td>
</tr>
</table>
<% end %>
<input name='userlogin' class='userlogin' />
<table class="table_no_header">
<tr>
<td class="left">
<div class="vcenter"><%= f.label :login, t(:userid) %></div>
</td>
<td class="right">
<%= f.text_field :login %>
</td>
</tr>
<tr>
<td class="left">
<div class="vcenter"><%= f.label t(:email) %></div>
</td>
<td class="right">
<%= f.text_field :email %>
</td>
</tr>
<tr>
<td class="left"><%= t(:time_zone) %></td>
<td><%= time_zone_select 'user', 'time_zone', nil, :default => 'Eastern Time (US & Canada)' %></td>
</tr>
<tr>
<td class="left">
<div class="vcenter"><%= f.label :password, raw(t(:password_change_raw)) %></div>
</td>
<td class="right">
<%= f.password_field :password %>
</td>
<tr>
<td class="left">
<%= f.label :password_confirmation, raw(t(:password_confirmation_raw)) %>
</td>
<td class="right">
<%= f.password_field :password_confirmation %>
</td>
</tr>
<tr>
<td class="left">
<%= raw(t(:password_current_raw)) %>
</td>
<td class="right">
<input name="password_current" type="password" />
</td>
</tr>
<tr>
<td class="left"></td>
<td class="right"><%= f.submit t(:account_edit_submit) %></td>
</tr>
</table>
<% end %>

11
app/views/users/show.html.erb
View File

@ -1,5 +1,10 @@
<h2><%= t(:account_info) %></h2>
<table class="bigtable styletable">
<%= link_to t(:account_edit), edit_account_path %>
<br /><br />
<table class="table_no_header">
<tr>
<td class="left"><%= t(:userid) %></td>
<td><%= @user.login %></td>
@ -13,7 +18,3 @@
<td><%= @user.time_zone %></td>
</tr>
</table>
<br /><br />
<div class="details">
<%= link_to t(:account_edit), edit_account_path %>
</div>