Permalink
Browse files

All functional part of the web-app is finished. Now working on the de…

…sign aspect and css
  • Loading branch information...
1 parent 0befd09 commit 5c83adee03cafaed31d024fac5620573f8ae8a61 unknown committed Aug 13, 2012
Showing with 47 additions and 74 deletions.
  1. +4 −4 css/general.css
  2. +6 −12 dairy.php
  3. +15 −19 fish.php
  4. +6 −12 fruitsveg.php
  5. +12 −17 index.php
  6. +4 −10 other.php
View
8 css/general.css
@@ -1,7 +1,7 @@
html {
margin: 0;
padding: 0;
- background-color:#000;
+ background-color:#0066CC;
color: #e2e2e2;
font: normal 100%/1.5 sans-serif;
}
@@ -66,7 +66,7 @@ nav a:active,
nav .current a,
nav .current a:link,
nav .current a:visited {
- background-color: rgba(50,50,50,0.5);
+
color: #fff;
-moz-border-radius-topleft: 4px;
-moz-border-radius-topright: 4px;
@@ -100,7 +100,6 @@ nav .current a:visited {
.col{
text-align:left;
- background-color: #333;
float: left;
width: 12.65%;
padding: 1%;
@@ -110,7 +109,8 @@ nav .current a:visited {
.triple{
text-align:left;
- background-color: #666;
+ background-color: #FFFF99;
+ font:family=Courgette;
float: left;
width: 30%;
padding: 1%;
View
18 dairy.php
@@ -52,7 +52,7 @@
<html>
<head>
<meta charset="utf-8">
- <title>Flexible Layouts</title>
+ <title>Dairy</title>
<link href="css/general.css" rel="stylesheet">
<script src="js/list-java.js"></script>
@@ -93,11 +93,7 @@ function MM_swapImage() { //v3.0
<a href="fish.php" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('Image9','','buttons/fish2.png',1)"><img src="buttons/fish.png" name="Image9" width="138" height="138" border="0"></a>
- <a href="other.php" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('other','','buttons/other2.png',1)"><img src="buttons/other.png" name="other" width="136" height="136" border="0"></a>
-
- <a href="#" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('edit','','buttons/edit2.png',1)"><img src="buttons/edit.png" name="edit" width="105" height="68" border="0"></a>
-
- <a href="undo.php"><img src="buttons/undo.png" width="63" height="78" alt="undo"></a>
+ <a href="other.php" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('other','','buttons/other2.png',1)"><img src="buttons/other.png" name="other" width="136" height="136" border="0"></a><a href="undo.php"><img src="buttons/undo.png" width="63" height="78" alt="undo"></a>
<a href="save.php"><img src="buttons/save.png" width="56" height="76" alt="save"></a>
@@ -109,17 +105,15 @@ function MM_swapImage() { //v3.0
<p>
<form method="post" action="dairy.php">
- <input id="item" autofocus>
+ <p>
+
- <p>
-
-
<input type="checkbox" name="milk" value="3" />Milk <br/>
<input type="checkbox" name="cheese" value="3" />Cheese <br>
<input type="checkbox" name="butter" value="3" />Butter <br>
<input type="checkbox" name="yogurt" value="3" />Yogurt <br>
-
- <h1>Bread</h1>
+
+ <h1>Bread</h1>
<input type="checkbox" name="brown" value="3" />Brown <br>
<input type="checkbox" name="white" value="3" />White <br>
View
34 fish.php
@@ -52,7 +52,7 @@
<html>
<head>
<meta charset="utf-8">
- <title>Flexible Layouts</title>
+ <title>Meat &amp; Seafood</title>
<link href="css/general.css" rel="stylesheet">
<script src="js/list-java.js"></script>
@@ -93,11 +93,7 @@ function MM_swapImage() { //v3.0
<img src="buttons/fish2.png" width="138" height="138" alt="veggiesfruits">
- <a href="other.php" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('other','','buttons/other2.png',1)"><img src="buttons/other.png" name="other" width="136" height="136" border="0"></a>
-
- <a href="#" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('edit','','buttons/edit2.png',1)"><img src="buttons/edit.png" name="edit" width="105" height="68" border="0"></a>
-
- <a href="undo.php"><img src="buttons/undo.png" width="63" height="78" alt="undo"></a>
+ <a href="other.php" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('other','','buttons/other2.png',1)"><img src="buttons/other.png" name="other" width="136" height="136" border="0"></a><a href="undo.php"><img src="buttons/undo.png" width="63" height="78" alt="undo"></a>
<a href="save.php"><img src="buttons/save.png" width="56" height="76" alt="save"></a>
@@ -109,26 +105,26 @@ function MM_swapImage() { //v3.0
<p>
<form method="post" action="fish.php">
- <input id="item" autofocus>
+ <p>
+
- <p>
-
-
<input type="checkbox" name="chicken" value="2" />Chicken<br/>
<input type="checkbox" name="lamb" value="2" />Lamb<br>
<input type="checkbox" name="beef" value="2" />Beef <br>
<input type="checkbox" name="oranges" value="2" />Oranges <br>
-
-
- <h1>Seafood</h1>
-
- <input type="checkbox" name="lobster" value="2" />Lobster <br>
- <input type="checkbox" name="oyster" value="2" />Oyster <br>
- <p>
-
- <button type="submit" id="additem">Add items</button>
+
+ <h1>Seafood</h1>
+ <p>
+ <input type="checkbox" name="lobster" value="2" />
+ Lobster <br>
+ <input type="checkbox" name="oyster" value="2" />Oyster <br>
+ </p>
+<p>
+
+ <button type="submit" id="additem">Add items</button>
+
</form>
</div>
View
18 fruitsveg.php
@@ -53,7 +53,7 @@
<html>
<head>
<meta charset="utf-8">
- <title>Flexible Layouts</title>
+ <title>Fruits &amp; Vegetables</title>
<link href="css/general.css" rel="stylesheet">
<script src="js/list-java.js"></script>
@@ -81,7 +81,7 @@ function MM_swapImage() { //v3.0
}
</script>
</head>
- <body onLoad="MM_preloadImages('buttons/dairy2.png','buttons/fruitsveggies2.png','buttons/fish2.png','buttons/other2.png','buttons/edit2.png')">
+ <body onLoad="MM_preloadImages('buttons/dairy2.png','buttons/fruitsveggies2.png','buttons/fish2.png','buttons/other2.png')">
<div class="col-group clearfix">
@@ -93,11 +93,7 @@ function MM_swapImage() { //v3.0
<a href="fish.php" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('Image9','','buttons/fish2.png',1)"><img src="buttons/fish.png" name="Image9" width="138" height="138" border="0"></a>
- <a href="other.php" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('other','','buttons/other2.png',1)"><img src="buttons/other.png" name="other" width="136" height="136" border="0"></a>
-
- <a href="#" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('edit','','buttons/edit2.png',1)"><img src="buttons/edit.png" name="edit" width="105" height="68" border="0"></a>
-
- <a href="undo.php"><img src="buttons/undo.png" width="63" height="78" alt="undo"></a>
+ <a href="other.php" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('other','','buttons/other2.png',1)"><img src="buttons/other.png" name="other" width="136" height="136" border="0"></a><a href="undo.php"><img src="buttons/undo.png" width="63" height="78" alt="undo"></a>
<a href="save.php"><img src="buttons/save.png" width="56" height="76" alt="save"></a>
@@ -109,19 +105,17 @@ function MM_swapImage() { //v3.0
<p>
<form method="post" action="fruitsveg.php">
- <input id="item" autofocus>
+ <p>
- <p>
-
<input type="checkbox" name="apples" value="1" />Apples <br/>
<input type="checkbox" name="bananas" value="1" />Bananas <br>
<input type="checkbox" name="grapes" value="1" />Grapes <br>
<input type="checkbox" name="oranges" value="1" />Oranges <br>
<input type="checkbox" name="pineapple" value="1" />Pineapple <br>
-
- <h1>Vegetables</h1>
+
+ <h1>Vegetables</h1>
<input type="checkbox" name="beans" value="1" />Beans <br>
<input type="checkbox" name="carrots" value="1" />Carrots <br>
View
29 index.php
@@ -11,8 +11,8 @@
$potatoes = filter_input(INPUT_POST, 'potatoes', FILTER_SANITIZE_NUMBER_INT);
$tomatoes = filter_input(INPUT_POST, 'tomatoes', FILTER_SANITIZE_NUMBER_INT);
-*/
+*/
include 'includes/db.php';
@@ -53,7 +53,7 @@
<html>
<head>
<meta charset="utf-8">
- <title>Flexible Layouts</title>
+ <title>Fruits &amp; Vegetables</title>
<link href="css/general.css" rel="stylesheet">
<script src="js/list-java.js"></script>
@@ -81,26 +81,21 @@ function MM_swapImage() { //v3.0
}
</script>
</head>
-
- <body onLoad="MM_preloadImages('buttons/dairy2.png','buttons/fruitsveggies2.png','buttons/fish2.png','buttons/other2.png','buttons/edit2.png')">
+ <body onLoad="MM_preloadImages('buttons/dairy2.png','buttons/fruitsveggies2.png','buttons/fish2.png','buttons/other2.png')">
<div class="col-group clearfix">
<div class="col-left">
- <a href="fruitsveg.php" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('fruitsandveggies','','buttons/fruitsveggies2.png',1)"><img src="buttons/fruitsveggies.png" name="fruitsandveggies" width="138" height="138" border="0"></a>
+ <img src="buttons/fruitsveggies2.png" width="138" height="138" alt="veggiesfruits">
<a href="dairy.php" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('Image8','','buttons/dairy2.png',1)"><img src="buttons/dairy.png" name="Image8" width="139" height="139" border="0"></a>
<a href="fish.php" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('Image9','','buttons/fish2.png',1)"><img src="buttons/fish.png" name="Image9" width="138" height="138" border="0"></a>
- <a href="other.php" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('other','','buttons/other2.png',1)"><img src="buttons/other.png" name="other" width="136" height="136" border="0"></a>
-
- <a href="#" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('edit','','buttons/edit2.png',1)"><img src="buttons/edit.png" name="edit" width="105" height="68" border="0"></a>
-
- <img src="buttons/undo.png" width="63" height="78" alt="undo">
+ <a href="other.php" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('other','','buttons/other2.png',1)"><img src="buttons/other.png" name="other" width="136" height="136" border="0"></a><a href="undo.php"><img src="buttons/undo.png" width="63" height="78" alt="undo"></a>
- <img src="buttons/save.png" width="56" height="76" alt="save">
+ <a href="save.php"><img src="buttons/save.png" width="56" height="76" alt="save"></a>
</div>
<div class="col-right">
@@ -109,26 +104,26 @@ function MM_swapImage() { //v3.0
<p>
-<form method="post" action="displaylist.php">
- <input id="item" autofocus>
+<form method="post" action="fruitsveg.php">
+ <p>
- <p>
-
<input type="checkbox" name="apples" value="1" />Apples <br/>
<input type="checkbox" name="bananas" value="1" />Bananas <br>
<input type="checkbox" name="grapes" value="1" />Grapes <br>
<input type="checkbox" name="oranges" value="1" />Oranges <br>
<input type="checkbox" name="pineapple" value="1" />Pineapple <br>
-
- <h1>Vegetables</h1>
+
+ <h1>Vegetables</h1>
<input type="checkbox" name="beans" value="1" />Beans <br>
<input type="checkbox" name="carrots" value="1" />Carrots <br>
<input type="checkbox" name="celery" value="1" />Celery <br>
<input type="checkbox" name="potatoes" value="1" />Potatoes <br>
<input type="checkbox" name="tomatoes" value="1" />Tomatoes <br>
+
+ <p>
<button type="submit" id="additem">Add items</button>
View
14 other.php
@@ -52,7 +52,7 @@
<html>
<head>
<meta charset="utf-8">
- <title>Flexible Layouts</title>
+ <title>Other...</title>
<link href="css/general.css" rel="stylesheet">
<script src="js/list-java.js"></script>
@@ -93,11 +93,7 @@ function MM_swapImage() { //v3.0
<a href="fish.php" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('Image9','','buttons/fish2.png',1)"><img src="buttons/fish.png" name="Image9" width="138" height="138" border="0"></a>
- <img src="buttons/other2.png" width="138" height="138" alt="veggiesfruits">
-
- <a href="#" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('edit','','buttons/edit2.png',1)"><img src="buttons/edit.png" name="edit" width="105" height="68" border="0"></a>
-
- <a href="undo.php"><img src="buttons/undo.png" width="63" height="78" alt="undo"></a>
+ <img src="buttons/other2.png" width="138" height="138" alt="veggiesfruits"><a href="undo.php"><img src="buttons/undo.png" width="63" height="78" alt="undo"></a>
<a href="save.php"><img src="buttons/save.png" width="56" height="76" alt="save"></a>
@@ -109,17 +105,15 @@ function MM_swapImage() { //v3.0
<p>
<form method="post" action="other.php">
- <input id="item" autofocus>
+ <p>
- <p>
-
<input type="checkbox" name="chips" value="4" />Chips<br/>
<input type="checkbox" name="candy" value="4" />Candy <br>
<input type="checkbox" name="cookies" value="4" />Cookies <br>
<input type="checkbox" name="ketchup" value="4" />Ketchup <br>
<input type="checkbox" name="lollipop" value="4" />Lollipop <br>
- <p>
+ <p>
<button type="submit" id="additem">Add items</button>

0 comments on commit 5c83ade

Please sign in to comment.