Commit 7ddcdd49
Changed files (4)
app
assets
images
stylesheets
views
home
layouts
app/assets/images/arx/frm-search-bg.png
Binary file
app/assets/stylesheets/interface.css
@@ -8,12 +8,13 @@ a:link { color: #333; }
a:hover { color: #000; }
/* header */
-#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 { background: #193D44 url(hd-bg.jpg); height: 120px; }
+/* #hd .top { height: 80px; width: 100%; background: url(arx/hd-graphic.jpg) no-repeat right; } */
+#hd .top { height: 80px; width: 100%; ; }
#hd .top .logo { margin: 20px 0 0 -10px; }
#hd .search { top: -35px; height: 0; }
-#hd .search form { background: url(../arx/frm-search-bg.png) no-repeat; }
-#hd .search input[type=submit] { background: url(../arx/btn-search.png) no-repeat; border: none; margin-left: 5px; }
+#hd .search form { background: #fff; }
+#hd .search input[type=submit] { background: url(arx/btn-search.png) no-repeat; border: none; margin-left: 5px; }
#hd .search input[type=text] { background: none; border: none; width: 140px; position: relative; top: -2px; outline: none; }
#hd .info { text-align: left; color: #CED8D9; padding-top: 12px; }
#hd .info .dull { color: #647F84; }
@@ -28,7 +29,7 @@ a:hover { color: #000; }
#bd .sidebar .summary .shaddow { position: absolute; left: -15px; top: 65px; }
#bd .sidebar .menu { background: #F0F2F2; margin-left: -10px; font-size: 14px; font-weight: bold; color: #333333; margin-bottom: 30px; }
#bd .sidebar .menu li { margin-left: 0; }
-#bd .sidebar .menu li.level_1 { background: url(../arx/hr.png) bottom repeat-x; padding: 6px 10px; }
+#bd .sidebar .menu li.level_1 { background: url(arx/hr.png) bottom repeat-x; padding: 6px 10px; }
#bd .sidebar .menu li.level_1:last-child { background: none; }
#bd .sidebar .menu ul.level_2 { margin-bottom: 0; margin-top: 5px; }
#bd .sidebar .menu li.level_2 { padding: 6px 0 6px 15px; }
@@ -40,8 +41,8 @@ a:hover { color: #000; }
#bd .content .helpbox p { margin-bottom: 0; }
#bd .content .helpbox li { margin-left: 15px; }
#bd .content table { width: 100%; }
-#bd .content table thead { background: url(../arx/hr.png) bottom repeat-x; }
-#bd .content table tbody { background: url(../arx/hr-light.png) bottom repeat-x; }
+#bd .content table thead { background: url(arx/hr.png) bottom repeat-x; }
+#bd .content table tbody { background: url(arx/hr-light.png) bottom repeat-x; }
#bd .content table td,
#bd .content table th { padding: 3px 0; white-space: nowrap; }
#bd .content table th { font-weight: bold; text-align: right; }
@@ -54,10 +55,10 @@ a:hover { color: #000; }
#bd .content .direction { margin-top: 10px; font-weight: bold; color: #999999; }
#bd .content .direction a { color: #333333; text-decoration: none; }
#bd .content .direction a:hover { color: #000; text-decoration: none; }
-#bd .content .direction .next { background: url(../arx/arrow-right.jpg) no-repeat right center; padding-right: 10px; }
-#bd .content .direction .previous { background: url(../arx/arrow-left.jpg) no-repeat left center; padding-left: 10px; }
-#bd .content .direction .next.disabled { background: url(../arx/arrow-right-deactive.jpg) no-repeat right center; }
-#bd .content .direction .previous.disabled { background: url(../arx/arrow-left-deactive.jpg) no-repeat left center; }
+#bd .content .direction .next { background: url(arx/arrow-right.jpg) no-repeat right center; padding-right: 10px; }
+#bd .content .direction .previous { background: url(arx/arrow-left.jpg) no-repeat left center; padding-left: 10px; }
+#bd .content .direction .next.disabled { background: url(arx/arrow-right-deactive.jpg) no-repeat right center; }
+#bd .content .direction .previous.disabled { background: url(arx/arrow-left-deactive.jpg) no-repeat left center; }
/* footer */
#ft { background: #F0F2F2; color: #8DA1A5; padding: 26px 0; }
app/views/home/index.html.erb
@@ -2,9 +2,6 @@
Welcome to the CakeSide
<% end %>
<% content_for :script do %>
- $('#s1').removeClass('hidden');
- $('#s1').addClass('slide');
- $('#s1').cycle({fx:'fade',speed:1500,timeout:4000});
<% end %>
<h1>Welcome to the CakeSide</h1>
@@ -15,7 +12,7 @@
<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 %>
+ <%= image_tag creation.image_url.to_s, :alt => creation.name %>
</a>
<p><%= creation.short_story %> <%= link_to 'more', creation %></p>
</div>
app/views/layouts/application.html.erb
@@ -20,7 +20,7 @@
<div id="hd">
<div class="container_12">
<div class="grid_12 top">
- <div class="logo"><img src="assets/arx/arc-resources-ltd.png" alt="arc-resources-ltd" width="205" height="38" /></div>
+ <div class="logo"><img src="/assets/cakeside-logo.png" alt="arc-resources-ltd" width="205" /></div>
</div>
<div class="clear"></div>
<div class="grid_3 push_9 search">
@@ -32,23 +32,31 @@
<div class="clear"></div>
<div class="info">
<div class="grid_3 dull">
- <strong style='font-family:"Julee", cursive;font-size: 2em;color:pink;'>Cakeside.com</strong>
+ <strong class="fright" style='font-family:"Julee", cursive;font-size: 1.5em;color:pink;'>yummy...</strong>
</div>
<div class="grid_3 arrow">
<% if user_signed_in? %>
<strong>Name:</strong> <%= link_to current_user.name, edit_user_registration_path %>
+ <% else %>
+
<% end %>
</div>
<div class="grid_3">
<% if user_signed_in? %>
<a href="<%= url_for my_creations_path %>"><strong>My Creations</strong></a>
+ <% else %>
+
<% end %>
</div>
<div class="grid_3">
<% if user_signed_in? %>
<strong><%= link_to "Sign Out", destroy_user_session_path %></strong>
<% else %>
- <strong><%= link_to "Sign Up", new_user_registration_path %> or <%= link_to "Sign In", new_user_session_path %></strong>
+ <strong>
+ <%= link_to "Sign Up", new_user_registration_path, :style => 'font-family:"Julee", cursive;font-size: 2em;color:pink;' %>
+ or
+ <%= link_to "Sign In", new_user_session_path, :style => 'font-family:"Julee", cursive;font-size: 2em;color:pink;' %>
+ </strong>
<% end %>
</div>
</div>
@@ -58,25 +66,21 @@
<div id="bd">
<div class="container_12">
<div class="grid_3 sidebar">
+ <% if user_signed_in? %>
<div class="summary">
<div class="shaddow"><img src="assets/arx/shaddow-left.png" /></div>
- <% if user_signed_in? %>
<%= image_tag avatar_url(current_user) + '&s=200', :class => ['photo', ''] %>
<p class="credits"><%= current_user.name %></p>
<p><span class="fright">0</span>Total Creations</p>
<p><span class="fright">0</span>Total Likes</p>
- <% else %>
- <p class="credits"><%= link_to "Sign Up", new_user_registration_path, :style => 'color:#fff;' %></p>
- <p>or <%= link_to "Sign In", new_user_session_path, :style => 'color:#fff;' %></p>
- <% end %>
</div><!-- /.summary -->
+ <% end %>
<div class="menu">
<ul class="level_1 nojot">
- <li class="level_1"><span class="fright"><img src="assets/arx/icon-check-green.png" /></span><%= link_to "Welcome", home_index_path %></li>
- <li class="level_1"><span class="fright"><img src="assets/arx/icon-check-green.png" /></span><%= link_to "Browse", creations_path %></li>
- <li class="level_1"><span class="fright"><img src="assets/arx/icon-check-green.png" /></span><%= link_to "Artists", all_profiles_path %></li>
- <li class="level_1"><span class="fright"><img src="assets/arx/icon-check-green.png" /></span>
- <a href="">Categories</a>
+ <li class="level_1"><%= link_to "Welcome", home_index_path %></li>
+ <li class="level_1"><%= link_to "Browse", creations_path %></li>
+ <li class="level_1"><%= link_to "Artists", all_profiles_path %></li>
+ <li class="level_1"><a href="">Categories</a>
<ul class="level_2 nojot">
<% Category.all.each do |category| %>
<li class="level_2"><a href='/categories/<%= category.slug %>'><%= category.name %></a></li>
@@ -99,7 +103,7 @@
<div class="grid_3">
<h3>Help</h3>
<p>support</p>
- <img src="assets/arx/icon-phone.png" /><span class="phone">1-800-cakeside</span>
+ <img src="/assets/arx/icon-phone.png" /><span class="phone">1-800-cakeside</span>
</div>
<div class="grid_9">
<h3>Quick Links</h3>