show recent changesets in user view
This commit is contained in:
parent
f53f20ef9a
commit
d8694a0290
4 changed files with 37 additions and 11 deletions
|
@ -157,6 +157,14 @@ form button.invisiblesubmit {
|
||||||
width:23px;
|
width:23px;
|
||||||
padding-right:0;
|
padding-right:0;
|
||||||
}
|
}
|
||||||
|
.changesettable td:first-child {
|
||||||
|
padding-left:0;
|
||||||
|
width:21px;
|
||||||
|
}
|
||||||
|
.changesettable td:last-child {
|
||||||
|
text-align:right;
|
||||||
|
padding-right:0;
|
||||||
|
}
|
||||||
|
|
||||||
/* Styles inside leaflet */
|
/* Styles inside leaflet */
|
||||||
.leaflet-container {
|
.leaflet-container {
|
||||||
|
@ -184,6 +192,9 @@ form button.invisiblesubmit {
|
||||||
.leaflet-overlay-pane .leaflet-image-layer {
|
.leaflet-overlay-pane .leaflet-image-layer {
|
||||||
z-index:201;
|
z-index:201;
|
||||||
}
|
}
|
||||||
|
.tooltip {
|
||||||
|
font-size:16px;
|
||||||
|
}
|
||||||
|
|
||||||
/* responsiveness */
|
/* responsiveness */
|
||||||
#responsive_switch {
|
#responsive_switch {
|
||||||
|
|
23
src/c3nav/editor/templates/editor/fragment_changesets.html
Normal file
23
src/c3nav/editor/templates/editor/fragment_changesets.html
Normal file
|
@ -0,0 +1,23 @@
|
||||||
|
{% load i18n %}
|
||||||
|
|
||||||
|
<table class="table table-condensed changesettable">
|
||||||
|
{% for changeset in changesets %}
|
||||||
|
<tr>
|
||||||
|
<td>
|
||||||
|
{% if changeset.state == 'unproposed' %}
|
||||||
|
<i class="glyphicon glyphicon-pencil text-muted" title="{{ changeset.get_state_display }}" data-toggle="tooltip" data-placement="right"></i>
|
||||||
|
{% elif changeset.state == 'proposed' or changeset.state == 'reproposed' %}
|
||||||
|
<i class="glyphicon glyphicon-send text-info" title="{{ changeset.get_state_display }}" data-toggle="tooltip" data-placement="right"></i>
|
||||||
|
{% elif changeset.state == 'review' or changeset.state == 'rereview' %}
|
||||||
|
<i class="glyphicon glyphicon-hourglass text-info" title="{{ changeset.get_state_display }}" data-toggle="tooltip" data-placement="right"></i>
|
||||||
|
{% elif changeset.state == 'rejected' or changeset.state == 'finallyrejected' %}
|
||||||
|
<i class="glyphicon glyphicon-remove text-danger" title="{{ changeset.get_state_display }}" data-toggle="tooltip" data-placement="right"></i>
|
||||||
|
{% elif changeset.state == 'applied' %}
|
||||||
|
<i class="glyphicon glyphicon-ok text-success" title="{{ changeset.get_state_display }}" data-toggle="tooltip" data-placement="right"></i>
|
||||||
|
{% endif %}
|
||||||
|
</td>
|
||||||
|
<td>{% if changeset.title %}{{ changeset.title }}{% else %}<em>#{{ changeset.id }} {% trans '(no title)' %}</em>{% endif %}</td>
|
||||||
|
<td><a href="{% url 'editor.changesets.detail' pk=changeset.pk %}">{% trans 'Details' %}</a></td>
|
||||||
|
</tr>
|
||||||
|
{% endfor %}
|
||||||
|
</table>
|
|
@ -8,15 +8,7 @@
|
||||||
{% endif %}
|
{% endif %}
|
||||||
</h3>
|
</h3>
|
||||||
|
|
||||||
<h4>{% trans 'Change sets' %}</h4>
|
<h4>{% trans 'Recent change sets' %}</h4>
|
||||||
<table class="table table-condensed itemtable">
|
{% include 'editor/fragment_changesets.html' %}
|
||||||
{% for changeset in changesets %}
|
|
||||||
<tr>
|
|
||||||
<td>#{{ changeset.pk }}: {% if changeset.title %}{{ changeset.title }}{% else %}<em>{% trans '(no title)' %}</em>{% endif %}</td>
|
|
||||||
<td><a href="{% url 'editor.changesets.detail' pk=changeset.pk %}">{% trans 'Details' %}</a></td>
|
|
||||||
</tr>
|
|
||||||
{% endfor %}
|
|
||||||
</table>
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -11,7 +11,7 @@ def user_detail(request, pk):
|
||||||
if str(pk) != str(user.pk):
|
if str(pk) != str(user.pk):
|
||||||
user = get_object_or_404(User, pk=pk)
|
user = get_object_or_404(User, pk=pk)
|
||||||
|
|
||||||
qs = ChangeSet.objects.filter(author=user)
|
qs = ChangeSet.objects.filter(author=user).order_by('-last_update')[:10]
|
||||||
|
|
||||||
ctx = {
|
ctx = {
|
||||||
'user': user,
|
'user': user,
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue