inpt/ponytracker
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

small display improvements

Browse source
This commit is contained in:
Élie Bouttier 2014-08-03 10:26:55 -07:00
parent 43ec23973f
commit 2f9fdf4a4f
6 changed files with 36 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

4
issue/models.py
View file

@ -245,9 +245,9 @@ class Event(models.Model):
def glyphicon(self): def glyphicon(self):
if self.code == Event.COMMENT: if self.code == Event.COMMENT:
return "bullhorn" return "comment"
elif self.code == Event.DESCRIBE: elif self.code == Event.DESCRIBE:
return "pencil" return "edit"
elif self.code == Event.CLOSE: elif self.code == Event.CLOSE:
return "ban-circle" return "ban-circle"
elif self.code == Event.REOPEN: elif self.code == Event.REOPEN:

8
issue/templates/issue/issue_list.html
View file

@ -8,7 +8,7 @@
<div class="panel panel-default"> <div class="panel panel-default">
<div class="panel-heading"> <div class="panel-heading clearfix">
<h1> <h1>
Issues Issues
<div class="pull-right"> <div class="pull-right">
@ -59,7 +59,11 @@
{% endfor %} {% endfor %}
<br /> <br />
<small>#{{ issue.id }} opened by <a href="{% url 'list-issue' project.name %}?q=is:open%20author:{{ issue.author.username }}"><strong>{{ issue.author.username }}</strong></a> {{ issue.opened_at|naturaltime }}</small> <small>#{{ issue.id }} opened by <a href="{% url 'list-issue' project.name %}?q=is:open%20author:{{ issue.author.username }}"><strong>{{ issue.author.username }}</strong></a> {{ issue.opened_at|naturaltime }}</small>
<span class="badge">{{ issue.comments.count }}</span> {% if issue.milestone %}
&#160;–&#160;&#160;<span class="glyphicon glyphicon-road"></span> {{ issue.milestone }}
{% endif %}
<!--&#160;&#160;<span class="badge"><span class="glyphicon glyphicon-comment"></span> {{ issue.comments.count }}</span>-->
&#160;–&#160;&#160;<span class="badge">{{ issue.comments.count }}</span>
</td> </td>
</tr> </tr>
{% endfor %} {% endfor %}

16
issue/templates/issue/label_list.html
View file

@ -6,7 +6,7 @@
<div class="panel panel-default"> <div class="panel panel-default">
<div class="panel-heading"> <div class="panel-heading clearfix">
<h1> <h1>
Labels Labels
<div class="pull-right"> <div class="pull-right">
@ -20,18 +20,10 @@
{% for label in labels %} {% for label in labels %}
<tr> <tr>
<td> <td>
<a href="{% url 'list-issue' project.name %}?q=is:open%20label:{{ label.name }}"> <a href="{% url 'list-issue' project.name %}?q=is:open%20label:{{ label.name }}"><button class="btn" style="{{ label.style }}"><span class="glyphicon glyphicon-tag" style="font-size: 100%;"></span> {{ label }}</button></a>
<button class="btn" style="{{ label.style }}">
<span class="glyphicon glyphicon-tag" style="font-size: 100%;"></span> {{ label }}
</button>
</a>
<div class="pull-right"> <div class="pull-right">
<a href="{% url 'edit-label' project.name label.id %}"> <a href="{% url 'edit-label' project.name label.id %}"><button class="btn btn-primary"><span class="glyphicon glyphicon-edit"></span> Edit</button></a>
<button class="btn btn-primary"><span class="glyphicon glyphicon-edit"></span> Edit</button> <a href="{% url 'delete-label' project.name label.id %}"><button class="btn btn-danger"><span class="glyphicon glyphicon-remove"></span> Delete</button></a>
</a>
<a href="{% url 'delete-label' project.name label.id %}">
<button class="btn btn-danger"><span class="glyphicon glyphicon-remove"></span> Delete</button>
</a>
</div> </div>
</td> </td>
</tr> </tr>

12
issue/templates/issue/milestone_list.html
View file

@ -6,7 +6,7 @@
<div class="panel panel-default"> <div class="panel panel-default">
<div class="panel-heading"> <div class="panel-heading clearfix">
<h1> <h1>
Milestone Milestone
<div class="pull-right"> <div class="pull-right">
@ -21,19 +21,15 @@
<tr> <tr>
<td> <td>
<div class="pull-right"> <div class="pull-right">
<a href="{% url 'edit-milestone' project.name milestone.name %}"> <a href="{% url 'edit-milestone' project.name milestone.name %}"><button class="btn btn-primary"><span class="glyphicon glyphicon-edit"></span> Edit</button></a>
<button class="btn btn-primary"><span class="glyphicon glyphicon-edit"></span> Edit</button> <a href="{% url 'delete-milestone' project.name milestone.name %}"><button class="btn btn-danger"><span class="glyphicon glyphicon-remove"></span> Delete</button></a>
</a>
<a href="{% url 'delete-milestone' project.name milestone.name %}">
<button class="btn btn-danger"><span class="glyphicon glyphicon-remove"></span> Delete</button>
</a>
</div> </div>
<b style="font-size: 200%;"> <b style="font-size: 200%;">
<a href="{% url 'list-issue' project.name %}?q=is:open%20milestone:{{ milestone.name }}">{{ milestone }}</a> <a href="{% url 'list-issue' project.name %}?q=is:open%20milestone:{{ milestone.name }}">{{ milestone }}</a>
</b> </b>
&#160; &#160;
<small> <small>
<span class="glyphicon glyphicon-calendar"></span> {% if milestone.due_date %}Due by {{ milestone.due_date }}{% else %}No due date{% endif %} <span style="white-space: nowrap;"><span class="glyphicon glyphicon-calendar"></span> {% if milestone.due_date %}Due by {{ milestone.due_date }}{% else %}No due date{% endif %}</span>
</small> </small>
<br /><br /> <br /><br />
<div class="progress"> <div class="progress">

14
issue/urls.py
View file

@ -7,13 +7,13 @@ urlpatterns = [
url(r'^(?P<project>[a-z0-9_-]+)/delete$', 'issue.views.project_delete', name='delete-project'), url(r'^(?P<project>[a-z0-9_-]+)/delete$', 'issue.views.project_delete', name='delete-project'),
url(r'^(?P<project>[a-z0-9_-]+)/issues$', 'issue.views.issue_list', name='list-issue'), url(r'^(?P<project>[a-z0-9_-]+)/issues$', 'issue.views.issue_list', name='list-issue'),
url(r'^(?P<project>[a-z0-9_-]+)/issues/add$', 'issue.views.issue_edit', name='add-issue'), url(r'^(?P<project>[a-z0-9_-]+)/issues/add$', 'issue.views.issue_edit', name='add-issue'),
url(r'^(?P<project>[a-z0-9_-]+)/issues/(?P<id>[0-9]+)$', 'issue.views.issue', name='show-issue'), url(r'^(?P<project>[a-z0-9_-]+)/issues/(?P<issue>[0-9]+)$', 'issue.views.issue', name='show-issue'),
url(r'^(?P<project>[a-z0-9_-]+)/issues/(?P<id>[0-9]+)/edit$', 'issue.views.issue_edit', name='edit-issue'), url(r'^(?P<project>[a-z0-9_-]+)/issues/(?P<issue>[0-9]+)/edit$', 'issue.views.issue_edit', name='edit-issue'),
url(r'^(?P<project>[a-z0-9_-]+)/issues/(?P<id>[0-9]+)/close$', 'issue.views.issue_close', name='close-issue'), url(r'^(?P<project>[a-z0-9_-]+)/issues/(?P<issue>[0-9]+)/close$', 'issue.views.issue_close', name='close-issue'),
url(r'^(?P<project>[a-z0-9_-]+)/issues/(?P<id>[0-9]+)/reopen$', 'issue.views.issue_reopen', name='reopen-issue'), url(r'^(?P<project>[a-z0-9_-]+)/issues/(?P<issue>[0-9]+)/reopen$', 'issue.views.issue_reopen', name='reopen-issue'),
url(r'^(?P<project>[a-z0-9_-]+)/issues/(?P<id>[0-9]+)/comment$', 'issue.views.issue_comment', name='comment-issue'), url(r'^(?P<project>[a-z0-9_-]+)/issues/(?P<issue>[0-9]+)/comment$', 'issue.views.issue_comment', name='comment-issue'),
url(r'^(?P<project>[a-z0-9_-]+)/issues/(?P<id>[0-9]+)/comments/(?P<comment>[0-9]+)/edit$', 'issue.views.issue_comment', name='edit-comment'), url(r'^(?P<project>[a-z0-9_-]+)/issues/(?P<issue>[0-9]+)/comments/(?P<comment>[0-9]+)/edit$', 'issue.views.issue_comment', name='edit-comment'),
url(r'^(?P<project>[a-z0-9_-]+)/issues/(?P<id>[0-9]+)/delete$', 'issue.views.issue_delete', name='delete-issue'), url(r'^(?P<project>[a-z0-9_-]+)/issues/(?P<issue>[0-9]+)/delete$', 'issue.views.issue_delete', name='delete-issue'),
url(r'^(?P<project>[a-z0-9_-]+)/issues/(?P<issue>[0-9]+)/add-label/(?P<label>[0-9]+)$', 'issue.views.issue_add_label', name='add-label-to-issue'), url(r'^(?P<project>[a-z0-9_-]+)/issues/(?P<issue>[0-9]+)/add-label/(?P<label>[0-9]+)$', 'issue.views.issue_add_label', name='add-label-to-issue'),
url(r'^(?P<project>[a-z0-9_-]+)/issues/(?P<issue>[0-9]+)/remove-label/(?P<label>[0-9]+)$', 'issue.views.issue_remove_label', name='remove-label-from-issue'), url(r'^(?P<project>[a-z0-9_-]+)/issues/(?P<issue>[0-9]+)/remove-label/(?P<label>[0-9]+)$', 'issue.views.issue_remove_label', name='remove-label-from-issue'),
url(r'^(?P<project>[a-z0-9_-]+)/issues/(?P<issue>[0-9]+)/add-milestone/(?P<milestone>[a-z0-9_.-]+)$', 'issue.views.issue_add_milestone', name='add-milestone-to-issue'), url(r'^(?P<project>[a-z0-9_-]+)/issues/(?P<issue>[0-9]+)/add-milestone/(?P<milestone>[a-z0-9_.-]+)$', 'issue.views.issue_add_milestone', name='add-milestone-to-issue'),

26
issue/views.py
View file

@ -215,12 +215,12 @@ def issue_list(request, project):
return render(request, 'issue/issue_list.html', c) return render(request, 'issue/issue_list.html', c)
def issue_edit(request, project, id=None): def issue_edit(request, project, issue=None):
project = get_object_or_404(Project, name=project) project = get_object_or_404(Project, name=project)
if id: if issue:
issue = get_object_or_404(Issue, project__name=project.name, id=id) issue = get_object_or_404(Issue, project__name=project.name, id=issue)
init_data = {'title': issue.title, init_data = {'title': issue.title,
'description': issue.description} 'description': issue.description}
else: else:
@ -284,9 +284,9 @@ def issue_edit(request, project, id=None):
return render(request, 'issue/issue_edit.html', c) return render(request, 'issue/issue_edit.html', c)
def issue(request, project, id): def issue(request, project, issue):
issue = get_object_or_404(Issue, project__name=project, id=id) issue = get_object_or_404(Issue, project__name=project, id=issue)
projects = Project.objects.all() projects = Project.objects.all()
labels = Label.objects.filter(project=issue.project, deleted=False) \ labels = Label.objects.filter(project=issue.project, deleted=False) \
@ -309,9 +309,9 @@ def issue(request, project, id):
return render(request, 'issue/issue.html', c) return render(request, 'issue/issue.html', c)
def issue_comment(request, project, id, comment=None): def issue_comment(request, project, issue, comment=None):
issue = get_object_or_404(Issue, project__name=project, id=id) issue = get_object_or_404(Issue, project__name=project, id=issue)
if comment: if comment:
event = get_object_or_404(Event, code=Event.COMMENT, issue=issue, id=comment) event = get_object_or_404(Event, code=Event.COMMENT, issue=issue, id=comment)
@ -361,9 +361,9 @@ def issue_comment(request, project, id, comment=None):
return render(request, 'issue/issue_comment.html', c) return render(request, 'issue/issue_comment.html', c)
def issue_close(request, project, id): def issue_close(request, project, issue):
issue = get_object_or_404(Issue, project__name=project, id=id, closed=False) issue = get_object_or_404(Issue, project__name=project, id=issue, closed=False)
issue.closed = True issue.closed = True
issue.save() issue.save()
@ -374,9 +374,9 @@ def issue_close(request, project, id):
return redirect('list-issue', project) return redirect('list-issue', project)
def issue_reopen(request, project, id): def issue_reopen(request, project, issue):
issue = get_object_or_404(Issue, project__name=project, id=id, closed=True) issue = get_object_or_404(Issue, project__name=project, id=issue, closed=True)
issue.closed = False issue.closed = False
issue.save() issue.save()
@ -387,9 +387,9 @@ def issue_reopen(request, project, id):
return redirect('show-issue', project, issue.id) return redirect('show-issue', project, issue.id)
def issue_delete(request, project, id): def issue_delete(request, project, issue):
issue = get_object_or_404(Issue, project__name=project, id=id) issue = get_object_or_404(Issue, project__name=project, id=issue)
issue.delete() issue.delete()