Commit 6ee6e811

mo k <m@mokhan.ca>
2011-12-04 23:57:59
switch to the 940px layout.
master
1 parent e34eddb
Changed files (15)
app
views
categories
show.html.erb
creations
edit.html.erb
new.html.erb
show.html.erb
devise
sessions
new.html.erb
home
index.html.erb
layouts
application.html.erb
profiles
mine.html.erb
show.html.erb
registrations
edit.html.erb
new.html.erb
search
index.html.erb
shared
_creation_image_gallery.html.erb
_creation_text_gallery.html.erb
config
application.rb
app/views/categories/show.html.erb
@@ -2,10 +2,11 @@
   All Creations in <%= @category.name %>
 <% end %>
 
-<% content_for :sidebar do %>
-  <%= render "shared/categories_sidebar" %>
-<% end %>
-
-<h1>Category <em><%= @category.name %></em></h1>
+<div class="row">
+  <div class="span16">
+    <h1>Category <em><%= @category.name %></em></h1>
+    <%= render "shared/creation_image_gallery" %>
+  </div>
+</div>
 
-<%= render "shared/creation_thumbs" %>
+<%= render "shared/creation_text_gallery" %>
app/views/creations/edit.html.erb
@@ -1,16 +1,21 @@
 <% content_for :title do %>
   Editing creation <%= @creation.name %>
 <% end %>
-<% content_for :script do %>
-  $('label[data-editable="false"]').addClass('hidden');
-  $('input[data-editable="false"]').addClass('hidden');
-<% end %>
-
 
-<div class="grid_9 alpha omega">
-  <%= link_to 'Show', @creation, :class => 'fright' %>
-  <h1>Editing creation <em><%= @creation.name %></em></h1>
-
-  <%= image_tag @creation.image_url.to_s, :class => ['photo'] %>
-  <%= render 'form' %>
+<div class="row">
+  <div class="span16">
+    <h1>Editing creation <em><%= @creation.name %></em></h1>
+  </div>
+</div>
+<div class="row">
+  <div class="span4">
+    <div class="media-grid">
+      <a href="<%= url_for creation_path(@creation) %>">
+        <%= image_tag @creation.image_url.to_s, :class => "thumbnail", :style => "width:235px;" %>
+      </a>
+    </div>
+  </div>
+  <div class="span12">
+    <%= render 'form' %>
+  </div>
 </div>
app/views/creations/new.html.erb
@@ -20,5 +20,14 @@
 <%#   <p><a class="btn primary large">Learn more &raquo;</a></p>%>
 <%# </div>%>
 
-<h2>Share My Latest Creation</h2>
-<%= render 'form' %>
+
+<div class="row">
+  <div class="span12">
+    <%= render 'form' %>
+  </div>
+  <div class="span4">
+    <div class="media-grid">
+      <a href="<%= url_for profile_path(current_user) %>"><img src="<%= avatar_url current_user %>&amp;s=200" alt="<%= current_user.name %>" /></a>
+    </div>
+  </div>
+</div>
app/views/creations/show.html.erb
@@ -2,44 +2,48 @@
   <%= @creation.name %> by <%= @creation.user.name %>
 <% end %>
 
-<% content_for :sidebar do %>
-  <%= render "shared/their_profile_sidebar" %>
-<% end %>
-
+<div class="page-header">
   <% if @creation.user == current_user %>
-    <h1><%= @creation.name %> <%= link_to '(edit)', edit_creation_path(@creation), :class => 'smallFont' %> by <em> <%= link_to @creation.user.name, profile_path(@creation.user) %> </em> </h1>
+    <h1><%= @creation.name %> <small><%= link_to '(edit)', edit_creation_path(@creation) %> by <%= link_to @creation.user.name, profile_path(@creation.user) %> </small> </h1>
   <% else %>
-    <h1><%= @creation.name %> by <em> <%= link_to @creation.user.name, profile_path(@creation.user) %> </em> </h1>
+    <h1><%= @creation.name %> <small> by <%= link_to @creation.user.name, profile_path(@creation.user) %> </small> </h1>
   <% end %>
-
+</div>
 
 <div class="row">
-  <div class="span12">
-  <ul class="media-grid">
-    <li>
-      <a href="#"> <img class="thumbnail" src="<%= @creation.image_url.to_s%>" alt="<%= @creation.name %>"> </a>
-    </li>
-  </ul>
-  </div>
-  <div class="span4">
-    <p><%= @creation.story %></p>
+  <div class="span16">
+    <div class="media-grid">
+      <a href="<%= url_for creation_path(@creation) %>"><img class="thumbnail" src="<%= @creation.image_url.to_s%>" alt="<%= @creation.name %>"></a>
+    </div>
   </div>
 </div>
+
 <div class="row">
-  <div class="span8">
+  <div class="span11">
     <iframe src="http://www.facebook.com/plugins/like.php?href=<%= request.url %>" scrolling="no" frameborder="0" style="border:none; width:350px; height:30px"></iframe>
     </p>
   </div>
-  <div class="span6">
+  <div class="span5">
     <p> submitted on: <%= @creation.created_at.to_s :foomat %>
-      <% @creation.categories.each do |category| %>
-        <span class="label notice"> <a href="/categories/<%= category.slug %>"><%= category.name %></a> </span>
-      <% end %> 
+    <% @creation.categories.each do |category| %>
+      <span class="label notice"> <a href="/categories/<%= category.slug %>"><%= category.name %></a> </span>
+    <% end %> 
   </div>
 </div>
 
 <div class="row">
-  <h3> other creations by <%= @creation.user.name.to_s %> <em><%= link_to 'view all', profile_path(@creation.user) %> </em> </h3>
+  <div class="span16">
+    <h3>What's the story morning glory?</h3>
+    <p><%= @creation.story %></p>
+  </div>
 </div>
 
-<%= render "shared/creation_thumbs" %>
+<div class="row">
+  <div class="span12">
+    <%= render "shared/creation_image_gallery" %>
+  </div>
+  <div class="span4 media-grid">
+    <a href="<%= url_for profile_path @creation.user %>"><img src="<%= avatar_url @creation.user %>&amp;s=200" alt="<%= @creation.user.name %>" /></a>
+  </div>
+</div>
+<%= render "shared/creation_text_gallery" %>
app/views/devise/sessions/new.html.erb
@@ -1,20 +1,99 @@
-<div class="grid_9 alpha omega">
-  <div class="grid_5 alpha">
-    <h1>Sign in</h1>
-    <%= form_for(resource, :as => resource_name, :url => session_path(resource_name)) do |f| %>
-      <p><%= f.label :email %><br />
-      <%= f.email_field :email, :class => "forms" %></p>
-
-      <p><%= f.label :password %><br />
-      <%= f.password_field :password, :class => "forms"  %></p>
+<div style="background: #000 url(/assets/sunset.png) no-repeat; border: none; margin-top:10px; margin-left:auto; margin-right:auto;width:960px;height:768px;">
+  <div class="row">
+    <div class="span10">
+      <div class="logo"><img src="/assets/cakeside-logo.png" alt="arc-resources-ltd" width="100%" /></div>
+    </div>
+    <div class="span6">
+      <div style="margin-top:100px;">
+        <%= form_for(resource, :as => resource_name, :url => session_path(resource_name)) do |f| %>
+          <div class="span2">
+            <%= f.email_field :email, :style => "height:20px;", :placeholder => 'Email', :size => 20 %>
+          </div>
+          <div class="span2">
+            <%= f.password_field :password, :style => "height:20px;", :placeholder => 'Password',:size => 20 %>
+          </div>
+          <div class="span1">
+            <%= f.submit "Sign in", :style => "width:100%;height:28px;"%>
+          </div>
+          <div class="span1"> &nbsp; </div>
+        <% end %>
+      </div>
+    </div>
+  </div>
+  <div class="row">
+    <div class="span10">
+      &nbsp;
+      <p class="notice"><%= notice %></p>
+      <p class="alert"><%= alert %></p>
+      <%= devise_error_messages! %>
+    </div>
+    <div class="span5">
+      <%# <%= yield %>
+      <h2>New to CakeSide? <em>Join Today!</em></h2>
+      <%= form_for(resource, :as => resource_name, :url => registration_path(resource_name)) do |f| %>
+        <p><%= f.text_field :name, :class => ['forms'], :placeholder => 'Full Name', :style => 'width:100%;height:20px;' %></p>
+        <p><%= f.email_field :email, :class => ['forms'], :placeholder => 'Email', :style => 'width:100%;height:20px;' %></p>
+        <p><%= f.password_field :password, :class => ['forms'], :placeholder => 'Password', :style => 'width:100%;height:20px;' %></p>
+        <p><%= f.password_field :password_confirmation, :class => ['forms'], :placeholder => 'Confirm Password', :style => 'width:100%;height:20px;' %></p>
+        <p><%= f.submit "Sign up", :style => "height:28px;" %></p>
+      <% end %>
+      <%# <%= render :partial => "devise/shared/links" %>
+    </div>
+    <div class="span1">
+      &nbsp;
+    </div>
+  </div>
+  <div>
+    <div class="row">
+      <div class="span4">
+        &nbsp;
+      </div>
+      <div class="span4" style="margin-top:180px;">
+        &nbsp;
+        <a href="" style="color:pink;">Contact Us</a> | 
+        <a href="/terms.html" style="color:pink;">Terms and Conditions</a> | 
+        <a href="/privacy.html" style="color:pink;">Privacy Policy</a>
+      </div>
+      <div class="span4">
+        &nbsp;
+      </div>
+    </div>
+  </div>
 
-      <% if devise_mapping.rememberable? -%>
-        <p><%= f.check_box :remember_me %> <%= f.label :remember_me %></p>
-      <% end -%>
 
-      <p><%= f.submit "Sign in" %></p>
-    <% end %>
-    <%= render :partial => "devise/shared/links" %>
-  </div>
 </div>
-<div class="clear" />
+
+
+<h1>Sign in</h1>
+<%= form_for(resource, :as => resource_name, :url => session_path(resource_name)) do |f| %>
+  <fieldset>
+    <legend>Example form legend</legend>
+    <div class="clearfix">
+      <%= f.label :email %>
+      <div class="input">
+        <%= f.email_field :email, :class => "xlarge" %>
+      </div>
+    </div><!-- /clearfix -->
+    <div class="clearfix">
+      <%= f.label :password %>
+      <div class="input">
+        <%= f.password_field :password, :class => "xlarge"  %></p>
+      </div>
+    </div><!-- /clearfix -->
+
+    <% if devise_mapping.rememberable? -%>
+      <!-- <p><%= f.check_box :remember_me %> <%= f.label :remember_me %></p> -->
+    <div class="clearfix">
+      <label>
+        <%= f.check_box :remember_me %>
+        <span>Remember me</span>
+      </label>
+    </div><!-- /clearfix -->
+    <% end -%>
+    <div class="actions">
+      <input type="submit" class="btn primary" value="Sign in">&nbsp;<button type="reset" class="btn">Cancel</button>
+    </div>
+  </fieldset>
+<% end %>
+<%= render :partial => "devise/shared/links" %>
+
app/views/home/index.html.erb
@@ -11,4 +11,5 @@
   <p>Vestibulum id ligula porta felis euismod semper. Integer posuere erat a ante venenatis dapibus posuere velit aliquet. Duis mollis, est non commodo luctus, nisi erat porttitor ligula, eget lacinia odio sem nec elit.</p>
   <p><a class="btn primary large">Learn more &raquo;</a></p>
 </div>
-<%= render "shared/creation_thumbs" %>
+<%= render "shared/creation_image_gallery" %>
+<%= render "shared/creation_text_gallery" %>
app/views/layouts/application.html.erb
@@ -26,12 +26,12 @@
   <body>
     <div class="topbar" data-dropdown="dropdown" >
       <div class="topbar-inner">
-        <div class="container-fluid">
+        <div class="container">
           <a class="brand" href="<%= url_for home_index_path %>">Cake<em>side</em></a>
           <ul class="nav">
             <li class="active"><a href="<%= url_for home_index_path %>">Home</a></li>
             <li><%= link_to "Share", new_creation_path, :style => "color:#48ce62;" %></li>
-            <li><%= link_to "Artists", all_profiles_path  %></li>
+            <%# <li><%= link_to "Artists", all_profiles_path  %></li>%>
             <li class="dropdown">
             <a href="#" class="dropdown-toggle">Categories</a>
             <ul class="dropdown-menu">
@@ -65,13 +65,7 @@
       </div><!-- /topbar-inner -->
     </div><!-- /topbar -->
 
-    <div class="container-fluid">
-      <div class="sidebar">
-        <div class="well">
-          <%= yield :sidebar %>
-        </div>
-      </div>
-
+    <div class="container">
       <div class="content">
         <% if notice %><p class="alert-message success"><%= notice %></p> <% end %>
         <% if alert %><p class="alert-message error"><%= alert %></p><% end %>
@@ -82,7 +76,7 @@
       <p>&copy; Cakeside 2011</p>
       </footer>
 
-    </div> <!-- /container-fluid -->
+    </div> <!-- /container -->
 
     <script type="text/javascript">
       var _gaq=[['_setAccount','UA-24090020-1'],['_trackPageview']];
app/views/profiles/mine.html.erb
@@ -10,9 +10,24 @@
 
 <ul class="tabs">
   <li class="active"> <%= link_to "Profile", profiles_mine_path %></li>
+  <li> <%= link_to "Share", new_creation_path %></li>
   <li><a href="#">Messages</a></li>
   <li> <%= link_to "Settings", edit_user_registration_path %> </li>
   <li><a href="#">Contact</a></li>
 </ul>
 
-<%= render "shared/creation_thumbs" %>
+<div class="row">
+  <div class="span4">
+    <div class="media-grid">
+      <a href="<%= url_for profile_path(current_user) %>"><img src="<%= avatar_url current_user %>&amp;s=200" alt="<%= current_user.name %>" /></a>
+    </div>
+    <h2><%= current_user.name %></h2>
+    <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>
+    <a href="http://en.gravatar.com/" target="_blank">Change My Photo</a>
+  </div>
+  <div class="span12">
+    <%= render "shared/creation_image_gallery" %>
+  </div>
+</div>
+<%= render "shared/creation_text_gallery" %>
app/views/profiles/show.html.erb
@@ -2,13 +2,24 @@
   <%= @profile.name %>
 <% end %>
 
-<% content_for :sidebar do %>
-  <%= render "shared/their_profile_sidebar" %>
-<% end %>
+<div class="row">
+  <div class="span16">
+    <h1>
+      <%= @profile.name %>
+      <small>A member since <%= @profile.created_at.to_s :foomat %>, with <%= @profile.creations.length %> creations.</small>
+    </h1>
+  </div>
+</div>
 
-<div class="grid_9 alpha omega">
-    <h1><%= @profile.name %></h1>
-    <p><em>A member since <%= @profile.created_at.to_s :foomat %>, with <%= @profile.creations.length %> creations.</em></p>
+<div class="row">
+  <div class="span4">
+    <div class="media-grid">
+      <a href="<%= url_for profile_path(@profile) %>"><img src="<%= avatar_url @profile %>&amp;s=200" alt="<%= @profile.name %>" /></a>
+    </div>
+  </div>
+  <div class="span12">
+    <%= render "shared/creation_image_gallery" %>
+  </div>
 </div>
-<div class="clear"></div>
-<%= render "shared/creation_thumbs" %>
+
+<%= render "shared/creation_text_gallery" %>
app/views/registrations/edit.html.erb
@@ -1,13 +1,6 @@
 <% content_for :title do %>
   Update My Account
 <% end %>
-<% content_for :stylesheets do %>
-<% end %>
-
-<% content_for :sidebar do %>
-  <%= render "shared/my_profile_sidebar" %>
-<% end %>
-
 <ul class="tabs">
   <li> <%= link_to "Profile", profiles_mine_path %></li>
   <li> <%= link_to "Share", new_creation_path %></li>
@@ -15,9 +8,8 @@
   <li class="active"> <%= link_to "Settings", edit_user_registration_path %> </li>
   <li><a href="#">Contact</a></li>
 </ul>
-
 <div class="row">
-  <div class="span8">
+  <div class="span12">
     <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 }) do |f| %>
@@ -50,10 +42,12 @@
       </fieldset>
     <% end %>
   </div>
-  <div class="span4">&nbsp;</div>
   <div class="span4">
+    <div class="media-grid">
+      <a href="<%= url_for profile_path(current_user) %>"><img src="<%= avatar_url current_user %>&amp;s=200" alt="<%= current_user.name %>" /></a>
+    </div>
+    <a href="http://en.gravatar.com/" target="_blank">Change My Photo</a>
     <h4>Cancel My Account</h4>
     <p>Unhappy? <%= button_to "Cancel my account", registration_path(resource_name), :confirm => "Are you sure?", :method => :delete, :class => "btn danger" %></p>
-    <a href="http://en.gravatar.com/" target="_blank">Change My Photo</a>
   </div>
 </div>
app/views/registrations/new.html.erb
@@ -26,11 +26,4 @@
 
     <%= render :partial => "devise/shared/links" %>
   </div>
-  <div class="grid_4 omega">
-    <h2>Sign up through one of these services</h2>
-    <a href="/auth/twitter" class="auth_provider"><%= image_tag "twitter_64.png", :size => "64x64", :alt => "Twitter" %>Twitter</a>
-    <a href="/auth/facebook" class="auth_provider"><%= image_tag "facebook_64.png", :size => "64x64", :alt => "Facebook" %>Facebook</a>
-    <a href="/auth/google_apps" class="auth_provider"><%= image_tag "google_64.png", :size => "64x64", :alt => "Google" %>Google</a>
-    <a href="/auth/open_id" class="auth_provider"><%= image_tag "openid_64.png", :size => "64x64", :alt => "OpenID" %>OpenID</a>
-  </div>
 </div>
app/views/search/index.html.erb
@@ -2,9 +2,11 @@
   Search Results for <%= @search %>
 <% end %>
 
-<% content_for :sidebar do %>
-  <%= render "shared/categories_sidebar" %>
-<% end %>
+<div class="row">
+  <div class="span16">
+    <h1>Search Results for <em><%= @search %></em></h1>
+    <%= render "shared/creation_image_gallery" %>
+  </div>
+</div>
 
-<h1>Search Results for <em><%= @search %></em></h1>
-<%= render "shared/creation_thumbs" %>
+<%= render "shared/creation_text_gallery" %>
app/views/shared/_creation_image_gallery.html.erb
@@ -0,0 +1,5 @@
+<ul class="media-grid">
+  <% @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>
app/views/shared/_creation_thumbs.html.erb → app/views/shared/_creation_text_gallery.html.erb
@@ -1,11 +1,3 @@
-<ul class="media-grid">
-<% @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>
-
 <% @creations.each_with_index do |creation, index| %>
   <% if index % 3 == 0  %>
     <div class="row">
@@ -48,8 +40,6 @@
 
 <div class="row">
   <div class="span6"> &nbsp;</div>
-  <div class="span5">
-    <p> <%= paginate @creations %> </p>
-  </div>
+  <div class="span5"> <p> <%= paginate @creations %> </p> </div>
   <div class="span5">&nbsp;</div>
 </div>
config/application.rb
@@ -46,12 +46,11 @@ module Cake
     config.assets.version = '1.0'
 
     config.to_prepare {
-      Devise::SessionsController.layout "users"
-      Devise::RegistrationsController.layout proc{ |controller| user_signed_in? ? "application" : "users" }
+      # Devise::SessionsController.layout "users"
+      # Devise::RegistrationsController.layout proc{ |controller| user_signed_in? ? "application" : "users" }
       Devise::ConfirmationsController.layout "application"
-      Devise::UnlocksController.layout "application"            
-      Devise::PasswordsController.layout "application"  
+      Devise::UnlocksController.layout "application"
+      Devise::PasswordsController.layout "application"
     }
-
   end
 end