[wellwell-devel] [SCM] Interchange wellwell catalog branch, master, updated. 83f150d4905bfbb827d313de37eaedf98609c555

[Stefan Hornburg]

       via  83f150d4905bfbb827d313de37eaedf98609c555 (commit)
      from  ab1af1a6075dfc4bc567c92dc8193c88021c4e12 (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 83f150d4905bfbb827d313de37eaedf98609c555
Author: Stefan Hornburg (Racke) <racke at linuxia.de>
Date:   Fri Oct 23 17:57:00 2009 +0200

    split body container into left,body,right
    moved oneThirdGrad div's to template

-----------------------------------------------------------------------

Summary of changes and diff:
 catalog.cfg                                   |    2 +-
 components/cart                               |    3 +--
 components/categorynav                        |    2 --
 components/product_list                       |    7 -------
 plugins/backend/components/backend_menus      |    3 +--
 plugins/backend/components/backend_menus_menu |    2 --
 templates/main                                |    7 +++++++
 7 files changed, 10 insertions(+), 16 deletions(-)

diff --git a/catalog.cfg b/catalog.cfg
index 18604b8..1818de5 100644
--- a/catalog.cfg
+++ b/catalog.cfg
@@ -28,7 +28,7 @@ Autoload init_filter
 Autoload init
 
 # Automatic components and attributes
-Variable MV_COMPONENT_AUTO htmlhead:htmlhead topheader=search_box logo:logo menu:menu banner:title,menu_crumbs footer:footer body:infobox,categorynav,local_body
+Variable MV_COMPONENT_AUTO htmlhead:htmlhead topheader=search_box logo:logo menu:menu banner:title,menu_crumbs left:categorynav footer:footer body:infobox,local_body
 Variable MV_ATTRIBUTE_AUTO menu.name=main htmlhead.css=others title.size=2
 
 Variable TITLE WellWell Shop
diff --git a/components/cart b/components/cart
index 8e809f6..18fe41f 100644
--- a/components/cart
+++ b/components/cart
@@ -1,4 +1,3 @@
-<div class="oneThirdGrad">
 <form action="[area cart]" method="post">
 <table class="cart">
 <tr class="header">
@@ -21,4 +20,4 @@
 <input type="submit" name="recalculate" value="[L]Recalculate[/L]">
 <input type="submit" name="checkout" value="[L]Checkout[/L]">
 </form>
-</div>
+
diff --git a/components/categorynav b/components/categorynav
index 53e3d39..c78c8c3 100644
--- a/components/categorynav
+++ b/components/categorynav
@@ -1,4 +1,3 @@
-<div class="oneThirdGrad">
 [query sql="select name,uri from categories" list=1]
 [on-match]
 <ul>
@@ -10,4 +9,3 @@
 </ul>
 [/on-match]
 [/query]
-</div>
\ No newline at end of file
diff --git a/components/product_list b/components/product_list
index de732fe..70cf2ea 100644
--- a/components/product_list
+++ b/components/product_list
@@ -5,14 +5,9 @@
 [/query]
 [product-list category="__CATEGORY__" ml=10 more=1 form="category=__CATEGORY__"]
 [no-match]
-<div class="oneThirdGrad">
 Nothing found.
-</div>
 [/no-match]
 [list]
-
-<div class="oneThirdGrad">
-
 <p class="image"><img src="[image-display [product-code] list]"></p>
 
 <h3><a href="[product-code]">[product-field manufacturer] [product-field name]</a></h3>
@@ -22,8 +17,6 @@ Nothing found.
 <ul class="price">
 <li>[product-price] [product-order [product-code]]</li>
 </ul>
-</div>
-
 [/list]
 
 <div class="more">
diff --git a/plugins/backend/components/backend_menus b/plugins/backend/components/backend_menus
index 3fdf11b..ef816b2 100644
--- a/plugins/backend/components/backend_menus
+++ b/plugins/backend/components/backend_menus
@@ -1,4 +1,3 @@
-<div class="oneThirdGrad">
 <h2>[L]Menus[/L]</h2>
 [query sql="select distinct menu_name from menus" list=1]
 [on-match]
@@ -14,4 +13,4 @@
 [L]No menus found.[/L]
 [/no-match]
 [/query]
-</div>
\ No newline at end of file
+
diff --git a/plugins/backend/components/backend_menus_menu b/plugins/backend/components/backend_menus_menu
index 8784d48..399df33 100644
--- a/plugins/backend/components/backend_menus_menu
+++ b/plugins/backend/components/backend_menus_menu
@@ -1,4 +1,3 @@
-<div class="oneThirdGrad">
 [query sql="select * from menus where menu_name = '[cgi menu]'" list=1]
 [on-match]
 <table>
@@ -12,4 +11,3 @@
 </table>
 [/on-match]
 [/query]
-</div>
\ No newline at end of file
diff --git a/templates/main b/templates/main
index 8b6964b..3e0c55a 100644
--- a/templates/main
+++ b/templates/main
@@ -17,8 +17,15 @@
 </div>
 </div>
 <div class="mainContent">
+<div class="oneThirdGrad">
+	{LEFT}
+</div>
+<div class="oneThirdGrad">
 	{BODY}
 </div>
+<div class="oneThirdGrad">
+	{RIGHT}
+</div>
 <div id="footer">
 	{FOOTER}
 </div>


hooks/post-receive
-- 
Interchange wellwell catalog