Merge

ailsoncgt
2 parents da5d345a 116f13bf
Showing 15 changed files with 234 additions and 120 deletions Show diff stats
app/static/js/home.js
app/templates/home.html
core/admin.py
core/static/css/base/amadeus.css
courses/static/js/topic.js
courses/templates/category/create.html
courses/templates/course/course_card.html
courses/templates/course/view.html
courses/templates/subject/form_view_student.html
courses/templates/subject/form_view_teacher.html
courses/templates/subject/index.html
courses/templates/topic/index.html
exercise/templates/exercise/exercise_edit.html
exercise/templates/exercise/update_exercise.html
exercise/templatetags/list_topic_exercises.py
@@ -0,0 +1,42 @@
+// loadOnScroll handler
+var loadOnScroll = function() {
+   // If the current scroll position is past out cutoff point...
+    if ($(window).scrollTop() >= $(document).height() - $(window).height() - 10) {
+        // temporarily unhook the scroll event watcher so we don't call a bunch of times in a row
+        $(window).unbind();
+        // execute the load function below that will visit the view and return the content
+        loadItems();
+    }
+};
+
+var loadItems = function() {
+    // Check if page is equal to the number of pages
+    if (pageNum == numberPages) {
+        return false
+    }
+    // Update the page number
+    pageNum = pageNum + 1;
+
+    $("#loading").show();
+    // Configure the url we're about to hit
+    setTimeout(function (){
+        $.ajax({
+            url: baseUrl,
+            data: {'page': pageNum},
+            success: function(data) {
+                $("#loading").hide();
+
+                $("#timeline").append(data);
+            },
+            complete: function(data, textStatus){
+                // Turn the scroll monitor back on
+                $(window).bind('scroll', loadOnScroll);
+            }
+        });
+    }, 1000)
+};
+
+$(document).ready(function(){
+   $(window).bind('scroll', loadOnScroll);
+   $.material.init();
+});
 \ No newline at end of file
@@ -5,59 +5,16 @@
 {% block javascript %}
     {% if page_obj %}
         <script type="text/javascript">
-            {% if page_obj and paginator %}
-                var pageNum = {{ page_obj.number }}; // The latest page loaded
-                var numberPages = {{ paginator.num_pages }}; // Indicates the number of pages
-            {% else %}
-                var pageNum = 0 ; // The latest page loaded
-                var numberPages = 0 ; // Indicates the number of pages
-            {% endif %}
-
-            var baseUrl = '{% url "app:index" %}';
-
-            // loadOnScroll handler
-            var loadOnScroll = function() {
-               // If the current scroll position is past out cutoff point...
-                if ($(window).scrollTop() >= $(document).height() - $(window).height() - 10) {
-                    // temporarily unhook the scroll event watcher so we don't call a bunch of times in a row
-                    $(window).unbind();
-                    // execute the load function below that will visit the view and return the content
-                    loadItems();
-                }
-            };
-
-            var loadItems = function() {
-                // Check if page is equal to the number of pages
-                if (pageNum == numberPages) {
-                    return false
-                }
-                // Update the page number
-                pageNum = pageNum + 1;
-
-                $("#loading").show();
-                // Configure the url we're about to hit
-                setTimeout(function (){
-                    $.ajax({
-                        url: baseUrl,
-                        data: {'page': pageNum},
-                        success: function(data) {
-                            $("#loading").hide();
-
-                            $("#timeline").append(data);
-                        },
-                        complete: function(data, textStatus){
-                            // Turn the scroll monitor back on
-                            $(window).bind('scroll', loadOnScroll);
-                        }
-                    });
-                }, 1000)
-            };
-
-            $(document).ready(function(){
-               $(window).bind('scroll', loadOnScroll);
-               $.material.init();
-            });
+          {% if page_obj and paginator %}
+            var pageNum = {{ page_obj.number }}; // The latest page loaded
+            var numberPages = {{ paginator.num_pages }}; // Indicates the number of pages
+          {% else %}
+            var pageNum = 0 ; // The latest page loaded
+            var numberPages = 0 ; // Indicates the number of pages
+          {% endif %}
+          var baseUrl = '{% url "app:index" %}';
         </script>
+        <script type="text/javascript" src="{% static 'js/home.js' %}"></script>
     {% endif %}
 {% endblock %}
@@ -96,7 +53,7 @@
               {% endblock %}
                 {% if user|has_role:'system_admin' %}
-                    
+
                     <li>
                       <a href="#menu_users" class="accordion" data-toggle="collapse">{% trans 'Users' %}<span class="pull-right glyphicon glyphicon-chevron-down"></span></a>
                       <div id="menu_users" class="collapse">
@@ -104,9 +61,9 @@
                           <li> <a href="{% url 'users:manage' %}">{% trans 'Manage Users' %}</a></li>
                           <li> <a href="{% url 'users:create' %}">{% trans 'Create User' %}</a></li>
                         </ul>
-                      </div> 
+                      </div>
                     </li>
-                    <li> 
+                    <li>
                       <a href="#menu_settings" class="accordion" data-toggle="collapse">{% trans 'Settings' %}<span class="pull-right glyphicon glyphicon-chevron-down"></span></a>
                       <div id="menu_settings" class="collapse">
                         <ul class="nav nav-pill nav-stacked accordion_list">
@@ -14,7 +14,7 @@ class ActionResourceAdmin(admin.ModelAdmin):
 	search_fields = ['action', 'resource']
 class LogAdmin(admin.ModelAdmin):
-	list_display = ['datetime', 'user', 'action_resource']
+	list_display = ['datetime', 'user', 'action_resource', 'context']
 	search_fields = ['user']
 class MimeTypeAdmin(admin.ModelAdmin):
@@ -77,9 +77,6 @@
 .end{
     text-align: right;
 }
-h5{
-    text-align: center;
-}
 #img {
     display: block;
@@ -406,16 +403,19 @@ ul, li {
     -webkit-animation-timing-function: ease-in-out;
 }
 /* Icon Topic */
-.divMoreActions {text-align: right; height: 39px; float: right;}
-.divMoreActions div button {padding-left: 10px; padding-right: 10px; padding-bottom: 10px; margin-bottom: 4px; height: 31px;}
-.titleTopic {padding-top: 18px; padding-left: 0px;}
-.titleTopic-detail {padding-top: 8px;  color: white;}
-.titleTopic a h4 {margin-top: 0px; color: black; cursor:pointer;}
+.divMoreActions {text-align: right; height: 59px; float: right;}
+.moreAccordion {height: 59px;}
+/*.divMoreActions div button {padding-left: 10px; padding-right: 10px; padding-bottom: 10px; margin-bottom: 4px; height: 31px;}*/
+.divMoreActions , .moreAccordion{padding-top: 5px; padding-bottom: 1%;}
+.moreAccordion button{margin-bottom: 0px; margin-top: 8px;}
+.titleTopic {padding-top: 10px; padding-bottom: 10px;}
+.titleTopic a h4, .titleTopic h4{color: white;}
+.titleTopic a:hover{text-decoration: none;}
+.Topic-detail a h4{color: black;}
+/* .titleTopic a h4 {margin-top: 0px; color: black; cursor:pointer;}*/
 .dropdown-menu .pull-right {
     right: 0;
   }
-.moreAccordion{ padding-left: 0px; padding-right: 0px;}
-.moreAccordion div button{ padding-left: 0px; padding-right: 0px;}
 .cards-content{ padding-left: 0px; padding-right: 0px; }
 .cards-detail{margin-left: 4%;}
 .cards-detail .panel .panel-heading{/*background-color:;*/}
@@ -2,14 +2,14 @@ function openTopic(url, topic, btn) {
     var icon = btn.find('i');
     var action = '', log_id;
-    if (icon.hasClass('fa-caret-square-o-down')) {
-        icon.removeClass('fa-caret-square-o-down');
-        icon.addClass('fa-caret-square-o-up');
+    if (icon.hasClass('fa-angle-down')) {
+        icon.removeClass('fa-angle-down');
+        icon.addClass('fa-angle-up');
         action = 'open';
         log_id = -1;
     } else {
-        icon.addClass('fa-caret-square-o-down');
-        icon.removeClass('fa-caret-square-o-up');
+        icon.addClass('fa-angle-down');
+        icon.removeClass('fa-angle-up');
         action = 'close';
         log_id = $(".topic_" + topic).find(".log_id").val();
     }
@@ -20,7 +20,7 @@ function openTopic(url, topic, btn) {
         dataType: 'json',
         success: function (data) {
            if (action == 'open') {
-                $(".topic_" + topic).find(".log_id").val(data.log_id);           
+                $(".topic_" + topic).find(".log_id").val(data.log_id);
            }
         },
         error: function(data) {
@@ -19,7 +19,7 @@
 							<label for="{{ field.auto_id }}">{{ field.label }}</label>
 							{% render_field field class='form-control input-sm' %}
 						</div>
-						{% if field.errors.length > 0 %}
+						{% if field.errors%}
 							<div class="alert alert-danger alert-dismissible" role="alert">
 								<ul>
 									{% for error in field.errors %}
@@ -3,7 +3,7 @@
     <div class="panel panel-info">
         <div class="panel-heading course">
           <div class="row">
-            <div class="col-xs-5 col-md-5 titleTopic">
+            <div class="col-xs-6 col-md-6 titleTopic">
               <a role="button" href="{% url 'course:view' course.slug %}">
                   <h4>{{course.name}}</h4>
               </a>
@@ -23,30 +23,36 @@
 {% block content %}
   <div class="col-md-12 cards-content">
-    <div class="panel panel-info">
-      <div class="panel-heading course-detail">
-        <div class="row">
-          <div class="col-xs-8 col-md-11 .titleTopic-detail">
-            <h4>{{course.name}}</h4>
-          </div>
-          {% if user|has_role:'professor' or user|has_role:'system_admin' %}
-            <div class="col-xs-4 col-md-1" id="divMoreActions">
+    <div class="group course-card ">
+      <div class="panel panel-info">
+        <div class="panel-heading course">
+          <div class="row">
+            <div class="col-xs-6 col-md-6 titleTopic">
+                <h4>{{course.name}}</h4>
+            </div>
+            {% if user|has_role:'professor' or user|has_role:'system_admin' %}
+            <div class="col-xs-6 col-md-6 divMoreActions" >
               <div class="btn-group">
                 <button class="btn btn-default btn-sm dropdown-toggle" type="button" id="moreActions" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
                   <i class="fa fa-ellipsis-v fa-2x" aria-hidden="true"></i>
-                <div class="ripple-container"></div></button>
+                 </button>
                 <ul class="dropdown-menu pull-right" aria-labelledby="moreActions">
-                  <li><a href="{% url 'course:replicate_course' course.slug %}"><i class="fa fa-files-o fa-fw" aria-hidden="true"></i>&nbsp; {% trans "Replicate" %}</a></li>
-                  <li><a href="{% url 'course:update' course.slug %}"><i class="fa fa-pencil fa-fw" aria-hidden="true"></i>&nbsp; {% trans "Edit" %}</a></li>
-                  <li><a href="javascript:javascript:delete_course('{% url 'course:delete' course.slug %}', '{{ course.slug }}', '{% trans "Are you sure you want to delete this course?" %}', '{% url 'course:manage' %}')" data-toggle="modal" data-target="#myModal2"><i class="fa fa-trash fa-fw" aria-hidden="true"></i>&nbsp; {% trans "Remove" %}</a></li>
+                  <li><a href="{% url 'course:replicate_course' course.slug %}"><i class="fa fa-files-o fa-fw" aria-hidden="true"></i>{% trans 'Replicate' %}</a></li>
+                  <li><a href="{% url 'course:update' course.slug %}"><i class="fa fa-pencil fa-fw" aria-hidden="true"></i>{% trans 'Edit' %}</a></li>
+                  <li><a href="javascript:delete_course.get('{% url 'course:delete' course.slug %}','#course','#modal_course')"><i class="fa fa-trash fa-fw" aria-hidden="true"></i>&nbsp;{% trans 'Remove' %}</a></li>
                 </ul>
               </div>
             </div>
+            {% elif user|has_role:'student' %}
+            {% if not request.user in course.students.all %}
+              <a onclick="subscribe($(this), '{% url 'course:subscribe' course.slug %}', {{ course.id}}, '{% trans 'Are you sure you want to subscribe to this course?' %}')"><button class="btn btn-sm btn-primary btn-raised pull-right">{% trans 'Subscribe' %}</button></a>
+            {% endif %}
           {% endif %}
+        </div>
+      </div>
+      <div class="panel-body">
+        <p><b>{% trans 'Coordinator' %}: </b>{{course.coordenator}}</p>
       </div>
-    </div>
-    <div class="panel-body">
-      <p><b>{% trans 'Coordinator' %}: </b>{{course.coordenator}}</p>
     </div>
   </div>
@@ -70,18 +76,18 @@
 </div>
 <div class="panel-group ui-accordion ui-widget ui-helper-reset ui-sortable" id="accordion" role="tablist" aria-multiselectable="false"></div>
-<div class="cards-detail">
+  <div class="cards-detail">
     {% for subject in subjects %}
         <div class="panel panel-default panel_{{ subject.id }}">
           <div class="panel-heading heading_{{subject.id}} subject ui-sortable-handle">
             <div class="row">
-                <div class="col-xs-9 col-md-10 titleTopic">
+                <div class="col-xs-9 col-md-6 titleTopic">
                   <a role="button" href="{% url 'course:view_subject' subject.slug %}">
                     <h4>{{subject.name}}</h4>
                   </a>
                 </div>
                 {% if user|has_role:'professor' or user|has_role:'system_admin' %}
-                  <div class="col-xs-3 col-md-1" id="divMoreActions">
+                  <div class="col-xs-3 col-md-6 divMoreActions">
                     <div class="btn-group">
                       <button class="btn btn-default btn-sm dropdown-toggle" type="button" id="moreActions" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
                         <i class="fa fa-ellipsis-v fa-2x" aria-hidden="true"></i>
@@ -33,7 +33,7 @@
           </p>
         </div>
-     
+
     {% if not professor_links %}
       <div class="row">
@@ -6,9 +6,9 @@
   <div class="panel-heading topic">
     <div class="row">
       <div class="col-md-1 moreAccordion" data-toggle="collapse" data-parent="#accordion-{{topic.slug}}" href=".collapseTopic-{{topic.slug}}" aria-expanded="false" aria-controls="collapseTopic-{{topic.slug}}">
-        <button class="btn btn-default btn-sm caret-square" onclick="openTopic('{% url 'course:topic_log' topic.id %}', '{{topic.id}}', $(this));"><i class="fa fa-caret-square-o-down fa-2x" aria-hidden="true"></i></button>
+        <button class="btn btn-default btn-sm caret-square" onclick="openTopic('{% url 'course:topic_log' topic.id %}', '{{topic.id}}', $(this));"><i class="fa fa-angle-down fa-2x" aria-hidden="true"></i></button>
       </div>
-      <div class="col-xs-9 col-md-9 titleTopic">
+      <div class="col-xs-9 col-md-9 titleTopic Topic-detail">
         <a href="{% url 'course:view_topic' topic.slug %}" role="button">
           <h4>{{topic}}</h4>
         </a>
@@ -127,13 +127,6 @@
               {% list_topic_foruns request topic %}
             </ul>
           </div>
-          <div class="editation editation_{{topic.slug}}">
-
-            {# exercícios do tópico no modo de edição #}
-            <ul>
-              {% list_topic_exercise_edit request topic %}
-            </ul>
-          </div>
         </div>
       </div>
@@ -19,14 +19,13 @@
 {% block content %}
   <div class="panel panel-info">
-    <div class="panel-heading course-detail">
+    <div class="panel-heading course">
       <div class="row">
-        <div class="col-md-10 col-sm-10">
+        <div class="col-xs-6 col-md-6 titleTopic">
           <h4>{{subject}}</h4>
         </div>
-
         {# dropdown de subject com as opções de replicar, editar e deletar #}
-        <div class="col-xs-4 col-md-2 divMoreActions">
+        <div class="col-xs-6 col-md-6 divMoreActions">
           {% professor_subject subject user as subject_professor%}
           {% if subject_professor %}
           <div class="btn-group">
@@ -41,10 +40,8 @@
           </div>
           {% endif %}
         </div>
-
       </div>
     </div>
-
     {# informações do subject(professor, descrição etc) #}
     <div class="panel-body">
       <p><b>{% trans "Professor" %}:</b> {% for professor in subject.professors.all %}{% if not forloop.first %},{% endif %}
@@ -62,7 +59,6 @@
         </div>
       </div>
     </div>
-
   </div>
   {# lista de tópicos #}
@@ -19,13 +19,13 @@
 {% block content %}
 <div class="col-md-12 col-xs-12 col-sm-12">
 <div class="panel panel-info">
-    <div class="panel-heading">
-			<div class="row">
-	      <div class="col-md-10 col-sm-7">
-	        <h3> {{topic.name}} </h3>
-	      </div>
-	      <div class="col-xs-4 col-md-2 divMoreActions">
-					{% professor_subject subject user as permissions%}
+    <div class="panel-heading course">
+	<div class="row">
+          <div class="col-md-10 col-sm-7 titleTopic">
+          <h4> {{topic.name}}</h4>
+          </div>
+      <div class="col-xs-4 col-md-2 divMoreActions">
+	{% professor_subject subject user as permissions%}
           {% if permissions %}
             <div class="btn-group">
               <button class="btn btn-default btn-sm dropdown-toggle" type="button" id="moreActions" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
@@ -110,8 +110,8 @@
     </div>
 </div>
   <div class="col-md-6">
-      <h3>{% trans 'Students - Specific Exercises' %}</h3>  
-      <br/>  
+      <h3>{% trans 'Students - Specific Exercises' %}</h3>
+      <br/>
   </div>
     {# mostra a lista de usuários caso seja um professor ou admin #}
   {% if user|has_role:'professor' or user|has_role:'system_admin' %}
 {% load static i18n list_topic_foruns permission_tags %}
 <div id="exercise-topic{{ topic.id }}-exercises-edit">
   {% for exercise in exercises %}
-    <li class="icon_edit_remove" id = "exercise_edit_icon_{{ exercise.slug }}"> <a href="javascript:modal.get('', '#exercisesModalEdit', '#requisicoes_ajax')"><i class="fa fa-pencil fa-lg" aria-hidden="true"></i></a>  <a href="javascript:modal.get('', '#exerciseDeleteModal', '#requisicoes_ajax')"><i class="fa fa-trash fa-lg" aria-hidden="true"></i></a></li>
+    <li class="icon_edit_remove" id = "exercise_edit_icon_{{ exercise.slug }}"> <a href="javascript:modal.get('{% url 'course:exercise:update_exercise' exercise.slug %}', '#exercisesModalEdit', '#requisicoes_ajax')"><i class="fa fa-pencil fa-lg" aria-hidden="true"></i></a>  <a href="javascript:modal.get('', '#exerciseDeleteModal', '#requisicoes_ajax')"><i class="fa fa-trash fa-lg" aria-hidden="true"></i></a></li>
     <li id = "exercise_edit_{{ exercise.slug }}"><i class="fa fa-file" aria-hidden="true"></i>  <a href="javascript:modal.get('', '#viewExerciseModal','#requisicoes_ajax')">{{exercise.name_exercise}}</a></li>
   {% endfor %}
 </div>
@@ -0,0 +1,120 @@
+{% load static widget_tweaks i18n %}
+
+<!-- MODAL CREATE FILE -->
+<link rel="stylesheet" type="text/css" href="{% static 'css/file.css' %}">
+
+<div class="erro-update">
+    <div class="modal fade" id="exercisesModalEdit" tabindex="-1" role="dialog" aria-labelledby="updateFileLabel" style="z-index: 10">
+        <div class="modal-dialog" role="document">
+            <div class="modal-content">
+                <div class="modal-header">
+                    <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">×</span></button>
+                    <h4 class="modal-title" id="updateFileLabel">{% trans 'Edit Material' %}</h4>
+                </div>
+                <div class="modal-body">
+                <!-- Card -->
+                    <form class="form-horizontal" method="post" id="form-update-exercise" enctype="multipart/form-data">
+                    {% csrf_token %}
+                        {% if messages %}
+                            {% for message in messages %}
+                                <div class="alert alert-{{ message.tags }} alert-dismissible" role="alert">
+                                    <button type="button" class="close" data-dismiss="alert" aria-label="Close">
+                                        <span aria-hidden="true">&times;</span>
+                                    </button>
+                                    <p>{{ message }}</p>
+                                </div>
+                            {% endfor %}
+                        {% endif %}
+                        <fieldset>
+                            {% for field in form %}
+                                <div class="form-group is-empy{% if form.has_error %} has-error {% endif %} is-fileinput">
+                                    <div class="col-md-12">
+                                        {% if field.field.required %}
+                                            <label for="{{ field.auto_id }}" class="control-label">{{ field.label }}<span>*</span></label>
+                                        {% else %}
+                                            <label for="{{ field.auto_id }}" class=" control-label">{{ field.label }}</label>
+                                        {% endif %}
+                                        {% if field.auto_id == 'id_file' %}
+                                            <input class="form-control input-sm" id="id_file_url" name="file_url" type="file">
+                                            <div class="input-group">
+                                                <input type="text" readonly="" class="form-control" placeholder="{% trans 'Choose your file...' %}">
+                                                <span class="input-group-btn input-group-sm">
+                                                    <button type="button" class="btn btn-fab btn-fab-mini">
+                                                        <i class="material-icons">attach_file</i>
+                                                    </button>
+                                                </span>
+                                            </div>
+                                            <div class="crearfix">
+                                                <a href="{{ file.file_url.url }}" target="_blank">{% trans "See current file" %}</a>
+                                            </div>
+                                        {% else %}
+                                            {% render_field field class='form-control input-sm' %}
+                                            <span id="helpBlock" class="help-block">{{ field.help_text }}</span>
+                                        {% endif %}
+                                    </div>
+
+                                    {% if field.errors %}
+                                        <div class="alert alert-danger alert-dismissible clearfix" role="alert">
+                                            <button type="button" class="close" data-dismiss="alert" aria-label="Close">
+                                                <span aria-hidden="true">&times;</span>
+                                            </button>
+                                            <ul>
+                                                {% for error in field.errors %}
+                                                    <li>{{ error }}</li>
+                                                {% endfor %}
+                                            </ul>
+                                        </div>
+                                    {% endif %}
+                                </div>
+                            {% endfor %}
+
+                            <div class="form-group">
+                                <div class="col-md-12 text-center">
+                                    <p><b>{% trans 'The file size shouldnt exceed 10MB' %}</b></p>
+                                </div>
+                            </div>
+
+                            <div class="form-group">
+                                <div class="col-md-12">
+                                     <button type="button" class="btn btn-default btn-raised" data-dismiss="modal">{% trans "Close" %}</button>
+                                    <button class="btn btn-raised btn-primary" type="submit">{% trans 'Submit' %}</button>
+                                </div>
+                            </div>
+                        </fieldset>
+                    </form>
+                <!-- .end Card -->
+              </div>
+            </div>
+        </div>
+    </div>
+</div>
+
+{% block script_file %}
+
+    {# // <script src="{% static 'js/file.js' %}"></script> #}
+    <script type="text/javascript">
+      $("#form-update-exercise").submit(function(event) {
+            var data = new FormData($('#form-update-exercise').get(0));
+            $.ajax({
+                url: "{% url 'course:exercise:update_exercise' exercise.slug %}",
+                type: $("#form-update-exercise").attr('method'),
+                data: data,
+                cache: false,
+                processData: false,
+                contentType: false,
+                success: function(data) {
+                    $('#Carrinho').modal('hide');
+                    $('#file_edit_{{ exercise.slug }}').replaceWith(data);
+                    $('#file_{{ exercise.slug }}').replaceWith(data);
+                },
+                error: function(data){
+                    $('.erro-update').html(data.responseText);
+                    $('.modal-backdrop').remove();
+                    $('#Carrinho').modal();
+                }
+            });
+            event.preventDefault();
+          });
+  </script>
+{% endblock script_file %}
+<!-- EndModal -->
 \ No newline at end of file
@@ -19,7 +19,7 @@ def list_topic_exercise_edit(request, topic):
     context = {
         'request': request,
     }
-    context['exercises'] = Exercise.objects.filter(topic = topic)
+    context['exercises'] = Exercise.objects.filter(topic=topic)
     context['topic'] = topic
     return context
	@@ -0,0 +1,42 @@		@@ -0,0 +1,42 @@
		1	+// loadOnScroll handler
		2	+var loadOnScroll = function() {
		3	+ // If the current scroll position is past out cutoff point...
		4	+ if ($(window).scrollTop() >= $(document).height() - $(window).height() - 10) {
		5	+ // temporarily unhook the scroll event watcher so we don't call a bunch of times in a row
		6	+ $(window).unbind();
		7	+ // execute the load function below that will visit the view and return the content
		8	+ loadItems();
		9	+ }
		10	+};
		11	+
		12	+var loadItems = function() {
		13	+ // Check if page is equal to the number of pages
		14	+ if (pageNum == numberPages) {
		15	+ return false
		16	+ }
		17	+ // Update the page number
		18	+ pageNum = pageNum + 1;
		19	+
		20	+ $("#loading").show();
		21	+ // Configure the url we're about to hit
		22	+ setTimeout(function (){
		23	+ $.ajax({
		24	+ url: baseUrl,
		25	+ data: {'page': pageNum},
		26	+ success: function(data) {
		27	+ $("#loading").hide();
		28	+
		29	+ $("#timeline").append(data);
		30	+ },
		31	+ complete: function(data, textStatus){
		32	+ // Turn the scroll monitor back on
		33	+ $(window).bind('scroll', loadOnScroll);
		34	+ }
		35	+ });
		36	+ }, 1000)
		37	+};
		38	+
		39	+$(document).ready(function(){
		40	+ $(window).bind('scroll', loadOnScroll);
		41	+ $.material.init();
		42	+});
0	\ No newline at end of file	43	\ No newline at end of file
	@@ -5,59 +5,16 @@		@@ -5,59 +5,16 @@
5	{% block javascript %}	5	{% block javascript %}
6	{% if page_obj %}	6	{% if page_obj %}
7	<script type="text/javascript">	7	<script type="text/javascript">
8	- {% if page_obj and paginator %}
9	- var pageNum = {{ page_obj.number }}; // The latest page loaded
10	- var numberPages = {{ paginator.num_pages }}; // Indicates the number of pages
11	- {% else %}
12	- var pageNum = 0 ; // The latest page loaded
13	- var numberPages = 0 ; // Indicates the number of pages
14	- {% endif %}
15	-
16	- var baseUrl = '{% url "app:index" %}';
17	-
18	- // loadOnScroll handler
19	- var loadOnScroll = function() {
20	- // If the current scroll position is past out cutoff point...
21	- if ($(window).scrollTop() >= $(document).height() - $(window).height() - 10) {
22	- // temporarily unhook the scroll event watcher so we don't call a bunch of times in a row
23	- $(window).unbind();
24	- // execute the load function below that will visit the view and return the content
25	- loadItems();
26	- }
27	- };
28	-
29	- var loadItems = function() {
30	- // Check if page is equal to the number of pages
31	- if (pageNum == numberPages) {
32	- return false
33	- }
34	- // Update the page number
35	- pageNum = pageNum + 1;
36	-
37	- $("#loading").show();
38	- // Configure the url we're about to hit
39	- setTimeout(function (){
40	- $.ajax({
41	- url: baseUrl,
42	- data: {'page': pageNum},
43	- success: function(data) {
44	- $("#loading").hide();
45	-
46	- $("#timeline").append(data);
47	- },
48	- complete: function(data, textStatus){
49	- // Turn the scroll monitor back on
50	- $(window).bind('scroll', loadOnScroll);
51	- }
52	- });
53	- }, 1000)
54	- };
55	-
56	- $(document).ready(function(){
57	- $(window).bind('scroll', loadOnScroll);
58	- $.material.init();
59	- });	8	+ {% if page_obj and paginator %}
		9	+ var pageNum = {{ page_obj.number }}; // The latest page loaded
		10	+ var numberPages = {{ paginator.num_pages }}; // Indicates the number of pages
		11	+ {% else %}
		12	+ var pageNum = 0 ; // The latest page loaded
		13	+ var numberPages = 0 ; // Indicates the number of pages
		14	+ {% endif %}
		15	+ var baseUrl = '{% url "app:index" %}';
60	</script>	16	</script>
		17	+ <script type="text/javascript" src="{% static 'js/home.js' %}"></script>
61	{% endif %}	18	{% endif %}
62	{% endblock %}	19	{% endblock %}
63		20
	@@ -96,7 +53,7 @@		@@ -96,7 +53,7 @@
96		53
97	{% endblock %}	54	{% endblock %}
98	{% if user\|has_role:'system_admin' %}	55	{% if user\|has_role:'system_admin' %}
99	-	56	+
100	<li>	57	<li>
101	<a href="#menu_users" class="accordion" data-toggle="collapse">{% trans 'Users' %}<span class="pull-right glyphicon glyphicon-chevron-down"></span></a>	58	<a href="#menu_users" class="accordion" data-toggle="collapse">{% trans 'Users' %}<span class="pull-right glyphicon glyphicon-chevron-down"></span></a>
102	<div id="menu_users" class="collapse">	59	<div id="menu_users" class="collapse">
	@@ -104,9 +61,9 @@		@@ -104,9 +61,9 @@
104	<li> <a href="{% url 'users:manage' %}">{% trans 'Manage Users' %}</a></li>	61	<li> <a href="{% url 'users:manage' %}">{% trans 'Manage Users' %}</a></li>
105	<li> <a href="{% url 'users:create' %}">{% trans 'Create User' %}</a></li>	62	<li> <a href="{% url 'users:create' %}">{% trans 'Create User' %}</a></li>
106	</ul>	63	</ul>
107	- </div>	64	+ </div>
108	</li>	65	</li>
109	- <li>	66	+ <li>
110	<a href="#menu_settings" class="accordion" data-toggle="collapse">{% trans 'Settings' %}<span class="pull-right glyphicon glyphicon-chevron-down"></span></a>	67	<a href="#menu_settings" class="accordion" data-toggle="collapse">{% trans 'Settings' %}<span class="pull-right glyphicon glyphicon-chevron-down"></span></a>
111	<div id="menu_settings" class="collapse">	68	<div id="menu_settings" class="collapse">
112	<ul class="nav nav-pill nav-stacked accordion_list">	69	<ul class="nav nav-pill nav-stacked accordion_list">
	@@ -14,7 +14,7 @@ class ActionResourceAdmin(admin.ModelAdmin):		@@ -14,7 +14,7 @@ class ActionResourceAdmin(admin.ModelAdmin):
14	search_fields = ['action', 'resource']	14	search_fields = ['action', 'resource']
15		15
16	class LogAdmin(admin.ModelAdmin):	16	class LogAdmin(admin.ModelAdmin):
17	- list_display = ['datetime', 'user', 'action_resource']	17	+ list_display = ['datetime', 'user', 'action_resource', 'context']
18	search_fields = ['user']	18	search_fields = ['user']
19		19
20	class MimeTypeAdmin(admin.ModelAdmin):	20	class MimeTypeAdmin(admin.ModelAdmin):
	@@ -19,7 +19,7 @@		@@ -19,7 +19,7 @@
19	<label for="{{ field.auto_id }}">{{ field.label }}</label>	19	<label for="{{ field.auto_id }}">{{ field.label }}</label>
20	{% render_field field class='form-control input-sm' %}	20	{% render_field field class='form-control input-sm' %}
21	</div>	21	</div>
22	- {% if field.errors.length > 0 %}	22	+ {% if field.errors%}
23	<div class="alert alert-danger alert-dismissible" role="alert">	23	<div class="alert alert-danger alert-dismissible" role="alert">
24	<ul>	24	<ul>
25	{% for error in field.errors %}	25	{% for error in field.errors %}
	@@ -3,7 +3,7 @@		@@ -3,7 +3,7 @@
3	<div class="panel panel-info">	3	<div class="panel panel-info">
4	<div class="panel-heading course">	4	<div class="panel-heading course">
5	<div class="row">	5	<div class="row">
6	- <div class="col-xs-5 col-md-5 titleTopic">	6	+ <div class="col-xs-6 col-md-6 titleTopic">
7	<a role="button" href="{% url 'course:view' course.slug %}">	7	<a role="button" href="{% url 'course:view' course.slug %}">
8	<h4>{{course.name}}</h4>	8	<h4>{{course.name}}</h4>
9	</a>	9	</a>
	@@ -33,7 +33,7 @@		@@ -33,7 +33,7 @@
33	</p>	33	</p>
34		34
35	</div>	35	</div>
36	-	36	+
37		37
38	{% if not professor_links %}	38	{% if not professor_links %}
39	<div class="row">	39	<div class="row">
1	{% load static i18n list_topic_foruns permission_tags %}	1	{% load static i18n list_topic_foruns permission_tags %}
2	<div id="exercise-topic{{ topic.id }}-exercises-edit">	2	<div id="exercise-topic{{ topic.id }}-exercises-edit">
3	{% for exercise in exercises %}	3	{% for exercise in exercises %}
4	- <li class="icon_edit_remove" id = "exercise_edit_icon_{{ exercise.slug }}"> <a href="javascript:modal.get('', '#exercisesModalEdit', '#requisicoes_ajax')"><i class="fa fa-pencil fa-lg" aria-hidden="true"></i></a> <a href="javascript:modal.get('', '#exerciseDeleteModal', '#requisicoes_ajax')"><i class="fa fa-trash fa-lg" aria-hidden="true"></i></a></li>	4	+ <li class="icon_edit_remove" id = "exercise_edit_icon_{{ exercise.slug }}"> <a href="javascript:modal.get('{% url 'course:exercise:update_exercise' exercise.slug %}', '#exercisesModalEdit', '#requisicoes_ajax')"><i class="fa fa-pencil fa-lg" aria-hidden="true"></i></a> <a href="javascript:modal.get('', '#exerciseDeleteModal', '#requisicoes_ajax')"><i class="fa fa-trash fa-lg" aria-hidden="true"></i></a></li>
5	<li id = "exercise_edit_{{ exercise.slug }}"><i class="fa fa-file" aria-hidden="true"></i> <a href="javascript:modal.get('', '#viewExerciseModal','#requisicoes_ajax')">{{exercise.name_exercise}}</a></li>	5	<li id = "exercise_edit_{{ exercise.slug }}"><i class="fa fa-file" aria-hidden="true"></i> <a href="javascript:modal.get('', '#viewExerciseModal','#requisicoes_ajax')">{{exercise.name_exercise}}</a></li>
6	{% endfor %}	6	{% endfor %}
7	</div>	7	</div>
	@@ -0,0 +1,120 @@		@@ -0,0 +1,120 @@
		1	+{% load static widget_tweaks i18n %}
		2	+
		3	+<!-- MODAL CREATE FILE -->
		4	+<link rel="stylesheet" type="text/css" href="{% static 'css/file.css' %}">
		5	+
		6	+<div class="erro-update">
		7	+ <div class="modal fade" id="exercisesModalEdit" tabindex="-1" role="dialog" aria-labelledby="updateFileLabel" style="z-index: 10">
		8	+ <div class="modal-dialog" role="document">
		9	+ <div class="modal-content">
		10	+ <div class="modal-header">
		11	+ <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">×</span></button>
		12	+ <h4 class="modal-title" id="updateFileLabel">{% trans 'Edit Material' %}</h4>
		13	+ </div>
		14	+ <div class="modal-body">
		15	+ <!-- Card -->
		16	+ <form class="form-horizontal" method="post" id="form-update-exercise" enctype="multipart/form-data">
		17	+ {% csrf_token %}
		18	+ {% if messages %}
		19	+ {% for message in messages %}
		20	+ <div class="alert alert-{{ message.tags }} alert-dismissible" role="alert">
		21	+ <button type="button" class="close" data-dismiss="alert" aria-label="Close">
		22	+ <span aria-hidden="true">×</span>
		23	+ </button>
		24	+ <p>{{ message }}</p>
		25	+ </div>
		26	+ {% endfor %}
		27	+ {% endif %}
		28	+ <fieldset>
		29	+ {% for field in form %}
		30	+ <div class="form-group is-empy{% if form.has_error %} has-error {% endif %} is-fileinput">
		31	+ <div class="col-md-12">
		32	+ {% if field.field.required %}
		33	+ <label for="{{ field.auto_id }}" class="control-label">{{ field.label }}<span>*</span></label>
		34	+ {% else %}
		35	+ <label for="{{ field.auto_id }}" class=" control-label">{{ field.label }}</label>
		36	+ {% endif %}
		37	+ {% if field.auto_id == 'id_file' %}
		38	+ <input class="form-control input-sm" id="id_file_url" name="file_url" type="file">
		39	+ <div class="input-group">
		40	+ <input type="text" readonly="" class="form-control" placeholder="{% trans 'Choose your file...' %}">
		41	+ <span class="input-group-btn input-group-sm">
		42	+ <button type="button" class="btn btn-fab btn-fab-mini">
		43	+ <i class="material-icons">attach_file</i>
		44	+ </button>
		45	+ </span>
		46	+ </div>
		47	+ <div class="crearfix">
		48	+ <a href="{{ file.file_url.url }}" target="_blank">{% trans "See current file" %}</a>
		49	+ </div>
		50	+ {% else %}
		51	+ {% render_field field class='form-control input-sm' %}
		52	+ <span id="helpBlock" class="help-block">{{ field.help_text }}</span>
		53	+ {% endif %}
		54	+ </div>
		55	+
		56	+ {% if field.errors %}
		57	+ <div class="alert alert-danger alert-dismissible clearfix" role="alert">
		58	+ <button type="button" class="close" data-dismiss="alert" aria-label="Close">
		59	+ <span aria-hidden="true">×</span>
		60	+ </button>
		61	+ <ul>
		62	+ {% for error in field.errors %}
		63	+ <li>{{ error }}</li>
		64	+ {% endfor %}
		65	+ </ul>
		66	+ </div>
		67	+ {% endif %}
		68	+ </div>
		69	+ {% endfor %}
		70	+
		71	+ <div class="form-group">
		72	+ <div class="col-md-12 text-center">
		73	+ <p><b>{% trans 'The file size shouldnt exceed 10MB' %}</b></p>
		74	+ </div>
		75	+ </div>
		76	+
		77	+ <div class="form-group">
		78	+ <div class="col-md-12">
		79	+ <button type="button" class="btn btn-default btn-raised" data-dismiss="modal">{% trans "Close" %}</button>
		80	+ <button class="btn btn-raised btn-primary" type="submit">{% trans 'Submit' %}</button>
		81	+ </div>
		82	+ </div>
		83	+ </fieldset>
		84	+ </form>
		85	+ <!-- .end Card -->
		86	+ </div>
		87	+ </div>
		88	+ </div>
		89	+ </div>
		90	+</div>
		91	+
		92	+{% block script_file %}
		93	+
		94	+ {# // <script src="{% static 'js/file.js' %}"></script> #}
		95	+ <script type="text/javascript">
		96	+ $("#form-update-exercise").submit(function(event) {
		97	+ var data = new FormData($('#form-update-exercise').get(0));
		98	+ $.ajax({
		99	+ url: "{% url 'course:exercise:update_exercise' exercise.slug %}",
		100	+ type: $("#form-update-exercise").attr('method'),
		101	+ data: data,
		102	+ cache: false,
		103	+ processData: false,
		104	+ contentType: false,
		105	+ success: function(data) {
		106	+ $('#Carrinho').modal('hide');
		107	+ $('#file_edit_{{ exercise.slug }}').replaceWith(data);
		108	+ $('#file_{{ exercise.slug }}').replaceWith(data);
		109	+ },
		110	+ error: function(data){
		111	+ $('.erro-update').html(data.responseText);
		112	+ $('.modal-backdrop').remove();
		113	+ $('#Carrinho').modal();
		114	+ }
		115	+ });
		116	+ event.preventDefault();
		117	+ });
		118	+ </script>
		119	+{% endblock script_file %}
		120	+<!-- EndModal -->
0	\ No newline at end of file	121	\ No newline at end of file
	@@ -19,7 +19,7 @@ def list_topic_exercise_edit(request, topic):		@@ -19,7 +19,7 @@ def list_topic_exercise_edit(request, topic):
19	context = {	19	context = {
20	'request': request,	20	'request': request,
21	}	21	}
22	- context['exercises'] = Exercise.objects.filter(topic = topic)	22	+ context['exercises'] = Exercise.objects.filter(topic=topic)
23	context['topic'] = topic	23	context['topic'] = topic
24		24
25	return context	25	return context