Commit 283d37f6

mo k <mo@mokhan.ca>
2012-06-03 06:50:40
move nav bar to the right hand side.
master
1 parent a6c2514
Changed files (4)
app
views
creations
new.html.erb
profiles
favorites.html.erb
mine.html.erb
registrations
edit.html.erb
app/views/creations/new.html.erb
@@ -12,6 +12,11 @@
         <p><a class="btn btn-primary" href="http://gravatar.com/emails" target="_blank">Change My Picture</a></p>
       </div>
     </div>
+  </div>
+  <div class="span6">
+    <%= render 'form' %>
+  </div>
+  <div class="span3">
     <div style="padding: 8px 0;" class="well">
       <ul class="nav nav-list">
         <li class="nav-header">Creations</li>
@@ -26,7 +31,4 @@
       </ul>
     </div>
   </div>
-  <div class="span9">
-    <%= render 'form' %>
-  </div>
 </div>
app/views/profiles/favorites.html.erb
@@ -10,6 +10,16 @@
         <p><a class="btn btn-primary" href="http://gravatar.com/emails" target="_blank">Change My Picture</a></p>
       </div>
     </div>
+  </div>
+  <div class="span6">
+    <h2>My Favorites</h2>
+    <ul class="thumbnails">
+      <% @creations.each do |creation| %>
+        <li><a href="<%= url_for creation %>"><img class="thumbnail" src="<%= creation.image.thumb.url %>" alt="<%= creation.name %>"></a></li>
+      <% end %>
+    </ul>
+  </div>
+  <div class="span3">
     <div style="padding: 8px 0;" class="well">
       <ul class="nav nav-list">
         <li class="nav-header">Creations</li>
@@ -24,12 +34,4 @@
       </ul>
     </div>
   </div>
-  <div class="span9">
-    <h2>My Favorites</h2>
-    <ul class="thumbnails">
-      <% @creations.each do |creation| %>
-        <li><a href="<%= url_for creation %>"><img class="thumbnail" src="<%= creation.image.thumb.url %>" alt="<%= creation.name %>"></a></li>
-      <% end %>
-    </ul>
-  </div>
 </div>
app/views/profiles/mine.html.erb
@@ -15,6 +15,11 @@
         <p>Facebook:<a  href="<%= current_user.facebook %>" target="_blank"> <%= current_user.facebook %></a></p>
       </div>
     </div>
+  </div>
+  <div class="span6">
+  <%= render "shared/creation_image_gallery" %>
+  </div>
+  <div class="span3">
     <div style="padding: 8px 0;" class="well">
       <ul class="nav nav-list">
         <li class="nav-header">Creations</li>
@@ -29,5 +34,4 @@
       </ul>
     </div>
   </div>
-  <%= render "shared/a_9_column_gallery" %>
 </div>
app/views/registrations/edit.html.erb
@@ -15,23 +15,8 @@
           <p><a class="btn btn-primary" href="http://gravatar.com/emails" target="_blank">Change My Picture</a></p>
         </div>
       </div>
-      <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 class="divider"></li>
-          <li><a href="#"><i class="icon-flag"></i> Help</a></li>
-        </ul>
-      </div>
-      <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="span9">
+    <div class="span6">
       <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| %>
@@ -96,4 +81,21 @@
         </fieldset>
       <% end %>
     </div>
+    <div class="span3">
+      <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 class="divider"></li>
+          <li><a href="#"><i class="icon-flag"></i> Help</a></li>
+        </ul>
+      </div>
+      <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>