Download as
Browse Code »

Commit 5b9cb644f454a02f9bb0f1f1c22b9374b9ab51f6

Authored by fbormann
2 parents 1fa68bbd 4781fde9
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 13 changed files with 42 additions and 62 deletions   Show diff stats
core/templates/base.html
  Diff comments   View file @5b9cb64
... ... @@ -20,7 +20,7 @@
20 20  
21 21 <!-- Bootstrap and themes (material) -->
22 22 <link rel="stylesheet" type="text/css" href="{% static 'bootstrap-3.3.7/css/bootstrap.css' %}">
23   -
  23 +
24 24 <link rel="stylesheet" type="text/css" href="{% static 'material/css/bootstrap-material-design.min.css' %}">
25 25 <link rel="stylesheet" type="text/css" href="{% static 'material/css/ripples.css' %}">
26 26 <link rel="stylesheet" type="text/css" href="{% static 'material/css/ripples.min.css' %}">
... ... @@ -79,7 +79,7 @@
79 79 <input type="text" class="form-control" placeholder="{% trans 'Search Files (.pdf, others) and/or activities' %}" name="search"></div>
80 80 <span class="input-group-btn input-group-sm">
81 81 <button type="submit" class="btn btn-fab btn-fab-mini">
82   - <i class="fa fa-search" aria-hidden="true"></i>
  82 + <i class="glyphicon glyphicon-search" aria-hidden="true" style="color:#93C741"></i>
83 83 </button>
84 84 </span>
85 85 </div>
... ...
core/templates/guest.html
  Diff comments   View file @5b9cb64
... ... @@ -107,6 +107,7 @@
107 107 </div>
108 108 <div class="col-xs-10 col-sm-10 col-md-10 col-lg-10 col-xl-10">
109 109 {% block breadcrumbs %}
  110 +
110 111 <div class="col-md-12">
111 112 <form id="searchform" action="{% url 'course:manage' %}" method="get" accept-charset="utf-8">
112 113 <div class="input-group">
... ... @@ -121,46 +122,34 @@
121 122 </form>
122 123 </div>
123 124  
124   - <div class="col-md-10">
125   - <div class="btn-group btn-group-justified btn-group-raised">
126   - <a href="?category=all" class="btn btn-raised btn-info">{% trans 'All' %}</a>
127   - {% for category in categories %}
128   - <a href="?category={{category.name}}" class="btn btn-raised btn-primary">{{category.name}}</a>
129   - {% endfor %}
130   - </div>
131   - </div>
132   -
133 125 {% endblock %}
134 126 {% block render_breadcrumbs %}{% endblock %}
135 127 <div>
136 128 </div>
137 129 <div class="col-xs-12 col-sm-12 col-md-10 col-lg-10 col-xl-12">
138 130 {% block content %}
139   - {% for course in courses %}
140   - <div class="panel panel-info panel_{{ course.id }}">
141   - <div class="panel-heading">
142   - <a href="{{ course.get_absolute_url }}" class="panel-title">{{course.name}}</a>
143   - {% if user|show_course_subscribe:course %}
144   - <a onclick="subscribe($(this), '{% url 'course:subscribe' course.slug %}', {{ course.id}}, '{% trans 'Are you sure you want to subscribe to this course?' %}')" class="btn btn-sm btn-primary btn-raised pull-right" style="margin-top:-4px">{% trans 'Subscribe' %}</a>
145   - {% endif %}
146   - </div>
147   -
148   - <div class="panel-body">
149   - <p><b>{% trans 'Course Name' %}: </b>{{course.name}}</p>
150   - <p><b>{% trans 'Begining' %}: </b>{{course.init_date}}</p>
151   - <p><b>{% trans 'End' %}: </b>{{course.end_date}}</p>
152   - <p><b>{% trans 'Professor' %}: </b>{{course.professors.name}}</p>
153   - <p>
154   - <b>{% trans 'Description' %}:</b>
155   - <i>
156   - {{course.content}}
157   - </i>
158   - </p>
159   - </div>
160   - </div>
161   - {% endfor %}
162 131  
163   - {% pagination request paginator page_obj %}
  132 + <div class="col-md-12 cards-content">
  133 + {% for category in categorys_courses %}
  134 + <div class="panel-group">
  135 + <div class="panel panel-default">
  136 + <div class="panel-heading">
  137 + <h4 class="panel-title">
  138 + <a class="category-course-link" data-toggle="collapse" href="#{{category.slug}}">{{category.name}}</a>
  139 + </h4>
  140 +
  141 + </div>
  142 + <div id="{{category.slug}}" class="panel-collapse collapse">
  143 + {% for course in category.course_category.all %}
  144 + {%if course.public == True %}
  145 + {% include "course/course_card.html" %}
  146 + {% endif %}
  147 + {% endfor %}
  148 + </div>
  149 + </div>
  150 + </div>
  151 + {% endfor %}
  152 + </div>
164 153 {% endblock %}
165 154 </div>
166 155 </div>
... ...
core/views.py
  Diff comments   View file @5b9cb64
... ... @@ -133,5 +133,5 @@ class GuestView (ListView):
133 133  
134 134 def get_context_data (self, **kwargs):
135 135 context = super(GuestView, self).get_context_data(**kwargs)
136   - context['categories'] = CourseCategory.objects.all()
137   - return context
  136 + context['categorys_courses'] = CourseCategory.objects.all()
  137 + return context
138 138 \ No newline at end of file
... ...
files/templates/files/create_file.html
  Diff comments   View file @5b9cb64
... ... @@ -47,7 +47,7 @@
47 47 <span id="helpBlock" class="help-block">{{ field.help_text }}</span>
48 48 {% endif %}
49 49 </div>
50   -
  50 +
51 51 {% if field.errors %}
52 52 <div class="alert alert-danger alert-dismissible clearfix" role="alert">
53 53 <button type="button" class="close" data-dismiss="alert" aria-label="Close">
... ... @@ -71,7 +71,7 @@
71 71  
72 72 <div class="form-group">
73 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 75 <button class="btn btn-raised btn-primary" type="submit">{% trans 'Submit' %}</button>
76 76 </div>
77 77 </div>
... ... @@ -85,7 +85,7 @@
85 85 </div>
86 86  
87 87 {% block script_file %}
88   -
  88 +
89 89 {# // <script src="{% static 'js/file.js' %}"></script> #}
90 90 <script type="text/javascript">
91 91 $("#form-file").submit(function(event) {
... ...
files/templates/files/delete_file.html
  Diff comments   View file @5b9cb64
... ... @@ -31,7 +31,7 @@
31 31 </div>
32 32 <div class="form-group">
33 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 35 <button class="btn btn-raised btn-primary" type="submit">{% trans 'Delete' %}</button>
36 36 </div>
37 37 </div>
... ... @@ -45,7 +45,7 @@
45 45 </div>
46 46  
47 47 {% block script_file %}
48   -
  48 +
49 49 {# // <script src="{% static 'js/file.js' %}"></script> #}
50 50 <script type="text/javascript">
51 51 $("#form-delete-file").submit(function(event) {
... ...
files/templates/files/update_file.html
  Diff comments   View file @5b9cb64
... ... @@ -52,7 +52,7 @@
52 52 <span id="helpBlock" class="help-block">{{ field.help_text }}</span>
53 53 {% endif %}
54 54 </div>
55   -
  55 +
56 56 {% if field.errors %}
57 57 <div class="alert alert-danger alert-dismissible clearfix" role="alert">
58 58 <button type="button" class="close" data-dismiss="alert" aria-label="Close">
... ... @@ -76,7 +76,7 @@
76 76  
77 77 <div class="form-group">
78 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 80 <button class="btn btn-raised btn-primary" type="submit">{% trans 'Submit' %}</button>
81 81 </div>
82 82 </div>
... ... @@ -90,7 +90,7 @@
90 90 </div>
91 91  
92 92 {% block script_file %}
93   -
  93 +
94 94 {# // <script src="{% static 'js/file.js' %}"></script> #}
95 95 <script type="text/javascript">
96 96 $("#form-update-file").submit(function(event) {
... ...
forum/templates/forum/forum_view.html
  Diff comments   View file @5b9cb64
... ... @@ -17,7 +17,7 @@
17 17 {% else %}
18 18 <li class="active">{{ forum.name }}</li>
19 19 {% endif %}
20   -
  20 +
21 21 </ol>
22 22 {% endblock %}
23 23  
... ... @@ -33,7 +33,7 @@
33 33 </ul>
34 34 </div>
35 35 </div>
36   -
  36 +
37 37 {% if request.user|has_role:'system_admin' or request.user|has_role:'professor' and request.user in forum.topic.subject.professors.all %}
38 38 <div class="panel panel-primary navigation">
39 39 <div class="panel-heading">
... ... @@ -121,7 +121,7 @@
121 121 </section>
122 122 </div>
123 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 125 <button type="button" onclick="$('#forum_create').submit();" class="btn btn-primary btn-raised">{% trans 'Update' %}</button>
126 126 </div>
127 127 </div>
... ...
links/static/links.js
View file @1fa68bb
... ... @@ -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 @5b9cb64
1 1 {% load widget_tweaks i18n %}
2   -
3 2 <!--MODAL CREATE LINK-->
4 3 <div class="modal fade" id="createLinksModal" tabindex="-1" role="dialog" aria-labelledby="createLink">
5 4 <div class="modal-dialog" role="document">
... ... @@ -33,7 +32,7 @@
33 32 </div>
34 33 {% endfor %}
35 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 36 <button class="btn btn-raised btn-primary" type="submit">{% trans 'Submit' %}</button>
38 37 </div>
39 38 <!-- .end Card -->
... ...
links/templates/links/delete_link.html
  Diff comments   View file @5b9cb64
... ... @@ -21,7 +21,7 @@
21 21 </div>
22 22 <div class="form-group">
23 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 25 <button class="btn btn-raised btn-primary" type="submit">{% trans 'Delete' %}</button>
26 26 </div>
27 27 </div>
... ...
links/templates/links/update_link.html
  Diff comments   View file @5b9cb64
... ... @@ -36,7 +36,7 @@
36 36 {% endif %}
37 37 {% endfor %}
38 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 40 <button class="btn btn-raised btn-primary" type="submit">{% trans 'Submit' %}</button>
41 41 </div>
42 42 <!-- .end Card -->
... ...
links/templates/links/view_link.html
  Diff comments   View file @5b9cb64
... ... @@ -14,7 +14,7 @@
14 14 <div class="card-block">
15 15 <b class="card-title">{{link.name}}</b><p></p>
16 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 18 </div>
19 19 </article>
20 20 <!-- .end Card -->
... ...
poll/templates/poll/create.html
  Diff comments   View file @5b9cb64
... ... @@ -151,7 +151,7 @@
151 151 <div class="modal-footer">
152 152  
153 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 155 {% block button_save %}
156 156 <!-- Put curtom buttons here!!! -->
157 157 <button type="submite" id="button" form="form" class="btn btn-primary btn-raised">{% trans "Create" %}</button>
... ...