Refactor 3-col-content

templates/organization/add.html

@@ -1,6 +1,6 @@
 {% extends "two-column-content.html" %}
 
-{% block two_col_js %}
+{% block js_media %}
   {{ form.media.js }}
 {% endblock %}
 

templates/organization/blog/add.html

@@ -1,6 +1,6 @@
 {% extends "organization/home-base.html" %}
 
-{% block three_col_js %}
+{% block js_media %}
   {{ form.media.js }}
   {% include "organization/home-js.html" %}
 {% endblock %}

templates/organization/blog/edit.html

@@ -1,6 +1,6 @@
 {% extends "organization/home-base.html" %}
 
-{% block three_col_js %}
+{% block js_media %}
   {{ form.media.js }}
   {% include "organization/home-js.html" %}
 {% endblock %}

templates/organization/contest/add.html

@@ -1,6 +1,6 @@
 {% extends "organization/home-base.html" %}
 
-{% block three_col_js %}
+{% block js_media %}
   {{ form.media.js }}
 {% endblock %}
 

templates/organization/contest/edit.html

@@ -1,6 +1,6 @@
 {% extends "organization/home-base.html" %}
 
-{% block three_col_js %}
+{% block js_media %}
   {{ form.media.js }}
 {% endblock %}
 

templates/organization/home-base.html

@@ -1,6 +1,6 @@
 {% extends "three-column-content.html" %}
 
-{% block three_col_js %}
+{% block js_media %}
   {% include "organization/home-js.html" %}
   {% block org_js %}{% endblock %}
 {% endblock %}

templates/organization/home-js.html

@@ -1,8 +1,5 @@
 <script type="text/javascript">
-  $(function () {
-    $('.time-remaining').each(function () {
-      count_down($(this));
-    });
+  function confirmLeaveOrganization() {
     $('.leave-organization').click(function () {
       if (confirm('{{ _('Are you sure you want to leave this organization?') }}\n' +
         {% if organization.is_open %}
@@ -14,5 +11,10 @@
         $(this).parent().submit();
       }
     });
+  }
+  $(function () {
+    $('.time-remaining').each(function () {
+      count_down($(this));
+    });
   });
 </script>

templates/organization/list.html

@@ -1,11 +1,12 @@
 {% extends "three-column-content.html" %}
 
-{% block three_col_js %}
+{% block js_media %}
   <script type="text/javascript">
     $(document).ready(function () {
       $('#mine-tab').attr('href', changeTabParameter('mine'));
       $('#public-tab').attr('href', changeTabParameter('public'));
       $('#private-tab').attr('href', changeTabParameter('private'));
+      registerNavigation();
 
       var $form = $('form#filter-form');
 

templates/organization/org-right-sidebar.html

@@ -58,7 +58,7 @@
           <div class="link-row" style="color: red;">
             <form method="post" action="{{ url('leave_organization', organization.id, organization.slug) }}">
               {% csrf_token %}
-              <a href="#" class="leave-organization">
+              <a href="#" class="leave-organization" onclick="confirmLeaveOrganization()">
                 <i class="fa fa-sign-out-alt"></i>{{ _('Leave group') }}</a>
             </form>
           </div>