Commit 8a38618b
Changed files (12)
app
assets
controllers
views
categories
layouts
app/assets/images/arx/hd-bg.jpg
Binary file
app/assets/images/arx/icon-check-green.png
Binary file
app/assets/images/arx/icon-no-red.png
Binary file
app/assets/images/arx/icon-no-yellow.png
Binary file
app/assets/images/arx/icon-x-red.png
Binary file
app/assets/images/arx/icon-x-yellow.png
Binary file
app/assets/images/cakeside-logo.png
Binary file
app/assets/images/hd-bg.jpg
Binary file
app/assets/stylesheets/960/interface.css → app/assets/stylesheets/interface.css
@@ -8,7 +8,7 @@ a:link { color: #333; }
a:hover { color: #000; }
/* header */
-#hd { background: #193D44 url(../arx/hd-bg.jpg); height: 120px; }
+#hd { background: #193D44 url(../assets/hd-bg.jpg); height: 120px; }
#hd .top { height: 80px; width: 100%; background: url(../arx/hd-graphic.jpg) no-repeat right; }
#hd .top .logo { margin: 20px 0 0 -10px; }
#hd .search { top: -35px; height: 0; }
@@ -34,14 +34,6 @@ a:hover { color: #000; }
#bd .sidebar .menu li.level_2 { padding: 6px 0 6px 15px; }
#bd .sidebar .menu a { text-decoration: none; color: #333333; width: 100%; display: block; }
#bd .sidebar .menu a:hover { text-decoration: none; color: #666666; }
-/* icons */
-#bd .sidebar .menu .enrollment-none-status { background: url(../arx/icon-check-green.png) no-repeat right center; }
-#bd .sidebar .menu .enrollment-requires-review-status { background: url(../arx/icon-check-green.png) no-repeat right center; }
-#bd .sidebar .menu .enrollment-warning-status { background: url(../arx/icon-check-green.png) no-repeat right center; }
-#bd .sidebar .menu .enrollment-green-status { background: url(../arx/icon-check-green.png) no-repeat right center; }
-#bd .sidebar .menu .enrollment-error-status { background: url(../arx/icon-no-red.png) no-repeat right center; }
-#bd .sidebar .menu .enrollment-question-mark-status { background: url(../arx/icon-no-yellow.png) no-repeat right center; }
-#bd .sidebar .menu .enrollment-unknown-status { background: url(../arx/icon-check-green.png) no-repeat right center; }
#bd .content { margin-bottom: 30px; }
#bd .content .helpbox { background: #F0F2F2; padding: 10px 15px 10px 10px; margin: 0 -15px 0 -5px; }
app/controllers/categories_controller.rb
@@ -13,7 +13,7 @@ class CategoriesController < ApplicationController
# GET /categories/1
# GET /categories/1.xml
def show
- @category = Category.where(:slug => params[:id])
+ @category = Category.where(:slug => params[:id]).first
@creations = Creation.joins(:categories).where(:categories => {:slug => params[:id]}).page(params[:page]).per(6)
respond_to do |format|
app/views/categories/show.html.erb
@@ -4,12 +4,12 @@
<% content_for :title do %>
All Creations in <%= @category.name %>
<% end %>
-<h1>All Creations in <%= @category.name %></h1>
+<h1>All Creations in <em><%= @category.name %></em></h1>
<% @creations.reverse.each do |creation| %>
<div class="product_box">
<h2><%= creation.name %></h2>
- <a href="<%= url_for creation %>"> <%= image_tag creation.image_url.to_s, :width => "285px", :height => "140px", :alt => creation.name %> </a>
+ <a href="<%= url_for creation %>"> <%= image_tag creation.image_url.to_s, :alt => creation.name %> </a>
<p><%= creation.short_story %> <%= link_to 'more', creation %></p>
</div>
<% end %>
app/views/layouts/application.html.erb
@@ -87,11 +87,9 @@
</div><!-- /.menu -->
</div>
<div class="grid_9 content">
- <!-- begin main page content -->
<p class="notice"><%= notice %></p>
<p class="alert"><%= alert %></p>
<%= yield %>
- <!-- end main page content -->
</div>
</div>
</div><!-- /#bd -->