Commit 29a5237d

@@ -3,53 +3,89 @@
 <% end %>
 <% content_for :head do %>
   <script type="text/javascript" charset="utf-8">
-  $(function(){
-    $('#edit_user').validate();
-    $('#user_city').autocomplete({
-      source: function(request, response){
-        $.ajax({
-          url: 'http://ws.geonames.org/searchJSON',
-          dataType: "jsonp",
-          data: {
-            featureClass: "P",
-            style: 'full',
-            maxRows: 12,
-            name_startsWith: request.term
-          },
-          success: function(data){
-            response( $.map(data.geonames, function(item){
-                return {
-                  label: item.name + (item.adminName1 ? ", " + item.adminName1 : "") + ", " + item.countryName,
-                  value: item.name + (item.adminName1 ? ", " + item.adminName1 : "") + ", " + item.countryName,
-                  latitude: item.lat,
-                  longitude: item.lng
-                }
-            }));
-          }
-        });
-      },
-      minlength:2,
-      select:function(event, ui){
-        var item = ui.item;
-        $('#user_latitude').val(item.latitude);
-        $('#user_longitude').val(item.longitude);
-      }
-    });
-  });
-  </script>
+    $(function(){
+        $('#edit_user').validate();
+        $('#user_city').autocomplete({
+source: function(request, response){
+$.ajax({
+url: 'http://ws.geonames.org/searchJSON',
+dataType: "jsonp",
+data: {
+featureClass: "P",
+style: 'full',
+maxRows: 12,
+name_startsWith: request.term
+},
+success: function(data){
+response( $.map(data.geonames, function(item){
+    return {
+label: item.name + (item.adminName1 ? ", " + item.adminName1 : "") + ", " + item.countryName,
+value: item.name + (item.adminName1 ? ", " + item.adminName1 : "") + ", " + item.countryName,
+latitude: item.lat,
+longitude: item.lng
+}
+}));
+}
+});
+},
+minlength:2,
+  select:function(event, ui){
+    var item = ui.item;
+    $('#user_latitude').val(item.latitude);
+    $('#user_longitude').val(item.longitude);
+  }
+});
+});
+</script>
 <% end %>
-<ul class="nav nav-tabs">
-  <li> <%= link_to "Profile", profiles_mine_path %></li>
-  <li> <%= link_to "Favorites", profiles_favorites_path %></li>
-  <li> <%= link_to "Add Creation", new_creation_path %></li>
-  <li class="active"> <%= link_to "Settings", edit_user_registration_path %> </li>
-</ul>
 <div class="row">
-  <div class="span9">
+  <div class="span12">
+    <ul class="nav nav-tabs">
+      <li> <%= link_to "Profile", profiles_mine_path %></li>
+      <li> <%= link_to "Favorites", profiles_favorites_path %></li>
+      <li> <%= link_to "Add Creation", new_creation_path %></li>
+      <li class="active"> <%= link_to "Settings", edit_user_registration_path %> </li>
+    </ul>
+  </div>
+</div>
+<div class="row">
+  <div class="span4">
+
+    <div style="padding: 8px 0;" class="well">
+      <ul class="nav nav-list">
+        <li class="nav-header">Creations</li>
+        <li><a href="<%= url_for root_path %>"><i class="icon-white icon-home"></i> Home</a></li>
+        <li><a href="<%= url_for profiles_favorites_path -%>"><i class="icon-book"></i> My Favorites</a></li>
+        <li><a href="<%= new_creation_path %>"><i class="icon-pencil"></i> Add Creation</a></li>
+        <li class="nav-header">Account</li>
+        <li><a href="<%= url_for profiles_mine_path %>"><i class="icon-user"></i> Profile</a></li>
+        <li class="active"><a href="<%= url_for edit_user_registration_path %>"><i class="icon-cog"></i> Settings</a></li>
+        <li><a href="<%= url_for edit_user_password_path(current_user) %>"><i class="icon-cog"></i> Change My Password</a></li>
+        <li class="divider"></li>
+        <li><a href="#"><i class="icon-flag"></i> Help</a></li>
+      </ul>
+    </div>
+
+    <ul class="thumbnails">
+      <li><a href="<%= url_for profile_path(current_user) %>"><img src="<%= avatar_url current_user %>&amp;s=200" alt="<%= current_user.name %>" /></a></li>
+    </ul>
+    <a href="http://gravatar.com/emails" target="_blank">Change My Photo</a>
+    <p>member since: <%= current_user.created_at.to_s :foomat %></p>
+    <p>last signed in: <%= current_user.last_sign_in_at.to_s :foomat %></p>
+    <hr>
+    <p>Website or blog: <a  href="<%= current_user.website %>" target="_blank"><%= current_user.website %></a></p>
+    <p>Twitter: <a href="https://twitter.com/<%= current_user.twitter %>" target="_blank" class="twitter-follow-button" data-show-count="false">@<%= current_user.twitter %></a></p>
+    <p>Facebook:<a  href="<%= current_user.facebook %>" target="_blank"> <%= current_user.facebook %></a></p>
+    <hr />
+
+    <h4>Cancel My Account</h4>
+    <p>Unhappy? <%= button_to "Cancel my account", registration_path(resource_name), :confirm => "Are you sure?", :method => :delete, :class => "btn btn-danger" %></p>
+
+  </div>
+  <div class="span8">
     <h1>Settings</h1>
     <p> If you prefer not to change your password, then just leave it blank.  </p>
     <%= form_for(resource, :as => resource_name, :url => registration_path(resource_name), :html => { :method => :put, :class=> "form-horizontal" }) do |f| %>
-      <%= devise_error_messages! %>
       <fieldset>
         <legend>Update your settings</legend>
         <div class="control-group">
@@ -75,7 +111,6 @@
         <div class="control-group">
           <%= f.label :city, :class => 'control-label' %>
           <div class="controls"> <%= f.text_field :city, :class => "input-xlarge" %> </div>
-<%#<input type="text" data-source="[&quot;Alabama&quot;,&quot;Alaska&quot;,&quot;Arizona&quot;,&quot;Arkansas&quot;,&quot;California&quot;,&quot;Colorado&quot;,&quot;Connecticut&quot;,&quot;Delaware&quot;,&quot;Florida&quot;,&quot;Georgia&quot;,&quot;Hawaii&quot;,&quot;Idaho&quot;,&quot;Illinois&quot;,&quot;Indiana&quot;,&quot;Iowa&quot;,&quot;Kansas&quot;,&quot;Kentucky&quot;,&quot;Louisiana&quot;,&quot;Maine&quot;,&quot;Maryland&quot;,&quot;Massachusetts&quot;,&quot;Michigan&quot;,&quot;Minnesota&quot;,&quot;Mississippi&quot;,&quot;Missouri&quot;,&quot;Montana&quot;,&quot;Nebraska&quot;,&quot;Nevada&quot;,&quot;New Hampshire&quot;,&quot;New Jersey&quot;,&quot;New Mexico&quot;,&quot;New York&quot;,&quot;North Dakota&quot;,&quot;North Carolina&quot;,&quot;Ohio&quot;,&quot;Oklahoma&quot;,&quot;Oregon&quot;,&quot;Pennsylvania&quot;,&quot;Rhode Island&quot;,&quot;South Carolina&quot;,&quot;South Dakota&quot;,&quot;Tennessee&quot;,&quot;Texas&quot;,&quot;Utah&quot;,&quot;Vermont&quot;,&quot;Virginia&quot;,&quot;Washington&quot;,&quot;West Virginia&quot;,&quot;Wisconsin&quot;,&quot;Wyoming&quot;]" data-items="4" data-provide="typeahead" style="margin: 0 auto;" class="span3">%>
         </div><!-- /control-group -->
         <div class="control-group">
           <%= f.label :website, :class => "control-label" %> 
@@ -115,15 +150,4 @@
       </fieldset>
     <% end %>
   </div>
-  <div class="span3">
-    <ul class="thumbnails">
-      <li><a href="<%= url_for profile_path(current_user) %>"><img src="<%= avatar_url current_user %>&amp;s=200" alt="<%= current_user.name %>" /></a></li>
-    </ul>
-    <a href="http://gravatar.com/emails" target="_blank">Change My Photo</a>
-    <p>member since: <%= current_user.created_at.to_s :foomat %></p>
-    <p>last signed in: <%= current_user.last_sign_in_at.to_s :foomat %></p>
-
-    <h4>Cancel My Account</h4>
-    <p>Unhappy? <%= button_to "Cancel my account", registration_path(resource_name), :confirm => "Are you sure?", :method => :delete, :class => "btn btn-danger" %></p>
-  </div>
 </div>