rename link title in nav bar.

2 files changed, 9 insertions, 6 deletions

diff --git a/app/assets/javascripts/templates/my/profiles/show.jst.ejs b/app/assets/javascripts/templates/my/profiles/show.jst.ejs
index 150073d8..7e861e11 100644
--- a/app/assets/javascripts/templates/my/profiles/show.jst.ejs
+++ b/app/assets/javascripts/templates/my/profiles/show.jst.ejs
@@ -31,13 +31,13 @@
     <label class="" for="user_twitter">Twitter username</label>
     <div class="input-group">
       <span class="input-group-addon">@</span>
-      <input class="form-control" id="user_twitter" maxlength="15" name="user[twitter]" placeholder="without the @ sign" size="255" type="text" value="<%= twitter %>">
+      <input class="form-control" id="user_twitter" maxlength="15" name="user[twitter]" placeholder="" size="255" type="text" value="<%= twitter %>">
     </div>
     <span class="help-inline"></span>
   </div>
   <div class="form-group">
     <label class="" for="user_facebook">Facebook</label>
-    <input class="form-control" id="user_facebook" maxlength="255" name="user[facebook]" placeholder="http://www.facebook.com/your_profile" size="255" type="text" value="<%= facebook %>">
+    <input class="form-control" id="user_facebook" maxlength="255" name="user[facebook]" placeholder="https://www.facebook.com/your_profile" size="255" type="text" value="<%= facebook %>">
     <span class="help-inline"></span>
   </div>
   <input id="save-button" type="submit" class="btn btn-primary" value="Update profile">
diff --git a/app/views/my/shared/_my_nav.html.erb b/app/views/my/shared/_my_nav.html.erb
index fe1d2164..83eaa067 100644
--- a/app/views/my/shared/_my_nav.html.erb
+++ b/app/views/my/shared/_my_nav.html.erb
@@ -9,11 +9,13 @@
   <%= link_to my_root_path(anchor: 'tutorials/new'), class: "nav-link" do %>
     <i class="fa fa-pencil-square"></i> Tutorial
   <% end %>
-  <%= link_to "Profile", my_root_path(anchor: 'profile/me'), class: "nav-link" %>
-  <%= link_to "Account", my_passwords_path, class: "nav-link #{"active" if controller?(:passwords)}" %>
-  <%= link_to "Favorites", my_favorites_path, class: "nav-link #{"active" if controller?(:favorites)}" %>
-  <%= link_to "Picture", new_my_avatar_path, class: "nav-link #{"active" if controller?(:avatars)}" %>
+  <%= link_to "My Profile", my_root_path(anchor: 'profile/me'), class: "nav-link" %>
+  <%= link_to "My Favorites", my_favorites_path, class: "nav-link #{"active" if controller?(:favorites)}" %>
+  <%= link_to "My Photo", new_my_avatar_path, class: "nav-link #{"active" if controller?(:avatars)}" %>
+  <%= link_to "Change My Password", my_passwords_path, class: "nav-link #{"active" if controller?(:passwords)}" %>
+
   <% if current_user.admin? %>
+    <h5>Admin</h5>
     <%= link_to "Users", admin_users_path, class: "nav-link" %>
     <%= link_to "Jobs", admin_jobs_path, class: "nav-link" %>
     <%= link_to "Activity", admin_activities_path, class: "nav-link" %>
@@ -21,5 +23,6 @@
     <%= link_to "Sessions", admin_sessions_path, class: "nav-link" %>
     <%= link_to "Products", admin_products_path, class: "nav-link" %>
   <% end %>
+
   <%= link_to t('.logout'), logout_path, method: :delete, class: "nav-link" %>
 </div>