From 295f601114f3b7c849c2ba7ce45f17439b8241ae Mon Sep 17 00:00:00 2001 From: filipecmedeiros Date: Wed, 9 Nov 2016 16:15:32 -0300 Subject: [PATCH] Adding summernote in update topic modal [Issue #232] --- core/templates/base.html | 6 ++++++ courses/static/js/topic_editation_presentation.js | 4 +++- courses/templates/course/view.html | 6 ++++-- courses/templates/subject/form_view_teacher.html | 6 +++++- courses/templates/subject/index.html | 2 +- 5 files changed, 19 insertions(+), 5 deletions(-) diff --git a/core/templates/base.html b/core/templates/base.html index 4e4e68a..a2fcc43 100644 --- a/core/templates/base.html +++ b/core/templates/base.html @@ -54,6 +54,12 @@ {% endblock %} {% block javascript %} {% endblock %} + + + + + + {% block nav %} diff --git a/courses/static/js/topic_editation_presentation.js b/courses/static/js/topic_editation_presentation.js index f2949b3..73a99e3 100644 --- a/courses/static/js/topic_editation_presentation.js +++ b/courses/static/js/topic_editation_presentation.js @@ -1,10 +1,12 @@ $(document).ready(function(){ - $(".editation").hide(); + $(".editation").hide(); }); + function show_editation(id_topic){ $(".presentation_"+ id_topic).hide(); $(".editation_"+ id_topic).show(); + $('#summernote').summernote({height: 300}); }; function show_presentation(id_topic){ diff --git a/courses/templates/course/view.html b/courses/templates/course/view.html index 6cf0946..21ee3f5 100644 --- a/courses/templates/course/view.html +++ b/courses/templates/course/view.html @@ -158,9 +158,11 @@ + {% endif %} diff --git a/courses/templates/subject/form_view_teacher.html b/courses/templates/subject/form_view_teacher.html index 976759f..f553910 100644 --- a/courses/templates/subject/form_view_teacher.html +++ b/courses/templates/subject/form_view_teacher.html @@ -25,6 +25,8 @@
  •   {% trans "Edit" %}
  •   {% trans "Remove" %}
    • + + {% endif %} @@ -49,7 +51,7 @@
    - +
    {# materiais do topico#} @@ -207,3 +209,5 @@ + + diff --git a/courses/templates/subject/index.html b/courses/templates/subject/index.html index ed16972..85c259d 100644 --- a/courses/templates/subject/index.html +++ b/courses/templates/subject/index.html @@ -75,7 +75,7 @@ -- libgit2 0.21.2