From 5cc7a9b21b780fb952b399c412055991482dbeed Mon Sep 17 00:00:00 2001 From: ashok sukumaran Date: Sat, 7 May 2011 16:27:31 +0530 Subject: [PATCH 01/19] added browse --- edgware/templates/main/browse.html | 21 +++++++++++++++++++++ edgware/templates/main/home.html | 4 ++-- 2 files changed, 23 insertions(+), 2 deletions(-) create mode 100644 edgware/templates/main/browse.html diff --git a/edgware/templates/main/browse.html b/edgware/templates/main/browse.html new file mode 100644 index 0000000..0eacb65 --- /dev/null +++ b/edgware/templates/main/browse.html @@ -0,0 +1,21 @@ +{% extends 'main_base.html' %} + +{% block title %} + Home +{% endblock %} + +{% block extra_head %} + +{% endblock %} + +{% block pageTitle %} + +{% endblock %} + +{% block content %} +
+ Welcome to the Edgware Road Project. + Here you can create new or browse existing publications, and view the archive of materials generated by the artists involved. +
+ +{% endblock %} diff --git a/edgware/templates/main/home.html b/edgware/templates/main/home.html index 1d92aee..0eacb65 100644 --- a/edgware/templates/main/home.html +++ b/edgware/templates/main/home.html @@ -14,8 +14,8 @@ {% block content %}
- Welcome to the Edgware Road Project. - Here you can create new or browse existing publications, and view the archive of materials generated by the artists involved. + Welcome to the Edgware Road Project. + Here you can create new or browse existing publications, and view the archive of materials generated by the artists involved.
{% endblock %} From b30bb4ff7fe2399c8116d2ace45660eb0158f90d Mon Sep 17 00:00:00 2001 From: ashok sukumaran Date: Sat, 7 May 2011 16:37:24 +0530 Subject: [PATCH 02/19] added notes to each html --- edgware/templates/main/archive.html | 5 +---- edgware/templates/main/browse.html | 3 +-- edgware/templates/main/contact.html | 2 +- edgware/templates/main/faq.html | 5 +---- edgware/templates/main/publish.html | 5 +---- edgware/templates/main_base.html | 4 +--- 6 files changed, 6 insertions(+), 18 deletions(-) diff --git a/edgware/templates/main/archive.html b/edgware/templates/main/archive.html index d3743e2..cf85f18 100644 --- a/edgware/templates/main/archive.html +++ b/edgware/templates/main/archive.html @@ -14,10 +14,7 @@ {% block content %}
- Welcome to the Edgware Road Project. - Here you can create a publication or - browse the archive of past works - created by the artists involved. + View the archive (files by study, sortable by type size, etc) here.
{% endblock %} diff --git a/edgware/templates/main/browse.html b/edgware/templates/main/browse.html index 0eacb65..77fd03c 100644 --- a/edgware/templates/main/browse.html +++ b/edgware/templates/main/browse.html @@ -14,8 +14,7 @@ {% block content %}
- Welcome to the Edgware Road Project. - Here you can create new or browse existing publications, and view the archive of materials generated by the artists involved. + Browse existing publications here.
{% endblock %} diff --git a/edgware/templates/main/contact.html b/edgware/templates/main/contact.html index 0e81df0..505d47f 100644 --- a/edgware/templates/main/contact.html +++ b/edgware/templates/main/contact.html @@ -39,7 +39,7 @@

About

- C.A.M.P. 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 + C.A.M.P. 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 diff --git a/edgware/templates/main/faq.html b/edgware/templates/main/faq.html index d3743e2..bc61ad3 100644 --- a/edgware/templates/main/faq.html +++ b/edgware/templates/main/faq.html @@ -14,10 +14,7 @@ {% block content %}

- Welcome to the Edgware Road Project. - Here you can create a publication or - browse the archive of past works - created by the artists involved. + FAQs are here. we should start writing a few.
{% endblock %} diff --git a/edgware/templates/main/publish.html b/edgware/templates/main/publish.html index d3743e2..efa7b0f 100644 --- a/edgware/templates/main/publish.html +++ b/edgware/templates/main/publish.html @@ -14,10 +14,7 @@ {% block content %}
- Welcome to the Edgware Road Project. - Here you can create a publication or - browse the archive of past works - created by the artists involved. + Publish here. Links to tool and ongoing (unpublished) projects.
{% endblock %} diff --git a/edgware/templates/main_base.html b/edgware/templates/main_base.html index b35a305..dac25c7 100644 --- a/edgware/templates/main_base.html +++ b/edgware/templates/main_base.html @@ -52,9 +52,7 @@
  • Login/Sign Up
    • -
  • - Help -
    • +
    From 2322097194239a9657d2111204017253bd64f107 Mon Sep 17 00:00:00 2001 From: ashok sukumaran Date: Sat, 7 May 2011 16:38:52 +0530 Subject: [PATCH 03/19] corrected about link --- edgware/templates/main/home.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/edgware/templates/main/home.html b/edgware/templates/main/home.html index 0eacb65..d0a706b 100644 --- a/edgware/templates/main/home.html +++ b/edgware/templates/main/home.html @@ -14,7 +14,7 @@ {% block content %}
    - Welcome to the Edgware Road Project. + Welcome to the Edgware Road Project. Here you can create new or browse existing publications, and view the archive of materials generated by the artists involved.
    From 532e47c9df1e3d7f2e189d1ee65fcdd273bf268e Mon Sep 17 00:00:00 2001 From: ashok sukumaran Date: Sat, 7 May 2011 16:47:45 +0530 Subject: [PATCH 04/19] added browse.html in .py --- edgware/main/views.py | 3 +++ edgware/urls.py | 1 + 2 files changed, 4 insertions(+) diff --git a/edgware/main/views.py b/edgware/main/views.py index b5e0258..9b53782 100644 --- a/edgware/main/views.py +++ b/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") diff --git a/edgware/urls.py b/edgware/urls.py index 60ac7f3..5ba5ab8 100644 --- a/edgware/urls.py +++ b/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/'}), From 38945e562b9a47279ce5cc7e99b22daf6a9af817 Mon Sep 17 00:00:00 2001 From: ashok sukumaran Date: Sat, 7 May 2011 17:05:39 +0530 Subject: [PATCH 05/19] xx --- edgware/static/css/main/home.css | 2 +- edgware/templates/main/archive.html | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/edgware/static/css/main/home.css b/edgware/static/css/main/home.css index 2eed294..592500d 100644 --- a/edgware/static/css/main/home.css +++ b/edgware/static/css/main/home.css @@ -1,7 +1,7 @@ .centerSentence { color: #393939; font-size: 48px; - width: 800px; + width: 55%; height: 350px; position: relative; top: 50%; diff --git a/edgware/templates/main/archive.html b/edgware/templates/main/archive.html index cf85f18..6be7f9e 100644 --- a/edgware/templates/main/archive.html +++ b/edgware/templates/main/archive.html @@ -14,7 +14,8 @@ {% block content %}
    - View the archive (files by study, sortable by type size, etc) here. + View the archive < /br> + (files by study, sortable by type size, etc) here.
    {% endblock %} From 33ecae1d08d2b61ca3f6d58fff58dedf02c5795f Mon Sep 17 00:00:00 2001 From: ashok sukumaran Date: Sat, 7 May 2011 17:12:11 +0530 Subject: [PATCH 06/19] home link --- edgware/static/css/main.css | 2 +- edgware/templates/main_base.html | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/edgware/static/css/main.css b/edgware/static/css/main.css index e769c6f..697d7b3 100644 --- a/edgware/static/css/main.css +++ b/edgware/static/css/main.css @@ -97,7 +97,7 @@ ul { } #footer a:hover { - color: #FFC0CB; + color: #FF00DB; } #nav { diff --git a/edgware/templates/main_base.html b/edgware/templates/main_base.html index dac25c7..9b16dde 100644 --- a/edgware/templates/main_base.html +++ b/edgware/templates/main_base.html @@ -14,7 +14,7 @@
    From da953d2abccfc7053bd6395acd49b9af8d8b91bc Mon Sep 17 00:00:00 2001 From: ashok sukumaran Date: Sat, 7 May 2011 17:14:23 +0530 Subject: [PATCH 07/19] width of centresentence --- edgware/static/css/main/home.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/edgware/static/css/main/home.css b/edgware/static/css/main/home.css index 592500d..83c6e92 100644 --- a/edgware/static/css/main/home.css +++ b/edgware/static/css/main/home.css @@ -1,7 +1,7 @@ .centerSentence { color: #393939; font-size: 48px; - width: 55%; + width: 70%; height: 350px; position: relative; top: 50%; From d91548fe8c641d835dd7167a61a6aac303baa906 Mon Sep 17 00:00:00 2001 From: ashok sukumaran Date: Sat, 7 May 2011 17:19:12 +0530 Subject: [PATCH 08/19] archive --- edgware/templates/main/archive.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/edgware/templates/main/archive.html b/edgware/templates/main/archive.html index 6be7f9e..4e02b82 100644 --- a/edgware/templates/main/archive.html +++ b/edgware/templates/main/archive.html @@ -14,7 +14,7 @@ {% block content %}
    - View the archive < /br> + View the archive
    (files by study, sortable by type size, etc) here.
    From e77b507495471fc9605a327cfd87fc593a98ef4b Mon Sep 17 00:00:00 2001 From: ashok sukumaran Date: Sat, 7 May 2011 17:23:52 +0530 Subject: [PATCH 09/19] serpentine link --- edgware/templates/main_base.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/edgware/templates/main_base.html b/edgware/templates/main_base.html index 9b16dde..6ebc57c 100644 --- a/edgware/templates/main_base.html +++ b/edgware/templates/main_base.html @@ -57,7 +57,7 @@
    From 98da0999dbc6fd4d1743030e159482997d1238c0 Mon Sep 17 00:00:00 2001 From: ashok sukumaran Date: Sat, 7 May 2011 17:37:23 +0530 Subject: [PATCH 10/19] google map --- edgware/templates/main/archive.html | 4 ++-- edgware/templates/main/contact.html | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/edgware/templates/main/archive.html b/edgware/templates/main/archive.html index 4e02b82..541b6b2 100644 --- a/edgware/templates/main/archive.html +++ b/edgware/templates/main/archive.html @@ -5,7 +5,7 @@ {% endblock %} {% block extra_head %} - + {% endblock %} {% block pageTitle %} @@ -15,7 +15,7 @@ {% block content %}
    View the archive
    - (files by study, sortable by type size, etc) here. + (files by study, sortable by type, size, etc) here.
    {% endblock %} diff --git a/edgware/templates/main/contact.html b/edgware/templates/main/contact.html index 505d47f..145e1ca 100644 --- a/edgware/templates/main/contact.html +++ b/edgware/templates/main/contact.html @@ -33,7 +33,7 @@ amalk@serpentinegallery.org

    - Google Map goes here. +
    View Larger Map

    From 239879a5b3f654db68b97a1faa5de1a9d3ead607 Mon Sep 17 00:00:00 2001 From: ashok sukumaran Date: Sat, 7 May 2011 17:38:45 +0530 Subject: [PATCH 11/19] google map --- edgware/templates/main/contact.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/edgware/templates/main/contact.html b/edgware/templates/main/contact.html index 145e1ca..915164c 100644 --- a/edgware/templates/main/contact.html +++ b/edgware/templates/main/contact.html @@ -33,7 +33,7 @@ amalk@serpentinegallery.org

    -
    View Larger Map +
    View Larger Map

    From ae6285624e6b48094099824379c6375684b3de3a Mon Sep 17 00:00:00 2001 From: ashok sukumaran Date: Sat, 7 May 2011 17:40:14 +0530 Subject: [PATCH 12/19] google map --- edgware/templates/main/contact.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/edgware/templates/main/contact.html b/edgware/templates/main/contact.html index 915164c..7ce6f3d 100644 --- a/edgware/templates/main/contact.html +++ b/edgware/templates/main/contact.html @@ -33,7 +33,7 @@ amalk@serpentinegallery.org

    -
    View Larger Map +
    View Larger Map

    From 16d0cc4a0de194bc4b9ce04c498c93305f2d62d3 Mon Sep 17 00:00:00 2001 From: ashok sukumaran Date: Sat, 7 May 2011 17:42:16 +0530 Subject: [PATCH 13/19] google map --- edgware/templates/main/contact.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/edgware/templates/main/contact.html b/edgware/templates/main/contact.html index 7ce6f3d..1ca9108 100644 --- a/edgware/templates/main/contact.html +++ b/edgware/templates/main/contact.html @@ -33,7 +33,7 @@ amalk@serpentinegallery.org

    -
    View Larger Map +
    View Larger Map

    From 2a0d072115d3a4e84231896f456050fa290d1bb2 Mon Sep 17 00:00:00 2001 From: ashok sukumaran Date: Sat, 7 May 2011 17:44:25 +0530 Subject: [PATCH 14/19] google map --- edgware/templates/main/contact.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/edgware/templates/main/contact.html b/edgware/templates/main/contact.html index 1ca9108..1aa992d 100644 --- a/edgware/templates/main/contact.html +++ b/edgware/templates/main/contact.html @@ -33,7 +33,7 @@ amalk@serpentinegallery.org

    -
    View Larger Map +
    View Larger Map

    From 62b671aa15c19de0d815f218d4823ae90d18856e Mon Sep 17 00:00:00 2001 From: ashok sukumaran Date: Sat, 7 May 2011 17:47:50 +0530 Subject: [PATCH 15/19] google map --- edgware/templates/main/contact.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/edgware/templates/main/contact.html b/edgware/templates/main/contact.html index 1aa992d..3bb9770 100644 --- a/edgware/templates/main/contact.html +++ b/edgware/templates/main/contact.html @@ -33,7 +33,7 @@ amalk@serpentinegallery.org

    -
    View Larger Map +
    View Larger Map

    From 0bf2ef0377da65fbdd5918fddb91d7445ee585d6 Mon Sep 17 00:00:00 2001 From: ashok sukumaran Date: Sat, 7 May 2011 17:53:08 +0530 Subject: [PATCH 16/19] font sizes --- edgware/static/css/main/home.css | 2 +- edgware/templates/main/archive.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/edgware/static/css/main/home.css b/edgware/static/css/main/home.css index 83c6e92..6e056ec 100644 --- a/edgware/static/css/main/home.css +++ b/edgware/static/css/main/home.css @@ -1,6 +1,6 @@ .centerSentence { color: #393939; - font-size: 48px; + font-size: 42px; width: 70%; height: 350px; position: relative; diff --git a/edgware/templates/main/archive.html b/edgware/templates/main/archive.html index 541b6b2..b8c089f 100644 --- a/edgware/templates/main/archive.html +++ b/edgware/templates/main/archive.html @@ -5,7 +5,7 @@ {% endblock %} {% block extra_head %} - + {% endblock %} {% block pageTitle %} From f10b6eb13f5212e50b1078b554258ac01f49c3b8 Mon Sep 17 00:00:00 2001 From: ashok sukumaran Date: Sat, 7 May 2011 17:55:02 +0530 Subject: [PATCH 17/19] font sizes --- edgware/static/css/main/home.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/edgware/static/css/main/home.css b/edgware/static/css/main/home.css index 6e056ec..96089fa 100644 --- a/edgware/static/css/main/home.css +++ b/edgware/static/css/main/home.css @@ -1,7 +1,7 @@ .centerSentence { color: #393939; font-size: 42px; - width: 70%; + width: 75%; height: 350px; position: relative; top: 50%; From 234c40598b853c0e447feb2c66287e84a20579de Mon Sep 17 00:00:00 2001 From: ashok sukumaran Date: Sat, 7 May 2011 17:56:13 +0530 Subject: [PATCH 18/19] font sizes --- edgware/static/css/main/home.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/edgware/static/css/main/home.css b/edgware/static/css/main/home.css index 96089fa..6e056ec 100644 --- a/edgware/static/css/main/home.css +++ b/edgware/static/css/main/home.css @@ -1,7 +1,7 @@ .centerSentence { color: #393939; font-size: 42px; - width: 75%; + width: 70%; height: 350px; position: relative; top: 50%; From a3a74ba67936a9a5215daf14e3c8fb489e7c060f Mon Sep 17 00:00:00 2001 From: ashok sukumaran Date: Sat, 7 May 2011 17:59:30 +0530 Subject: [PATCH 19/19] hover yellow --- edgware/static/css/main.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/edgware/static/css/main.css b/edgware/static/css/main.css index 697d7b3..81692b9 100644 --- a/edgware/static/css/main.css +++ b/edgware/static/css/main.css @@ -97,7 +97,7 @@ ul { } #footer a:hover { - color: #FF00DB; + color: #ffff00; } #nav {