From 6b5acf4e98c6a2c954e3e7e9887bbd2b2a9808fa Mon Sep 17 00:00:00 2001
From: juliotoscano <juliotoscanodebrito@gmail.com>
Date: Tue, 6 Dec 2016 09:02:48 -0300
Subject: [PATCH] modifying js #228

---
 app/static/js/home.js                   | 11 +++++------
 app/templates/home.html                 |  3 ++-
 core/templates/base.html                |  1 +
 courses/templates/course/create.html    |  2 --
 courses/templates/course/index.html     |  4 ++++
 courses/templates/course/replicate.html |  2 --
 courses/templates/course/update.html    |  4 ++--
 courses/templates/course/view.html      |  5 +++--
 courses/templates/subject/index.html    |  2 +-
 9 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/app/static/js/home.js b/app/static/js/home.js
index 1377f82..e5434cd 100644
--- a/app/static/js/home.js
+++ b/app/static/js/home.js
@@ -35,6 +35,10 @@ var loadItems = function() {
         });
     }, 1000)
 };
+$(document).ready(function(){
+   $(window).bind('scroll', loadOnScroll);
+   $.material.init();
+});
 $(".accordion").bind('click', function(){
     var icon = $(this).find('span');
     if(icon.hasClass("glyphicon-chevron-down")){
@@ -43,10 +47,5 @@ $(".accordion").bind('click', function(){
     }else{
         $(this).find('span').removeClass('glyphicon-chevron-up');
         $(this).find('span').addClass('glyphicon-chevron-down');
-    };
-    
-});
-$(document).ready(function(){
-   $(window).bind('scroll', loadOnScroll);
-   $.material.init();
+    }
 });
\ No newline at end of file
diff --git a/app/templates/home.html b/app/templates/home.html
index 4878fa5..00fde03 100644
--- a/app/templates/home.html
+++ b/app/templates/home.html
@@ -3,6 +3,7 @@
 {% load static i18n django_bootstrap_breadcrumbs permission_tags %}
 
 {% block javascript %}
+    {{ block.super }}
     {% if page_obj %}
         <script type="text/javascript">
           {% if page_obj and paginator %}
@@ -15,7 +16,7 @@
           var baseUrl = '{% url "app:index" %}';
         </script> 
     {% endif %}
-    <script type="text/javascript" src="{% static 'js/home.js' %}"></script>
+    
 {% endblock %}
 
 {% block breadcrumbs %}
diff --git a/core/templates/base.html b/core/templates/base.html
index d59aa90..89eca77 100644
--- a/core/templates/base.html
+++ b/core/templates/base.html
@@ -143,6 +143,7 @@
 
   {% endblock script_link %}
   <!-- Init material Bootstrap -->
+  <script type="text/javascript" src="{% static 'js/home.js' %}"></script>
   <script type="text/javascript">$.material.init()</script>
 </body>
 
diff --git a/courses/templates/course/create.html b/courses/templates/course/create.html
index ca4d38c..6956af5 100644
--- a/courses/templates/course/create.html
+++ b/courses/templates/course/create.html
@@ -3,10 +3,8 @@
 {% load widget_tweaks static i18n permission_tags django_bootstrap_breadcrumbs %}
 
 {% block breadcrumbs %}
-
   {{ block.super }}
   {% breadcrumb 'Create Course' 'course:create' %}
-
 {% endblock %}
 
 {% block content %}
diff --git a/courses/templates/course/index.html b/courses/templates/course/index.html
index 2b26d6b..a0056c2 100644
--- a/courses/templates/course/index.html
+++ b/courses/templates/course/index.html
@@ -3,6 +3,10 @@
 {% load static i18n permission_tags %}
 {% load django_bootstrap_breadcrumbs %}
 
+{% block javascript%}
+  {{ block.super }}
+{% endblock%}
+
 {% block breadcrumbs %}
 
 {{ block.super }}
diff --git a/courses/templates/course/replicate.html b/courses/templates/course/replicate.html
index 77b865d..d4476af 100644
--- a/courses/templates/course/replicate.html
+++ b/courses/templates/course/replicate.html
@@ -4,10 +4,8 @@
 {% load widget_tweaks course_value_field django_bootstrap_breadcrumbs %}
 
 {% block breadcrumbs %}
-
   {{ block.super }}
   {% breadcrumb 'Replicate Course' 'course:replicate_course' %}
-
 {% endblock %}
 
 {% block content %}
diff --git a/courses/templates/course/update.html b/courses/templates/course/update.html
index 5b63039..afa8e87 100644
--- a/courses/templates/course/update.html
+++ b/courses/templates/course/update.html
@@ -5,10 +5,10 @@
 
 {% block breadcrumbs %}
 	{{ block.super }}
-	 {% breadcrumb 'Update' 'course:update'  course.slug %}
+	{% breadcrumb 'Update' 'course:update'  course.slug %}
 {% endblock %}
-{% block content %}
 
+{% block content %}
 </br>
 <div class="card card-content">
   <div class="card-body">
diff --git a/courses/templates/course/view.html b/courses/templates/course/view.html
index 6b44497..829cf9c 100644
--- a/courses/templates/course/view.html
+++ b/courses/templates/course/view.html
@@ -4,13 +4,14 @@
 {% load django_bootstrap_breadcrumbs %}
 
 {% block style %}
-<link rel="stylesheet" href="{% static 'css/course/course.css' %}">
+ <!-- <link rel="stylesheet" href="{% static 'css/course/course.css' %}"> --> <!-- Este arquivo já nao se encontra no Sistema -->
 {% endblock style %}
 
 {% block javascript %}
+  {{block.super}}
   <script type="text/javascript" src="{% static 'js/course.js' %}"></script>
   <script type="text/javascript" src="{% static 'js/modal_subject.js' %}"></script>
-  <script type="text/javascript" src="{% static 'js/topic_editation_presentation.js' %}"></script>
+  <script type="text/javascript" src="{% static 'js/topic_editation_presentation_search.js' %}"></script>
 {% endblock %}
 
 {% block breadcrumbs %}
diff --git a/courses/templates/subject/index.html b/courses/templates/subject/index.html
index e38454e..421a206 100644
--- a/courses/templates/subject/index.html
+++ b/courses/templates/subject/index.html
@@ -3,13 +3,13 @@
 {% load static i18n permission_tags professor_access django_bootstrap_breadcrumbs %}
 
 {% block javascript %}
+  {{block.super}}
   <script type="text/javascript" src="{% static 'js/forum.js' %}"></script>
   <script src="{% static 'js/file.js' %}"></script>
   <script type="text/javascript" src="{% static 'js/material.js' %}"></script>
   <script type="text/javascript" src="{% static 'js/modals_requisitions.js' %}"></script>
   <script type = "text/javascript" src="{% static 'js/links.js' %}"></script>
   <script src="{% static 'js/modal_poll.js' %}"></script>
-  <script src="{% static 'js/modal_subject.js' %}"></script>
   <script type="text/javascript" src="{% static 'js/topic.js' %}"></script>
 {% endblock %}
 
--
libgit2 0.21.2