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

merged ashoks changes

Browse Source
This commit is contained in:
Sanj 2011-05-09 17:45:56 +05:30
commit 0365221776
11 changed files with 39 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
edgware/main/views.py
View File

@ -13,6 +13,9 @@ def archive(request):
def publish(request):
return render_to_response("main/publish.html")
def browse(request):
return render_to_response("main/browse.html")
def faq(request):
return render_to_response("main/faq.html")

2
edgware/static/css/main.css
View File

@ -97,7 +97,7 @@ ul {
}
#footer a:hover {
color: #FFC0CB;
color: #ffff00;
}
#nav {

4
edgware/static/css/main/home.css
View File

@ -1,7 +1,7 @@
.centerSentence {
color: #393939;
font-size: 48px;
width: 800px;
font-size: 42px;
width: 70%;
height: 350px;
position: relative;
top: 50%;

6
edgware/templates/main/archive.html
View File

@ -14,10 +14,8 @@
{% block content %}
<div class="centerSentence">
Welcome to the <a href="/about">Edgware Road Project</a>.
Here you can create a <a href="/publication">publication</a> or
browse the <a href="/archive">archive</a> of past works
created by the artists involved.
View the archive </br>
(files by study, sortable by type, size, etc) here.
</div>
{% endblock %}

20
edgware/templates/main/browse.html Normal file
View File

@ -0,0 +1,20 @@
{% extends 'main_base.html' %}
{% block title %}
Home
{% endblock %}
{% block extra_head %}
<link rel="stylesheet" href="/static/css/main/home.css" />
{% endblock %}
{% block pageTitle %}
{% endblock %}
{% block content %}
<div class="centerSentence">
Browse existing publications here.
</div>
{% endblock %}

4
edgware/templates/main/contact.html
View File

@ -33,13 +33,13 @@
<strong>amalk@serpentinegallery.org</strong>
</p>
<p>
Google Map goes here.
<iframe width="275" height="300" frameborder="0" scrolling="no" marginheight="0" marginwidth="0" src="http://maps.google.com/maps?f=q&amp;source=s_q&amp;hl=en&amp;geocode=&amp;q=64+Seymour+Street+London+W1H+5BH+&amp;aq=&amp;sll=33.590355,130.401716&amp;sspn=0.16845,0.350876&amp;ie=UTF8&amp;hq=&amp;hnear=64+Seymour+St,+Paddington,+Greater+London+W1H+5,+United+Kingdom&amp;ll=51.52044,-0.161791&amp;spn=0.016022,0.023603&amp;z=14&amp;iwloc=A&amp;output=embed"></iframe><br /><small><a href="http://maps.google.com/maps?f=q&amp;source=embed&amp;hl=en&amp;geocode=&amp;q=64+Seymour+Street+London+W1H+5BH+&amp;aq=&amp;sll=33.590355,130.401716&amp;sspn=0.16845,0.350876&amp;ie=UTF8&amp;hq=&amp;hnear=64+Seymour+St,+Paddington,+Greater+London+W1H+5,+United+Kingdom&amp;ll=51.52044,-0.161791&amp;spn=0.016022,0.023603&amp;z=14&amp;iwloc=A" style="color:#0000FF;text-align:left">View Larger Map</a></small>
</p>
</div>
<div class="centerContent middleContent">
<h3>About</h3>
<p>
<strong>C.A.M.P.</strong> is a Mumbai-based group of artists and programmers who test the ground between art and the public, often working via infrastructures such as the internet, CCTV systems, water, electricity, and transportation. C.A.M.P. have created edgwareroad.org, an open publishing platform for local research to be printed and
<a href="http://camputer.org">C.A.M.P.</a> is a Mumbai-based organisation of artists and programmers who test the ground between art and the public, often working via infrastructures such as the internet, CCTV systems, electricity, water and transportation. C.A.M.P. have created edgwareroad.org, an open publishing platform for local research to be printed and
distributed as journals, placemats, pamphlets
and webcasts. Their residency is a
collaboration with Gasworks and

5
edgware/templates/main/faq.html
View File

@ -14,10 +14,7 @@
{% block content %}
<div class="centerSentence">
Welcome to the <a href="/about">Edgware Road Project</a>.
Here you can create a <a href="/publication">publication</a> or
browse the <a href="/archive">archive</a> of past works
created by the artists involved.
FAQs are here. we should start writing a few.
</div>
{% endblock %}

4
edgware/templates/main/home.html
View File

@ -14,8 +14,8 @@
{% block content %}
<div class="centerSentence">
Welcome to the <a href="/about">Edgware Road Project</a>.
Here you can <a href="/publication">create new</a> or <a href="/publication">browse existing</a> publications, and view the <a href="/archive">archive</a> of materials generated by the artists involved.
Welcome to the <a href="contact">Edgware Road Project</a>.
Here you can <a href="publish">create new</a> or <a href="browse">browse existing</a> publications, and view the <a href="archive">archive</a> of materials generated by the artists involved.
</div>
{% endblock %}

5
edgware/templates/main/publish.html
View File

@ -14,10 +14,7 @@
{% block content %}
<div class="centerSentence">
Welcome to the <a href="/about">Edgware Road Project</a>.
Here you can create a <a href="/publication">publication</a> or
browse the <a href="/archive">archive</a> of past works
created by the artists involved.
Publish here. Links to tool and ongoing (unpublished) projects.
</div>
{% endblock %}

10
edgware/templates/main_base.html
View File

@ -14,7 +14,7 @@
<div id="wrapper">
<div id="header">
<div id="mainTitle">
<h1><a href="/" title="Go Home">The Edgware Road Project</a></h1>
<h1><a href="home" title="Go Home">The Edgware Road Project</a></h1>
</div>
<div id="pageTitle">
<h2>{% block pageTitle %} {% endblock %}</h2>
@ -24,7 +24,7 @@
Edgware Road.org is a platform for publishing and archiving possible studies about the Edgware Road.
</p>
<p>
It was created by artists C.A.M.P. during their residency at the Serpentine Gallery.
Created by artists C.A.M.P. during their residency at the Serpentine Gallery.
</p>
</div>
</div>
@ -52,14 +52,12 @@
<li>
<a href="account" title="Login / Sign Up">Login/Sign Up</a>
</li>
<li>
<a href="help" title="Help!">Help</a>
</li>
</ul>
</div>
<div id="logo">
<a href="" title="Serpentine Gallery Webpage">Serpentine <br />Gallery</a>
<a href="http://www.serpentinegallery.org/edgware_road_project.html" title="Serpentine Gallery Webpage">Serpentine <br />Gallery</a>
</div>
</div>

1
edgware/urls.py
View File

@ -15,6 +15,7 @@ urlpatterns = patterns('',
(r'^sandbox/contact$', 'main.views.contact'),
(r'^sandbox/archive$', 'main.views.archive'),
(r'^sandbox/publish$', 'main.views.publish'),
(r'^sandbox/browse$', 'main.views.browse'),
(r'^sandbox/faq$', 'main.views.faq'),
(r'^sandbox/help$', 'main.views.help'),
(r'^$', 'django.views.generic.simple.redirect_to', {'url': '/slider/'}),