From bfbe201bdeb15cbf70fbfb3de8c7afc736610786 Mon Sep 17 00:00:00 2001 From: Sanj Date: Tue, 1 Nov 2011 05:23:11 +0000 Subject: [PATCH 01/12] er --- mofca/local_settings.py | 1 - 1 file changed, 1 deletion(-) delete mode 100644 mofca/local_settings.py diff --git a/mofca/local_settings.py b/mofca/local_settings.py deleted file mode 100644 index f872f09..0000000 --- a/mofca/local_settings.py +++ /dev/null @@ -1 +0,0 @@ -LOCAL_DEVELOPMENT = True From 3218e3d2733cef09ff50c96e4fd8f69b817eefbc Mon Sep 17 00:00:00 2001 From: Sanj Date: Tue, 1 Nov 2011 05:32:39 +0000 Subject: [PATCH 02/12] add 404.html --- mofca/templates/404.html | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 mofca/templates/404.html diff --git a/mofca/templates/404.html b/mofca/templates/404.html new file mode 100644 index 0000000..19aa9a4 --- /dev/null +++ b/mofca/templates/404.html @@ -0,0 +1,12 @@ +{% extends 'base.html' %} + +{% block extra_head %} + +{% endblock %} + +{% block content %} +
+ The website is under construction, and this page is coming soon.. sorry :) +
+{% endblock %} + From b7d8bcb478cfeb78b6865cd84f29b51870ceaa0d Mon Sep 17 00:00:00 2001 From: Sanj Date: Tue, 1 Nov 2011 05:36:16 +0000 Subject: [PATCH 03/12] coming soon styling --- mofca/templates/404.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mofca/templates/404.html b/mofca/templates/404.html index 19aa9a4..aecf71f 100644 --- a/mofca/templates/404.html +++ b/mofca/templates/404.html @@ -5,8 +5,8 @@ {% endblock %} {% block content %} -
- The website is under construction, and this page is coming soon.. sorry :) +
+

This page is coming soon..

{% endblock %} From ab78b2704c45c95f8fe31befa30b95bae1058ccb Mon Sep 17 00:00:00 2001 From: Sanj Date: Tue, 1 Nov 2011 05:40:39 +0000 Subject: [PATCH 04/12] hide side-bar --- mofca/static/css/main.css | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/mofca/static/css/main.css b/mofca/static/css/main.css index b5ba631..a217209 100644 --- a/mofca/static/css/main.css +++ b/mofca/static/css/main.css @@ -99,7 +99,8 @@ background: linear-gradient(top, rgba(14,128,160,1) 0%,rgba(84,117,54,1) 100%); filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#0e80a0', endColorstr='#547536',GradientType=0 );} #search -{width:300px; +{visibility:hidden; +width:300px; border:none; height:30px; /*position:absolute; @@ -147,7 +148,8 @@ float:left; z-index:130;} #col2 -{width:300px; +{visibility:hidden; +width:300px; float:right; /*background-color:#C09;*/ z-index:120; From 35ea194cd0c55187b9a7f46b6cf26579f8239b71 Mon Sep 17 00:00:00 2001 From: Sanj Date: Tue, 1 Nov 2011 05:45:23 +0000 Subject: [PATCH 05/12] send all links to coming soon --- mofca/templates/base.html | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/mofca/templates/base.html b/mofca/templates/base.html index 00d18a7..996d48e 100644 --- a/mofca/templates/base.html +++ b/mofca/templates/base.html @@ -34,26 +34,26 @@
  • Sign-up
  • Where: Pickup & Delivery
  • This season's vegetables
    • -
  • Meet the farmers
    • +
  • Meet the farmers
    • -
  • Recipes +
  • Recipes
    • -
  • Events
    • +
  • Events
    • -
  • Resources +
  • Resources
    • @@ -139,20 +139,20 @@ From 1ad5eee67979ed6cbea5eef8ab797c55c55a3bbc Mon Sep 17 00:00:00 2001 From: Sanj Date: Tue, 1 Nov 2011 05:50:35 +0000 Subject: [PATCH 06/12] coming soon for front-page --- mofca/templates/base.html | 2 +- mofca/templates/index.html | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/mofca/templates/base.html b/mofca/templates/base.html index 996d48e..6f85148 100644 --- a/mofca/templates/base.html +++ b/mofca/templates/base.html @@ -2,7 +2,7 @@ -PLEASE ADD TITLES HERE +MOFCA: Mumbai Organic Farmers Association diff --git a/mofca/templates/index.html b/mofca/templates/index.html index 1ce3e82..2c58849 100644 --- a/mofca/templates/index.html +++ b/mofca/templates/index.html @@ -11,9 +11,9 @@

    Hari Bhari Tokri

    -

    is a weekly selection of organic vegetables gathered by  
    Mofca – the Mumbai Organic Farmers & Consumers  
    Association. Mouse over the vegetables in this week's tokri  
    for nutrition information, recipes, and more.       +

    is a weekly selection of organic vegetables gathered by  
    Mofca – the Mumbai Organic Farmers & Consumers  
    Association.

    -

    Winter 2011, Tokri 2

    +

    Winter 2011, Tokri 2

    @@ -22,7 +22,7 @@
    tokri
    recipe-card

    THIS WEEK'S FEATURED RECIPE

    -

    Gongura Pickle

    +

    Coming Soon

    brinjal
    brinjal
    From ce3cc523cee9da2c8456e1fbe944b39c4b206f25 Mon Sep 17 00:00:00 2001 From: Sanj Date: Tue, 1 Nov 2011 05:52:43 +0000 Subject: [PATCH 07/12] a styling --- mofca/static/css/home.css | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/mofca/static/css/home.css b/mofca/static/css/home.css index b70dc4b..3dd17cc 100644 --- a/mofca/static/css/home.css +++ b/mofca/static/css/home.css @@ -29,6 +29,17 @@ margin-top:24px; padding:6px; display:inline-block;} +hgroup h3 a +{font-size:24px; +background-color:#f0f0f0; +background-color:rgba(254, 254, 254, 0.7); +margin-top:24px; +padding:6px; +display:inline-block; +text-decoration:none;} + +hgroup h3 a:hover +{text-decoration:none;} #basket {margin-left:0px; margin-top:20px; From a98464fe528c5189333a208d6257fd3fb02b758f Mon Sep 17 00:00:00 2001 From: Sanj Date: Tue, 1 Nov 2011 05:55:31 +0000 Subject: [PATCH 08/12] a style --- mofca/static/css/home.css | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/mofca/static/css/home.css b/mofca/static/css/home.css index 3dd17cc..d67f4d2 100644 --- a/mofca/static/css/home.css +++ b/mofca/static/css/home.css @@ -31,15 +31,14 @@ display:inline-block;} hgroup h3 a {font-size:24px; -background-color:#f0f0f0; -background-color:rgba(254, 254, 254, 0.7); +color: #547536; margin-top:24px; padding:6px; -display:inline-block; text-decoration:none;} hgroup h3 a:hover {text-decoration:none;} + #basket {margin-left:0px; margin-top:20px; From 5ae4830f6c6c4769050ae1cb5920f732ad9b39fc Mon Sep 17 00:00:00 2001 From: Sanj Date: Tue, 1 Nov 2011 05:57:09 +0000 Subject: [PATCH 09/12] fixed link --- mofca/templates/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mofca/templates/index.html b/mofca/templates/index.html index 2c58849..8982968 100644 --- a/mofca/templates/index.html +++ b/mofca/templates/index.html @@ -13,7 +13,7 @@

    Hari Bhari Tokri

    is a weekly selection of organic vegetables gathered by  
    Mofca – the Mumbai Organic Farmers & Consumers  
    Association.

    -

    Winter 2011, Tokri 2

    +

    Winter 2011, Tokri 2

    From 85578f10aa2f49f736eca541ddcb7ee3431261c9 Mon Sep 17 00:00:00 2001 From: Sanj Date: Wed, 2 Nov 2011 18:45:57 +0000 Subject: [PATCH 10/12] switch /test/ to main --- mofca/templates/base.html | 2 +- mofca/urls.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/mofca/templates/base.html b/mofca/templates/base.html index 6f85148..33e4d54 100644 --- a/mofca/templates/base.html +++ b/mofca/templates/base.html @@ -24,7 +24,7 @@
    - +