Download as
Browse Code »

Commit d155b66bbfeaac324649977054f9f124a61fa0d0

Authored by filipecmedeiros
2 parents 475d5a6e 8fee5212
Exists in master and in 5 other branches amadeus_univasf, dev, image-crop, pdf_file_html, refactoring

Merge branch 'dev' of https://github.com/amadeusproject/amadeuslms into dev

Showing 10 changed files with 16 additions and 25 deletions   Show diff stats
files/templates/files/create_file.html
  Diff comments   View file @d155b66
@@ -47,7 +47,7 @@ @@ -47,7 +47,7 @@
47 <span id="helpBlock" class="help-block">{{ field.help_text }}</span> 47 <span id="helpBlock" class="help-block">{{ field.help_text }}</span>
48 {% endif %} 48 {% endif %}
49 </div> 49 </div>
50 - 50 +
51 {% if field.errors %} 51 {% if field.errors %}
52 <div class="alert alert-danger alert-dismissible clearfix" role="alert"> 52 <div class="alert alert-danger alert-dismissible clearfix" role="alert">
53 <button type="button" class="close" data-dismiss="alert" aria-label="Close"> 53 <button type="button" class="close" data-dismiss="alert" aria-label="Close">
@@ -71,7 +71,7 @@ @@ -71,7 +71,7 @@
71 71
72 <div class="form-group"> 72 <div class="form-group">
73 <div class="col-md-12"> 73 <div class="col-md-12">
74 - <button type="button" class="btn btn-danger btn-raised" data-dismiss="modal">{% trans "Close" %}</button> 74 + <button type="button" class="btn btn-default btn-raised" data-dismiss="modal">{% trans "Close" %}</button>
75 <button class="btn btn-raised btn-primary" type="submit">{% trans 'Submit' %}</button> 75 <button class="btn btn-raised btn-primary" type="submit">{% trans 'Submit' %}</button>
76 </div> 76 </div>
77 </div> 77 </div>
@@ -85,7 +85,7 @@ @@ -85,7 +85,7 @@
85 </div> 85 </div>
86 86
87 {% block script_file %} 87 {% block script_file %}
88 - 88 +
89 {# // <script src="{% static 'js/file.js' %}"></script> #} 89 {# // <script src="{% static 'js/file.js' %}"></script> #}
90 <script type="text/javascript"> 90 <script type="text/javascript">
91 $("#form-file").submit(function(event) { 91 $("#form-file").submit(function(event) {
files/templates/files/delete_file.html
  Diff comments   View file @d155b66
@@ -31,7 +31,7 @@ @@ -31,7 +31,7 @@
31 </div> 31 </div>
32 <div class="form-group"> 32 <div class="form-group">
33 <div class="col-md-12"> 33 <div class="col-md-12">
34 - <button type="button" class="btn btn-danger btn-raised" data-dismiss="modal">{% trans "Close" %}</button> 34 + <button type="button" class="btn btn-default btn-raised" data-dismiss="modal">{% trans "Close" %}</button>
35 <button class="btn btn-raised btn-primary" type="submit">{% trans 'Delete' %}</button> 35 <button class="btn btn-raised btn-primary" type="submit">{% trans 'Delete' %}</button>
36 </div> 36 </div>
37 </div> 37 </div>
@@ -45,7 +45,7 @@ @@ -45,7 +45,7 @@
45 </div> 45 </div>
46 46
47 {% block script_file %} 47 {% block script_file %}
48 - 48 +
49 {# // <script src="{% static 'js/file.js' %}"></script> #} 49 {# // <script src="{% static 'js/file.js' %}"></script> #}
50 <script type="text/javascript"> 50 <script type="text/javascript">
51 $("#form-delete-file").submit(function(event) { 51 $("#form-delete-file").submit(function(event) {
files/templates/files/update_file.html
  Diff comments   View file @d155b66
@@ -52,7 +52,7 @@ @@ -52,7 +52,7 @@
52 <span id="helpBlock" class="help-block">{{ field.help_text }}</span> 52 <span id="helpBlock" class="help-block">{{ field.help_text }}</span>
53 {% endif %} 53 {% endif %}
54 </div> 54 </div>
55 - 55 +
56 {% if field.errors %} 56 {% if field.errors %}
57 <div class="alert alert-danger alert-dismissible clearfix" role="alert"> 57 <div class="alert alert-danger alert-dismissible clearfix" role="alert">
58 <button type="button" class="close" data-dismiss="alert" aria-label="Close"> 58 <button type="button" class="close" data-dismiss="alert" aria-label="Close">
@@ -76,7 +76,7 @@ @@ -76,7 +76,7 @@
76 76
77 <div class="form-group"> 77 <div class="form-group">
78 <div class="col-md-12"> 78 <div class="col-md-12">
79 - <button type="button" class="btn btn-danger btn-raised" data-dismiss="modal">{% trans "Close" %}</button> 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> 80 <button class="btn btn-raised btn-primary" type="submit">{% trans 'Submit' %}</button>
81 </div> 81 </div>
82 </div> 82 </div>
@@ -90,7 +90,7 @@ @@ -90,7 +90,7 @@
90 </div> 90 </div>
91 91
92 {% block script_file %} 92 {% block script_file %}
93 - 93 +
94 {# // <script src="{% static 'js/file.js' %}"></script> #} 94 {# // <script src="{% static 'js/file.js' %}"></script> #}
95 <script type="text/javascript"> 95 <script type="text/javascript">
96 $("#form-update-file").submit(function(event) { 96 $("#form-update-file").submit(function(event) {
forum/templates/forum/forum_view.html
  Diff comments   View file @d155b66
@@ -17,7 +17,7 @@ @@ -17,7 +17,7 @@
17 {% else %} 17 {% else %}
18 <li class="active">{{ forum.name }}</li> 18 <li class="active">{{ forum.name }}</li>
19 {% endif %} 19 {% endif %}
20 - 20 +
21 </ol> 21 </ol>
22 {% endblock %} 22 {% endblock %}
23 23
@@ -33,7 +33,7 @@ @@ -33,7 +33,7 @@
33 </ul> 33 </ul>
34 </div> 34 </div>
35 </div> 35 </div>
36 - 36 +
37 {% if request.user|has_role:'system_admin' or request.user|has_role:'professor' and request.user in forum.topic.subject.professors.all %} 37 {% if request.user|has_role:'system_admin' or request.user|has_role:'professor' and request.user in forum.topic.subject.professors.all %}
38 <div class="panel panel-primary navigation"> 38 <div class="panel panel-primary navigation">
39 <div class="panel-heading"> 39 <div class="panel-heading">
@@ -121,7 +121,7 @@ @@ -121,7 +121,7 @@
121 </section> 121 </section>
122 </div> 122 </div>
123 <div class="modal-footer"> 123 <div class="modal-footer">
124 - <button type="button" class="btn btn-danger btn-raised" data-dismiss="modal">{% trans 'Close' %}</button> 124 + <button type="button" class="btn btn-default btn-raised" data-dismiss="modal">{% trans 'Close' %}</button>
125 <button type="button" onclick="$('#forum_create').submit();" class="btn btn-primary btn-raised">{% trans 'Update' %}</button> 125 <button type="button" onclick="$('#forum_create').submit();" class="btn btn-primary btn-raised">{% trans 'Update' %}</button>
126 </div> 126 </div>
127 </div> 127 </div>
links/static/links.js
View file @475d5a6
@@ -1,8 +0,0 @@ @@ -1,8 +0,0 @@
1 -function get_modal_link(url, id,div_content){  
2 - $.get(url, function (data) {  
3 - $(div_content).empty();  
4 - $(div_content).append(data);  
5 - $(id).modal('show');  
6 - });  
7 -  
8 -}  
links/templates/links/create_link.html
  Diff comments   View file @d155b66
1 {% load widget_tweaks i18n %} 1 {% load widget_tweaks i18n %}
2 -  
3 <!--MODAL CREATE LINK--> 2 <!--MODAL CREATE LINK-->
4 <div class="modal fade" id="createLinksModal" tabindex="-1" role="dialog" aria-labelledby="createLink"> 3 <div class="modal fade" id="createLinksModal" tabindex="-1" role="dialog" aria-labelledby="createLink">
5 <div class="modal-dialog" role="document"> 4 <div class="modal-dialog" role="document">
@@ -33,7 +32,7 @@ @@ -33,7 +32,7 @@
33 </div> 32 </div>
34 {% endfor %} 33 {% endfor %}
35 <div class="form-group"> 34 <div class="form-group">
36 - <button type="button" class="btn btn-danger btn-raised" data-dismiss="modal">{% trans "Cancel" %}</button> 35 + <button type="button" class="btn btn-raised btn-default " data-dismiss="modal">{% trans "Cancel" %}</button>
37 <button class="btn btn-raised btn-primary" type="submit">{% trans 'Submit' %}</button> 36 <button class="btn btn-raised btn-primary" type="submit">{% trans 'Submit' %}</button>
38 </div> 37 </div>
39 <!-- .end Card --> 38 <!-- .end Card -->
links/templates/links/delete_link.html
  Diff comments   View file @d155b66
@@ -21,7 +21,7 @@ @@ -21,7 +21,7 @@
21 </div> 21 </div>
22 <div class="form-group"> 22 <div class="form-group">
23 <div class="col-md-12"> 23 <div class="col-md-12">
24 - <button type="button" class="btn btn-danger btn-raised" data-dismiss="modal">{% trans "Close" %}</button> 24 + <button type="button" class="btn btn-default btn-raised" data-dismiss="modal">{% trans "Close" %}</button>
25 <button class="btn btn-raised btn-primary" type="submit">{% trans 'Delete' %}</button> 25 <button class="btn btn-raised btn-primary" type="submit">{% trans 'Delete' %}</button>
26 </div> 26 </div>
27 </div> 27 </div>
links/templates/links/update_link.html
  Diff comments   View file @d155b66
@@ -36,7 +36,7 @@ @@ -36,7 +36,7 @@
36 {% endif %} 36 {% endif %}
37 {% endfor %} 37 {% endfor %}
38 <div class="form-group"> 38 <div class="form-group">
39 - <button type="button" class="btn btn-danger btn-raised" data-dismiss="modal">{% trans "Cancel" %}</button> 39 + <button type="button" class="btn btn-default btn-raised" data-dismiss="modal">{% trans "Cancel" %}</button>
40 <button class="btn btn-raised btn-primary" type="submit">{% trans 'Submit' %}</button> 40 <button class="btn btn-raised btn-primary" type="submit">{% trans 'Submit' %}</button>
41 </div> 41 </div>
42 <!-- .end Card --> 42 <!-- .end Card -->
links/templates/links/view_link.html
  Diff comments   View file @d155b66
@@ -14,7 +14,7 @@ @@ -14,7 +14,7 @@
14 <div class="card-block"> 14 <div class="card-block">
15 <b class="card-title">{{link.name}}</b><p></p> 15 <b class="card-title">{{link.name}}</b><p></p>
16 <p class="card-text"> </p><p>{{link.link_description}}</p> 16 <p class="card-text"> </p><p>{{link.link_description}}</p>
17 - <a href="{{ link.link_url }}" class="btn btn-primary">{% trans 'Read more' %}</a> 17 + <a href="{{ link.link_url }}" class="btn btn-raised btn-primary">{% trans 'Read more' %}</a>
18 </div> 18 </div>
19 </article> 19 </article>
20 <!-- .end Card --> 20 <!-- .end Card -->
poll/templates/poll/create.html
  Diff comments   View file @d155b66
@@ -151,7 +151,7 @@ @@ -151,7 +151,7 @@
151 <div class="modal-footer"> 151 <div class="modal-footer">
152 152
153 <!-- Don't remove that!!! --> 153 <!-- Don't remove that!!! -->
154 - <button type="button" class="btn btn-danger btn-raised" data-dismiss="modal">{% trans "Close" %}</button> 154 + <button type="button" class="btn btn-default btn-raised" data-dismiss="modal">{% trans "Close" %}</button>
155 {% block button_save %} 155 {% block button_save %}
156 <!-- Put curtom buttons here!!! --> 156 <!-- Put curtom buttons here!!! -->
157 <button type="submite" id="button" form="form" class="btn btn-primary btn-raised">{% trans "Create" %}</button> 157 <button type="submite" id="button" form="form" class="btn btn-primary btn-raised">{% trans "Create" %}</button>