マージ失敗っぽいの直した

kawazrepos · Nov 4, 2014 · 985e65d · 985e65d
1 parent fe941d4
commit 985e65d
Showing 1 changed file with 0 additions and 33 deletions.
diff --git a/src/templates/blogs/entry_detail.html b/src/templates/blogs/entry_detail.html
@@ -53,36 +53,3 @@ <h2 class="panel-title">{% trans "Administration" %}</h2>
         </div>
     {% endif %}
 {% endblock %}
-{% block content-aside %}
-    <div class="entry-item entry-item-right">
-        <dl class="blog-author">
-            <dt><span class="glyphicon glyphicon-pencil"></span><span>{% trans "Blog author" %}</span></dt>
-            <dd>
-                <a class="author-info" href="{{ object.author.profile.get_absolute_url }}">
-                    <img src="{{ object.author.get_middle_avatar }}" alt="{{ object.author.nickname }} Avatar blog-avatar" class="avatar avatar-middle"/> <p class="author-quotes">{{ object.author.quotes }}</p>
-                </a>
-                <a class="author-info author-name" href="{{ object.author.profile.get_absolute_url }}">
-                    {{ object.author.nickname }}(id: {{ object.author }})
-                </a>
-            </dd>
-        </dl>
-    </div>
-    {% if user has 'blogs.change_entry' of object or user has 'blogs.delete_entry' of object %}
-        <div class="panel panel-default blog-administration">
-          <div class="panel-heading blog-administration-head">
-              <h2 class="panel-title">{% trans "Administration" %}</h2>
-          </div>
-          <div class="list-group">
-              {% if user has 'blogs.change_entry' of object %}
-            <a class="list-group-item" href="{% url 'blogs_entry_update' author=user.username pk=object.pk %}"><span class="glyphicon glyphicon-pencil"></span> {% trans "Edit the blog entry" %}</a>
-                {% endif %}
-                {% if user has 'blogs.delete_entry' of object %}
-                <a class="list-group-item list-group-item-danger post-link" href="{% url 'blogs_entry_delete' author=user.username pk=object.pk %}" confirm-message="{% trans "Do you want to delete this entry?" %}"><span class="glyphicon glyphicon-remove"></span>
-                    {% trans "Delete the blog entry" %}
-                    <form method="POST" style="display: none;">{% csrf_token %}</form>
-                </a>
-                {% endif %}
-          </div>
-        </div>
-    {% endif %}
-{% endblock %}