Download as
Browse Code »

Commit 37ff92569e6994f22eff0f9f4bf3f270c181ef85

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

remove static obsolet #237

Showing 22 changed files with 28 additions and 64 deletions   Show diff stats
amadeus/staticfiles/img/95.a77a09f7671a.jpg
View file @ee6914a

6.44 KB
amadeus/staticfiles/img/95.jpg
View file @ee6914a

6.44 KB
amadeus/staticfiles/img/amadeus.560cc142c808.png
View file @ee6914a

105 KB
amadeus/staticfiles/img/amadeus.png
View file @ee6914a

105 KB
amadeus/staticfiles/img/no_image.eeb967309a39.jpg
View file @ee6914a

2.99 KB
amadeus/staticfiles/img/no_image.jpg
View file @ee6914a

2.99 KB
amadeus/staticfiles/img/topo-amadeus-white.d5e2fe1501ee.png
View file @ee6914a

990 Bytes
amadeus/staticfiles/img/topo-amadeus-white.png
View file @ee6914a

990 Bytes
amadeus/staticfiles/img/topo-amadeus.c7f9f1aa3d37.png
View file @ee6914a

47.7 KB
amadeus/staticfiles/img/topo-amadeus.png
View file @ee6914a

47.7 KB
amadeus/staticfiles/js/amadeus.8464fe062d5d.js.gz
View file @ee6914a
No preview for this file type
amadeus/staticfiles/js/amadeus.js.gz
View file @ee6914a
No preview for this file type
amadeus/staticfiles/js/forum.c8d2268fd6dd.js.gz
View file @ee6914a
No preview for this file type
amadeus/staticfiles/js/forum.js.gz
View file @ee6914a
No preview for this file type
amadeus/staticfiles/js/jquery-3.1.0.min.64ec1b9cff68.js.gz
View file @ee6914a
No preview for this file type
amadeus/staticfiles/js/jquery-3.1.0.min.js.gz
View file @ee6914a
No preview for this file type
amadeus/staticfiles/js/main.8880c1f6d0fc.js
View file @ee6914a
@@ -1 +0,0 @@ @@ -1 +0,0 @@
1 -$('.date-picker').datepicker();  
2 \ No newline at end of file 0 \ No newline at end of file
core/static/img/95.jpg
View file @ee6914a

6.44 KB
courses/migrations/0003_remove_course_image.py 0 → 100644
  Diff comments   View file @37ff925
@@ -0,0 +1,19 @@ @@ -0,0 +1,19 @@
  1 +# -*- coding: utf-8 -*-
  2 +# Generated by Django 1.10 on 2016-11-06 12:35
  3 +from __future__ import unicode_literals
  4 +
  5 +from django.db import migrations
  6 +
  7 +
  8 +class Migration(migrations.Migration):
  9 +
  10 + dependencies = [
  11 + ('courses', '0002_auto_20161024_1559'),
  12 + ]
  13 +
  14 + operations = [
  15 + migrations.RemoveField(
  16 + model_name='course',
  17 + name='image',
  18 + ),
  19 + ]
courses/templates/topic/index.html
  Diff comments   View file @37ff925
@@ -40,7 +40,7 @@ @@ -40,7 +40,7 @@
40 </div> 40 </div>
41 </div> 41 </div>
42 42
43 - 43 +
44 44
45 {% endblock %} 45 {% endblock %}
46 46
@@ -61,7 +61,7 @@ @@ -61,7 +61,7 @@
61 </button> 61 </button>
62 <ul class="dropdown-menu pull-right" aria-labelledby="moreActions"> 62 <ul class="dropdown-menu pull-right" aria-labelledby="moreActions">
63 <li> 63 <li>
64 - <a href="javascript:void(0)" data-toggle="modal" data-target="#myModal4"><i class="fa fa-files-o fa-fw" aria-hidden="true"></i>&nbsp; {% trans "Replicate" %}</a> 64 + <a href="javascript:void(0)"><i class="fa fa-files-o fa-fw" aria-hidden="true"></i>&nbsp; {% trans "Replicate" %}</a>
65 </li> 65 </li>
66 <li> 66 <li>
67 <a href="{% url 'course:update_subject' subject.slug %}" data-toggle="modal" data-target="#editSubject"><i class="fa fa-pencil fa-fw" aria-hidden="true"></i>&nbsp; {% trans "Edit" %}</a> 67 <a href="{% url 'course:update_subject' subject.slug %}" data-toggle="modal" data-target="#editSubject"><i class="fa fa-pencil fa-fw" aria-hidden="true"></i>&nbsp; {% trans "Edit" %}</a>
@@ -85,14 +85,14 @@ @@ -85,14 +85,14 @@
85 <div class="panel-body"> 85 <div class="panel-body">
86 {% include "topic/topic_card_student.html" %} 86 {% include "topic/topic_card_student.html" %}
87 {% comment %} 87 {% comment %}
88 -  
89 - 88 +
  89 +
90 <!--{% for activit in activitys %} 90 <!--{% for activit in activitys %}
91 <form class="form-horizontal" enctype='multipart/form-data'>{% csrf_token %} 91 <form class="form-horizontal" enctype='multipart/form-data'>{% csrf_token %}
92 <fieldset> 92 <fieldset>
93 <legend>{{activit.name}}</legend> 93 <legend>{{activit.name}}</legend>
94 94
95 - 95 +
96 {% for student in students_activit %} 96 {% for student in students_activit %}
97 <div class="panel-group" id="accordion"> 97 <div class="panel-group" id="accordion">
98 <div class="panel panel-info"> 98 <div class="panel panel-info">
@@ -134,7 +134,7 @@ @@ -134,7 +134,7 @@
134 </fieldset> 134 </fieldset>
135 </form>--> 135 </form>-->
136 {% endcomment %} 136 {% endcomment %}
137 - 137 +
138 138
139 139
140 140
courses/templates/topic/list_file_edit.html
  Diff comments   View file @37ff925
@@ -2,9 +2,9 @@ @@ -2,9 +2,9 @@
2 2
3 <div id="list-topic{{ topic.id }}-files-edit"> 3 <div id="list-topic{{ topic.id }}-files-edit">
4 {% for file in files %} 4 {% for file in files %}
5 - <li class="icon_edit_remove" id="file_edit_icon_{{ file.slug }}"> <a href="javascript:get_modal_file('{% url 'course:file:update_file' file.slug %}', '#fileUpdateModal', '#divModalFileUpdate')" ><i class="fa fa-pencil fa-lg" aria-hidden="true"></i></a> <a href="javascript:get_modal_file('{% url 'course:file:delete_file' file.slug %}', '#fileDeleteModal', '#divModalFileUpdate')"><i class="fa fa-trash fa-lg" aria-hidden="true"></i></a></li> 5 + <li class="icon_edit_remove" id="file_edit_icon_{{ file.slug }}"> <a href="javascript:modal.get('{% url 'course:file:update_file' file.slug %}', '#fileUpdateModal', '#divModalFileUpdate')" ><i class="fa fa-pencil fa-lg" aria-hidden="true"></i></a> <a href="javascript:modal.get('{% url 'course:file:delete_file' file.slug %}', '#fileDeleteModal', '#divModalFileUpdate')"><i class="fa fa-trash fa-lg" aria-hidden="true"></i></a></li>
6 <li id="file_edit_{{ file.slug }}"><i class="material-icons">{{ file.file_type.icon }}</i> <a href="{{ file.file_url.url }}" target="_blank">{{ file.name }}</a></li> 6 <li id="file_edit_{{ file.slug }}"><i class="material-icons">{{ file.file_type.icon }}</i> <a href="{{ file.file_url.url }}" target="_blank">{{ file.name }}</a></li>
7 - {% endfor %} 7 + {% endfor %}
8 </div> 8 </div>
9 9
10 <div class="row" id="divModalFileUpdate"> 10 <div class="row" id="divModalFileUpdate">
files/static/js/file.js
  Diff comments   View file @37ff925
1 function get_modal_file(url, id, div_content){ 1 function get_modal_file(url, id, div_content){
2 - 2 +
3 $.get(url, function (data) { 3 $.get(url, function (data) {
4 $(div_content).detach(); 4 $(div_content).detach();
5 $(div_content).append(data); 5 $(div_content).append(data);
@@ -7,57 +7,3 @@ function get_modal_file(url, id, div_content){ @@ -7,57 +7,3 @@ function get_modal_file(url, id, div_content){
7 }); 7 });
8 8
9 } 9 }
10 -  
11 -// $(document).ready(function (){  
12 -// // alert('Oi');  
13 -// var frm = $("#form-file");  
14 -// frm.submit(function(event) {  
15 -// $.ajax({  
16 -// type: frm.attr('method'),  
17 -// url: frm.attr('action'),  
18 -// data: {  
19 -// 'file_url': $('#id_file_url'),  
20 -// 'name': $('#id_name'),  
21 -// csrfmiddlewaretoken: csrf  
22 -// },  
23 -// success: function (data) {  
24 -// alert(data);  
25 -// // $("#posts_list").append(data);  
26 -// // frm[0].reset();  
27 -// },  
28 -// processData : false,  
29 -// error: function(data) {  
30 -// alert('Error');  
31 -// // console.log(frm.serialize());  
32 -// // console.log('Error');  
33 -// }  
34 -// });  
35 -// $('#fileModal').modal('hide');  
36 -// event.preventDefault();  
37 -// });  
38 -// });  
39 -  
40 -// var Submite = {  
41 -// post: function(url,dados){  
42 -// $('#fileModal').modal('hide');  
43 -// $.post(url,dados, function(data){  
44 -// }).fail(function(data){  
45 -// $("div.modal-backdrop.fade.in").remove();  
46 -// $("#modal_poll").empty();  
47 -// $("#modal_poll").append(data.responseText);  
48 -// });  
49 -// }  
50 -// ,  
51 -// remove: function(url,dados, id_li_link){  
52 -// $('#fileModal').modal('hide');  
53 -// $.post(url,dados, function(data){  
54 -// $(id_li_link).remove();  
55 -// $("#modal_poll").empty();  
56 -// $("div.modal-backdrop.fade.in").remove();  
57 -// }).fail(function(){  
58 -// $("#modal_poll").empty();  
59 -// $("#modal_poll").append(data);  
60 -// $('#fileModal').modal('show');  
61 -// });  
62 -// }  
63 -// }  
64 \ No newline at end of file 10 \ No newline at end of file