diff --git a/ffdemo/markup/views.py b/ffdemo/markup/views.py index 438fa86..221aefe 100644 --- a/ffdemo/markup/views.py +++ b/ffdemo/markup/views.py @@ -81,9 +81,6 @@ def evan(request): return render_response(request, 'evan-roth.html', evan_urls) @cache_page(60 * 30) -def collaborators(request): - return render_response(request, 'other-collaborators.html') - def gml(request, mark_reference): mark = get_object_or_404(Mark, reference=mark_reference) obj_decoded = simplejson.loads(common.decode_points_obj(mark.points_obj_simplified)) diff --git a/ffdemo/templates_orig/about.html b/ffdemo/templates_orig/about.html index 855662d..8a26c65 100644 --- a/ffdemo/templates_orig/about.html +++ b/ffdemo/templates_orig/about.html @@ -11,7 +11,6 @@
  • {{ _('About Mozilla') }}
  • {{ _('GML') }}
  • {{ _('Evan Roth') }}
    • -
  • {{ _('Other Collaborators') }}
  • {{ _('Code Repository') }}
    • diff --git a/ffdemo/templates_orig/other-collaborators.html b/ffdemo/templates_orig/other-collaborators.html deleted file mode 100644 index 2ed09ba..0000000 --- a/ffdemo/templates_orig/other-collaborators.html +++ /dev/null @@ -1,22 +0,0 @@ -{% extends "about.html" %} -{% load i18n %} -{% block bodytag %} - -{% endblock %} - -{% block about-content %} -

    {{ _('Other Collaborators') }}

    - -

    {{ _('Golan Levin') }} ( {{ _('project coming soon') }} )

    - {{ _('Golan Levin') }} -

    {% blocktrans %}Golan Levin's work explores the intersection of abstract communication and interactivity. Through performances, digital artifacts, and virtual environments, often created with a variety of collaborators, Levin applies creative twists to digital technologies that highlight our relationship with machines and make visible our ways of interacting with each other. Levin is Associate Professor of Electronic Art and Director of the STUDIO for Creative Inquiry at Carnegie Mellon University, Pittsburgh.{% endblocktrans %}

    - -

    {{ _('Amanda Cox') }} ( {{ _('project coming soon') }} )

    - {{ _('Amanda Cox') }} -

    {% blocktrans %}Amanda Cox is a graphics editor at the New York Times, where she creates charts and maps for the newspaper and its Web site. She is primarily interested in revealing patterns, uncovering structure and finding new ways of looking at things. Before joining the Times in 2005, Cox received a master's degree in statistics from the University of Washington and a bachelor's degree in mathematics and economics from St. Olaf College.{% endblocktrans %}

    - -

    {{ _('Jeff Larson') }} ( {{ _('project coming soon') }} )

    - {{ _('Jeff Larson') }} -

    {% blocktrans %}Jeff Larson is a Developer at ProPublica where he works with reporters and editors to create news applications. Previously, he worked as the Online Director of the Nation and as an Editorial Assistant at W.W. Norton. He graduated with a degree in English Literature from UCSC. His favorite language is JavaScript.{% endblocktrans %}

    - -{% endblock %} diff --git a/ffdemo/urls.py b/ffdemo/urls.py index 858268c..86b7719 100644 --- a/ffdemo/urls.py +++ b/ffdemo/urls.py @@ -30,7 +30,6 @@ urlpatterns += patterns('markup.views', (r'^about/credits/$', 'credits'), (r'^about/mozilla/$', 'mozilla'), (r'^about/evan-roth/$', 'evan'), - (r'^about/other-collaborators/$', 'collaborators'), (r'^about/$', 'about'), (r'^about/coming-soon/$', 'coming_soon'), (r'^manifesto/$', 'manifesto'),