Merge branch 'issue-27' into 3.3-dev

institutotim · Oct 31, 2016 · 65bd9b9 · 65bd9b9
2 parents 54b2ef9 + 74a947e
commit 65bd9b9
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 7 deletions.
diff --git a/themes/default/templates/class_edit.html b/themes/default/templates/class_edit.html
@@ -56,7 +56,7 @@
             </div>
 
             <div class="row">
-                <div class="col-xs-9">
+                <div class="col-xs-12">
                     <div class="professor-assistant">
                         <label for="{{ form.assistant.id_for_label }}">{% trans 'Assistant Professor' %}:</label>
                         {% if user|is_course_coordinator:object.course %}
@@ -66,15 +66,10 @@
                         {% endif %}
                     </div>
                 </div>
-                <div class="col-xs-3">
-                    <a class="btn btn-lg btn-danger uppercase"
-                       href="{% url 'course-evaluations' object.course.slug %}#/class-evaluations/{{ object.id }}">
-                        {% trans 'Certification' %}
-                    </a>
-                </div>
             </div>
         </header>
 
+        {% block class_edit_allow_certification %}
         <div class="alert row" role="alert"
              ng-class="{'alert-info': classe.user_can_certificate, 'alert-danger': !classe.user_can_certificate}">
             <div class="col-xs-8">
@@ -100,6 +95,7 @@
                 </div>
             </div>
         </div>
+        {% endblock %}
 
         <div class="row">
             <div class="col-lg-12">

diff --git a/themes/timtec/templates/class_edit.html b/themes/timtec/templates/class_edit.html
@@ -0,0 +1,3 @@
+{% extends "default:class_edit.html" %}
+
+{% block class_edit_allow_certification %}{% endblock %}
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		{% extends "default:class_edit.html" %}

		{% block class_edit_allow_certification %}{% endblock %}