[wellwell-devel] [SCM] Interchange wellwell catalog branch, master, updated. 085f7e641109610d26a790a656fa90cabb76b920
Stefan Hornburg
racke at rt.icdevgroup.org
Mon Jun 1 15:49:09 UTC 2009
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Interchange wellwell catalog".
The branch, master has been updated
via 085f7e641109610d26a790a656fa90cabb76b920 (commit)
via fc9729f57bd2c11ddeb7c81b9de028c57e0109c5 (commit)
via e02be4388e8b1bda508dccab7dca9c3f668e50c1 (commit)
via b0547df0d154830173a271367bd467793d4d4c7a (commit)
via 5a603417597167aa6f74ccb8458aa8df7aaea3f5 (commit)
from 5df6915544567620d136a051c77a47039031cfd5 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 085f7e641109610d26a790a656fa90cabb76b920
Author: Stefan Hornburg (Racke) <racke at linuxia.de>
Date: Mon Jun 1 13:23:29 2009 +0200
get rid of backticks, quotes and character set
commit fc9729f57bd2c11ddeb7c81b9de028c57e0109c5
Author: Stefan Hornburg (Racke) <racke at linuxia.de>
Date: Mon Jun 1 11:18:29 2009 +0200
get rid of backticks, quotes and character set
commit e02be4388e8b1bda508dccab7dca9c3f668e50c1
Author: Stefan Hornburg (Racke) <racke at linuxia.de>
Date: Mon Jun 1 11:10:06 2009 +0200
omit menu from the left third for now
use proper class for product_list and category navigation
commit b0547df0d154830173a271367bd467793d4d4c7a
Author: Stefan Hornburg (Racke) <racke at linuxia.de>
Date: Mon Jun 1 09:12:59 2009 +0200
size of title is now automatic attribute
commit 5a603417597167aa6f74ccb8458aa8df7aaea3f5
Author: Stefan Hornburg (Racke) <racke at linuxia.de>
Date: Mon Jun 1 09:08:54 2009 +0200
introducing layout from devsite relaunch
-----------------------------------------------------------------------
Summary of changes and diff:
catalog.cfg | 5 +-
components/categorynav | 4 +-
components/footer | 1 +
components/htmlhead | 5 +
components/logo | 3 +
components/menu_crumbs | 8 +
components/product_list | 2 +-
components/search_box | 6 +
components/title | 1 +
database/mysql/images.sql | 18 +-
database/mysql/product_images.sql | 13 +-
database/pgsql/images.sql | 16 +-
database/pgsql/product_images.sql | 8 +-
database/variable.txt | 2 +-
static/style/bg_search_box.gif | Bin 0 -> 1335 bytes
static/style/btn_search_box.gif | Bin 0 -> 811 bytes
static/style/content.css | 471 +++++++++++++++++++++++++++++++++
static/style/crumbs.gif | Bin 0 -> 2842 bytes
static/{images => }/style/favicon.ico | Bin 1406 -> 1406 bytes
static/{images => }/style/favicon.xpm | 0
static/{css => style}/forms.css | 22 +-
static/style/front.css | 10 +
static/style/header_logo.gif | Bin 0 -> 8916 bytes
static/{images => }/style/logo.svg | 0
static/style/others-back.gif | Bin 0 -> 9016 bytes
static/style/others-background.gif | Bin 0 -> 115 bytes
static/style/others.css | 18 ++
templates/main | 32 ++-
28 files changed, 592 insertions(+), 53 deletions(-)
create mode 100644 components/footer
create mode 100644 components/logo
create mode 100644 components/menu_crumbs
create mode 100644 components/search_box
create mode 100644 components/title
create mode 100644 static/style/bg_search_box.gif
create mode 100644 static/style/btn_search_box.gif
create mode 100644 static/style/content.css
create mode 100644 static/style/crumbs.gif
rename static/{images => }/style/favicon.ico (100%)
rename static/{images => }/style/favicon.xpm (100%)
copy static/{css => style}/forms.css (78%)
create mode 100644 static/style/front.css
create mode 100644 static/style/header_logo.gif
rename static/{images => }/style/logo.svg (100%)
create mode 100644 static/style/others-back.gif
create mode 100644 static/style/others-background.gif
create mode 100644 static/style/others.css
diff --git a/catalog.cfg b/catalog.cfg
index a8d734b..de56b27 100644
--- a/catalog.cfg
+++ b/catalog.cfg
@@ -27,8 +27,8 @@ OrderProfile profiles/*
Autoload init
# Automatic components and attributes
-Variable MV_COMPONENT_AUTO htmlhead:htmlhead left:menu,categorynav body:infobox,local_body
-Variable MV_ATTRIBUTE_AUTO menu.name=main
+Variable MV_COMPONENT_AUTO htmlhead:htmlhead topheader=search_box logo:logo banner:title,menu_crumbs footer:footer body:infobox,categorynav,local_body
+Variable MV_ATTRIBUTE_AUTO menu.name=main htmlhead.css=others title.size=2
Variable TITLE WellWell Shop
@@ -79,3 +79,4 @@ Jobs email __JOBS_TO__
Jobs log var/log/jobs.log
Jobs use_global 1
ParseVariables No
+
diff --git a/components/categorynav b/components/categorynav
index 9b5921b..53e3d39 100644
--- a/components/categorynav
+++ b/components/categorynav
@@ -1,3 +1,4 @@
+<div class="oneThirdGrad">
[query sql="select name,uri from categories" list=1]
[on-match]
<ul>
@@ -8,4 +9,5 @@
[on-match]
</ul>
[/on-match]
-[/query]
\ No newline at end of file
+[/query]
+</div>
\ No newline at end of file
diff --git a/components/footer b/components/footer
new file mode 100644
index 0000000..bffc639
--- /dev/null
+++ b/components/footer
@@ -0,0 +1 @@
+Copyright Interchange Development Group 2004-2009 | Contact | <a href="[area login]">Login</a>
diff --git a/components/htmlhead b/components/htmlhead
index 65fb7ab..e9bfa5a 100644
--- a/components/htmlhead
+++ b/components/htmlhead
@@ -5,3 +5,8 @@
<link rel="shortcut icon" href="__IMAGE_URL__/style/favicon.ico">
<title>__TITLE__</title>
<link rel="stylesheet" type="text/css" href="__CSS_URL__/container.css">
+<style type="text/css">
+ at import "/style/content.css";
+ at import "/style/forms.css";
+ at import "/style/__CSS__.css";
+</style>
diff --git a/components/logo b/components/logo
new file mode 100644
index 0000000..2e4f348
--- /dev/null
+++ b/components/logo
@@ -0,0 +1,3 @@
+<div id="logo">
+<a href="[area index]"><img src="/style/header_logo.gif" alt="Go to homepage"></a>
+</div>
diff --git a/components/menu_crumbs b/components/menu_crumbs
new file mode 100644
index 0000000..823ee39
--- /dev/null
+++ b/components/menu_crumbs
@@ -0,0 +1,8 @@
+<ul class="crumbs">
+<li><a href="#">Home lalalalala</a></li>
+<li><a href="#">Main section</a></li>
+<li><a href="#">Sub section</a></li>
+<li><a href="#">Sub sub section</a></li>
+<li>The page you are on right now</li>
+</ul>
+
diff --git a/components/product_list b/components/product_list
index 7972fae..9efbd36 100644
--- a/components/product_list
+++ b/components/product_list
@@ -7,7 +7,7 @@
[product-list category="__CATEGORY__" ml=10 more=1 form="category=__CATEGORY__"]
[list]
-<div class="oneThird">
+<div class="oneThirdGrad">
<p class="image">
[image-list
diff --git a/components/search_box b/components/search_box
new file mode 100644
index 0000000..b5326bc
--- /dev/null
+++ b/components/search_box
@@ -0,0 +1,6 @@
+<div class="search_box">
+ <form id="search_form" method="post" action="/">
+ <input type="text" class="s" title="Search">
+ <input type="image" src="btn_search_box.gif" class="go" alt="Search">
+ </form>
+</div>
diff --git a/components/title b/components/title
new file mode 100644
index 0000000..d1674e9
--- /dev/null
+++ b/components/title
@@ -0,0 +1 @@
+<h__SIZE__>__TITLE__</h__SIZE__>
diff --git a/database/mysql/images.sql b/database/mysql/images.sql
index 8322bba..96ca660 100644
--- a/database/mysql/images.sql
+++ b/database/mysql/images.sql
@@ -1,10 +1,10 @@
-CREATE TABLE `images`
+CREATE TABLE images
(
- `code` int unsigned NOT NULL auto_increment,
- `name` varchar(255),
- `format` char(3),
- `created` datetime,
- `author` int unsigned,
- `inactive` boolean DEFAULT FALSE,
- PRIMARY KEY (`code`)
-) CHARACTER SET utf8;
+ code int unsigned NOT NULL auto_increment,
+ name varchar(255),
+ format char(3),
+ created datetime,
+ author int unsigned,
+ inactive boolean DEFAULT FALSE,
+ PRIMARY KEY (code)
+)
diff --git a/database/mysql/product_images.sql b/database/mysql/product_images.sql
index 0056d95..5a09be3 100644
--- a/database/mysql/product_images.sql
+++ b/database/mysql/product_images.sql
@@ -1,7 +1,8 @@
-CREATE TABLE `product_images`
+CREATE TABLE product_images
(
- `sku` varchar(64) NOT NULL,
- `image` int unsigned NOT NULL,
- `main` boolean DEFAULT false,
- PRIMARY KEY (`sku`, `image`)
-) CHARACTER SET utf8;
+ sku varchar(64) NOT NULL,
+ image int unsigned NOT NULL,
+ main boolean DEFAULT false,
+ PRIMARY KEY (sku, image)
+);
+
diff --git a/database/pgsql/images.sql b/database/pgsql/images.sql
index 7478301..42e54e9 100644
--- a/database/pgsql/images.sql
+++ b/database/pgsql/images.sql
@@ -1,10 +1,10 @@
-CREATE TABLE "images"
+CREATE TABLE images
(
- "code" serial NOT NULL,
- "name" varchar(255),
- "format" char(3),
- "created" timestamp,
- "author" int4,
- "inactive" bool DEFAULT false,
- CONSTRAINT images_pkey PRIMARY KEY ("code")
+ code serial NOT NULL,
+ name varchar(255),
+ format char(3),
+ created timestamp,
+ author int4,
+ inactive bool DEFAULT false,
+ CONSTRAINT images_pkey PRIMARY KEY (code)
);
diff --git a/database/pgsql/product_images.sql b/database/pgsql/product_images.sql
index c23253c..0593828 100644
--- a/database/pgsql/product_images.sql
+++ b/database/pgsql/product_images.sql
@@ -1,7 +1,7 @@
-CREATE TABLE "product_images"
+CREATE TABLE product_images
(
- "sku" varchar(64) NOT NULL,
- "image" int4 NOT NULL,
- "main" bool DEFAULT FALSE,
+ sku varchar(64) NOT NULL,
+ image int4 NOT NULL,
+ main bool DEFAULT FALSE,
CONSTRAINT product_images_pkey PRIMARY KEY (sku, image)
);
diff --git a/database/variable.txt b/database/variable.txt
index 965b47d..b9ad331 100644
--- a/database/variable.txt
+++ b/database/variable.txt
@@ -4,7 +4,7 @@ MV_COMPONENT_DIR components Directory with components
PLUGINS List of plugins used in this catalog
STATIC_URL /static URL of the static content directory
STATIC_DIR static Path to the static content directory (relative to catalog directory)
-IMAGE_URL /images URL of image directory
+IMAGE_URL /style URL of image directory
IMAGE_DIR static/images STATIC_DIR relative path of image directory
CSS_URL /css URL of the CSS files
CSS_DIR static/css Path to CSS directory (relative to catalog path)
diff --git a/static/style/bg_search_box.gif b/static/style/bg_search_box.gif
new file mode 100644
index 0000000..723ab6e
Binary files /dev/null and b/static/style/bg_search_box.gif differ
diff --git a/static/style/btn_search_box.gif b/static/style/btn_search_box.gif
new file mode 100644
index 0000000..7fd4524
Binary files /dev/null and b/static/style/btn_search_box.gif differ
diff --git a/static/style/content.css b/static/style/content.css
new file mode 100644
index 0000000..2933a79
--- /dev/null
+++ b/static/style/content.css
@@ -0,0 +1,471 @@
+
+/* CONTENT PAGE HEADER DEFINITION */
+
+/* CONTENT PAGE HEADER DEFINITION */
+BODY{
+ /*font-family: 'Trebuchet MS', trebuchet, sans-serif;*/
+ font-family: Arial, Helvetica, sans-serif;
+ color: #4c4c4c;
+ font-size: 12px;
+ font-style: normal;
+ margin: 0 0 0 0;
+ padding: 0 0 0 0;
+ text-align: justify;
+}
+
+a {
+ color: Black;
+ background-color: transparent;
+ border: 0;
+}
+
+img {
+ border: 0;
+}
+
+a:hover {
+ color: Black;
+ text-decoration: none;
+ background-color: transparent;
+}
+
+
+h1 { font-size: 250%; }
+h2 { font-size: 200%; }
+h3 { font-size: 150%; }
+h4 { font-size: 130%; }
+
+h1, h2, h3, h4{
+ color:#F26331;
+}
+
+h1, h2, h3, h4, p{
+ text-align:left;
+ margin: 0 0 5px 0;
+ font-weight: normal;
+}
+
+p{
+ padding-bottom: 6px;
+ padding-top: 3px;
+
+}
+
+tr,td {
+ border-bottom: 1px dotted #595241;
+ vertical-align: top;
+}
+
+
+img {
+ z-index: 1;
+}
+
+.top_header{
+ margin: 0 auto 0 auto;
+ padding: 0 0 0 0;
+ height: 42px;
+ width: 890px;
+ text-align: right;
+}
+
+#header{
+ width: 980px;
+ position: relative;
+ margin-right: auto;
+ margin-left: auto;
+ padding: 0;
+}
+
+#header #logo{
+ width: 322px;
+ height: 88px;
+ float: left;
+ padding: 0;
+ margin: 16px 0 0 0;
+}
+
+
+#header #intro h3{
+ font-size: 22px;
+ font-weight: bold;
+ color: white;
+}
+
+#header #intro {
+ font-size: 16px;
+ color: white;
+ height: 220px;
+ margin: 0 0 0 0;
+ padding: 0 0 0 10px;
+ width: 360px;
+ text-align: left;
+ float: left;
+}
+
+#nav {
+ float: right;
+ width:650px;
+ height: 84px;
+ position: relative;
+ vertical-align: bottom;
+ padding: 0;
+ margin: 0;
+ }
+
+#nav ul {
+ float: right;
+ position: relative;
+ height: 25px;
+ margin: 0 0 0 0;
+ padding: 0 24px 0 50px;
+ list-style: none;
+ }
+
+#nav li {
+ float:left;
+ background: transparent url("menu_right.gif") no-repeat right top;
+ margin:0 0 0 0;
+ padding:0 0 0 0;
+ width: 115px;
+ text-align: center;
+ }
+
+#nav a {
+ margin:0;
+ height: 26px;
+ display:block;
+ left:-14px;
+ background:url("menu_left.gif") no-repeat left top;
+ padding: 7px 5px 3px 7px;
+ text-decoration:none;
+ color:#f07822;
+ font-size: 16px;
+ font-family: Arial, Helvetica;
+ font-weight: bold;
+ }
+
+#nav > ul a {width:auto;}
+
+/* Commented Backslash Hack hides rule from IE5 \*/
+#nav a {float:none;}
+/* End IE5 */
+
+#nav a:hover, #nav .selected a{
+ color:Black;
+ }
+
+/* doesn't work in IE5.x or IE6 */
+#nav li:hover,
+#nav li:hover a, #nav .selected a, #nav .selected {
+ background-position:100% -42px;
+ color:Black;
+ }
+
+#nav li:hover a, #nav .selected a {
+ background-position:0 -42px;
+ }
+
+.mainContent {
+ width: 980px;
+ margin: 0 auto;
+}
+
+#casestudy {
+ color: #f2ebc7;
+ float: right;
+ margin: 0 0 0 0;
+ padding: 0 67px 0 0;
+ z-index: 0;
+ width: 428px;
+ height: 278px;
+ position: relative;
+}
+
+#casestudy #slidetext {
+ position: absolute;
+ right: 0;
+ bottom: 0;
+ padding: 0 71px 0 0;
+ color: #353c42;
+ width: 415px;
+ height: 120px;
+}
+
+#casestudy #slidetext .name{
+ font-size: 18px;
+ padding-bottom: 0;
+ margin: 0;
+ color: #706D51;
+}
+
+#casestudy #slidetext .quote{
+ font-size: 26px;
+ padding-top: 4px;
+}
+
+/* Search Box */
+
+.search_box {
+ height: 38px;
+ margin: 0 0 0 0;
+ padding: 0 0 0 0;
+ width: 309px;
+ background: url(bg_search_box.gif);
+ float: right;
+}
+
+.search_box .s {
+ float: left;
+ padding: 0;
+ margin: 13px 0 0 6px;
+ border: 0;
+ width: 172px;
+ background: none;
+}
+.search_box .go {
+ width: 97px;
+ float: right;
+ margin: 8px 3px 0 0;
+}
+
+.banner{
+ width: 450px;
+ text-align: left;
+}
+
+.banner p{
+ font-size: 12px;
+ padding: 0;
+}
+
+.banner h2{
+ height: 51px;
+ font-size: 32px;
+ padding: 14px 0 0 0;
+}
+
+
+
+/* ##### Footer ##### */
+
+#footer {
+clear: both;
+ color: #353c42;
+ text-align: center;
+ padding: 10px 10px 0 0;
+ margin: 0;
+ border-top: 1px solid #D7D5C2;
+}
+
+#footer a {
+ color: #353c42;
+ background-color: transparent;
+ text-decoration: underline;
+}
+
+#footer a:hover {
+ text-decoration: none;
+}
+
+.leftmenu {
+ background:url(leftback.jpg) repeat-y left top;
+}
+
+.leftmenu li a {
+ font-weight: bold;
+}
+
+.leftmenu li li a {
+ font-weight: normal;
+}
+
+.news {
+ background:url("right_side.gif") repeat-x left top;
+}
+
+.news h3 {
+ color: #111B21;
+}
+
+.news h4 a{
+ color: #F26331;
+}
+
+.news .date {
+ color: #353C42;
+ font-size: 12px;
+ margin: 5px 0 0 0;
+ padding: 0;
+}
+
+.news .more {
+ color: #353C42;
+ margin: 5px 0 18px 0;
+ padding: 0;
+}
+
+
+.oneThirdGrad {
+ margin: 0 0 0 0;
+ padding: 12px 17px 10px 17px;
+ width: 273px;
+ float: left;
+ font-size: 14px;
+}
+
+.oneThirdGrad ul{
+ margin: 0;
+ padding: 0;
+ list-style-image: url(orange_bullet.png);
+}
+
+.oneThirdGrad li{
+ margin-left: 20px;
+ padding-top: 6px;
+ padding-bottom: 6px;
+ text-align: left;
+}
+
+.oneThirdGrad .ticklist{
+ list-style: none;
+ margin: 0;
+ padding: 0 0 0 0;
+}
+
+.oneThirdGrad .ticklist li{
+ background: url(tick.png) left center no-repeat;
+ padding-left: 25px;
+ padding-top: 2px;
+ padding-bottom: 6px;
+ margin: 6px 0 0 0;
+ text-align: left;
+}
+
+.oneThirdGrad h3{
+ font-size: 26px;
+ margin-top: 10px;
+}
+
+.oneThirdGrad .intro{
+ padding: 0;
+ font-size: 18px;
+}
+
+#footer ul {
+ list-style: none;
+ padding-left: 14px;
+}
+
+#footer li, .uvod_storitve li {
+ margin-top: 5px;
+}
+
+#footer h2{
+ color: #F26331;
+}
+
+/* CRUMBS */
+
+.banner .crumbs_frame{
+ margin: 0;
+ padding: 0;
+ text-align: left;
+}
+
+.crumbs ul, .crumbs li {
+ list-style-type:none;
+ margin:0;
+ }
+
+.crumbs {
+ height:2.3em;
+ /*border:1px solid #dedede;*/
+ margin: 0 0 0 0;
+ padding: 0 0 0 0;
+ }
+
+.crumbs li {
+ float:left;
+ line-height:18px;
+ color:#777;
+ padding-left:.4em;
+ }
+
+.crumbs li a {
+ background:url(crumbs.gif) no-repeat right center;
+ display:block;
+ padding:0 15px 0 0;
+ }
+
+.crumbs li a:link,
+.crumbs li a:visited {
+ color:#5C5C3D;
+ text-decoration:underline;
+ }
+
+.crumbs a:link, #crumbs a:visited,
+.crumbs li a:hover,
+.crumbs li a:focus {
+ color:#111B21;
+ text-decoration: underline;
+ }
+
+
+ /*
+
+This part is completely reusable
+
+*/
+
+.rowOfBoxes {
+ clear: both;
+}
+
+.quarter, .oneThird, .half, .twoThirds, .fullWidth, .crumbs_frame {
+ margin: 1em 0;
+ float: left;
+ /*border-left: 1px solid rgb(204,204,204);*/
+}
+
+.quarter {
+ width: 21%;
+ padding: 0 1.9%;
+}
+
+.oneThird {
+ width: 28%;
+ padding: 0 1.9%;
+ text-align: left;
+}
+
+.half {
+ text-align: justify;
+ width: 46%;
+ padding: 0 1.9%;
+}
+
+.twoThirds {
+ text-align: justify;
+ width: 63%;
+ padding: 0 1.9%;
+}
+
+.fullWidth, .crumbs_frame {
+ text-align: justify;
+ width: 96%;
+ padding: 0 1.2em;
+ border-left: none;
+}
+
+.filler { /* use with an empty <p> element to add padding to the end of a text box */
+ border: 1px solid white;
+}
+
+.noBorderOnLeft {
+ border-left: none;
+}
+
+.dividingBorderAbove {
+ border-top: 1px dotted #595241;
+}
diff --git a/static/style/crumbs.gif b/static/style/crumbs.gif
new file mode 100644
index 0000000..7ced3f7
Binary files /dev/null and b/static/style/crumbs.gif differ
diff --git a/static/images/style/favicon.ico b/static/style/favicon.ico
similarity index 100%
rename from static/images/style/favicon.ico
rename to static/style/favicon.ico
diff --git a/static/images/style/favicon.xpm b/static/style/favicon.xpm
similarity index 100%
rename from static/images/style/favicon.xpm
rename to static/style/favicon.xpm
diff --git a/static/css/forms.css b/static/style/forms.css
similarity index 78%
copy from static/css/forms.css
copy to static/style/forms.css
index f08417d..403d9ee 100644
--- a/static/css/forms.css
+++ b/static/style/forms.css
@@ -7,27 +7,33 @@
*
*/
+/* Inline avoids wrapping due to form elements */
+
+form {
+ display: inline;
+}
+
/* Standard form elements styling */
-fieldset {
+.form fieldset {
border: 1px solid #ccc;
margin: 15px 0 30px 0;
padding: 10px;
}
-legend {
+.form legend {
font-weight:bold;
font-size:110%;
}
/* Label */
-label {
+.form label {
display: block;
position: relative;
}
-label small {
+.form label small {
position: absolute;
right: 0;
top: 0;
@@ -37,7 +43,7 @@ label small {
/* Other standard elements (that don't need classes) */
-input,textarea,select{
+.form input, .form textarea, .form select{
font-size: inherit;
font-family: inherit;
padding: 3px 0;
@@ -46,20 +52,20 @@ input,textarea,select{
/* Checkbox styling (needs special class) */
- p.checkbox {
+.form p.checkbox {
clear: both;
float: none;
position: relative;
}
-p.checkbox input {
+.form p.checkbox input {
left: 10px;
width: 14px;
position: absolute;
top: 1px;
}
-p.checkbox label {
+.form p.checkbox label {
display: block;
margin-left: 40px;
width: 80%;
diff --git a/static/style/front.css b/static/style/front.css
new file mode 100644
index 0000000..22f2f20
--- /dev/null
+++ b/static/style/front.css
@@ -0,0 +1,10 @@
+
+/* CONTENT PAGE HEADER DEFINITION */
+BODY{
+ background: url(header-back-front.gif) top repeat-x;
+}
+
+#header{
+ background:url("home-back.jpg") no-repeat right top;
+ height: 440px;
+}
diff --git a/static/style/header_logo.gif b/static/style/header_logo.gif
new file mode 100644
index 0000000..edd167d
Binary files /dev/null and b/static/style/header_logo.gif differ
diff --git a/static/images/style/logo.svg b/static/style/logo.svg
similarity index 100%
rename from static/images/style/logo.svg
rename to static/style/logo.svg
diff --git a/static/style/others-back.gif b/static/style/others-back.gif
new file mode 100644
index 0000000..32a0eb0
Binary files /dev/null and b/static/style/others-back.gif differ
diff --git a/static/style/others-background.gif b/static/style/others-background.gif
new file mode 100644
index 0000000..2afa315
Binary files /dev/null and b/static/style/others-background.gif differ
diff --git a/static/style/others.css b/static/style/others.css
new file mode 100644
index 0000000..3bcce03
--- /dev/null
+++ b/static/style/others.css
@@ -0,0 +1,18 @@
+
+/* CONTENT PAGE HEADER DEFINITION */
+BODY{
+ background: transparent url(others-background.gif) repeat-x top;
+}
+
+#header{
+ background:url("others-back.gif") no-repeat right top;
+ height: 216px;
+}
+
+.banner {
+ margin: 16px 0 0 10px;
+ width: 950px;
+ height: 100px;
+ text-align: left;
+ float: left;
+ }
diff --git a/templates/main b/templates/main
index 75f0403..8b6964b 100644
--- a/templates/main
+++ b/templates/main
@@ -1,20 +1,26 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-
-<head>
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html><head>
{HTMLHEAD}
</head>
<body>
-<div id="container">
- <div id="header"> {HEADER} </div>
- <div id="wrapper">
- <div id="body"> {BODY} </div>
- </div>
- <div id="left"> {LEFT} </div>
- <div id="right"> {RIGHT} </div>
- <div id="footer"> {FOOTER} </div>
+<div class="top_header">
+{TOPHEADER}
+</div>
+<div id="header">
+ {LOGO}
+<div id="nav"><div class="menu">
+ {MENU}
+</div></div>
+<div class="banner">
+ {BANNER}
+</div>
+</div>
+<div class="mainContent">
+ {BODY}
+</div>
+<div id="footer">
+ {FOOTER}
</div>
</body>
-
</html>
hooks/post-receive
--
Interchange wellwell catalog
More information about the wellwell-devel
mailing list