Permalink
Browse files

Last minute updates

Signed-off-by: Terence Huynh <terencehuynh@techgeek.com.au>
  • Loading branch information...
1 parent 07f7908 commit 2e0e326eb9a9c40ff843f89961dd0b2df7db080d @terencehuynh terencehuynh committed May 24, 2012
Showing with 325 additions and 166 deletions.
  1. +3 −1 about.cfm
  2. +22 −18 contact.cfm
  3. +50 −32 css/style.css
  4. +23 −35 fitness-tips.cfm
  5. +1 −1 footer.cfm
  6. +9 −7 header.cfm
  7. +0 −3 img/_notes/dwsync.xml
  8. BIN img/fitness-tips/dumbells.jpg
  9. BIN img/fitness-tips/salad.jpg
  10. BIN img/fitness-tips/treadmill-room.jpg
  11. BIN img/fitness-tips/woman-workout.jpg
  12. BIN img/homepage/clothing-clearance.jpg
  13. BIN img/homepage/need-shoes.jpg
  14. BIN img/homepage/new-bike.jpg
  15. BIN img/homepage/slider-basketball.jpg
  16. BIN img/homepage/slider-treadmill.jpg
  17. BIN img/homepage/slider-washer.jpg
  18. BIN img/products/full/ax12.jpg
  19. BIN img/products/full/az52.jpg
  20. BIN img/products/full/ba74.jpg
  21. BIN img/products/full/bh22.jpg
  22. BIN img/products/full/bt04.jpg
  23. BIN img/products/full/bz66.jpg
  24. BIN img/products/full/ca14.jpg
  25. BIN img/products/full/cb03.jpg
  26. BIN img/products/full/cx11.jpg
  27. BIN img/products/full/cz81.jpg
  28. BIN img/products/thumbnails/ax12.JPG
  29. BIN img/products/thumbnails/az52.JPG
  30. BIN img/products/thumbnails/ba74.JPG
  31. BIN img/products/thumbnails/bh22.JPG
  32. BIN img/products/thumbnails/bt04.JPG
  33. BIN img/products/thumbnails/bz66.JPG
  34. BIN img/products/thumbnails/ca14.JPG
  35. BIN img/products/thumbnails/cb03.JPG
  36. BIN img/products/thumbnails/cx11.JPG
  37. BIN img/products/thumbnails/cz81.JPG
  38. BIN img/search-button-hover.png
  39. BIN img/search-button-nohover.png
  40. BIN img/search-sprite.png
  41. BIN img/search-text.png
  42. BIN img/the-melbourne-store.jpg
  43. +16 −11 index.cfm
  44. +43 −16 productPage.cfm
  45. +12 −10 products.cfm
  46. +34 −9 readme.html
  47. +1 −1 txt/fitness-tips/basic-exercise.txt
  48. +30 −0 txt/fitness-tips/dumbells.txt
  49. +30 −0 txt/fitness-tips/healthy-eating.txt
  50. +30 −0 txt/fitness-tips/plan-a-workout.txt
  51. +1 −1 txt/products/ax12.txt
  52. +1 −2 txt/products/az52.txt
  53. +1 −1 txt/products/bh22.txt
  54. +1 −1 txt/products/bt04.txt
  55. +1 −1 txt/products/bz66.txt
  56. +1 −1 txt/products/ca14.txt
  57. +1 −1 txt/products/cb03.txt
  58. +1 −1 txt/products/cx11.txt
  59. +1 −1 txt/products/cz81.txt
  60. +12 −12 txt/slider.txt
View
@@ -1,4 +1,6 @@
<!--- Header --->
+<cfset pageTitle="About Us" />
+<cfset bodyClass="about" />
<cfinclude template="header.cfm" />
<!--- Page contents can go here --->
@@ -16,7 +18,7 @@
<div id="about-column">
-<img class="about-sidepush" src="http://placehold.it/360x220/" alt="Placeholder" />
+<img class="about-sidepush" src="img/the-melbourne-store.jpg" width="360" height="220" alt="Image of outside our Melbourne Store" />
<p class="first">Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Vestibulum tortor quam, feugiat vitae, ultricies eget, tempor sit amet, ante. Donec eu libero sit amet quam egestas semper. Aenean ultricies mi vitae est. Mauris placerat eleifend leo.</p>
View
@@ -1,23 +1,22 @@
-<!--- Header --->
+<!--- Call Mail Script --->
<cfif IsDefined("Form.contactName")>
- <cfmail
- from="#Form.contactEmail#"
- to="pkra4@student.monash.edu"
- subject="#Form.contactSubject#">
-
- #Form.contactName# says: #Form.contactMessage#, contact phone is #Form.contactPhone#
-
- </cfmail>
+ <cfmail server="smtp.monash.edu" from="#Form.contactEmail#" to="pkra4@student.monash.edu" subject="#Form.contactSubject#">
+ #Form.contactName# says: #Form.contactMessage#, contact phone is #Form.contactPhone#
+ </cfmail>
</cfif>
+
+<!--- Header --->
+<cfset pageTitle="Contact Us" />
+<cfset bodyClass="contact" />
<cfinclude template="header.cfm" />
<!--- Page contents can go here --->
<div id="breadcrumbs">
- <p>Breadcrumbs</p>
- <ul>
- <li><a href="index.cfm">Fitness Movement</a></li>
- <li><a href="contact.cfm">Contact</a></li>
- </ul>
+ <p>Breadcrumbs</p>
+ <ul>
+ <li><a href="index.cfm">Fitness Movement</a></li>
+ <li><a href="contact.cfm">Contact</a></li>
+ </ul>
</div>
<h2 id="page-title">Contact Us</h2>
@@ -41,18 +40,19 @@
<dd>
123 Fake Street, <br />
Melbourne, <br />
- <abbr name="Victoria">VIC</abbr>, 3000
+ <abbr title="Victoria">VIC</abbr>, 3000
</dd>
<dt>Sydney Office</dt>
<dd>
Lv 12, 1 George Street, <br />
Sydney, <br />
- <abbr name="New South Wales">NSW</abbr>, 2000
+ <abbr title="New South Wales">NSW</abbr>, 2000
</dd>
</dl>
</div>
<div id="contact-form">
+ <cfif !IsDefined("Form.contactName")>
<h3>Send us an Email</h3>
<form action="" method="post" onsubmit="validateContactForm(this); return false;">
<p id="requiredAlert" class="note">All fields are required to be filled.</p>
@@ -71,7 +71,7 @@
<p>
<label for="contactSubject">Subject</label>
<select name="contactSubject" id="contactSubject">
- <option value="" selected="">Please select one...</option>
+ <option value="" selected="selected">Please select one...</option>
<option value="Product Enquiry">Product Enquiry</option>
<option value="Sales Support">Sales Support</option>
<option value="Website Feedback">Website Feedback</option>
@@ -81,13 +81,17 @@
</p>
<p>
<label for="contactMessage">Enquiry Description</label>
- <textarea name="contactMessage" id="contactMessage"></textarea>
+ <textarea name="contactMessage" id="contactMessage" cols="300" rows="300"></textarea>
</p>
<p>
<button id="sendEmail" type="submit">Send Message</button>
<button id="resetForm" type="reset">Reset Form</button>
</p>
</form>
+ <cfelse>
+ <h3>Thanks!</h3>
+ <p class="message">We will be in touch with you soon.</p>
+ </cfif>
</div>
</div>
View
@@ -35,6 +35,12 @@ body {
text-indent: -999em;
}
+#header h1 a {
+ display: block;
+ width: 185px;
+ height: 46px;
+}
+
#footer {
padding: 25px 0 55px;
border-top: 6px solid #dfdfdf;
@@ -66,7 +72,7 @@ body {
#header form#search-form input[type=text] {
height: 24px;
width: 124px;
- background: url(../img/search-text.png) top left no-repeat;
+ background: url(../img/search-sprite.png) 0 0 no-repeat;
font-size: 12px;
color: #6C6C6C;
border: 0;
@@ -75,14 +81,18 @@ body {
}
#header form#search-form button {
- background: url(../img/search-button-nohover.png) top left no-repeat;
+ background: url(../img/search-sprite.png) 0 -32px no-repeat;
height: 32px;
width: 32px;
text-indent: -999em;
border: 0;
float: right;
}
+#header form#search-form button:hover {
+ background: url(../img/search-sprite.png) 0 -64px no-repeat;
+}
+
/* Navigation */
#navigation {
@@ -112,9 +122,15 @@ body {
text-decoration: none;
}
-#navigation ul#mainNav li a:hover,
-#navigation ul#mainNav li.selected a {
- background-color: #ae0c0c;
+#navigation ul#mainNav li a:hover {
+ background-color: #dd1010;
+}
+
+body.products #navigation ul#mainNav li.products a,
+body.fitness #navigation ul#mainNav li.fitness a,
+body.about #navigation ul#mainNav li.about a,
+body.contact #navigation ul#mainNav li.contact a {
+ background-color: #b00c0c;
}
/*
@@ -126,12 +142,12 @@ HOMEPAGE
/* Columns */
.threeCol {
overflow: hidden;
- margin-top: 25px;
+ margin-top: 30px;
+ margin-bottom: 5px;
}
#featured.threeCol {
- border-bottom: 1px solid #dfdfdf;
- padding-bottom: 30px;
+ margin-bottom: 40px;
}
.threeCol .col {
@@ -146,32 +162,22 @@ HOMEPAGE
.threeCol .col h3 {
font-size: 24px;
- margin-bottom: 12px;
+ padding-bottom: 12px;
color: black;
font-weight: bold;
letter-spacing: -1px;
+ border-bottom: 3px solid black;
}
.threeCol .col ul li {
margin-bottom: 12px;
+ padding-top: 12px;
+ border-top: 1px solid #dadada;
overflow: hidden;
}
-.threeCol .col ul li img {
- float: left;
- margin-right: 12px;
-}
-
-.threeCol .col ul li p.productName {
- font-size: 16px;
- font-weight: bold;
- margin-top: 12px;
- margin-bottom: 12px;
-}
-
-.threeCol .col ul li p.productPrice {
- font-size: 13px;
- color: #969696;
+.threeCol .col ul li:first-child {
+ border-top: none;
}
/* Slider */
@@ -321,7 +327,8 @@ ABOUT AND CONTACT PAGE
}
#about-column p,
-#contact-details p {
+#contact-details p,
+#contact-form p.message {
font-size: 14px;
line-height: 28px;
color: #333333;
@@ -575,7 +582,7 @@ PRODUCTS PAGE
background-color: #EFEFEF;
}
-/* Results */
+/* Results and Three-Col Results on Home Page */
#products-results {
float: right;
@@ -604,26 +611,36 @@ ul#productList li {
margin-bottom: 20px;
}
-ul#productList li img {
+ul#productList li img,
+.threeCol .col ul li img {
float: left;
margin: 0 24px 0 0;
}
-ul#productList li p.productName {
+ul#productList li p.productName,
+.threeCol .col ul li p.productName {
font-size: 18px;
font-weight: bold;
margin: 8px 0 4px;
letter-spacing: -1px;
color: black;
}
-ul#productList li p.productCode {
+ul#productList li p.productName a,
+.threeCol .col ul li p.productName a {
+ color: black;
+ text-decoration: none;
+}
+
+ul#productList li p.productCode,
+.threeCol .col ul li p.productCode {
font-size: 12px;
text-transform: uppercase;
color: #ABABAB;
-}
+}
-ul#productList li p.productPrice {
+ul#productList li p.productPrice,
+.threeCol .col ul li p.productPrice {
font-size: 21px;
margin-top: 16px;
color: #818181;
@@ -849,7 +866,7 @@ FITNESS TIPS
background: white;
position: relative;
z-index: 2;
- margin-top: 240px;
+ margin-top: 300px;
}
#fitness-article .article-header .article-title-overlay span {
@@ -866,6 +883,7 @@ FITNESS TIPS
color: black;
font-weight: bold;
letter-spacing: -2px;
+ line-height: 56px;
}
#fitness-article .article-content {
View
@@ -1,4 +1,13 @@
+<!--- Get Article --->
+<cfif isDefined("url.p")>
+ <cffile action="read" file="#GetDirectoryFromPath( GetCurrentTemplatePath() )#txt/fitness-tips/#url.p#.txt" variable="articleContent" />
+<cfelse>
+ <cffile action="read" file="#GetDirectoryFromPath( GetCurrentTemplatePath() )#txt/fitness-tips/basic-exercise.txt" variable="articleContent" />
+</cfif>
+
<!--- Header --->
+<cfset pageTitle="Fitness Tips" />
+<cfset bodyClass="fitness" />
<cfinclude template="header.cfm" />
<!--- Page contents can go here --->
@@ -7,64 +16,43 @@
<ul>
<li><a href="index.cfm">Fitness Movement</a></li>
<li><a href="fitness-tips.cfm">Fitness Tips</a></li>
- <li><a href="fitness-tips.cfm?article=tip-001">Exercise Basics</a></li>
+ <cfoutput>
+ <cfif isDefined("url.p")>
+ <li><a href="fitness-tips.cfm?p=#url.p#">Article</a></li>
+ <cfelse>
+ <li><a href="fitness-tips.cfm">Article</a></li>
+ </cfif>
+ </cfoutput>
</ul>
</div>
<!-- It is span here because we want h2 to be the product title not the section -->
<div id="page-wrap">
+ <cfoutput>
<div id="fitness-article">
- <div class="article-header">
- <div class="article-image">
- <img src="http://placehold.it/700x330/" alt="Placeholder" />
- </div>
- <div class="article-title-overlay">
- <span class="section-title">Fitness Tips &raquo;</span>
- <h2 class="article-title">Exercise Basics</h2>
- </div>
- </div>
- <div class="article-content">
- <p>Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Vestibulum tortor quam, feugiat vitae, ultricies eget, tempor sit amet, ante. Donec eu libero sit amet quam egestas semper. Aenean ultricies mi vitae est. Mauris placerat eleifend leo. Quisque sit amet est et sapien ullamcorper pharetra. Vestibulum erat wisi, condimentum sed, commodo vitae, ornare sit amet, wisi. Aenean fermentum, elit eget tincidunt condimentum, eros ipsum rutrum orci, sagittis tempus lacus enim ac dui. Donec non enim in turpis pulvinar facilisis. Ut felis. Praesent dapibus, neque id cursus faucibus, tortor neque egestas augue, eu vulputate magna eros eu erat. Aliquam erat volutpat. Nam dui mi, tincidunt quis, accumsan porttitor, facilisis luctus, metus</p>
- <p>Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Vestibulum tortor quam, feugiat vitae, ultricies eget, tempor sit amet, ante. Donec eu libero sit amet quam egestas semper. Aenean ultricies mi vitae est. Mauris placerat eleifend leo. Quisque sit amet est et sapien ullamcorper pharetra. Vestibulum erat wisi, condimentum sed, commodo vitae, ornare sit amet, wisi. Aenean fermentum, elit eget tincidunt condimentum, eros ipsum rutrum orci, sagittis tempus lacus enim ac dui. Donec non enim in turpis pulvinar facilisis. Ut felis. Praesent dapibus, neque id cursus faucibus, tortor neque egestas augue, eu vulputate magna eros eu erat. Aliquam erat volutpat. Nam dui mi, tincidunt quis, accumsan porttitor, facilisis luctus, metus</p>
- <p>Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Vestibulum tortor quam, feugiat vitae, ultricies eget, tempor sit amet, ante. Donec eu libero sit amet quam egestas semper. Aenean ultricies mi vitae est. Mauris placerat eleifend leo. Quisque sit amet est et sapien ullamcorper pharetra. Vestibulum erat wisi, condimentum sed, commodo vitae, ornare sit amet, wisi. Aenean fermentum, elit eget tincidunt condimentum, eros ipsum rutrum orci, sagittis tempus lacus enim ac dui. Donec non enim in turpis pulvinar facilisis. Ut felis. Praesent dapibus, neque id cursus faucibus, tortor neque egestas augue, eu vulputate magna eros eu erat. Aliquam erat volutpat. Nam dui mi, tincidunt quis, accumsan porttitor, facilisis luctus, metus</p>
- <p>Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Vestibulum tortor quam, feugiat vitae, ultricies eget, tempor sit amet, ante. Donec eu libero sit amet quam egestas semper. Aenean ultricies mi vitae est. Mauris placerat eleifend leo. Quisque sit amet est et sapien ullamcorper pharetra. Vestibulum erat wisi, condimentum sed, commodo vitae, ornare sit amet, wisi. Aenean fermentum, elit eget tincidunt condimentum, eros ipsum rutrum orci, sagittis tempus lacus enim ac dui. Donec non enim in turpis pulvinar facilisis. Ut felis. Praesent dapibus, neque id cursus faucibus, tortor neque egestas augue, eu vulputate magna eros eu erat. Aliquam erat volutpat. Nam dui mi, tincidunt quis, accumsan porttitor, facilisis luctus, metus</p>
- <p>Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Vestibulum tortor quam, feugiat vitae, ultricies eget, tempor sit amet, ante. Donec eu libero sit amet quam egestas semper. Aenean ultricies mi vitae est. Mauris placerat eleifend leo. Quisque sit amet est et sapien ullamcorper pharetra. Vestibulum erat wisi, condimentum sed, commodo vitae, ornare sit amet, wisi. Aenean fermentum, elit eget tincidunt condimentum, eros ipsum rutrum orci, sagittis tempus lacus enim ac dui. Donec non enim in turpis pulvinar facilisis. Ut felis. Praesent dapibus, neque id cursus faucibus, tortor neque egestas augue, eu vulputate magna eros eu erat. Aliquam erat volutpat. Nam dui mi, tincidunt quis, accumsan porttitor, facilisis luctus, metus</p>
- <p>Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Vestibulum tortor quam, feugiat vitae, ultricies eget, tempor sit amet, ante. Donec eu libero sit amet quam egestas semper. Aenean ultricies mi vitae est. Mauris placerat eleifend leo. Quisque sit amet est et sapien ullamcorper pharetra. Vestibulum erat wisi, condimentum sed, commodo vitae, ornare sit amet, wisi. Aenean fermentum, elit eget tincidunt condimentum, eros ipsum rutrum orci, sagittis tempus lacus enim ac dui. Donec non enim in turpis pulvinar facilisis. Ut felis. Praesent dapibus, neque id cursus faucibus, tortor neque egestas augue, eu vulputate magna eros eu erat. Aliquam erat volutpat. Nam dui mi, tincidunt quis, accumsan porttitor, facilisis luctus, metus</p>
- </div>
- <div class="article-metadata">
- <h3>Article Metadata</h3>
- <ul>
- <li class="article-date">
- <span class="metadata-title">Date:</span>
- 12 May 2012
- </li>
- <li class="article-author">
- <span class="metadata-title">Author:</span>
- John Smith
- </li>
- </ul>
- </div>
+ #articleContent#
</div>
+ </cfoutput>
<div id="fitness-article-archives">
<h4>More Fitness Tips</h4>
<ul>
<li>
- <p class="title"><a href="#">Exercise Basics</a></p>
+ <p class="title"><a href="fitness-tips.cfm?p=basic-exercise">Exercise Basics</a></p>
<p class="date">12/05/2012</p>
</li>
<li>
- <p class="title"><a href="#">Using Dumbells Effectively</a></p>
+ <p class="title"><a href="fitness-tips.cfm?p=dumbells">Using Dumbells Effectively</a></p>
<p class="date">11/05/2012</p>
</li>
<li>
- <p class="title"><a href="#">How to Plan A Workout</a></p>
+ <p class="title"><a href="fitness-tips.cfm?p=plan-a-workout">How to Plan A Workout</a></p>
<p class="date">10/05/2012</p>
</li>
<li>
- <p class="title"><a href="#">Healthy Eating</a></p>
+ <p class="title"><a href="fitness-tips.cfm?p=healthy-eating">Healthy Eating</a></p>
<p class="date">09/05/2012</p>
</li>
</ul>
View
@@ -13,7 +13,7 @@
<div id="footer">
<p>&copy; 2012 Premier Products, LLC. All Rights Reserved.</p>
-<p>Designed by xxx and xxx</p>
+<p>Designed by Terence Huynh and Pinchas Krakovich</p>
</div>
</body>
Oops, something went wrong.

0 comments on commit 2e0e326

Please sign in to comment.