Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

delete this #30

Open
wants to merge 25 commits into
base: master
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
corrected some links, deleted unused pages/routing
anjakammer committed May 4, 2015
commit 0ddf9e0c201586a606e1b51675ca9bed496d5904
257 changes: 0 additions & 257 deletions website/frontend/templates/browsetab.html

This file was deleted.

2 changes: 1 addition & 1 deletion website/frontend/templates/examples.html
Original file line number Diff line number Diff line change
@@ -6,7 +6,7 @@
<h1>Highlights</h1>
<p>Hier haben wir ein paar besonders interessante Änderungen
zusammengestellt. Hast du eine interessante beim stöbern gefunden, die du uns
<a href="http://www.newsdiffs.org/contact/">mitteilen</a> magst?</p>
<a href="{% url 'contact' %}">mitteilen</a> magst?</p>
<p>
<p>
<style>
8 changes: 4 additions & 4 deletions website/frontend/templates/front.html
Original file line number Diff line number Diff line change
@@ -7,13 +7,13 @@

{% include "find_by_uri.html" %}

<a href="http://newsdiffs.org/browse"><img
src="https://phaven-prod.s3.amazonaws.com/files/image_part/asset/802050/slGF-1I5TqAsI_01Z9N8hnAv85o/medium_Screen_shot_2012-06-18_at_5.10.png"
<a href="{% url 'browse' %}"><img
src="https://phaven-prod.s3.amazonaws.com/files/image_part/asset/802050/slGF-1I5TqAsI_01Z9N8hnAv85o/medium_Screen_shot_2012-06-18_at_5.10.png"
style="padding:10px; margin-left:25px; margin-top:10px; float:right" width="400"></a>

<h1>NewsDiffs | Tracking Online News Over Time</h1><p>

<h2> NewsDiffs <a href="http://newsdiffs.org/browse">archiviert Änderungen</a>, die an
<h2> NewsDiffs <a href="{% url 'browse' %}">archiviert Änderungen</a>, die an
Artikeln nach ihrer Veröffentlichung vorgenommen werden und macht diese sichtbar.<br> Zur Zeit verfolgen wir die Änderungen auf
{% for source in sources|slice:":-1" %}
<a href="{% url 'browse' source %}">{{source}}</a>,
@@ -24,7 +24,7 @@ <h2> NewsDiffs <a href="http://newsdiffs.org/browse">archiviert Änderungen</a>,
<p>
<p>NewsDiffs versucht das Problem der Nachrichtenarchivierung in der sich ständig ändernden Welt des Online-Journalismus zu beheben.

<p>Du kannst unser Archiv nach Artikeln <a href="http://newsdiffs.org/browse/">durchsuchen</a>. Außerdem haben wir ein paar <a href="http://newsdiffs.org/examples/">Beispiele</a> für besonders interessante Änderungen an Artikeln zusammengestellt.
<p>Du kannst unser Archiv nach Artikeln <a href="{% url 'browse' %}">durchsuchen</a>. Außerdem haben wir ein paar <a href="{% url 'examples' %}">Beispiele</a> für besonders interessante Änderungen an Artikeln zusammengestellt.
<p>Softwareentwickler können sich gerne unser <a href="https://github.com/NewsdiffsDE/newsdiffs">GitHub Repository</a> angucken.


42 changes: 0 additions & 42 deletions website/frontend/templates/press.html

This file was deleted.

17 changes: 0 additions & 17 deletions website/frontend/templates/subscribe.html

This file was deleted.

11 changes: 0 additions & 11 deletions website/frontend/templates/upvote.html

This file was deleted.

3 changes: 0 additions & 3 deletions website/frontend/urls.py
Original file line number Diff line number Diff line change
@@ -6,16 +6,13 @@
url(r'^article-history/$', 'frontend.views.article_history', name='article_history'),

# These are current:
url(r'^upvote/$', 'frontend.views.upvote', name='upvote'),
url(r'^diff/(?P<vid1>\d+)/(?P<vid2>\d+)/(?P<urlarg>.*)$', 'frontend.views.diffview', name='diffview'),
url(r'^about/$', 'frontend.views.about', name='about'),
url(r'^browse/$', 'frontend.views.browse', name='browse'),
url(r'^browse/(.*)$', 'frontend.views.browse', name='browse'),
url(r'^feed/browse/(.*)$', 'frontend.views.feed', name='feed'),
url(r'^contact/$', 'frontend.views.contact', name='contact'),
url(r'^examples/$', 'frontend.views.examples', name='examples'),
url(r'^subscribe/$', 'frontend.views.subscribe', name='subscribe'),
url(r'^press/$', 'frontend.views.press', name='press'),
url(r'^feed/article-history/(.*)$', 'frontend.views.article_history_feed', name='article_history_feed'),
url(r'^article-history/(?P<urlarg>.*)$', 'frontend.views.article_history', name='article_history'),
url(r'^json/view/(?P<vid>\d+)/?$', 'frontend.views.json_view'),
14 changes: 0 additions & 14 deletions website/frontend/views.py
Original file line number Diff line number Diff line change
@@ -342,15 +342,6 @@ def json_view(request, vid):
)
return HttpResponse(json.dumps(data), mimetype="application/json")

def upvote(request):
article_url = request.REQUEST.get('article_url')
diff_v1 = request.REQUEST.get('diff_v1')
diff_v2 = request.REQUEST.get('diff_v2')
remote_ip = request.META.get('REMOTE_ADDR')
article_id = Article.objects.get(url=article_url).id
models.Upvote(article_id=article_id, diff_v1=diff_v1, diff_v2=diff_v2, creation_time=datetime.datetime.now(), upvoter_ip=remote_ip).save()
return render_to_response('upvote.html')

def about(request):
return render_to_response('about.html', {})

@@ -363,9 +354,4 @@ def contact(request):
def front(request):
return render_to_response('front.html', {'sources': SOURCES})

def subscribe(request):
return render_to_response('subscribe.html', {})

def press(request):
return render_to_response('press.html', {})