Skip to content
This repository was archived by the owner on May 4, 2018. It is now read-only.

Make usage of url template tag compatible with Django 1.5 #22

Open
Rizziepit wants to merge 4 commits into
base: develop
Choose a base branch
from
Open

Make usage of url template tag compatible with Django 1.5 #22

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d9d2d4c
quote view_name in {% url view_name %}
Apr 18, 2013
71cd1d5
use load url from future in template so that it works in django 1.4 +…
Apr 18, 2013
0f3aedc
pin django version
Apr 18, 2013
9b06990
fix pin
Apr 18, 2013
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
7 changes: 4 additions & 3 deletions holodeck/templates/holodeck/dashboard.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,16 @@
{% extends "holodeck/layout.html" %}

{% load i18n holodeck_inclusion_tags %}
{% load url from future %}

{% block title %}{% trans "Dashboard Overview" %} | {{ block.super }}{% endblock %}

{% block breadcrumb %}
<li><a href="{% url holodeck %}">{% trans "Dashboard Overview" %}</a></li>
<li><a href="{% url "holodeck" %}">{% trans "Dashboard Overview" %}</a></li>
{% endblock %}

{% block page_header %}
<a href="{% url holodeck-new-dashboard %}" class="btn pull-right btn-primary">{% trans "Create a new dashboard" %}</a>
<a href="{% url "holodeck-new-dashboard" %}" class="btn pull-right btn-primary">{% trans "Create a new dashboard" %}</a>
{{ block.super }}
{% endblock %}

Expand All @@ -24,7 +25,7 @@
<ul class="events" id="event_list">
<li class="empty-result" id="no_messages">
<div class="alert alert-block alert-notice">
{% url holodeck-new-dashboard as link %}
{% url "holodeck-new-dashboard" as link %}
<p>{% blocktrans %}This Holodeck does not contain any dashboards. Would you like to <a href="{{ link }}">create a new dashboard now</a>?{% endblocktrans %}</p>
</div>
</li>
Expand Down
11 changes: 6 additions & 5 deletions holodeck/templates/holodeck/dashboard/manage.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,18 @@
{% extends "holodeck/layout.html" %}

{% load i18n %}
{% load url from future %}

{% block title %}{% blocktrans with dashboard.name as name %}Manage Dashboard: {{ name }}{% endblocktrans %} | {{ block.super }}{% endblock %}

{% block breadcrumb %}
<li><a href="{% url holodeck-view-dashboard dashboard.pk %}">{{ dashboard.name }}</a></li>
<li><a href="{% url "holodeck-view-dashboard" dashboard.pk %}">{{ dashboard.name }}</a></li>
<li class="divider">/</li>
<li><a href="{% url holodeck-manage-dashboard dashboard.id %}">Edit</a></li>
<li><a href="{% url "holodeck-manage-dashboard" dashboard.id %}">Edit</a></li>
{% endblock %}

{% block page_header %}
<a href="{% url holodeck-new-metric dashboard.pk %}" class="btn pull-right btn-primary">{% trans "Create a new metric" %}</a>
<a href="{% url "holodeck-new-metric" dashboard.pk %}" class="btn pull-right btn-primary">{% trans "Create a new metric" %}</a>
{{ block.super }}
{% endblock %}

Expand Down Expand Up @@ -40,11 +41,11 @@
<fieldset id="client-security">
<div><legend>{% trans "Sharing URL" %}</legend></div>
<p>{% trans "To share this dashboard with 3rd parties for viewing send them the following publicly accessible URL:" %}</p>
<p><code class="clippy">{{ SITE_URL }}{% url holodeck-share-dashboard dashboard.id dashboard.share_key %}</code></p>
<p><code class="clippy">{{ SITE_URL }}{% url "holodeck-share-dashboard" dashboard.id dashboard.share_key %}</code></p>
</fieldset>
<div class="form-actions">
<button type="submit" class="btn btn-primary">{% trans "Save Changes" %}</button>
<a href="{% url holodeck-remove-dashboard dashboard.id %}" class="btn btn-danger">{% trans "Remove Dashboard" %}</a>
<a href="{% url "holodeck-remove-dashboard" dashboard.id %}" class="btn btn-danger">{% trans "Remove Dashboard" %}</a>
</div>
</form>
{% endblock %}
Expand Down
3 changes: 2 additions & 1 deletion holodeck/templates/holodeck/dashboard/new.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
{% extends "holodeck/layout.html" %}

{% load i18n %}
{% load url from future %}

{% block title %}{% trans "New Dashboard" %} | {{ block.super }}{% endblock %}

{% block breadcrumb %}
<li><a href="{% url holodeck-new-dashboard %}">{% trans "New Dashboard" %}</a></li>
<li><a href="{% url "holodeck-new-dashboard" %}">{% trans "New Dashboard" %}</a></li>
{% endblock %}

{% block main %}
Expand Down
7 changes: 4 additions & 3 deletions holodeck/templates/holodeck/dashboard/share.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,24 +1,25 @@
{% extends "holodeck/layout.html" %}

{% load i18n holodeck_inclusion_tags %}
{% load url from future %}

{% block title %}{{ dashboard.name }} | {{ block.super }}{% endblock %}

{% block breadcrumb %}
<li><a href="{% url holodeck-share-dashboard dashboard.pk dashboard.share_key %}">{{ dashboard.name }}</a></li>
<li><a href="{% url "holodeck-share-dashboard" dashboard.pk dashboard.share_key %}">{{ dashboard.name }}</a></li>
{% endblock %}

{% block page_header %}
<div class="btn-group pull-right">
<a class="btn btn-primary" title="Export" href="{% url holodeck-export-shared-dashboard dashboard.pk dashboard.share_key %}"><i class="icon-file icon-white"></i></a>
<a class="btn btn-primary" title="Export" href="{% url "holodeck-export-shared-dashboard" dashboard.pk dashboard.share_key %}"><i class="icon-file icon-white"></i></a>
</div>
{{ block.super }}
{% endblock %}

{% block main %}
<section class="body">
{% if not metrics %}
{% url holodeck-new-metric dashboard.pk as link %}
{% url "holodeck-new-metric" dashboard.pk as link %}
<div class="alert alert-info">{% blocktrans %}This dashboard does not currently have any metrics. Would you like to <a href="{{ link }}">create a new metric now</a>?{% endblocktrans %}</div>
{% else %}
{% for metric in metrics %}
Expand Down
15 changes: 8 additions & 7 deletions holodeck/templates/holodeck/dashboard/view.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,27 +1,28 @@
{% extends "holodeck/layout.html" %}

{% load i18n holodeck_inclusion_tags %}
{% load url from future %}

{% block title %}{{ dashboard.name }} | {{ block.super }}{% endblock %}

{% block breadcrumb %}
<li><a href="{% url holodeck-view-dashboard dashboard.id %}">{{ dashboard.name }}</a></li>
<li><a href="{% url "holodeck-view-dashboard" dashboard.id %}">{{ dashboard.name }}</a></li>
{% endblock %}

{% block page_header %}
<div class="btn-group pull-right">
<a class="btn" title="Export" href="{% url holodeck-export-dashboard dashboard.id %}"><i class="icon-file"></i></a>
<a class="btn" title="Share" href="{{ SITE_URL }}{% url holodeck-share-dashboard dashboard.id dashboard.share_key %}"><i class="icon-share"></i></a>
<a class="btn" title="Edit" href="{% url holodeck-manage-dashboard dashboard.id %}"><i class="icon-pencil"></i></a>
<a class="btn btn-primary" title="Add Metric" href="{% url holodeck-new-metric dashboard.id %}"><i class="icon-white icon-plus-sign"></i></a>
<a class="btn" title="Export" href="{% url "holodeck-export-dashboard" dashboard.id %}"><i class="icon-file"></i></a>
<a class="btn" title="Share" href="{{ SITE_URL }}{% url "holodeck-share-dashboard" dashboard.id dashboard.share_key %}"><i class="icon-share"></i></a>
<a class="btn" title="Edit" href="{% url "holodeck-manage-dashboard" dashboard.id %}"><i class="icon-pencil"></i></a>
<a class="btn btn-primary" title="Add Metric" href="{% url "holodeck-new-metric" dashboard.id %}"><i class="icon-white icon-plus-sign"></i></a>
</div>
{{ block.super }}
{% endblock %}

{% block main %}
<section class="body" id="sortable">
{% if not metrics %}
{% url holodeck-new-metric dashboard.id as link %}
{% url "holodeck-new-metric" dashboard.id as link %}
<div class="alert alert-info">{% blocktrans %}This dashboard does not currently have any metrics. Would you like to <a href="{{ link }}">create a new metric now</a>?{% endblocktrans %}</div>
{% else %}
{% for metric in metrics %}
Expand All @@ -41,7 +42,7 @@
},
update: function(event, ui) {
var order = $(this).sortable("toArray").toString();
$.get("{% url holodeck-sort-dashboard dashboard.id %}", {order: order});
$.get("{% url "holodeck-sort-dashboard" dashboard.id %}", {order: order});
}
});
$("#sortable").disableSelection();
Expand Down
21 changes: 11 additions & 10 deletions holodeck/templates/holodeck/header.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
{% load i18n holodeck_inclusion_tags %}
{% load url from future %}

<header id="header">
<div class="navbar">
<div class="navbar-inner">
<div class="container">
<a id="logo" href="{% url holodeck %}">Holodeck</a>
<a id="logo" href="{% url "holodeck" %}">Holodeck</a>
{% comment %}
{% block search %}
{% if project %}
<form action="{% url sentry-search project.slug %}" class="navbar-search pull-right" id="search">
<form action="{% url "sentry-search" project.slug %}" class="navbar-search pull-right" id="search">
<input type="hidden" name="sort" value="{% if sort %}{{ sort }}{% endif %}"/>
<input type="text" name="q" value="{% if query %}{{ query }}{% endif %}" placeholder="{% if HAS_SEARCH %}{% trans "search query or message id" %}{% else %}{% trans "message id" %}{% endif %}" class="search-query pull-left" />
</form>
Expand All @@ -24,8 +25,8 @@
{% comment %}
<ul class="nav">
{% if project %}
<li{% if PAGE == 'dashboard' %} class="active"{% endif %}><a href="{% url sentry project.slug %}">{% trans "Dashboard" %}</a></li>
<li{% if PAGE == 'stream' %} class="active"{% endif %}><a href="{% url sentry-events project.slug %}">{% trans "Stream" %}</a></li>
<li{% if PAGE == 'dashboard' %} class="active"{% endif %}><a href="{% url "sentry" project.slug %}">{% trans "Dashboard" %}</a></li>
<li{% if PAGE == 'stream' %} class="active"{% endif %}><a href="{% url "sentry-events" project.slug %}">{% trans "Stream" %}</a></li>
{% endif %}
</ul>
{% endcomment %}
Expand All @@ -38,19 +39,19 @@
<a href="#" class="dropdown-toggle" data-toggle="dropdown"><img class="avatar" src=""> {{ user.username}} <span class="caret"></span></a>
<ul class="dropdown-menu">
{% comment %}
<li><a href="{% url sentry-project-list %}">{% trans "Projects" %}</a></li>
<li><a href="{% url sentry-team-list %}">{% trans "Teams" %}</a></li>
<li><a href="{% url "sentry-project-list" %}">{% trans "Projects" %}</a></li>
<li><a href="{% url "sentry-team-list" %}">{% trans "Teams" %}</a></li>
{% if request.user.is_staff %}
<li><a href="{% url sentry-admin-status %}">{% trans "Admin" %}</a></li>
<li><a href="{% url "sentry-admin-status" %}">{% trans "Admin" %}</a></li>
{% endif %}
<li class="divider"></li>
<li><a href="{% url sentry-account-settings %}">{% trans "Settings" %}</a></li>
<li><a href="{% url "sentry-account-settings" %}">{% trans "Settings" %}</a></li>
{% endcomment %}
<li><a href="{% url holodeck-logout %}">{% trans "Logout" %}</a></li>
<li><a href="{% url "holodeck-logout" %}">{% trans "Logout" %}</a></li>
</ul>
</li>
{% else %}
<li><a href="{% url holodeck-login %}">{% trans "Login" %}</a></li>
<li><a href="{% url "holodeck-login" %}">{% trans "Login" %}</a></li>
{% endif %}
{% endblock %}
</ul>
Expand Down
5 changes: 3 additions & 2 deletions holodeck/templates/holodeck/inclusion_tags/dashboard_dropdown.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
{% load i18n %}
{% load url from future %}

<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown">{% trans "Dashboards" %} <span class="caret"></span></a>
<ul class="dropdown-menu">
{% for object in dashboard_list %}
<li{% if object == dashboard %} class="active"{% endif %}><a href="{% url holodeck-view-dashboard object.pk %}">{{ object.name }}</a></li>
<li{% if object == dashboard %} class="active"{% endif %}><a href="{% url "holodeck-view-dashboard" object.pk %}">{{ object.name }}</a></li>
{% endfor %}
{% if dashboard_list %}<li class="divider"></li>{% endif %}
<li><a href="{% url holodeck-new-dashboard %}">{% trans "Create New Dashboard" %} </a></li>
<li><a href="{% url "holodeck-new-dashboard" %}">{% trans "Create New Dashboard" %} </a></li>
</ul>
</li>
5 changes: 3 additions & 2 deletions holodeck/templates/holodeck/inclusion_tags/dashboard_list_summary.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
{% load i18n %}
{% load url from future %}

<li class="event" data-count="{{ group.times_seen|safe }}" data-score="{{ group.sort_value|safe }}" data-group="{{ group.id|safe }}">
<div class="count {{ previous.color }}"><span>{% if metric %}{{ previous.percentage }}%{% else %} NA {% endif %}</span></div>
<div class="details">
<h3>
<a href="{% url holodeck-view-dashboard dashboard.id %}">{{ dashboard.name }}</a>
<a href="{% url "holodeck-view-dashboard" dashboard.id %}">{{ dashboard.name }}</a>
</h3>
<p class="message" title="{{ group.message }}">
{{ metric.name }}
Expand All @@ -14,7 +15,7 @@ <h3>
{% if metric %}
<span class="loading">{% trans "Loading data..." %}</span>
{% else %}
{% url holodeck-new-metric dashboard.pk as link %}
{% url "holodeck-new-metric" dashboard.pk as link %}
<div class="alert alert-info">{% blocktrans %}This dashboard does not currently have any metrics. Would you like to <a href="{{ link }}">create a new metric now</a>?{% endblocktrans %}</div>
{% endif %}
</div>
Expand Down
7 changes: 4 additions & 3 deletions holodeck/templates/holodeck/layout.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{% load i18n %}
{% load url from future %}

<!DOCTYPE html>
<html lang="en">
Expand All @@ -15,7 +16,7 @@
<script type="text/javascript" src="{{ STATIC_URL }}holodeck/scripts/client.js" %}"></script>
<script type="text/javascript">
Sentry.client.config({
server: '{% url sentry-api-store %}',
server: '{% url "sentry-api-store" %}',
logger: 'sentry.errors.javascript'
})
Sentry.client.registerGlobalHandler();
Expand Down Expand Up @@ -56,10 +57,10 @@
{% block page_header %}
<ul class="breadcrumb">
{% comment %}
<li><a href="{% url holodeck %}">{% trans "Dashboard" %}</a></li>
<li><a href="{% url "holodeck" %}">{% trans "Dashboard" %}</a></li>
{% if project %}
<li class="divider">/</li>
<li><a href="{% url sentry project.slug %}">{{ project.name }}</a> <a class="action" href="{% url sentry-manage-project project.slug %}">Edit</a></li>
<li><a href="{% url "sentry" project.slug %}">{{ project.name }}</a> <a class="action" href="{% url "sentry-manage-project" project.slug %}">Edit</a></li>
{% endif %}
{% endcomment %}
{% block breadcrumb %}
Expand Down
3 changes: 2 additions & 1 deletion holodeck/templates/holodeck/login.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
{% extends "holodeck/layout.html" %}

{% load i18n %}
{% load url from future %}

{% block title %}{% trans "Login" %} | {{ block.super }}{% endblock %}

{% block breadcrumb %}
<li><a href="{% url holodeck-login %}">{% trans "Login" %}</a></li>
<li><a href="{% url "holodeck-login" %}">{% trans "Login" %}</a></li>
{% endblock %}

{% block search %}{% endblock %}
Expand Down
11 changes: 6 additions & 5 deletions holodeck/templates/holodeck/metric/manage.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,18 @@
{% extends "holodeck/layout.html" %}

{% load i18n %}
{% load url from future %}

{% block title %}{% blocktrans with metric.name as name %}Manage Metric: {{ name }}{% endblocktrans %} | {{ block.super }}{% endblock %}

{% block breadcrumb %}
<li><a href="{% url holodeck-view-dashboard dashboard.pk %}">{{ dashboard.name }}</a></li>
<li><a href="{% url "holodeck-view-dashboard" dashboard.pk %}">{{ dashboard.name }}</a></li>
<li class="divider">/</li>
<li><a href="{% url holodeck-manage-metric metric.id %}">{{ metric.name }}</a></li>
<li><a href="{% url "holodeck-manage-metric" metric.id %}">{{ metric.name }}</a></li>
{% endblock %}

{% block page_header %}
<a href="{% url holodeck-new-metric dashboard.pk %}" class="btn pull-right btn-primary">{% trans "Create a new metric" %}</a>
<a href="{% url "holodeck-new-metric" dashboard.pk %}" class="btn pull-right btn-primary">{% trans "Create a new metric" %}</a>
{{ block.super }}
{% endblock %}

Expand Down Expand Up @@ -49,8 +50,8 @@
</fieldset>
<div class="form-actions">
<button type="submit" class="btn btn-primary">{% trans "Save Changes" %}</button>
<a href="{% url holodeck-remove-metric metric.id %}" class="btn btn-danger">{% trans "Remove Metric" %}</a>
<a href="{% url holodeck-purge-metric-samples metric.id %}" class="btn btn-danger">{% trans "Purge Samples" %}</a>
<a href="{% url "holodeck-remove-metric" metric.id %}" class="btn btn-danger">{% trans "Remove Metric" %}</a>
<a href="{% url "holodeck-purge-metric-samples" metric.id %}" class="btn btn-danger">{% trans "Purge Samples" %}</a>
</div>
</form>
{% endblock %}
Expand Down
5 changes: 3 additions & 2 deletions holodeck/templates/holodeck/metric/new.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
{% extends "holodeck/layout.html" %}

{% load i18n %}
{% load url from future %}

{% block title %}{% trans "New Metric" %} | {{ block.super }}{% endblock %}

{% block breadcrumb %}
<li><a href="{% url holodeck-view-dashboard dashboard.pk %}">{{ dashboard.name }}</a></li>
<li><a href="{% url "holodeck-view-dashboard" dashboard.pk %}">{{ dashboard.name }}</a></li>
<li class="divider">/</li>
<li><a href="{% url holodeck-new-metric dashboard.pk %}">{% trans "New Metric" %}</a></li>
<li><a href="{% url "holodeck-new-metric" dashboard.pk %}">{% trans "New Metric" %}</a></li>
{% endblock %}

{% block main %}
Expand Down
1 change: 1 addition & 0 deletions holodeck/templates/holodeck/metric/share.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{% extends "holodeck/layout.html" %}

{% load i18n holodeck_inclusion_tags %}
{% load url from future %}

{% block body %}
{% render_metric metric minimal="True" %}
Expand Down
7 changes: 4 additions & 3 deletions holodeck/templates/holodeck/widgets/base_full.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,17 @@
{% load i18n %}
{% load url from future %}

<div class="widget span{{ width }}" id="metric_{{ metric.id }}">
<div class="widget-header">
<span{% if metric.description %} title="{{ metric.description }}"{% endif %}>{{ metric.name }}</span>
{% if request.user.is_authenticated %}
<div class="btn-group pull-right">
<a class="btn btn-icon" title="Share" href="{% url holodeck-share-metric metric.id metric.share_key %}"><i class="icon-share"></i></a>
<a class="btn btn-icon" title="Edit" href="{% url holodeck-manage-metric metric.id %}"><i class="icon-pencil"></i></a>
<a class="btn btn-icon" title="Share" href="{% url "holodeck-share-metric" metric.id metric.share_key %}"><i class="icon-share"></i></a>
<a class="btn btn-icon" title="Edit" href="{% url "holodeck-manage-metric" metric.id %}"><i class="icon-pencil"></i></a>
<a class="btn btn-icon btn-primary dropdown-toggle" title="Switch Type" data-toggle="dropdown" href="#"><span class="caret"></span></a>
<ul class="dropdown-menu">
{% for widget_type in widget_types %}
<li><a href="{% url holodeck-type-change-metric metric.id forloop.counter0 %}">{{ widget_type.1 }}</a></li>
<li><a href="{% url "holodeck-type-change-metric" metric.id forloop.counter0 %}">{{ widget_type.1 }}</a></li>
{% endfor %}
</ul>
</div>
Expand Down
2 changes: 1 addition & 1 deletion setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
url='http://github.com/shaunsephton/holodeck',
packages = find_packages(),
install_requires = [
'django',
'django>=1.3',
'logan',
'south',
'xlwt',
Expand Down