CAMP/mofca
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

changed sign up text

Browse Source
This commit is contained in:
Karen 2012-06-13 01:24:21 +05:30
commit 68fa0f261b
9 changed files with 57 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
mofca/local_settings.py
View File

@ -1 +0,0 @@
LOCAL_DEVELOPMENT = True

6
mofca/organic/views.py
View File

@ -8,7 +8,11 @@ def hbt(request):
return render_to_response("hbt.html") return render_to_response("hbt.html")
def pickup(request): def pickup(request):
return render_to_response("pickup.html") context = {
'x': 'foo',
'y': 'bar'
}
return render_to_response("pickup.html", context)
def seasons_veggies(request): def seasons_veggies(request):
return render_to_response("seasons_veggies.html") return render_to_response("seasons_veggies.html")

6
mofca/recipes/models.py
View File

@ -19,7 +19,7 @@ class TokriVegetable(models.Model):
types = models.ManyToManyField("VegetableType", blank=True) types = models.ManyToManyField("VegetableType", blank=True)
slug = models.SlugField() slug = models.SlugField()
description = models.TextField(blank=True) description = models.TextField(blank=True)
main_image = models.ImageField(upload_to='veggie_main_images', null=True) main_image = models.ImageField(upload_to='veggie_main_images', null=True, blank=True)
season = models.ForeignKey("Season", null=True) season = models.ForeignKey("Season", null=True)
def __unicode__(self): def __unicode__(self):
@ -72,8 +72,8 @@ class RecipeTokri(models.Model):
class AlternativeName(models.Model): class AlternativeName(models.Model):
ingredient = models.ForeignKey(TokriVegetable) ingredient = models.ForeignKey(TokriVegetable)
name_roman = models.CharField(max_length=255) name_roman = models.CharField(max_length=255, help_text="Name in Roman Script")
name_unicode = models.CharField(max_length=255) name_unicode = models.CharField(max_length=255, blank=True, help_text="Name in local language script")
language = models.ForeignKey("Language", null=True) language = models.ForeignKey("Language", null=True)
def __unicode__(self): def __unicode__(self):

10
mofca/static/css/home.css
View File

@ -29,6 +29,16 @@ margin-top:24px;
padding:6px; padding:6px;
display:inline-block;} display:inline-block;}
hgroup h3 a
{font-size:24px;
color: #547536;
margin-top:24px;
padding:6px;
text-decoration:none;}
hgroup h3 a:hover
{text-decoration:none;}
#basket #basket
{margin-left:0px; {margin-left:0px;
margin-top:20px; margin-top:20px;

6
mofca/static/css/main.css
View File

@ -100,7 +100,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 );} filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#0e80a0', endColorstr='#547536',GradientType=0 );}
#search #search
{width:300px; {visibility:hidden;
width:300px;
border:none; border:none;
height:30px; height:30px;
/*position:absolute; /*position:absolute;
@ -148,7 +149,8 @@ float:left;
z-index:130;} z-index:130;}
#col2 #col2
{width:300px; {visibility:hidden;
width:300px;
float:right; float:right;
/*background-color:#C09;*/ /*background-color:#C09;*/
z-index:120; z-index:120;

12
mofca/templates/404.html Normal file
View File

@ -0,0 +1,12 @@
{% extends 'base.html' %}
{% block extra_head %}
<link rel="stylesheet" href="/static/css/inner.css" type="text/css" />
{% endblock %}
{% block content %}
<div class="colInner">
<h1>This page is coming soon..</h1>
</div>
{% endblock %}

38
mofca/templates/base.html
View File

@ -2,7 +2,7 @@
<html lang="en"> <html lang="en">
<head> <head>
<meta charset="utf-8"> <meta charset="utf-8">
<title>PLEASE ADD TITLES HERE</title> <title>MOFCA: Mumbai Organic Farmers Association</title>
<link rel="stylesheet" href="/static/css/reset.css" type="text/css" /> <link rel="stylesheet" href="/static/css/reset.css" type="text/css" />
<link rel="stylesheet" href="/static/css/main.css" type="text/css" /> <link rel="stylesheet" href="/static/css/main.css" type="text/css" />
@ -24,7 +24,7 @@
<header> <header>
<a href="/test/"><img src="/static/img/logo.png" width="171" height="73" alt="logo-mofca" id="logo"></a> <a href="/"><img src="/static/img/logo.png" width="171" height="73" alt="logo-mofca" id="logo"></a>
<nav> <nav>
<ul class="navMain"> <ul class="navMain">
@ -34,26 +34,26 @@
<li><a href="/signup/">Sign-up</a></li> <li><a href="/signup/">Sign-up</a></li>
<li><a href="/pickup-delivery/">Where: Pickup & Delivery</a></li> <li><a href="/pickup-delivery/">Where: Pickup & Delivery</a></li>
<li><a href="/seasons-veggies/">This season's vegetables</a></li> <li><a href="/seasons-veggies/">This season's vegetables</a></li>
<li><a href="#">Meet the farmers</a></li> <li><a href="/comingsoon/">Meet the farmers</a></li>
</ul> </ul>
</li> </li>
<li><a href="#">Recipes</a> <li><a href="/comingsoon/">Recipes</a>
<ul class="navSubs"> <ul class="navSubs">
<li><a href="#">Find a recipe</a></li> <li><a href="/comingsoon/">Find a recipe</a></li>
<li><a href="#">Add a recipe</a></li> <li><a href="/comingsoon/">Add a recipe</a></li>
</ul> </ul>
</li> </li>
<li><a href="#">Events</a></li> <li><a href="/comingsoon/">Events</a></li>
<li><a href="#">Resources</a> <li><a href="/comingsoon/">Resources</a>
<ul class="navSubs"> <ul class="navSubs">
<li><a href="#">Food questions</a></li> <li><a href="/comingsoon/">Food questions</a></li>
<li><a href="#">Farming questions</a></li> <li><a href="/comingsoon/">Farming questions</a></li>
<li><a href="#">Ask a question</a></li> <li><a href="/comingsoon/">Ask a question</a></li>
<li><a href="#">Our blog</a></li> <li><a href="http://blog.mofca.in/">Our blog</a></li>
<li><a href="#">Our friends/partners</a></li> <li><a href="/comingsoon/">Our friends/partners</a></li>
</ul> </ul>
</li> </li>
</ul> </ul>
@ -139,20 +139,20 @@
<ul> <ul>
<li><a href="/about/">About Us</a></li> <li><a href="/about/">About Us</a></li>
<li><a href="/contact/">Contact </a> hari.bhari.tokri@gmail.com</li> <li><a href="/contact/">Contact </a> hari.bhari.tokri@gmail.com</li>
<li><a href="#">Get Involved</a></li> <li><a href="/comingsoon/">Get Involved</a></li>
</ul> </ul>
<ul> <ul>
<li><a href="#">Frequently asked questions</a></li> <li><a href="/comingsoon/">Frequently asked questions</a></li>
<li><a href="#">Food questions</a></li> <li><a href="/comingsoon/">Food questions</a></li>
<li><a href="#">Farmer questions</a></li> <li><a href="/comingsoon/">Farmer questions</a></li>
</ul> </ul>
<ul> <ul>
<li><a href="#"><img src="/static/img/rss.png" width="12" height="12" alt="rss-icon"> RSS</a> &nbsp; &nbsp;<a href="#"><img src="/static/img/facebook-icon.png" width="14" height="14 alt="facebook-icon"> Facebook</a></li> <li><a href="/comingsoon/"><img src="/static/img/rss.png" width="12" height="12" alt="rss-icon"> RSS</a> &nbsp; &nbsp;<a href="#"><img src="/static/img/facebook-icon.png" width="14" height="14 alt="facebook-icon"> Facebook</a></li>
<li><a href="http://blog.mofca.in/">Blog</a></li> <li><a href="http://blog.mofca.in/">Blog</a></li>
<li><a href="#">Newsletter</a></li> <li><a href="/comingsoon/">Newsletter</a></li>
</ul> </ul>
</footer> </footer>

6
mofca/templates/index.html
View File

@ -11,9 +11,9 @@
<hgroup> <hgroup>
<h1>Hari Bhari Tokri</h1> <h1>Hari Bhari Tokri</h1>
<h2><span>is a weekly selection of organic vegetables gathered by &nbsp;<br/>Mofca &#150; the Mumbai Organic Farmers & Consumers &nbsp;<br/> Association. Mouse over the vegetables in this week's tokri &nbsp;<br/>for nutrition information, recipes, and more. &nbsp;</span> <h2><span>is a weekly selection of organic vegetables gathered by &nbsp;<br/>Mofca &#150; the Mumbai Organic Farmers & Consumers &nbsp;<br/> Association. <!-- Mouse over the vegetables in this week's tokri &nbsp;<br/>for nutrition information, recipes, and more. &nbsp; --></span>
</h2> </h2>
<h3>Winter 2011, Tokri 2</h3> <h3><a href="/seasons-veggies/">Winter 2011, Tokri 2</a></h3>
</hgroup> </hgroup>
@ -22,7 +22,7 @@
<div id="basketBottom"><img src="/static/img/tokri.png" width="729" height="325" alt ="tokri"></div> <div id="basketBottom"><img src="/static/img/tokri.png" width="729" height="325" alt ="tokri"></div>
<div id="basketRecipe"><img src="/static/img/recipe-cards.png" width="265" height="182" alt="recipe-card"><!--this is a large png 24 file needs to be reduced in size--> <div id="basketRecipe"><img src="/static/img/recipe-cards.png" width="265" height="182" alt="recipe-card"><!--this is a large png 24 file needs to be reduced in size-->
<p id="featuredRecipe">THIS WEEK'S FEATURED RECIPE</p> <p id="featuredRecipe">THIS WEEK'S FEATURED RECIPE</p>
<p id="recipeName">Gongura Pickle</p> <p id="recipeName">Coming Soon</p>
</div> </div>
<div id="vegLeft"><img src="/static/img/brinjal.png" width="187" height="155" alt="brinjal"></div> <div id="vegLeft"><img src="/static/img/brinjal.png" width="187" height="155" alt="brinjal"></div>
<div id="vegCenter"><img src="/static/img/bhindis.png" width="240" height="214" alt="brinjal"></div> <div id="vegCenter"><img src="/static/img/bhindis.png" width="240" height="214" alt="brinjal"></div>

2
mofca/urls.py
View File

@ -9,7 +9,7 @@ admin.autodiscover()
urlpatterns = patterns('', urlpatterns = patterns('',
# Example: # Example:
# (r'^mofca/', include('mofca.foo.urls')), # (r'^mofca/', include('mofca.foo.urls')),
(r'^$', 'recipes.views.index'), (r'^$', 'recipes.views.test'),
(r'^test/$', 'recipes.views.test'), (r'^test/$', 'recipes.views.test'),
(r'^hbt/$', 'organic.views.hbt'), (r'^hbt/$', 'organic.views.hbt'),
(r'^pickup-delivery/$', 'organic.views.pickup'), (r'^pickup-delivery/$', 'organic.views.pickup'),