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.

Sign up for GitHub

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

Update for Django 1.8 #4

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Update for Django 1.8 #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 5 additions & 1 deletion shortener/urls.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
from django.conf.urls.defaults import patterns, url
try:
from django.conf.urls import patterns, url
except:
# Django <=1.5
from django.conf.urls.defaults import patterns, url


urlpatterns = patterns('shortener.views',
Expand Down
4 changes: 2 additions & 2 deletions templates/base.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
</head>

<body>
<h1><a href="{% url index %}">{{ request.META.HTTP_HOST }}</a></h1>
<h1><a href="{% url 'index' %}">{{ request.META.HTTP_HOST }}</a></h1>
<hr/>
{% block content %}{% endblock %}

Expand All @@ -15,7 +15,7 @@ <h1><a href="{% url index %}">{{ request.META.HTTP_HOST }}</a></h1>
{% block bookmarklet %}
<br/>
Bookmarklet (drag this to your bookmarks bar):<br/>
<a href="javascript:(function(){var a=window,b=document,c=encodeURIComponent;d=a.open(&#39;//{{ request.META.HTTP_HOST }}/submit/?u=&#39;+c(b.location));})();">Shorten with {{ request.META.HTTP_HOST }}</a>
<a href="javascript:(function(){var a=window,b=document,c=encodeURIComponent;d=a.open(&#39;//{{ request.META.HTTP_HOST }}{% url 'index' %}submit/?u=&#39;+c(b.location));})();">Shorten with {{ request.META.HTTP_HOST }}</a>
{% endblock %}

{% block extra_body %}{% endblock %}
Expand Down
2 changes: 1 addition & 1 deletion templates/shortener/form.inc.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{% if link_form %}
<form name="url_form" action="{% url submit %}" method="post">
<form name="url_form" action="{% url 'submit' %}" method="post">
{% csrf_token %}
{{ link_form.as_p }}
<input type="submit" value="Shorten" />
Expand Down
4 changes: 2 additions & 2 deletions templates/shortener/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,15 @@ <h2>Recent Links</h2>
<ul>
{% for link in recent_links %}
<li><a href="{% short_url link %}">{{ link.url }}</a> (Count: {{ link.usage_count }})
(<a href="{% url info link.to_base62 %}">Info</a>)</li>
(<a href="{% url 'info' link.to_base62 %}">Info</a>)</li>
{% endfor %}
</ul>

<h2>Most Popular Links</h2>
<ul>
{% for link in most_popular_links %}
<li><a href="{% short_url link %}">{{ link.url }}</a> (Count: {{ link.usage_count }})
(<a href="{% url info link.to_base62 %}">Info</a>)</li>
(<a href="{% url 'info' link.to_base62 %}">Info</a>)</li>
{% endfor %}
</ul>
{% endblock content %}