Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Comparing changes

Choose two branches to see what's changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: openhealthcare/nhsbugs
base: 3869da1b56
...
head fork: openhealthcare/nhsbugs
compare: 9244ba40ab
Checking mergeability… Don't worry, you can still create the pull request.
  • 3 commits
  • 6 files changed
  • 0 commit comments
  • 1 contributor
View
1  nhsbugs/nhsbugs/views.py
@@ -7,6 +7,7 @@
from django.contrib.auth import authenticate, login, logout
from voting.models import Vote
+from voting.models import Vote
from bugs.models import Bug
from forms import LoginForm
from bugs.forms import BugForm
View
2  nhsbugs/static/css/style.css
@@ -319,7 +319,7 @@ footer {
float: right;
float: right;
}
-.bugsList .summary {
+.bugsList .detail {
margin-bottom: 10px;
}
.bugsList .more {
View
7 nhsbugs/templates/bugs/detail.html
@@ -6,9 +6,10 @@
<hgroup>
<h1>{{ bug.title }}</h1>
<h2>{{ bug.votes }} votes</h2>
- <time pubdate>{{ bug.reported_date }}</time>
+ <time pubdate>{{ bug.report_date }}</time>
</hgroup>
- <p class="summary">{{ bug.description|truncatechars:50 }}</p>
-
+
+ <p class="detail">{% if description %}{{ description }}{% else %}{{ bug.description }}{% endif %}</p>
+
<a href="{% url view_bug slug=bug.slug %}" class="more">More information</a>
</article>
View
17 nhsbugs/templates/bugs/form.html
@@ -1,23 +1,26 @@
<form action="/bugs/report/" method="POST" enctype="multipart/form-data">
{% csrf_token %}
- {{ form.title.label }}
- {{ form.title }}<br/>
+<<<<<<< HEAD
+
+ <label for="title">Title:</label>
+ <input id="title" name="title" type="text" value="{{ form.cleaned_data.title }}" required />
+
{% if form.title.errors %}
{{form.title.errors }}
{% endif %}
-
- {{ form.description.label }}
- {{ form.description }}<br/>
+
+ <label for="description">Description:</label>
+ <textarea id="description" name="description">{{ form.cleaned_data.description }}</textarea>
{% if form.description.errors %}
{{form.description.errors }}
{% endif %}
-
+
{{ form.hospital.label }}
{{ form.hospital }}<br/>
{% if form.hospital.errors %}
{{form.hospital.errors }}
{% endif %}
-
+
{{ form.pic.label }}
{{ form.pic }}<br/>
View
19 nhsbugs/templates/bugs/view.html
@@ -9,22 +9,9 @@
<a href="{% url vote_bug slug=bug.slug score=1%}">Vote UP</a><br/>
<a href="{% url vote_bug slug=bug.slug score=-1%}">Vote Down</a><br/>
-
-<article>
- <h1>{{ bug.title }}</h1>
-
- {% if bug.pic %}
- <img src="{{ MEDIA_URL }}/{{bug.pic}}" width="100" height="100"/>
- {% else %}
- <p>--No picture--</p>
- {% endif %}
-
-</article>
-
-
- <section class="bugsList">
- {% include 'bugs/detail.html' %}
- </section>
+<section class="bugsList">
+ {% include 'bugs/detail.html' %}
+</section>
{% get_comment_list for bug as comment_list %}
{% get_comment_count for bug as comment_count %}.
View
2  nhsbugs/templates/home.html
@@ -6,7 +6,7 @@
<h1>Popular Bugs</h1>
{% for bug in top_bugs %}
- {% include 'bugs/detail.html' %}
+ {% include 'bugs/detail.html' with description=bug.description|truncatechars:50 %}
{% endfor %}
</section>

No commit comments for this range

Something went wrong with that request. Please try again.