Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Adding the purchased iStockphoto images

Need to complete this asap...
  • Loading branch information...
commit 57cf9e2915bcffca1603587ee2891c5b0b7a76ff 1 parent 69c6ee0
@duncanssmith authored
View
8 body.php
@@ -67,7 +67,7 @@
<!--<li> -->
<!--<a href="?pageid=1.6">Weight Loss &rarr;</a>-->
<!--</li> -->
- <!--</ul> -->
+ <!--</ul> -->
</div>
<div id="right_sidebar">
<?php
@@ -76,8 +76,8 @@
include "debug_printout.php";
}
?>
- </div>
- <div id="ribbon">
+ </div>
+ <div id="ribbon">
<ul class="ribbon_sub group">
<li class="ribbon_sub_left">
<a href="index.php?pageid=1"><img src="img/blank_your_health.png" alt="Your Health" width="240" height="120" /></a>
@@ -88,7 +88,7 @@
<li class="ribbon_sub_right">
<a href="index.php?pageid=1.5"><img src="<?php echo "img/blank_weight_loss.png";?>" alt="Weight Loss" width="240" height="120" /></a>
</li>
- </ul>
+ </ul>
</div>
View
6 css/main.css
@@ -621,12 +621,16 @@ body.wide h1 #pagetitle {
float: left;
background: white;
background: rgba(255, 255, 255, 0.05);
- width: 240px;
+ width: 340px;
padding: 15px 10px 10px 10px;
margin: 0 120px 0 0;
display: inline; }
#right_sidebar h3 {
margin: 0; }
+ #right_sidebar #main_image {
+ width: 400px;
+ background: rgba(250, 250, 250, 0.8);
+ border: 1px solid black; }
#ribbon {
clear: left; }
View
124 css/sass/colors.sass
@@ -1,48 +1,6 @@
/*--------------------------------------------------------------
* colors.sass => colors.css
*--------------------------------------------------------------
-$footbox_center_background_color_IE: #373737
-$footbox_center_background_color: rgba(55, 55, 55, 0.90)
-
-$navigation_border_color_IE: #41cda0
-$navigation_border_color: rgba(65, 205, 160, 0.70)
-
-$left_sidebar_list_background_hover_color_IE: #41cda0
-$left_sidebar_list_background_hover_color: rgba(65, 205, 160, 0.90)
-
-$footbox_left_color_IE: #373737
-$footbox_left_color: rgba(55, 55, 55, 0.90)
-
-$content_sub_link_background_hover_color_IE: #fafafa
-$content_sub_link_background_hover_color: rgba(250, 250, 250, 0.80)
-
-$footer_box_center_background_color_IE: #373737
-$footer_box_center_background_color: rgba(55, 55, 55, 1.00)
-
-$navigation_link_text_color_IE: #ffffff
-$navigation_link_text_color: rgba(255, 255, 255, 0.90)
-
-$left_sidebar_link_text_hover_color_IE: #373737
-$left_sidebar_link_text_hover_color: rgba(55, 55, 55, 0.90)
-
-$ribbon_sub_center_left_background_color_IE: #fafafa
-$ribbon_sub_center_left_background_color: rgba(250, 250, 250, 0.80)
-
-$content_pagetitle_hover_color_IE: #c3a5a5
-$content_pagetitle_hover_color: rgba(195, 165, 165, 0.90)
-
-$content_sub_background_color_IE: #fafafa
-$content_sub_background_color: rgba(250, 250, 250, 0.80)
-
-$ribbon_sub_link_background_color_IE: #fafafa
-$ribbon_sub_link_background_color: rgba(250, 250, 250, 0.80)
-
-$right_sidebar_background_color_IE: #ffffff
-$right_sidebar_background_color: rgba(255, 255, 255, 0.05)
-
-$content_sub_center_left_background_color_IE: #fafafa
-$content_sub_center_left_background_color: rgba(250, 250, 250, 0.80)
-
$footbox_center_color_IE: #373737
$footbox_center_color: rgba(55, 55, 55, 0.90)
@@ -61,9 +19,6 @@ $content_sub_link_hover_color: rgba(250, 250, 250, 0.80)
$content_container1_background_color_IE: #ffffff
$content_container1_background_color: rgba(255, 255, 255, 0.90)
-$content_pagetitle_color_IE: #dcb4b4
-$content_pagetitle_color: rgba(220, 180, 180, 0.90)
-
$left_sidebar_link_background_hover_color_IE: #c8e65a
$left_sidebar_link_background_hover_color: rgba(200, 230, 90, 1.00)
@@ -73,11 +28,8 @@ $footer_link_text_hover_color: rgba(255, 255, 255, 1.00)
$ribbon_sub_left_background_color_IE: #fafafa
$ribbon_sub_left_background_color: rgba(250, 250, 250, 0.80)
-$contact_number_bg_color_IE: #ffffff
-$contact_number_bg_color: rgba(255, 255, 255, 0.01)
-
-$content_sub_center_background_color_IE: #fafafa
-$content_sub_center_background_color: rgba(250, 250, 250, 0.80)
+$content_pagetitle_color_IE: #dcb4b4
+$content_pagetitle_color: rgba(220, 180, 180, 0.90)
$listlineoddcolor_IE: #dcfff0
$listlineoddcolor: rgba(220, 255, 240, 0.80)
@@ -85,8 +37,11 @@ $listlineoddcolor: rgba(220, 255, 240, 0.80)
$ribbon_sub_link_hover_color_IE: #fafafa
$ribbon_sub_link_hover_color: rgba(250, 250, 250, 0.80)
-$left_sidebar_list_text_hover_color_IE: #ffffff
-$left_sidebar_list_text_hover_color: rgba(255, 255, 255, 1.00)
+$contact_number_bg_color_IE: #ffffff
+$contact_number_bg_color: rgba(255, 255, 255, 0.01)
+
+$content_sub_center_background_color_IE: #fafafa
+$content_sub_center_background_color: rgba(250, 250, 250, 0.80)
$footbox_right_background_color_IE: #373737
$footbox_right_background_color: rgba(55, 55, 55, 0.90)
@@ -94,6 +49,9 @@ $footbox_right_background_color: rgba(55, 55, 55, 0.90)
$pcolor_IE: #1e1e1e
$pcolor: rgba(30, 30, 30, 0.80)
+$left_sidebar_list_text_hover_color_IE: #ffffff
+$left_sidebar_list_text_hover_color: rgba(255, 255, 255, 1.00)
+
$footboxes_color_IE: #373737
$footboxes_color: rgba(55, 55, 55, 0.90)
@@ -139,20 +97,14 @@ $container_background_color: rgba(255, 255, 255, 0.90)
$ribbon_sub_center_right_background_color_IE: #fafafa
$ribbon_sub_center_right_background_color: rgba(250, 250, 250, 0.80)
-$listlineevencolor_IE: #f0ffdc
-$listlineevencolor: rgba(240, 255, 220, 0.60)
-
$footer_background_color_IE: #373737
$footer_background_color: rgba(55, 55, 55, 1.00)
$content_sub_link_color_IE: #fafafa
$content_sub_link_color: rgba(250, 250, 250, 0.80)
-$footer_box_left_background_color_IE: #373737
-$footer_box_left_background_color: rgba(55, 55, 55, 1.00)
-
-$ribbon_sub_background_color_IE: #fafafa
-$ribbon_sub_background_color: rgba(250, 250, 250, 0.80)
+$listlineevencolor_IE: #f0ffdc
+$listlineevencolor: rgba(240, 255, 220, 0.60)
$header_background_color_IE: #41cda0
$header_background_color: rgba(65, 205, 160, 1.00)
@@ -160,8 +112,11 @@ $header_background_color: rgba(65, 205, 160, 1.00)
$content_container2_background_color_IE: #ffffff
$content_container2_background_color: rgba(255, 255, 255, 0.09)
-$base_color_IE: #ffffff
-$base_color: rgba(255, 255, 255, 0.90)
+$footer_box_left_background_color_IE: #373737
+$footer_box_left_background_color: rgba(55, 55, 55, 1.00)
+
+$ribbon_sub_background_color_IE: #fafafa
+$ribbon_sub_background_color: rgba(250, 250, 250, 0.80)
$navigation_background_hover_color_IE: #28af82
$navigation_background_hover_color: rgba(40, 175, 130, 1.00)
@@ -169,6 +124,9 @@ $navigation_background_hover_color: rgba(40, 175, 130, 1.00)
$left_sidebar_link_text_color_IE: #287832
$left_sidebar_link_text_color: rgba(40, 120, 50, 0.90)
+$base_color_IE: #ffffff
+$base_color: rgba(255, 255, 255, 0.90)
+
$left_sidebar_link_background_color_IE: #373737
$left_sidebar_link_background_color: rgba(55, 55, 55, 0.95)
@@ -202,3 +160,45 @@ $left_sidebar_background_color: rgba(255, 255, 255, 0.90)
$content_sub_center_right_background_color_IE: #fafafa
$content_sub_center_right_background_color: rgba(250, 250, 250, 0.80)
+$navigation_border_color_IE: #41cda0
+$navigation_border_color: rgba(65, 205, 160, 0.70)
+
+$left_sidebar_list_background_hover_color_IE: #41cda0
+$left_sidebar_list_background_hover_color: rgba(65, 205, 160, 0.90)
+
+$footbox_center_background_color_IE: #373737
+$footbox_center_background_color: rgba(55, 55, 55, 0.90)
+
+$footer_box_center_background_color_IE: #373737
+$footer_box_center_background_color: rgba(55, 55, 55, 1.00)
+
+$footbox_left_color_IE: #373737
+$footbox_left_color: rgba(55, 55, 55, 0.90)
+
+$content_sub_link_background_hover_color_IE: #fafafa
+$content_sub_link_background_hover_color: rgba(250, 250, 250, 0.80)
+
+$left_sidebar_link_text_hover_color_IE: #373737
+$left_sidebar_link_text_hover_color: rgba(55, 55, 55, 0.90)
+
+$ribbon_sub_center_left_background_color_IE: #fafafa
+$ribbon_sub_center_left_background_color: rgba(250, 250, 250, 0.80)
+
+$content_pagetitle_hover_color_IE: #c3a5a5
+$content_pagetitle_hover_color: rgba(195, 165, 165, 0.90)
+
+$navigation_link_text_color_IE: #ffffff
+$navigation_link_text_color: rgba(255, 255, 255, 0.90)
+
+$content_sub_background_color_IE: #fafafa
+$content_sub_background_color: rgba(250, 250, 250, 0.80)
+
+$ribbon_sub_link_background_color_IE: #fafafa
+$ribbon_sub_link_background_color: rgba(250, 250, 250, 0.80)
+
+$right_sidebar_background_color_IE: #ffffff
+$right_sidebar_background_color: rgba(255, 255, 255, 0.05)
+
+$content_sub_center_left_background_color_IE: #fafafa
+$content_sub_center_left_background_color: rgba(250, 250, 250, 0.80)
+
View
214 css/sass/colors_bak.yaml
@@ -1,74 +1,4 @@
---
-:footbox_center_background_color:
- :r: 55
- :g: 55
- :b: 55
- :a: 0.9
-:navigation_border_color:
- :r: 65
- :g: 205
- :b: 160
- :a: 0.7
-:left_sidebar_list_background_hover_color:
- :r: 65
- :g: 205
- :b: 160
- :a: 0.9
-:footbox_left_color:
- :r: 55
- :g: 55
- :b: 55
- :a: 0.9
-:content_sub_link_background_hover_color:
- :r: 250
- :g: 250
- :b: 250
- :a: 0.8
-:footer_box_center_background_color:
- :r: 55
- :g: 55
- :b: 55
- :a: 1
-:navigation_link_text_color:
- :r: 255
- :g: 255
- :b: 255
- :a: 0.9
-:left_sidebar_link_text_hover_color:
- :r: 55
- :g: 55
- :b: 55
- :a: 0.9
-:ribbon_sub_center_left_background_color:
- :r: 250
- :g: 250
- :b: 250
- :a: 0.8
-:content_pagetitle_hover_color:
- :r: 195
- :g: 165
- :b: 165
- :a: 0.9
-:content_sub_background_color:
- :r: 250
- :g: 250
- :b: 250
- :a: 0.8
-:ribbon_sub_link_background_color:
- :r: 250
- :g: 250
- :b: 250
- :a: 0.8
-:right_sidebar_background_color:
- :r: 255
- :g: 255
- :b: 255
- :a: 0.05
-:content_sub_center_left_background_color:
- :r: 250
- :g: 250
- :b: 250
- :a: 0.8
:footbox_center_color:
:r: 55
:g: 55
@@ -99,11 +29,6 @@
:g: 255
:b: 255
:a: 0.9
-:content_pagetitle_color:
- :r: 220
- :g: 180
- :b: 180
- :a: 0.9
:left_sidebar_link_background_hover_color:
:r: 200
:g: 230
@@ -119,16 +44,11 @@
:g: 250
:b: 250
:a: 0.8
-:contact_number_bg_color:
- :r: 255
- :g: 255
- :b: 255
- :a: 0.01
-:content_sub_center_background_color:
- :r: 250
- :g: 250
- :b: 250
- :a: 0.8
+:content_pagetitle_color:
+ :r: 220
+ :g: 180
+ :b: 180
+ :a: 0.9
:listlineoddcolor:
:r: 220
:g: 255
@@ -139,11 +59,16 @@
:g: 250
:b: 250
:a: 0.8
-:left_sidebar_list_text_hover_color:
+:contact_number_bg_color:
:r: 255
:g: 255
:b: 255
- :a: 1
+ :a: 0.01
+:content_sub_center_background_color:
+ :r: 250
+ :g: 250
+ :b: 250
+ :a: 0.8
:footbox_right_background_color:
:r: 55
:g: 55
@@ -154,6 +79,11 @@
:g: 30
:b: 30
:a: 0.8
+:left_sidebar_list_text_hover_color:
+ :r: 255
+ :g: 255
+ :b: 255
+ :a: 1
:footboxes_color:
:r: 55
:g: 55
@@ -229,11 +159,6 @@
:g: 250
:b: 250
:a: 0.8
-:listlineevencolor:
- :r: 240
- :g: 255
- :b: 220
- :a: 0.6
:footer_background_color:
:r: 55
:g: 55
@@ -244,16 +169,11 @@
:g: 250
:b: 250
:a: 0.8
-:footer_box_left_background_color:
- :r: 55
- :g: 55
- :b: 55
- :a: 1
-:ribbon_sub_background_color:
- :r: 250
- :g: 250
- :b: 250
- :a: 0.8
+:listlineevencolor:
+ :r: 240
+ :g: 255
+ :b: 220
+ :a: 0.6
:header_background_color:
:r: 65
:g: 205
@@ -264,11 +184,16 @@
:g: 255
:b: 255
:a: 0.09
-:base_color:
- :r: 255
- :g: 255
- :b: 255
- :a: 0.9
+:footer_box_left_background_color:
+ :r: 55
+ :g: 55
+ :b: 55
+ :a: 1
+:ribbon_sub_background_color:
+ :r: 250
+ :g: 250
+ :b: 250
+ :a: 0.8
:navigation_background_hover_color:
:r: 40
:g: 175
@@ -279,6 +204,11 @@
:g: 120
:b: 50
:a: 0.9
+:base_color:
+ :r: 255
+ :g: 255
+ :b: 255
+ :a: 0.9
:left_sidebar_link_background_color:
:r: 55
:g: 55
@@ -334,3 +264,73 @@
:g: 250
:b: 250
:a: 0.8
+:navigation_border_color:
+ :r: 65
+ :g: 205
+ :b: 160
+ :a: 0.7
+:left_sidebar_list_background_hover_color:
+ :r: 65
+ :g: 205
+ :b: 160
+ :a: 0.9
+:footbox_center_background_color:
+ :r: 55
+ :g: 55
+ :b: 55
+ :a: 0.9
+:footer_box_center_background_color:
+ :r: 55
+ :g: 55
+ :b: 55
+ :a: 1
+:footbox_left_color:
+ :r: 55
+ :g: 55
+ :b: 55
+ :a: 0.9
+:content_sub_link_background_hover_color:
+ :r: 250
+ :g: 250
+ :b: 250
+ :a: 0.8
+:left_sidebar_link_text_hover_color:
+ :r: 55
+ :g: 55
+ :b: 55
+ :a: 0.9
+:ribbon_sub_center_left_background_color:
+ :r: 250
+ :g: 250
+ :b: 250
+ :a: 0.8
+:content_pagetitle_hover_color:
+ :r: 195
+ :g: 165
+ :b: 165
+ :a: 0.9
+:navigation_link_text_color:
+ :r: 255
+ :g: 255
+ :b: 255
+ :a: 0.9
+:content_sub_background_color:
+ :r: 250
+ :g: 250
+ :b: 250
+ :a: 0.8
+:ribbon_sub_link_background_color:
+ :r: 250
+ :g: 250
+ :b: 250
+ :a: 0.8
+:right_sidebar_background_color:
+ :r: 255
+ :g: 255
+ :b: 255
+ :a: 0.05
+:content_sub_center_left_background_color:
+ :r: 250
+ :g: 250
+ :b: 250
+ :a: 0.8
View
6 css/sass/structure_fixed.sass
@@ -259,12 +259,16 @@ body.wide
float: left
background: $right_sidebar_background_color_IE
background: $right_sidebar_background_color
- width: 240px
+ width: 340px
padding: 15px 10px 10px 10px
margin: 0 120px 0 0
display: inline
h3
margin: 0
+ #main_image
+ width: 400px
+ background: $ribbon_sub_background_color
+ border: 1px solid black
#ribbon
clear: left
View
4 data.php
@@ -144,10 +144,10 @@
),
'1'=>array(
'title'=>'Your Health',
- 'sow'=>true,
+ 'show'=>true,
'layout'=>'info',
'parent' => '/',
- 'image' => $images[20],
+ 'image' => $images[9],
'xmlfile'=>'xml/nutrition.xml',
'include'=>'inc/your_health.inc',
'sidebar_file' => 'gen/sidebar_1.inc',
View
15 functions_main.php
@@ -991,11 +991,16 @@ function showimages($p,$cols,$width){
$pk = array_keys($p);
if(isset($p['image'])){
- printf("<img src=\"img/iStockPhoto/%s\" alt=\"%s\" width=\"%d\" oncontextmenu=\"return false;\" />\n",
- $p['image'],
- $p['image_alt_text'],
- $width
- );
+ #printf("<img src=\"img/iStockPhoto_FINAL/%s\" alt=\"%s\" width=\"%d\" oncontextmenu=\"return false;\" />\n",
+
+ echo "<div id=\"main_image\">";
+ printf("<img src=\"img/iStockPhoto_FINAL/%s\" alt=\"%s\" oncontextmenu=\"return false;\" />\n",
+ $p['image'],
+ $p['image_alt_text']
+ #,$width
+ );
+ echo "</div>";
+
if(isset($p['image_caption'])){
printf("<p class=\"small\">%s</p>", $p['image_caption']);
}
View
44 images.php
@@ -1,26 +1,26 @@
<?php
$images=array(
-'0'=>'ist2_10645616-stethoscope-and-fruit.jpg',
-'1'=>'ist2_14958241-young-businessman-with-his-team-in-the-background.jpg',
-'2'=>'ist2_1770751-weighing-in.jpg',
-'3'=>'ist2_6167844-healthy-eating.jpg',
-'4'=>'ist2_7747607-tomatoe-with-nutriton-facts.jpg',
-'5'=>'ist2_9129573-human-digestive-system.jpg',
-'6'=>'istockphoto_12711860-pollen-illustration.jpg',
-'7'=>'istockphoto_12888270-digestive-system-pancreas.jpg',
-'8'=>'stock-photo-13078634-help-and-support-signpost.jpg',
-'9'=>'istockphoto_7353693-human-heart.jpg',
-'10'=>'stock-illustration-10480606-collection-of-human-icons.jpg',
-'11'=>'stock-illustration-11253428-family-tree-relatives.jpg',
-'12'=>'stock-illustration-16308811-vegetarian-head.jpg',
-'13'=>'stock-illustration-8919761-family-meal.jpg',
-'14'=>'stock-photo-11734855-ovary.jpg',
-'15'=>'stock-photo-13078634-help-and-support-signpost.jpg',
-'16'=>'istockphoto_12257917-clusters-of-cells.jpg',
-'17'=>'stock-photo-14769178-anti-wheat-isolated.jpg',
-'18'=>'istockphoto_11469890-virus-in-red-blood.jpg',
-'19'=>'stock-photo-15323913-cinnamon-sticks-bunch.jpg',
-'20'=>'ist2_8534640-internal-organs.jpg',
-'21'=>'ist2_14894484-blueberries.jpg'
+ '0'=>'iStock_000010645616XSmall.jpg',
+ '1'=>'iStock_000014958241XSmall.jpg',
+ '2'=>'iStock_000001770751XSmall.jpg',
+ '3'=>'iStock_000006167844XSmall.jpg',
+ '4'=>'.jpg',
+ '5'=>'.jpg',
+ '6'=>'.jpg',
+ '7'=>'iStock_000012888270XSmall.jpg',
+ '8'=>'iStock_000013078634XSmall.jpg',
+ '9'=>'iStock_000007353693XSmall.jpg',
+ '10'=>'.jpg',
+ '11'=>'.jpg',
+ '12'=>'.jpg',
+ '13'=>'.jpg',
+ '14'=>'iStock_000011734855XSmall.jpg',
+ '15'=>'.jpg',
+ '16'=>'iStock_000012257917XSmall.jpg',
+ '17'=>'iStock_000014769178XSmall.jpg',
+ '18'=>'iStock_000011469890XSmall.jpg',
+ '19'=>'iStock_000015323913XSmall.jpg',
+ '20'=>'.jpg',
+ '21'=>'.jpg'
);
?>
View
26 images_20111106.php
@@ -0,0 +1,26 @@
+<?php
+$images=array(
+'0'=>'ist2_10645616-stethoscope-and-fruit.jpg',
+'1'=>'ist2_14958241-young-businessman-with-his-team-in-the-background.jpg',
+'2'=>'ist2_1770751-weighing-in.jpg',
+'3'=>'ist2_6167844-healthy-eating.jpg',
+'4'=>'ist2_7747607-tomatoe-with-nutriton-facts.jpg',
+'5'=>'ist2_9129573-human-digestive-system.jpg',
+'6'=>'istockphoto_12711860-pollen-illustration.jpg',
+'7'=>'istockphoto_12888270-digestive-system-pancreas.jpg',
+'8'=>'stock-photo-13078634-help-and-support-signpost.jpg',
+'9'=>'istockphoto_7353693-human-heart.jpg',
+'10'=>'stock-illustration-10480606-collection-of-human-icons.jpg',
+'11'=>'stock-illustration-11253428-family-tree-relatives.jpg',
+'12'=>'stock-illustration-16308811-vegetarian-head.jpg',
+'13'=>'stock-illustration-8919761-family-meal.jpg',
+'14'=>'stock-photo-11734855-ovary.jpg',
+'15'=>'stock-photo-13078634-help-and-support-signpost.jpg',
+'16'=>'istockphoto_12257917-clusters-of-cells.jpg',
+'17'=>'stock-photo-14769178-anti-wheat-isolated.jpg',
+'18'=>'istockphoto_11469890-virus-in-red-blood.jpg',
+'19'=>'stock-photo-15323913-cinnamon-sticks-bunch.jpg',
+'20'=>'ist2_8534640-internal-organs.jpg',
+'21'=>'ist2_14894484-blueberries.jpg'
+);
+?>
View
17 images_FINAL.php
@@ -0,0 +1,17 @@
+<?php
+$images=array(
+'0'=>'iStock_000010645616XSmall.jpg',
+'1'=>'iStock_000014958241XSmall.jpg',
+'2'=>'iStock_000001770751XSmall.jpg',
+'3'=>'iStock_000006167844XSmall.jpg',
+'7'=>'iStock_000012888270XSmall.jpg',
+'8'=>'iStock_000013078634XSmall.jpg',
+'9'=>'iStock_000007353693XSmall.jpg',
+'14'=>'iStock_000011734855XSmall.jpg',
+'16'=>'iStock_000012257917XSmall.jpg',
+'17'=>'iStock_000014769178XSmall.jpg',
+'18'=>'iStock_000011469890XSmall.jpg',
+'19'=>'iStock_000015323913XSmall.jpg'
+);
+
+?>
View
5,045 img/iStockPhoto_FINAL/illustration.eps
5,045 additions, 0 deletions not shown
View
5,045 img/iStockPhoto_PURCHASED_20111009/iStock_000010480606Illustra/illustration.eps
5,045 additions, 0 deletions not shown
Please sign in to comment.
Something went wrong with that request. Please try again.