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