Download as
Browse Code »

Commit 6b5acf4e98c6a2c954e3e7e9887bbd2b2a9808fa

Authored by juliotoscano
1 parent de77742b
Exists in master and in 5 other branches amadeus_univasf, dev, image-crop, pdf_file_html, refactoring

modifying js #228

Showing 9 changed files with 18 additions and 16 deletions   Show diff stats
app/static/js/home.js
  Diff comments   View file @6b5acf4
@@ -35,6 +35,10 @@ var loadItems = function() { @@ -35,6 +35,10 @@ var loadItems = function() {
35 }); 35 });
36 }, 1000) 36 }, 1000)
37 }; 37 };
  38 +$(document).ready(function(){
  39 + $(window).bind('scroll', loadOnScroll);
  40 + $.material.init();
  41 +});
38 $(".accordion").bind('click', function(){ 42 $(".accordion").bind('click', function(){
39 var icon = $(this).find('span'); 43 var icon = $(this).find('span');
40 if(icon.hasClass("glyphicon-chevron-down")){ 44 if(icon.hasClass("glyphicon-chevron-down")){
@@ -43,10 +47,5 @@ $(".accordion").bind('click', function(){ @@ -43,10 +47,5 @@ $(".accordion").bind('click', function(){
43 }else{ 47 }else{
44 $(this).find('span').removeClass('glyphicon-chevron-up'); 48 $(this).find('span').removeClass('glyphicon-chevron-up');
45 $(this).find('span').addClass('glyphicon-chevron-down'); 49 $(this).find('span').addClass('glyphicon-chevron-down');
46 - };  
47 -  
48 -});  
49 -$(document).ready(function(){  
50 - $(window).bind('scroll', loadOnScroll);  
51 - $.material.init(); 50 + }
52 }); 51 });
53 \ No newline at end of file 52 \ No newline at end of file
app/templates/home.html
  Diff comments   View file @6b5acf4
@@ -3,6 +3,7 @@ @@ -3,6 +3,7 @@
3 {% load static i18n django_bootstrap_breadcrumbs permission_tags %} 3 {% load static i18n django_bootstrap_breadcrumbs permission_tags %}
4 4
5 {% block javascript %} 5 {% block javascript %}
  6 + {{ block.super }}
6 {% if page_obj %} 7 {% if page_obj %}
7 <script type="text/javascript"> 8 <script type="text/javascript">
8 {% if page_obj and paginator %} 9 {% if page_obj and paginator %}
@@ -15,7 +16,7 @@ @@ -15,7 +16,7 @@
15 var baseUrl = '{% url "app:index" %}'; 16 var baseUrl = '{% url "app:index" %}';
16 </script> 17 </script>
17 {% endif %} 18 {% endif %}
18 - <script type="text/javascript" src="{% static 'js/home.js' %}"></script> 19 +
19 {% endblock %} 20 {% endblock %}
20 21
21 {% block breadcrumbs %} 22 {% block breadcrumbs %}
core/templates/base.html
  Diff comments   View file @6b5acf4
@@ -143,6 +143,7 @@ @@ -143,6 +143,7 @@
143 143
144 {% endblock script_link %} 144 {% endblock script_link %}
145 <!-- Init material Bootstrap --> 145 <!-- Init material Bootstrap -->
  146 + <script type="text/javascript" src="{% static 'js/home.js' %}"></script>
146 <script type="text/javascript">$.material.init()</script> 147 <script type="text/javascript">$.material.init()</script>
147 </body> 148 </body>
148 149
courses/templates/course/create.html
  Diff comments   View file @6b5acf4
@@ -3,10 +3,8 @@ @@ -3,10 +3,8 @@
3 {% load widget_tweaks static i18n permission_tags django_bootstrap_breadcrumbs %} 3 {% load widget_tweaks static i18n permission_tags django_bootstrap_breadcrumbs %}
4 4
5 {% block breadcrumbs %} 5 {% block breadcrumbs %}
6 -  
7 {{ block.super }} 6 {{ block.super }}
8 {% breadcrumb 'Create Course' 'course:create' %} 7 {% breadcrumb 'Create Course' 'course:create' %}
9 -  
10 {% endblock %} 8 {% endblock %}
11 9
12 {% block content %} 10 {% block content %}
courses/templates/course/index.html
  Diff comments   View file @6b5acf4
@@ -3,6 +3,10 @@ @@ -3,6 +3,10 @@
3 {% load static i18n permission_tags %} 3 {% load static i18n permission_tags %}
4 {% load django_bootstrap_breadcrumbs %} 4 {% load django_bootstrap_breadcrumbs %}
5 5
  6 +{% block javascript%}
  7 + {{ block.super }}
  8 +{% endblock%}
  9 +
6 {% block breadcrumbs %} 10 {% block breadcrumbs %}
7 11
8 {{ block.super }} 12 {{ block.super }}
courses/templates/course/replicate.html
  Diff comments   View file @6b5acf4
@@ -4,10 +4,8 @@ @@ -4,10 +4,8 @@
4 {% load widget_tweaks course_value_field django_bootstrap_breadcrumbs %} 4 {% load widget_tweaks course_value_field django_bootstrap_breadcrumbs %}
5 5
6 {% block breadcrumbs %} 6 {% block breadcrumbs %}
7 -  
8 {{ block.super }} 7 {{ block.super }}
9 {% breadcrumb 'Replicate Course' 'course:replicate_course' %} 8 {% breadcrumb 'Replicate Course' 'course:replicate_course' %}
10 -  
11 {% endblock %} 9 {% endblock %}
12 10
13 {% block content %} 11 {% block content %}
courses/templates/course/update.html
  Diff comments   View file @6b5acf4
@@ -5,10 +5,10 @@ @@ -5,10 +5,10 @@
5 5
6 {% block breadcrumbs %} 6 {% block breadcrumbs %}
7 {{ block.super }} 7 {{ block.super }}
8 - {% breadcrumb 'Update' 'course:update' course.slug %} 8 + {% breadcrumb 'Update' 'course:update' course.slug %}
9 {% endblock %} 9 {% endblock %}
10 -{% block content %}  
11 10
  11 +{% block content %}
12 </br> 12 </br>
13 <div class="card card-content"> 13 <div class="card card-content">
14 <div class="card-body"> 14 <div class="card-body">
courses/templates/course/view.html
  Diff comments   View file @6b5acf4
@@ -4,13 +4,14 @@ @@ -4,13 +4,14 @@
4 {% load django_bootstrap_breadcrumbs %} 4 {% load django_bootstrap_breadcrumbs %}
5 5
6 {% block style %} 6 {% block style %}
7 -<link rel="stylesheet" href="{% static 'css/course/course.css' %}"> 7 + <!-- <link rel="stylesheet" href="{% static 'css/course/course.css' %}"> --> <!-- Este arquivo já nao se encontra no Sistema -->
8 {% endblock style %} 8 {% endblock style %}
9 9
10 {% block javascript %} 10 {% block javascript %}
  11 + {{block.super}}
11 <script type="text/javascript" src="{% static 'js/course.js' %}"></script> 12 <script type="text/javascript" src="{% static 'js/course.js' %}"></script>
12 <script type="text/javascript" src="{% static 'js/modal_subject.js' %}"></script> 13 <script type="text/javascript" src="{% static 'js/modal_subject.js' %}"></script>
13 - <script type="text/javascript" src="{% static 'js/topic_editation_presentation.js' %}"></script> 14 + <script type="text/javascript" src="{% static 'js/topic_editation_presentation_search.js' %}"></script>
14 {% endblock %} 15 {% endblock %}
15 16
16 {% block breadcrumbs %} 17 {% block breadcrumbs %}
courses/templates/subject/index.html
  Diff comments   View file @6b5acf4
@@ -3,13 +3,13 @@ @@ -3,13 +3,13 @@
3 {% load static i18n permission_tags professor_access django_bootstrap_breadcrumbs %} 3 {% load static i18n permission_tags professor_access django_bootstrap_breadcrumbs %}
4 4
5 {% block javascript %} 5 {% block javascript %}
  6 + {{block.super}}
6 <script type="text/javascript" src="{% static 'js/forum.js' %}"></script> 7 <script type="text/javascript" src="{% static 'js/forum.js' %}"></script>
7 <script src="{% static 'js/file.js' %}"></script> 8 <script src="{% static 'js/file.js' %}"></script>
8 <script type="text/javascript" src="{% static 'js/material.js' %}"></script> 9 <script type="text/javascript" src="{% static 'js/material.js' %}"></script>
9 <script type="text/javascript" src="{% static 'js/modals_requisitions.js' %}"></script> 10 <script type="text/javascript" src="{% static 'js/modals_requisitions.js' %}"></script>
10 <script type = "text/javascript" src="{% static 'js/links.js' %}"></script> 11 <script type = "text/javascript" src="{% static 'js/links.js' %}"></script>
11 <script src="{% static 'js/modal_poll.js' %}"></script> 12 <script src="{% static 'js/modal_poll.js' %}"></script>
12 - <script src="{% static 'js/modal_subject.js' %}"></script>  
13 <script type="text/javascript" src="{% static 'js/topic.js' %}"></script> 13 <script type="text/javascript" src="{% static 'js/topic.js' %}"></script>
14 {% endblock %} 14 {% endblock %}
15 15