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

fix column width and plugin styles

Browse Source
This commit is contained in:
Lee Lawlor
2014-10-15 21:47:51 -04:00
parent ee05bbd102
commit 75ac3db89a
6 changed files with 143 additions and 135 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -6,45 +6,47 @@
<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' />
<div class="col-pad">
<%= 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' />
<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>
<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 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>
</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(: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(: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">
<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">
<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>
<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>
<% end %>
<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>
</div>
</div>

49
app/views/users/edit_profile.html.erb
View File

@ -5,39 +5,40 @@
<li class="active"><%= t(:profile_edit) %></li>
</ol>
<div class="col-pad">
<%= form_for @user, :url => update_profile_path, :html => {:class => 'form-horizontal'} do |f| %>
<input name='userlogin' class='userlogin' />
<%= form_for @user, :url => update_profile_path, :html => {:class => 'form-horizontal'} do |f| %>
<input name='userlogin' class='userlogin' />
<div class="form-group">
<div class="col-sm-offset-4 col-sm-8 col-xs-offset-3 col-xs-6">
<div class="checkbox">
<label>
<%= f.check_box :public_flag %>
<%= t(:public) %>
</label>
<div class="form-group">
<div class="col-sm-offset-4 col-sm-8 col-xs-offset-3 col-xs-6">
<div class="checkbox">
<label>
<%= f.check_box :public_flag %>
<%= t(:public) %>
</label>
</div>
</div>
</div>
</div>
<div class="form-group">
<label class="col-sm-4 col-xs-3 control-label"><%= t(:profile_website) %></label>
<div class="col-sm-8 col-xs-6"><%= f.text_field :website, :class => 'form-control' %></div>
</div>
<div class="form-group">
<label class="col-sm-4 col-xs-3 control-label"><%= t(:profile_website) %></label>
<div class="col-sm-8 col-xs-6"><%= f.text_field :website, :class => 'form-control' %></div>
</div>
<div class="form-group">
<label class="col-sm-4 col-xs-3 control-label"><%= t(:profile_bio) %></label>
<div class="col-sm-8 col-xs-6"><%= f.text_area :bio, :class => 'form-control', :rows => 4 %></div>
</div>
<div class="form-group">
<label class="col-sm-4 col-xs-3 control-label"><%= t(:profile_bio) %></label>
<div class="col-sm-8 col-xs-6"><%= f.text_area :bio, :class => 'form-control', :rows => 4 %></div>
</div>
<div class="form-group">
<label class="col-sm-4 control-label"></label>
<div class="col-sm-8"><p class="form-control-static"><%= f.submit t(:profile_update), :class => 'btn btn-primary' %></p></div>
</div>
<div class="form-group">
<label class="col-sm-4 control-label"></label>
<div class="col-sm-8"><p class="form-control-static"><%= f.submit t(:profile_update), :class => 'btn btn-primary' %></p></div>
</div>
<% end %>
<% end %>
</div>
</div>