Commit 97806e5c
Changed files (2)
app
views
home
layouts
app/views/home/index.html.erb
@@ -1,37 +1,37 @@
<div class="welcomeHolder">
<div class="welcome">
- <img src="images/img01.jpg" alt="" />
- <h1>Welcome to CakeSide</h1>
+ <img src="/images/img01.jpg" alt="" />
+ <h1>Welcome to the CakeSide</h1>
<p><em>Introduce your company here. Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. </em></p>
- <p align="right"><input type="button" value="VIEW OUR PACKAGES" class="view" /></p>
+ <p align="right"><input type="button" value="MY CREATIONS" class="view" /></p>
<div class="clear"></div>
</div>
<div class="welcomeBottom"></div>
</div>
-<div class="heading">Why Organic?</div>
+<div class="heading">Mmm... Cake!</div>
<div class="organic">
<div class="organicHolder">
<div class="organicContent">
- <img src="images/img02.jpg" alt="" />
- <h2>Header One</h2>
+ <a href="#"><img src="/images/img02.jpg" alt="" /></a>
+ <h2>Birthday Day</h2>
<p>Organic fruit and vegetables Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco </p>
</div>
</div>
<div class="organicHolder">
<div class="organicContent">
- <img src="images/img03.jpg" alt="" />
- <h2>Header Two</h2>
+ <img src="/images/img03.jpg" alt="" />
+ <h2>Pound Cake</h2>
<p>Organic fruit and vegetables Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco </p>
</div>
</div>
<div class="organicHolder">
<div class="organicContent">
- <img src="images/img04.jpg" alt="" />
- <h2>Header Three</h2>
+ <img src="/images/img04.jpg" alt="" />
+ <h2>iPad Cake</h2>
<p>Organic fruit and vegetables Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim </p>
</div>
</div>
@@ -42,23 +42,23 @@
<div class="organic">
<div class="organicHolder">
<div class="organicContent">
- <img src="images/img05.jpg" alt="" />
- <h2>Header Four</h2>
+ <img src="/images/img05.jpg" alt="" />
+ <h2>Spiderman Cake</h2>
<p>Organic fruit and vegetables Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud.</p>
</div>
</div>
<div class="organicHolder">
<div class="organicContent">
- <img src="images/img06.jpg" alt="" />
- <h2>Header Five</h2>
+ <img src="/images/img06.jpg" alt="" />
+ <h2>My Little Pony Cake</h2>
<p>Organic fruit and vegetables Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim </p>
</div>
</div>
<div class="organicHolder">
<div class="vegetable">
- <h3>Learn About Our Organic Vegetables</h3>
+ <h3>Learn About Our Cakes</h3>
</div>
</div>
</div>
app/views/layouts/application.html.erb
@@ -14,16 +14,16 @@
</head>
<body>
- <div id="main" style="background-color: pink;"><!-- Main starts here -->
+ <div id="main"><!-- Main starts here -->
<header>
<div id="header"><!-- Header starts here -->
- <div class="searchBar" style="background-color: pink;">
+ <div class="searchBar">
<div class="search">
<div class="txt"><input type="text" /></div>
<div class="searchBt"><input type="button" value="search" /></div>
</div>
<% if user_signed_in? %>
- <%= current_user.email %>
+ welcome back <%= link_to current_user.email, edit_user_registration_path %>
<div class="signOut">
<%= link_to "sign out", destroy_user_session_path, :class => 'blah' %> </p>
</div>
@@ -35,20 +35,15 @@
<% end %>
</div>
- <div class="logo" style="background-color: pink;">
- <a href="#"><img src="images/logo.png" alt="" /></a>
- </div>
-
<div class="menu">
<ul id="menu">
- <li class="home"><a href="#">home</a></li>
- <li class="commit"><a href="#">our commitment</a></li>
- <li class="organic"><a href="#">organic vegetables</a></li>
+ <li class="home"><%= link_to "home", home_index_path %></li>
+ <li class="commit"><a href="#">creations</a></li>
<li class="contact"><a href="#">contact us</a></li>
</ul>
</div>
<div class="subs">
- <p>SUBCRIBE to RSS</p><img src="images/rss.png" alt="" />
+ <p>SUBCRIBE to RSS</p><img src="/images/rss.png" alt="" />
</div>
</div><!-- Header ends here -->
</header>
@@ -69,12 +64,12 @@
<div class="footerHolder">
<div class="footerLeft">
<p class="left">Address:</p>
- <p class="right">123 Street St<br /> Vancouver BC<br /> Canada</p>
+ <p class="right">123 Street St<br /> Calgary AB<br /> Canada</p>
</div>
<div class="footerRight">
<p class="left">Phone: <br /> Fax: <br />Email: <br /> Twitter:</p>
- <p class="right">1 800 600 0000 <br /> 1 800 600 0000 <br /> organic@organic.com <br /> @organics</p>
+ <p class="right">1 800 600 0000 <br /> 1 800 600 0000 <br /> cake@cakeside.com <br /> @cakeside</p>
</div>
<div class="clear"></div>
</div>
@@ -85,8 +80,8 @@
<div id="contentBottom"></div><!-- Content ends here -->
<div class="bottomHolder">
- <div class="copy">Copyright 2011 CakeSide</div>
- <div class="design"><a href="http://studio7designs.com">Design by STUDIO7DESIGNS</a></div>
+ <div class="copy">© 2011 CakeSide Inc.</div>
+ <div class="design"><a href="#">SuLuMo</a></div>
</div>
</div><!-- Main ends here -->