merged ashoks changes

edgware/main/views.py

@@ -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")
 

edgware/static/css/main.css

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

edgware/static/css/main/home.css

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

edgware/templates/main/archive.html

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

edgware/templates/main/browse.html

@@ -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 %}

edgware/templates/main/contact.html

@@ -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

edgware/templates/main/faq.html

@@ -14,10 +14,7 @@
 
 {% block content %}
   <div class="centerSentence">
-    Welcome to the <a href="/about">Edgware Road Project</a>.
+    FAQs are here. we should start writing a few. 
-    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.
   </div>
 
 {% endblock %}

edgware/templates/main/home.html

@@ -14,8 +14,8 @@
 
 {% block content %}
   <div class="centerSentence">
-    Welcome to the <a href="/about">Edgware Road Project</a>.
+    Welcome to the <a href="contact">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.
+    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 %}

edgware/templates/main/publish.html

@@ -14,10 +14,7 @@
 
 {% block content %}
   <div class="centerSentence">
-    Welcome to the <a href="/about">Edgware Road Project</a>.
+    Publish here. Links to tool and ongoing (unpublished) projects. 
-    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.
   </div>
 
 {% endblock %}

edgware/templates/main_base.html

@@ -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>
 

edgware/urls.py

@@ -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/'}),