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

update with changes from Production branch

Browse Source
This commit is contained in:
Lee Lawlor
2014-02-17 12:05:39 -05:00
parent 5b640cf9d8
commit a4937fb2e5
384 changed files with 14690 additions and 2242 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,62 +1,54 @@
<h2>
<%= link_to t(:myaccount), account_path %> &raquo;
<%= t(:account_edit) %>
</h2>
<div class="col-sm-8 col-xs-7">
<%= form_for @user, :url => account_path do |f| %>
<%= error_messages_for 'user', :header_message => t(:try_again), :message => t(:account_error_edit) %>
<ol class="breadcrumb">
<li><%= link_to t(:myaccount), account_path %></li>
<li class="active"><%= t(:account_edit) %></li>
</ol>
<%= form_for @user, :url => account_path, :html => {:class => 'form-horizontal'} do |f| %>
<%= error_messages_for 'user', :header_message => t(:try_again), :message => t(:account_error_edit) %>
<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>
<div class="form-group">
<label class="col-sm-4 col-xs-4 control-label"><%= t(:userid) %></label>
<div class="col-sm-8 col-xs-8"><%= f.text_field :login, :class => 'form-control' %></div>
</div>
</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 %>
<div class="form-group">
<label class="col-sm-4 col-xs-4 control-label"><%= t(:email) %></label>
<div class="col-sm-8 col-xs-8"><%= f.text_field :email, :class => 'form-control' %></div>
</div>
<div class="form-group">
<label class="col-sm-4 col-xs-4 control-label"><%= t(:time_zone) %></label>
<div class="col-sm-8 col-xs-8">
<p class="form-control-static">
<%= time_zone_select 'user', 'time_zone', nil, {:default => 'Eastern Time (US & Canada)'}, {:class => 'form-control'} %>
</p>
</div>
</div>
<div class="form-group">
<label class="col-sm-4 col-xs-4 control-label"><%= t(:password_change) %></label>
<div class="col-sm-8 col-xs-8"><%= f.password_field :password, :class => 'form-control' %></div>
</div>
<div class="form-group">
<label class="col-sm-4 col-xs-4 control-label"><%= t(:password_confirmation) %></label>
<div class="col-sm-8 col-xs-8"><%= f.password_field :password_confirmation, :class => 'form-control' %></div>
</div>
<div class="form-group">
<label class="col-sm-4 col-xs-4 control-label"><%= t(:password_current) %></label>
<div class="col-sm-8 col-xs-8"><%= f.password_field :password_current, :class => 'form-control' %></div>
</div>
<div class="form-group">
<div class="col-sm-offset-4 col-sm-8 col-xs-offset-4 col-xs-8"><p class="form-control-static"><%= f.submit t(:account_update), :class => 'btn btn-primary' %></p></div>
</div>
<% end %>
</div>
</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_update) %></td>
</tr>
</table>
<% end %>