@@ -30,7 +30,7 @@ <% end %> <li class="personal"><%= link_to('Logout', logout_url) %></li> <li class="personal"><%= link_to "Invite users", signup_url %></li> - <li class="personal"><%= link_to('Your Settings', bio_settings_url) %></li> + <li class="personal"><%= link_to('Your Settings', username_email_settings_url) %></li>   <% else %> app/views/layouts/application.html.erb @@ -2,12 +2,6 @@ <div id="sidebar" class="grid_5 alpha"> <h2><%= @page_title = "Your Settings" %>:</h2> <ul class="settings"> - <li <%= current_if_context_is(:bio) %>> - <%= link_to "Profile info", bio_settings_url %> - </li> - <li <%= current_if_context_is(:picture) %>> - <%= link_to "Picture", picture_settings_url %> - </li> <li <%= current_if_context_is(:username_email) %>> <%= link_to "User name and email", username_email_settings_url %> </li> app/views/settings/_header.html.erb @@ -3,6 +3,7 @@ <%= render :partial => 'settings/header' %> <div id="main" class="grid_11 omega"> + <div class="paddedSection"> <%= error_messages_for(:user) %> <% form_for @user, :url => password_settings_url do | f | %> @@ -16,6 +17,7 @@ <%= submit_tag "Save Password" %> </p> <% end %> + </div> </div> </div> app/views/settings/password.html.erb @@ -2,7 +2,8 @@ <%= render :partial => 'settings/header' %> - <div id="main" class="grid_11 omega"> + <div id="main" class="grid_11 omega"> + <div class="paddedSection"> <%= error_messages_for(:user) %> <% form_for @user, :url => username_email_settings_url do | f | %> @@ -21,6 +22,7 @@ <%= submit_tag "Save changes" %> </p> <% end %> + </div> </div> </div> app/views/settings/username_email.html.erb 6432d64be7feaeea9a84a3fc1123f6283c261843 Alexander Kohlhofer alex@alex.local http://github.com/red56/the-connected-website/commit/4467c1992812291eb67b881960d49f2f501e6ec3 4467c1992812291eb67b881960d49f2f501e6ec3

2009-06-11T05:33:58-07:00

cleaned up settings area, removed bio, removed avatar section b90b09c83fe3732974710379a0b6e6c26c97f582 Alexander Kohlhofer alex@alex.local