update with changes from Production branch

app/views/users/edit.html.erb

@@ -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 %>

app/views/users/edit_profile.html.erb

@@ -0,0 +1,43 @@
+<div class="col-sm-8 col-xs-7">
+
+  <ol class="breadcrumb">
+    <li><%= link_to t(:myaccount), account_path %></li>
+    <li class="active"><%= t(:profile_edit) %></li>
+  </ol>
+
+
+  <%= 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>
+      </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 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 %>
+
+</div>
+

app/views/users/forgot_password.html.erb

@@ -1,11 +1,30 @@
-<h2><%= t(:password_forgot) %></h2>
-<%= t(:password_forgot_message) %>
-<br /><br />
-<%= form_for :user, :url => resetpassword_path do |f| %>
-	<input name='userlogin' class='userlogin' />
-	<%= f.text_field :login %>
-	<%= f.submit t(:submit) %>
-<% end %>
+<div class="col-sm-7 col-xs-12">
+
+  <h4 class="breadcrumb"><%= t(:password_forgot) %></h4>
+
+  <%= t(:password_forgot_message) %>
+
+  <br><br>
+
+  <%= form_for @user, :url => { :controller => 'mailer', :action => 'resetpassword' }, :html => {:class => 'form-horizontal' } do |f| %>
+    <input name='userlogin' class='userlogin' />
+
+    <div class="form-group">
+      <label class="col-sm-3 col-xs-3 control-label"><%= t(:email) %></label>
+      <div class="col-sm-9 col-xs-9"><%= f.text_field :login, :class => 'form-control' %></div>
+    </div>
+
+
+    <div class="form-group">
+      <div class="col-sm-offset-3 col-sm-9 col-xs-offset-3 col-xs-9"><p class="form-control-static"><%= f.submit t(:submit), :class => 'btn btn-primary' %></p></div>
+    </div>
+
+  <% end %>
+
+</div>
+
+
 <script type="text/javascript">
-	document.getElementById('user_login').focus();
-</script>
+  document.getElementById('user_login').focus();
+</script>
+

app/views/users/list_channels.html.erb

@@ -0,0 +1,19 @@
+<h3><%= t(:user_public_channels) %> <%= @user.login %></h3>
+
+<% if @channels.present? && @channels.count > 0 %>
+  <table class="table table-striped table-bordered">
+    <tr><th><%= t(:channel_name) %></th><th><%= t(:channel_description) %></th><th><%= t(:tags) %></th></tr>
+    <% @channels.each do |m| %>
+      <tr<%= cycle('', raw(' class="stripe"')) %>>
+        <td><%= link_to m.name, channel_path(m.id) %></td>
+        <td><%= m.description %></td>
+        <td><%= m.list_tags %></td>
+      </tr>
+    <% end %>
+  </table>
+  <br />
+  <%= will_paginate @channels %>
+<% else %>
+  <%= t(:user_no_public_channels) %>
+<% end %>
+

app/views/users/new.html.erb

@@ -1,51 +1,49 @@
-<h2><%= t(:signup_header) %></h2>
-<br />
-<%= form_for @user, :url => account_path do |f| %>
-  <%= error_messages_for 'user', :header_message => t(:try_again), :message => t(:account_error) %>
-	<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 t(:password) %></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"></td>
-			<td class="right"><%= f.submit t(:create_account) %></td>
-		</tr>
-	</table>
-<% end %>
+<div class="col-sm-8 col-xs-7">
+
+  <h4 class="breadcrumb"><%= t(:signup_header) %></h4>
+
+  <%= 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) %>
+    <input name='userlogin' class='userlogin' />
+
+    <div class="form-group">
+      <label class="col-sm-4 col-xs-3 control-label"><%= t(:userid) %></label>
+      <div class="col-sm-8 col-xs-6"><%= f.text_field :login, :class => 'form-control' %></div>
+    </div>
+
+    <div class="form-group">
+      <label class="col-sm-4 col-xs-3 control-label"><%= t(:email) %></label>
+      <div class="col-sm-8 col-xs-6"><%= f.text_field :email, :class => 'form-control' %></div>
+    </div>
+
+    <div class="form-group">
+      <label class="col-sm-4 col-xs-3 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-3 control-label"><%= t(:password) %></label>
+      <div class="col-sm-8 col-xs-6"><%= f.password_field :password, :class => 'form-control' %></div>
+    </div>
+
+    <div class="form-group">
+      <label class="col-sm-4 col-xs-3 control-label"><%= t(:password_confirmation) %></label>
+      <div class="col-sm-8 col-xs-6"><%= f.password_field :password_confirmation, :class => 'form-control' %></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(:create_account), :id => "user_submit", :class => 'btn btn-primary' %></p></div>
+    </div>
+
+  <% end %>
+</div>
 
 <script type="text/javascript">
-	document.getElementById('user_login').focus();
-</script>
+  document.getElementById('user_login').focus();
+</script>
+

app/views/users/profile.html.erb

@@ -0,0 +1,19 @@
+<% if @user.public_flag == true %>
+
+  <div class="FR">
+    <br /><br />
+    <%= gravatar_tag @user, :default => 'wavatar', :secure => true %>
+  </div>
+
+  <h2><%= t(:profile_for) %> <%= @user.login %></h2>
+  <%= link_to t(:channels_public_view), list_channels_path(@user.login) %>
+  <br /><br />
+  <%= t(:member_since) %> <%= @user.created_at.strftime('%B %-d, %Y') %>
+  <br /><br />
+  <%= t(:profile_website) %>: <%= link_to @user.website, @user.website %>
+  <br /><br />
+  <%= t(:profile_bio) %>: <%= @user.bio %>
+
+<% else %>
+  <%= t(:profile_not_public) %>
+<% end %>

app/views/users/reset_password.html.erb

@@ -1,34 +1,35 @@
 <% if @valid_link %>
-	<h2><%= t(:password_new) %></h2>
-	<%= form_for @user, :url => change_password_user_path(@user) do |f| %>
-		<%= error_messages_for 'user', :header_message => t(:try_again), :message => t(:password_new_error) %>
-		<input name='userlogin' class='userlogin' />
-		<table class="bigtable">
-			<tr>
-				<td class="left">
-					<div class="vcenter"><%= f.label :password %></div>
-				</td>
-				<td class="right">
-					<%= f.password_field :password %>
-					<br />
-					<%= t(:password_new_choose) %>
-				</td>
-			<tr>
-				<td class="left">
-					<%= f.label :password_confirmation, raw(t(:password_confirmation_raw)) %>
-				</td>
-				<td class="right">
-					<%= f.password_field :password_confirmation %>
-					<br />
-					<%= t(:password_new_confirmation) %>
-				</td>
-			</tr>
-			<tr>
-				<td class="left"></td>
-				<td class="right"><%= f.submit t(:submit) %></td>
-			</tr>
-		</table>
-	<% end %>
+  <h2><%= t(:password_new) %></h2>
+  <%= form_for @user, :url => { :controller => 'users', :action => 'change_password', :id => @user.id } do |f| %>
+    <%= error_messages_for 'user', :header_message => t(:try_again), :message => t(:password_new_error) %>
+    <input name='userlogin' class='userlogin' />
+    <table class="bigtable">
+      <tr>
+        <td class="left">
+          <div class="vcenter"><%= f.label :password %></div>
+        </td>
+        <td class="right">
+          <%= f.password_field :password %>
+          <br />
+          <%= t(:password_new_choose) %>
+        </td>
+      <tr>
+        <td class="left">
+          <%= f.label :password_confirmation, raw(t(:password_confirmation)) %>
+        </td>
+        <td class="right">
+          <%= f.password_field :password_confirmation %>
+          <br />
+          <%= t(:password_new_confirmation) %>
+        </td>
+      </tr>
+      <tr>
+        <td class="left"></td>
+        <td class="right"><%= f.submit t(:submit) %></td>
+      </tr>
+    </table>
+  <% end %>
 <% else %>
-	<%= t(:password_link_expired) %>
-<% end %>
+  <%= t(:password_link_expired) %>
+<% end %>
+

app/views/users/show.html.erb

@@ -1,20 +1,56 @@
-<h2><%= t(:account_info) %></h2>
+<div class="col-sm-5 col-xs-12">
 
-<%= link_to t(:account_edit), edit_account_path %>
+  <h4 class="breadcrumb"><%= t(:myaccount) %></h4>
 
-<br /><br />
+  <div class="col-pad">
+    <%= link_to t(:account_edit), edit_account_path, :class => 'btn btn-primary btn-sm' %>
+    <br /><br />
+    <table class="table">
+      <tr>
+        <td><%= t(:userid) %></td>
+        <td><%= @user.login %></td>
+      </tr>
+      <tr>
+        <td><%= t(:email) %></td>
+        <td><%= @user.email %></td>
+      </tr>
+      <tr>
+        <td><%= t(:time_zone) %></td>
+        <td><%= @user.time_zone %></td>
+      </tr>
+      <tr>
+        <td><%= t(:api_key) %></td>
+        <td>
+          <%= @user.api_key %><br>
+          <%= button_to t(:api_key_new), user_new_api_key_path, :data => { :confirm => t(:confirm_new_user_api_key) }, :class => 'btn btn-primary btn-sm' %>
+        </td>
+      </tr>
+
+    </table>
+  </div>
+
+  <br /><br />
+  <h4 class="breadcrumb"><%= t(:public_profile) %></h4>
+  <div class="col-pad">
+    <%= link_to t(:profile_edit), edit_profile_path, :class => 'btn btn-primary btn-sm' %>
+    <br /><br />
+    <%= link_to t(:profile_view), user_profile_path(@user.login) %>
+    <br /><br />
+    <% if @user.public_flag %>
+      <table class="table">
+        <tr>
+          <td><%= t(:profile_website) %></td>
+          <td><%= @user.website %></td>
+        </tr>
+        <tr>
+          <td><%= t(:profile_bio) %></td>
+          <td><%= @user.bio %></td>
+        </tr>
+      </table>
+    <% else %>
+      <%= t(:profile_not_public_me) %>
+    <% end %>
+
+  </div>
+</div>
 
-<table class="table_no_header">
-	<tr>
-		<td class="left"><%= t(:userid) %></td>
-		<td><%= @user.login %></td>
-	</tr>
-	<tr>
-		<td class="left"><%= t(:email) %></td>
-		<td><%= @user.email %></td>
-	</tr>
-	<tr>
-		<td class="left"><%= t(:time_zone) %></td>
-		<td><%= @user.time_zone %></td>
-	</tr>
-</table>