Download as
Browse Code »

Commit 07356d24a9770b9e90444523c0a82dc417eb871f

Authored by juliotoscano
2 parents 4b911e26 f1958757
Exists in master and in 5 other branches amadeus_univasf, dev, image-crop, pdf_file_html, refactoring

merge #205

Showing 9 changed files with 433 additions and 94 deletions   Show diff stats
amadeus/staticfiles/css/base/amadeus.css
  Diff comments   View file @07356d2
@@ -18,7 +18,10 @@ @@ -18,7 +18,10 @@
18 padding-bottom: 1%; 18 padding-bottom: 1%;
19 width: 15%; 19 width: 15%;
20 } 20 }
  21 +<<<<<<< HEAD
21 22
  23 +=======
  24 +>>>>>>> front_cards
22 .breadcrumb{ 25 .breadcrumb{
23 margin-bottom: 5px; 26 margin-bottom: 5px;
24 } 27 }
@@ -318,4 +321,4 @@ body .container .jumbotron-inverse, body .container .well-inverse, body .contain @@ -318,4 +321,4 @@ body .container .jumbotron-inverse, body .container .well-inverse, body .contain
318 321
319 .notification-count { 322 .notification-count {
320 background-color: #FF0000; 323 background-color: #FF0000;
321 -} 324 -}
  325 +}
322 \ No newline at end of file 326 \ No newline at end of file
core/static/css/base/amadeus.css
  Diff comments   View file @07356d2
@@ -30,7 +30,7 @@ @@ -30,7 +30,7 @@
30 margin: 10% 10% 5% 5%; 30 margin: 10% 10% 5% 5%;
31 } 31 }
32 .breadcrumb{ 32 .breadcrumb{
33 - margin-bottom: 5px; 33 + margin-bottom: 25px;
34 } 34 }
35 .courseHome{ 35 .courseHome{
36 text-align: center; 36 text-align: center;
@@ -394,4 +394,21 @@ ul, li { @@ -394,4 +394,21 @@ ul, li {
394 -webkit-animation-duration: 900ms; 394 -webkit-animation-duration: 900ms;
395 -webkit-animation-iteration-count: 3; 395 -webkit-animation-iteration-count: 3;
396 -webkit-animation-timing-function: ease-in-out; 396 -webkit-animation-timing-function: ease-in-out;
397 -}  
398 \ No newline at end of file 397 \ No newline at end of file
  398 +}
  399 +/* Icon Topic */
  400 +.divMoreActions {text-align: right; height: 39px; float: right;}
  401 +.divMoreActions div button {padding-left: 10px; padding-right: 10px; padding-bottom: 10px; margin-bottom: 4px; height: 31px;}
  402 +.titleTopic {padding-top: 18px; padding-left: 0px;}
  403 +.titleTopic-detail {padding-top: 8px; color: white;}
  404 +.titleTopic a h4 {margin-top: 0px; color: white; cursor:pointer;}
  405 +.dropdown-menu .pull-right {
  406 + right: 0;
  407 + }
  408 +.moreAccordion{ padding-left: 0px; padding-right: 0px;}
  409 +.moreAccordion div button{ padding-left: 0px; padding-right: 0px;}
  410 +.cards-content{ padding-left: 0px; padding-right: 0px; }
  411 +.cards-detail{margin-left: 4%;}
  412 +.cards-detail .panel .panel-heading{/*background-color:;*/}
  413 +.cards-detail .panel .panel-heading h4{color:black;}
  414 +.course, .subject, .topic{ padding-top: 0px; padding-bottom: 0px; }
  415 +.course-detail{padding-top: 10px; padding-bottom: 10px;}
399 \ No newline at end of file 416 \ No newline at end of file
core/templates/guest.html
  Diff comments   View file @07356d2
@@ -78,6 +78,7 @@ @@ -78,6 +78,7 @@
78 </ul> 78 </ul>
79 </li> 79 </li>
80 80
  81 +<<<<<<< HEAD
81 <li data-toggle="tooltip" data-placement="bottom" title data-original-title="{% trans 'messages' %}"> <a href="#"><i class="fa fa-comments" aria-hidden="true"></i></a> </li> 82 <li data-toggle="tooltip" data-placement="bottom" title data-original-title="{% trans 'messages' %}"> <a href="#"><i class="fa fa-comments" aria-hidden="true"></i></a> </li>
82 <li > <a class="link" href="{% url 'app:index' %}">{{ user }}</a></li> 83 <li > <a class="link" href="{% url 'app:index' %}">{{ user }}</a></li>
83 84
@@ -167,6 +168,97 @@ @@ -167,6 +168,97 @@
167 {% block script_file %} 168 {% block script_file %}
168 169
169 {% endblock script_file %} 170 {% endblock script_file %}
  171 +=======
  172 + <li data-toggle="tooltip" data-placement="bottom" title data-original-title="{% trans 'messages' %}"> <a href="#"><i class="fa fa-comments" aria-hidden="true"></i></a> </li>
  173 + <li > <a class="link" href="{% url 'app:index' %}">{{ user }}</a></li>
  174 +
  175 + </ul>
  176 + </div>
  177 + </div>
  178 + {% endblock %}
  179 + <div class="container-fluid">
  180 + <div class="row">
  181 +
  182 + <div class="col-xs-2 col-sm-2 col-md-2 col-lg-2 col-xl-2">
  183 + {% block sidebar %}
  184 + <div class="panel panel-primary">
  185 + <div class="panel-heading">
  186 + <h4>Menu</h4>
  187 + </div>
  188 + <div class="panel-body">
  189 + <ul class="nav nav-pills nav-stacked">
  190 + <li><a href="{% url 'core:register' %}">{% trans 'Register' %}</a></li>
  191 + </ul>
  192 + </div>
  193 + </div>
  194 + {% endblock %}
  195 +
  196 + </div>
  197 + <div class="col-xs-10 col-sm-10 col-md-10 col-lg-10 col-xl-10">
  198 + {% block breadcrumbs %}
  199 + <div class="col-md-12">
  200 + <form id="searchform" action="{% url 'course:manage' %}" method="get" accept-charset="utf-8">
  201 + <div class="input-group">
  202 + <div class="form-group is-empty">
  203 + <input type="search" class="form-control" placeholder="Search Courses" name="q" id="searchbox"></div>
  204 + <span class="input-group-btn input-group-sm">
  205 + <button type="button" class="btn btn-fab btn-fab-mini">
  206 + <i class="material-icons">search</i>
  207 + </button>
  208 + </span>
  209 + </div>
  210 + </form>
  211 + </div>
  212 +
  213 + <div class="col-md-10">
  214 + <div class="btn-group btn-group-justified btn-group-raised">
  215 + <a href="?category=all" class="btn btn-raised btn-info">Todos</a>
  216 + {% for category in categories %}
  217 + <a href="?category={{category.name}}" class="btn btn-raised btn-primary">{{category.name}}</a>
  218 + {% endfor %}
  219 + </div>
  220 + </div>
  221 +
  222 + {% endblock %}
  223 + {% block render_breadcrumbs %}{% endblock %}
  224 + <div>
  225 + </div>
  226 + <div class="col-xs-12 col-sm-12 col-md-10 col-lg-10 col-xl-12">
  227 + {% block content %}
  228 + {% for course in courses %}
  229 + <div class="panel panel-info panel_{{ course.id }}">
  230 + <div class="panel-heading">
  231 + <a href="{{ course.get_absolute_url }}" class="panel-title">{{course.name}}</a>
  232 + {% if user|show_course_subscribe:course %}
  233 + <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>
  234 + {% endif %}
  235 + </div>
  236 +
  237 + <div class="panel-body">
  238 + <p><b>Course Name: </b>{{course.name}}</p>
  239 + <p><b>Begining: </b>{{course.init_date}}</p>
  240 + <p><b>End: </b>{{course.end_date}}</p>
  241 + <p><b>Professor: </b>{{course.professors.name}}</p>
  242 + <p>
  243 + <b>Description:</b>
  244 + <i>
  245 + {{course.content}}
  246 + </i>
  247 + </p>
  248 + </div>
  249 + </div>
  250 + {% endfor %}
  251 +
  252 + {% endblock %}
  253 + </div>
  254 + </div>
  255 + </div>
  256 + <script src="{% static 'js/main.js' %}"></script>
  257 + <script type="text/javascript" src="{% static 'js/topic_editation_presentation.js' %}"></script>
  258 + {% block script_file %}
  259 +
  260 + {% endblock script_file %}
  261 +>>>>>>> front_cards
170 </body> 262 </body>
171 263
172 </html> 264 </html>
173 \ No newline at end of file 265 \ No newline at end of file
courses/static/js/course.js
  Diff comments   View file @07356d2
@@ -49,13 +49,13 @@ function subscribe(elem, url, id, confirm_message) { @@ -49,13 +49,13 @@ function subscribe(elem, url, id, confirm_message) {
49 function delete_course(url, course, message, return_url) { 49 function delete_course(url, course, message, return_url) {
50 alertify.confirm(message, function(){ 50 alertify.confirm(message, function(){
51 var csrftoken = getCookie('csrftoken'); 51 var csrftoken = getCookie('csrftoken');
52 - 52 +
53 $.ajax({ 53 $.ajax({
54 method: 'post', 54 method: 'post',
55 beforeSend: function (request) { 55 beforeSend: function (request) {
56 request.setRequestHeader('X-CSRFToken', csrftoken); 56 request.setRequestHeader('X-CSRFToken', csrftoken);
57 }, 57 },
58 - url: url, 58 + url: url,
59 success: function(data) { 59 success: function(data) {
60 alertify.alert('Remove Course', 'Course removed successfully!', function(){ 60 alertify.alert('Remove Course', 'Course removed successfully!', function(){
61 window.location.href = return_url; 61 window.location.href = return_url;
@@ -71,7 +71,7 @@ function delete_course(url, course, message, return_url) { @@ -71,7 +71,7 @@ function delete_course(url, course, message, return_url) {
71 */ 71 */
72 function replicate_course(url, course) { 72 function replicate_course(url, course) {
73 $.ajax({ 73 $.ajax({
74 - url: url, 74 + url: url,
75 data: {'form': course}, 75 data: {'form': course},
76 success: function(data) { 76 success: function(data) {
77 $(".course_replicate_form").html(data); 77 $(".course_replicate_form").html(data);
courses/templates/course/index.html
  Diff comments   View file @07356d2
@@ -44,6 +44,7 @@ @@ -44,6 +44,7 @@
44 44
45 {% if user|has_role:'professor' or user|has_role:'system_admin' %} 45 {% if user|has_role:'professor' or user|has_role:'system_admin' %}
46 46
  47 +<<<<<<< HEAD
47 <div class="panel panel-primary"> 48 <div class="panel panel-primary">
48 <div class="panel-heading"> 49 <div class="panel-heading">
49 <h3 class="panel-title">Category</h3> 50 <h3 class="panel-title">Category</h3>
@@ -56,6 +57,20 @@ @@ -56,6 +57,20 @@
56 </div> 57 </div>
57 </div> 58 </div>
58 {% endif %} 59 {% endif %}
  60 +=======
  61 + <div class="panel panel-primary">
  62 + <div class="panel-heading">
  63 + <h3 class="panel-title">Category</h3>
  64 + </div>
  65 + <div class="panel-body">
  66 + <ul class="nav nav-pills nav-stacked">
  67 + <li><a href="{% url 'course:create_cat' %}">Create Category</a></li>
  68 + <li><a href="{% url 'course:manage_cat' %}">List Category</a></li>
  69 + </ul>
  70 + </div>
  71 + </div>
  72 + {% endif %}
  73 +>>>>>>> front_cards
59 {% endblock %} 74 {% endblock %}
60 75
61 {% block content %} 76 {% block content %}
@@ -71,6 +86,7 @@ @@ -71,6 +86,7 @@
71 {% endif %} 86 {% endif %}
72 87
73 <div class="col-md-12 cards-content"> 88 <div class="col-md-12 cards-content">
  89 +<<<<<<< HEAD
74 <form id="searchform" action="{% url 'course:manage' %}" method="get" accept-charset="utf-8"> 90 <form id="searchform" action="{% url 'course:manage' %}" method="get" accept-charset="utf-8">
75 <div class="input-group"> 91 <div class="input-group">
76 <div class="form-group is-empty"> 92 <div class="form-group is-empty">
@@ -82,10 +98,24 @@ @@ -82,10 +98,24 @@
82 </span> 98 </span>
83 </div> 99 </div>
84 </form> 100 </form>
  101 +=======
  102 + <form id="searchform" action="{% url 'course:manage' %}" method="get" accept-charset="utf-8">
  103 + <div class="input-group">
  104 + <div class="form-group is-empty">
  105 + <input type="search" class="form-control" placeholder="Search Courses" name="q" id="searchbox"></div>
  106 + <span class="input-group-btn input-group-sm">
  107 + <button type="button" class="btn btn-fab btn-fab-mini">
  108 + <i class="material-icons">search</i>
  109 + </button>
  110 + </span>
  111 + </div>
  112 + </form>
  113 +>>>>>>> front_cards
85 </div> 114 </div>
86 115
87 116
88 </fieldset> 117 </fieldset>
  118 +<<<<<<< HEAD
89 <div class="col-md-12 cards-content"> 119 <div class="col-md-12 cards-content">
90 {% if courses|length > 0 %} 120 {% if courses|length > 0 %}
91 {% if request.GET.category == 'all' or none or request.GET.category == '' %} 121 {% if request.GET.category == 'all' or none or request.GET.category == '' %}
@@ -104,6 +134,26 @@ @@ -104,6 +134,26 @@
104 {% trans 'No courses found' %} 134 {% trans 'No courses found' %}
105 {% endif %} 135 {% endif %}
106 </div> 136 </div>
  137 +=======
  138 + <div class="col-md-12 cards-content">
  139 + {% if courses|length > 0 %}
  140 + {% if request.GET.category == 'all' or none or request.GET.category == '' %}
  141 + {% for course in list_courses %}
  142 + {% include "course/course_card.html" %}
  143 + {% endfor %}
  144 + {% else %}
  145 + {% for course in courses_category %}
  146 + {% if course.category.name == request.GET.category %}
  147 + <!-- Put your content here! -->
  148 + {% include "course/course_card.html" %}
  149 + {% endif %}
  150 + {% endfor %}
  151 + {% endif %}
  152 + {% else %}
  153 + {% trans 'No courses found' %}
  154 + {% endif %}
  155 + </div>
  156 +>>>>>>> front_cards
107 157
108 <script type="text/javascript" src="{% static 'js/course.js' %}"></script> 158 <script type="text/javascript" src="{% static 'js/course.js' %}"></script>
109 {% endblock %} 159 {% endblock %}
courses/templates/subject/form_view_student.html
  Diff comments   View file @07356d2
1 -{% load static i18n list_topic_foruns %} 1 + {% load static i18n list_topic_foruns permission_tags widget_tweaks professor_access%}
2 2
3 -{% block javascript %}  
4 - <script type="text/javascript" src="{% static 'js/forum.js' %}"></script>  
5 -{% endblock %}  
6 -  
7 -<div class="panel panel-default">  
8 - <a href="{% url 'course:view_topic' topic.slug %}">  
9 - <div class="panel-heading">  
10 - <div class="row">  
11 - <div class="col-md-9 col-sm-9">  
12 - <h3>{{topic}}</h3>  
13 - </div>  
14 - </div> 3 + {% block javascript %}
  4 + <script type="text/javascript" src="{% static 'js/forum.js' %}"></script>
  5 + <script src="{% static 'js/file.js' %}"></script>
  6 + <script type="text/javascript" src="{% static 'js/material.js' %}"></script>
  7 + <script type = "text/javascript" src="{% static 'links.js' %}"></script>
  8 + {% endblock %}
  9 +<div class="cards-detail">
  10 + <div class="panel-group accordion ui-accordion ui-widget ui-helper-reset ui-sortable" role="tablist" aria-multiselectable="false">
  11 + <div class="group"><div class="panel panel-default">
  12 + <div class="panel-heading topic ui-sortable-handle" role="tab">
  13 + <div class="row">
  14 + <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}}">
  15 + <button class="btn btn-default btn-sm caret-square"><i class="fa fa-caret-square-o-down fa-2x" aria-hidden="true"></i></button>
15 </div> 16 </div>
16 - </a>  
17 -</div>  
18 -<div class="panel-body">  
19 - <p>{{topic.description|linebreaks}}</p>  
20 - {% list_topic_foruns request topic %}  
21 - {% list_topic_poll request topic %}  
22 -</div> 17 + <div class="col-xs-9 col-md-9 titleTopic">
  18 + <a role="button">
  19 + <h4>{{topic}}</h4>
  20 + </a>
  21 + </div>
  22 + </div>
  23 + </div>
  24 + <div class="panel-collapse collapseTopic-{{topic.slug}} collapse in" role="tabpanel" aria-labelledby="heading_{{topic.id}}" aria-expanded="true" aria-hidden="false">
  25 + <div class="panel-body">
  26 + <div class="presentation">
  27 + <p>
  28 + <i>
  29 + {{topic.description|linebreaks}}
  30 + </i>
  31 + </p>
  32 + <div class="row">
  33 + <div class="col-xs-6 col-md-6">
  34 + <div class="resource_inline">
  35 + <h4>Material</h4>
  36 + </div>
  37 + <ul id="list-materials">
  38 + {% list_topic_file request topic %}
  39 + {% list_topic_link request topic%}
23 40
24 -<div class="modal fade" id="forumModal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel">  
25 - <div class="modal-dialog" role="document">  
26 - <div class="modal-content">  
27 - <div class="modal-header">  
28 - <h4 class="modal-title" id="myModalLabel">{% trans 'Forum' %}</h4> 41 + </ul>
29 </div> 42 </div>
30 - <div class="modal-body">  
31 - <section>  
32 - <div class="forum_topics"></div>  
33 - </section>  
34 - </div>  
35 - <div class="modal-footer">  
36 - <button type="button" class="btn btn-danger btn-raised" data-dismiss="modal">{% trans 'Close' %}</button>  
37 - <button type="button" class="btn btn-primary btn-raised">{% trans 'Save changes' %}</button> 43 + <div class="col-xs-4 col-md-4">
  44 + <div class="resource_inline">
  45 + <h4>Activities</h4>
  46 + </div>
  47 + <ul>
  48 +
  49 + <div class="foruns_list">
  50 + {% list_topic_foruns request topic %}
  51 + </div>
  52 + </ul>
38 </div> 53 </div>
  54 + {% list_topic_poll request topic %}
  55 + </div>
39 </div> 56 </div>
  57 + </div>
  58 + </div>
  59 + </div>
  60 +
  61 + </div>
  62 +
  63 + {% professor_subject topic.subject user as professor_links %}
  64 + {% if professor_links%}
  65 + {% include "links/create_link.html" %}
  66 + {% include "links/delete_link.html" %}
  67 + {% endif %}
  68 +
  69 +
  70 + <!-- MODAL LINK EDIT-->
  71 + {% professor_subject topic.subject user as links_update %}
  72 + {% if links_update%}
  73 + {% include "links/update_link.html" %}
  74 + {% endif %}
40 </div> 75 </div>
41 -</div> 76 + </div>
42 \ No newline at end of file 77 \ No newline at end of file
courses/templates/subject/form_view_teacher.html
  Diff comments   View file @07356d2
@@ -6,38 +6,41 @@ @@ -6,38 +6,41 @@
6 <script type="text/javascript" src="{% static 'js/material.js' %}"></script> 6 <script type="text/javascript" src="{% static 'js/material.js' %}"></script>
7 <script type = "text/javascript" src="{% static 'links.js' %}"></script> 7 <script type = "text/javascript" src="{% static 'links.js' %}"></script>
8 {% endblock %} 8 {% endblock %}
9 -  
10 - <div class="panel-group accordion ui-accordion ui-widget ui-helper-reset ui-sortable" role="tablist" aria-multiselectable="false">  
11 - <div class="group"><div class="panel panel-default">  
12 - <div class="panel-heading headingOne ui-sortable-handle" role="tab">  
13 - <div class="row">  
14 - <div class="col-xs-9 col-md-10 titleTopic">  
15 - <a role="button" data-toggle="collapse" data-parent=".accordion" href=".collapseOne" aria-expanded="false" aria-controls="collapseOne" class="" aria-selected="false" tabindex="-1">  
16 - {{topic}}  
17 - </a> 9 +<div class="cards-detail">
  10 + <div class="panel-group accordion ui-accordion ui-widget ui-helper-reset ui-sortable" role="tablist" aria-multiselectable="false">
  11 + <div class="group"><div class="panel panel-default">
  12 + <div class="panel-heading topic ui-sortable-handle" role="tab">
  13 + <div class="row">
  14 + <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}}">
  15 + <button class="btn btn-default btn-sm caret-square"><i class="fa fa-caret-square-o-down fa-2x" aria-hidden="true"></i></button>
  16 + </div>
  17 + <div class="col-xs-9 col-md-9 titleTopic">
  18 + <a role="button">
  19 + <h4>{{topic}}</h4>
  20 + </a>
  21 + </div>
  22 + <div class="col-xs-3 col-md-2 divMoreActions">
  23 + <div class="btn-group">
  24 + <button type="button" class="btn btn-default btn-sm eye" data-toggle="tooltip" data-placement="bottom" title="Visible">
  25 + <i class="fa fa-eye fa-2x" aria-hidden="true"></i>
  26 + </button>
18 </div> 27 </div>
19 - <div class="col-xs-3 col-md-2 divMoreActions">  
20 - <div class="btn-group">  
21 - <button type="button" class="btn btn-default btn-sm eye" data-toggle="tooltip" data-placement="bottom" title="Visible">  
22 - <i class="fa fa-eye fa-2x" aria-hidden="true"></i>  
23 - </button>  
24 - </div>  
25 - <div class="btn-group">  
26 - <button class="btn btn-default btn-sm dropdown-toggle" type="button" id="moreActions" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">  
27 - <i class="fa fa-ellipsis-v fa-2x" aria-hidden="true"></i>  
28 - </button>  
29 - {% professor_subject topic.subject user as dropdown_topic %}  
30 - {% if dropdown_topic %}  
31 - <ul class="dropdown-menu pull-right" aria-labelledby="moreActions">  
32 - <li><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></li>  
33 - <li><a href="javascript:void(0)" class="edit_card"><i class="fa fa-pencil fa-fw" aria-hidden="true"></i>&nbsp; {% trans "Edit" %}</a></li>  
34 - <li><a href="javascript:void(0)" data-toggle="modal" data-target="#removeTopic"><i class="fa fa-trash fa-fw" aria-hidden="true"></i>&nbsp; {% trans "Remove" %}</a></li>  
35 - </ul>  
36 - {% endif %}  
37 - </div> 28 + <div class="btn-group">
  29 + <button class="btn btn-default btn-sm dropdown-toggle" type="button" id="moreActions" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
  30 + <i class="fa fa-ellipsis-v fa-2x" aria-hidden="true"></i>
  31 + </button>
  32 + {% professor_subject topic.subject user as dropdown_topic %}
  33 + {% if dropdown_topic %}
  34 + <ul class="dropdown-menu pull-right" aria-labelledby="moreActions">
  35 + <li><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></li>
  36 + <li><a href="javascript:void(0)" class="edit_card"><i class="fa fa-pencil fa-fw" aria-hidden="true"></i>&nbsp; {% trans "Edit" %}</a></li>
  37 + <li><a href="javascript:void(0)" data-toggle="modal" data-target="#removeTopic"><i class="fa fa-trash fa-fw" aria-hidden="true"></i>&nbsp; {% trans "Remove" %}</a></li>
  38 + </ul>
  39 + {% endif %}
38 </div> 40 </div>
39 </div> 41 </div>
40 </div> 42 </div>
  43 +<<<<<<< HEAD
41 <div class="panel-collapse collapseOne collapse in" role="tabpanel" aria-labelledby="headingOne" aria-expanded="false" aria-hidden="true" tabindex="-1" aria-selected="false"> 44 <div class="panel-collapse collapseOne collapse in" role="tabpanel" aria-labelledby="headingOne" aria-expanded="false" aria-hidden="true" tabindex="-1" aria-selected="false">
42 <div class="panel-body"> 45 <div class="panel-body">
43 <div class="presentation"> 46 <div class="presentation">
@@ -77,27 +80,69 @@ @@ -77,27 +80,69 @@
77 <div class="col-xs-4 col-md-4"> 80 <div class="col-xs-4 col-md-4">
78 <div class="resource_inline"> 81 <div class="resource_inline">
79 <h4>{% trans 'Activities' %}</h4> 82 <h4>{% trans 'Activities' %}</h4>
  83 +=======
  84 + </div>
  85 + <div class="panel-collapse collapseTopic-{{topic.slug}} collapse in" role="tabpanel" aria-labelledby="heading_{{topic.id}}" aria-expanded="true" aria-hidden="false">
  86 + <div class="panel-body">
  87 + <div class="presentation">
  88 + <p>
  89 + <i>
  90 + {{topic.description|linebreaks}}
  91 + </i>
  92 + </p>
  93 + <div class="row">
  94 + <div class="col-xs-6 col-md-6">
  95 + <div class="resource_inline">
  96 + <h4>Material</h4>
  97 + </div>
  98 + <div class="resource_inline">
  99 + <div class="dropdown">
  100 + <a href="#" type="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><i class="fa fa-plus-circle fa-lg" aria-hidden="true"></i></a>
  101 + <ul class="dropdown-menu" aria-labelledby="dLabel">
  102 + <li><a href=" javascript:get_modal_link('{% url 'course:links:create_link' topic.slug %}', '#createLinksModal','#divModalLink') ">Create a Link<div class="ripple-container"><div class="ripple ripple-on ripple-out" style="left: 54.5312px; top: 22px; background-color: rgb(0, 150, 136); transform: scale(20);"></div></div></a></li>
  103 + <li>
  104 + <a href="javascript:get_modal_file('{% url 'course:file:create_file' topic.slug %}', '#fileModal', '#divModalFile')">
  105 + {% trans "Create a file" %}
  106 + <div class="ripple-container">
  107 + <div class="ripple ripple-on ripple-out" style="left: 33.5312px; top: 11px; background-color: rgb(0, 150, 136); transform: scale(20);">
  108 + </div>
  109 + </div>
  110 + </a>
  111 + </li>
  112 + </ul>
  113 +>>>>>>> front_cards
80 </div> 114 </div>
81 - <div class="resource_inline">  
82 - <div class="dropdown">  
83 - <a href="#" type="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><i class="fa fa-plus-circle fa-lg" aria-hidden="true"></i></a>  
84 - <ul class="dropdown-menu" aria-labelledby="dLabel">  
85 - <li><a href="javascript:createForum('{% url 'course:forum:create' %}', '{{ topic.id }}')">{% trans 'Create Forum' %}<div class="ripple-container"><div class="ripple ripple-on ripple-out" style="left: 33.5312px; top: 11px; background-color: rgb(0, 150, 136); transform: scale(20);"></div></div></a></li>  
86 - <li><a href="javascript:modal.get('{% url 'course:poll:create_poll' topic.slug%}','#poll','#modal_poll');">{% trans 'Create Poll' %}</a></li> 115 + </div>
  116 + <ul id="list-materials">
  117 + {% list_topic_file request topic %}
  118 + {% list_topic_link request topic%}
87 119
88 - </ul>  
89 - </div> 120 + </ul>
  121 + </div>
  122 + <div class="col-xs-4 col-md-4">
  123 + <div class="resource_inline">
  124 + <h4>Activities</h4>
  125 + </div>
  126 + <div class="resource_inline">
  127 + <div class="dropdown">
  128 + <a href="#" type="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><i class="fa fa-plus-circle fa-lg" aria-hidden="true"></i></a>
  129 + <ul class="dropdown-menu" aria-labelledby="dLabel">
  130 + <li><a href="javascript:createForum('{% url 'course:forum:create' %}', '{{ topic.id }}')">{% trans 'Create Forum' %}<div class="ripple-container"><div class="ripple ripple-on ripple-out" style="left: 33.5312px; top: 11px; background-color: rgb(0, 150, 136); transform: scale(20);"></div></div></a></li>
  131 + <li><a href="javascript:modal.get('{% url 'course:poll:create_poll' topic.slug%}','#poll','#modal_poll');">{% trans 'Create Poll' %}</a></li>
  132 +
  133 + </ul>
90 </div> 134 </div>
91 - <ul>  
92 -  
93 - <div class="foruns_list">  
94 - {% list_topic_foruns request topic %}  
95 - </div>  
96 - </ul>  
97 </div> 135 </div>
98 - {% list_topic_poll request topic %} 136 + <ul>
  137 +
  138 + <div class="foruns_list">
  139 + {% list_topic_foruns request topic %}
  140 + </div>
  141 + </ul>
99 </div> 142 </div>
  143 + {% list_topic_poll request topic %}
100 </div> 144 </div>
  145 +<<<<<<< HEAD
101 <div class="editation" style="display: none"> 146 <div class="editation" style="display: none">
102 <div class="form-group"> 147 <div class="form-group">
103 <label class="control-label" for="focusedInput2">{% trans 'Name Topic' %}</label> 148 <label class="control-label" for="focusedInput2">{% trans 'Name Topic' %}</label>
@@ -145,26 +190,86 @@ @@ -145,26 +190,86 @@
145 <li>{% trans 'Anything' %}</li> 190 <li>{% trans 'Anything' %}</li>
146 </ul> 191 </ul>
147 </div> 192 </div>
  193 +=======
  194 + </div>
  195 + <div class="editation" style="display: none">
  196 + <div class="form-group">
  197 + <label class="control-label" for="focusedInput2">Name Topic</label>
  198 + <input type="text" class="form-control" value="Topic 1">
  199 + </div>
  200 + <div class="form-group is-empty">
  201 + <label class="control-label" for="focusedInput2">Description</label>
  202 + <textarea class="form-control" rows="3" id="textArea"></textarea>
  203 + </div>
  204 + <div class="row">
  205 + <div class=" col-xs-6 col-md-4">
  206 + <div class="resource_inline">
  207 + <h4>Material</h4>
  208 + </div>
  209 + <div class="resource_inline">
  210 + <div class="dropdown">
  211 + <a href="#" type="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><i class="fa fa-plus-circle fa-lg" aria-hidden="true"></i></a>
  212 + <ul class="dropdown-menu" aria-labelledby="dLabel">
  213 + <li><a href="javascript:get_modal_link('{% url 'course:links:create_link' topic.slug %}', '#createLinksModal','#divModalLink')">Create a Link</a></li>
  214 + <li>
  215 + <a href="#">
  216 + {% trans "Create a file" %}
  217 + <div class="ripple-container">
  218 + <div class="ripple ripple-on ripple-out" style="left: 33.5312px; top: 11px; background-color: rgb(0, 150, 136); transform: scale(20);">
  219 + </div>
  220 + </div>
  221 + </a>
  222 + </li>
  223 + </ul>
  224 +>>>>>>> front_cards
148 </div> 225 </div>
149 - <ul>  
150 - <li class="icon_edit_remove"><i class="fa fa-pencil fa-lg" aria-hidden="true"></i> <i class="fa fa-trash fa-lg" aria-hidden="true"></i></li>  
151 -  
152 - <li class="icon_edit_remove"><i class="fa fa-pencil fa-lg" aria-hidden="true"></i> <i class="fa fa-trash fa-lg" aria-hidden="true"></i></li>  
153 -  
154 - </ul>  
155 </div> 226 </div>
  227 + <ul id="list-materials-edit">
  228 + {% list_topic_link_edit request topic%}
  229 + {% list_topic_file_edit request topic %}
  230 + </ul>
156 </div> 231 </div>
  232 +<<<<<<< HEAD
157 <div class="form-group"> 233 <div class="form-group">
158 <div class="col-md-10"> 234 <div class="col-md-10">
159 <button type="button" class="btn btn-raised btn-default edit_card_end">{% trans 'Cancel' %}</button> 235 <button type="button" class="btn btn-raised btn-default edit_card_end">{% trans 'Cancel' %}</button>
160 <button type="submit" class="btn btn-raised btn-primary edit_card_end">{% trans 'Submit' %}</button> 236 <button type="submit" class="btn btn-raised btn-primary edit_card_end">{% trans 'Submit' %}</button>
  237 +=======
  238 + <div class="col-xs-4 col-md-offset-1 col-md-4">
  239 + <div class="resource_inline">
  240 + <h4>Activities</h4>
  241 +>>>>>>> front_cards
161 </div> 242 </div>
  243 + <div class="resource_inline">
  244 + <div class="dropdown">
  245 + <a href="#" type="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><i class="fa fa-plus-circle fa-lg" aria-hidden="true"></i></a>
  246 + <ul class="dropdown-menu" aria-labelledby="dLabel">
  247 + <li>Qualquer coisa</li>
  248 + </ul>
  249 + </div>
  250 + </div>
  251 + <ul>
  252 + <li class="icon_edit_remove"><i class="fa fa-pencil fa-lg" aria-hidden="true"></i> <i class="fa fa-trash fa-lg" aria-hidden="true"></i></li>
  253 +
  254 + <li class="icon_edit_remove"><i class="fa fa-pencil fa-lg" aria-hidden="true"></i> <i class="fa fa-trash fa-lg" aria-hidden="true"></i></li>
  255 +
  256 + </ul>
  257 + </div>
  258 + </div>
  259 + <div class="form-group">
  260 + <div class="col-md-10">
  261 + <button type="button" class="btn btn-raised btn-default edit_card_end">Cancel</button>
  262 + <button type="submit" class="btn btn-raised btn-primary edit_card_end">Submit</button>
162 </div> 263 </div>
163 </div> 264 </div>
164 </div> 265 </div>
165 </div> 266 </div>
  267 + </div>
  268 + </div>
166 269
167 </div> 270 </div>
  271 +
  272 +
168 <!-- MODAL REMOVE TOPIC --> 273 <!-- MODAL REMOVE TOPIC -->
169 <div class="modal" id="removeTopic"> 274 <div class="modal" id="removeTopic">
170 <div class="modal-dialog"> 275 <div class="modal-dialog">
courses/templates/subject/index.html
  Diff comments   View file @07356d2
@@ -16,13 +16,50 @@ @@ -16,13 +16,50 @@
16 </ol> 16 </ol>
17 {% endblock %} 17 {% endblock %}
18 18
  19 +<<<<<<< HEAD
  20 +=======
  21 +{% block sidebar %}
  22 +<div class="panel panel-primary">
  23 + <div class="panel-heading">
  24 + <h4>Menu</h4>
  25 + </div>
  26 + <div class="panel-body">
  27 + <ul class="nav nav-pills nav-stacked">
  28 + <li><a href="{% url 'app:index' %}">{% trans 'Home' %}</a></li>
  29 + <li><a href="{% url 'users:profile' %}">{% trans 'Profile' %}</a></li>
  30 + {% if user|has_role:'student' or not user.is_staff %}
  31 + <li><a href="{% url 'course:manage' %}">{% trans 'My courses' %}</a></li>
  32 + <li><a href="{% url 'core:guest' %}">{% trans 'All Courses' %}</a></li>
  33 + {% endif %}
  34 + {% if user|has_role:'system_admin' %}
  35 + <li> <a href="{% url 'users:manage' %}">{% trans 'Manage Users' %}</a></li>
  36 + {% endif %}
  37 + {% if user|has_role:'system_admin' or user|has_role:'professor' %}
  38 + <li>
  39 + <a href="#courses_list" class="accordion" data-toggle="collapse">{% trans 'Manage Courses' %}</a>
  40 + <div id="courses_list" class="collapse">
  41 + <ul class="nav nav-pill nav-stacked accordion_list">
  42 + {% for course in courses_list %}
  43 + <li><a href="{% url 'course:view' course.slug %}">{{ course }}</a></li>
  44 + {% endfor %}
  45 + </ul>
  46 + </div>
  47 + </li>
  48 + {% endif %}
  49 + </ul>
  50 + </div>
  51 +</div>
  52 +
  53 +
  54 +{% endblock %}
  55 +>>>>>>> front_cards
19 56
20 {% block content %} 57 {% block content %}
21 <div class="panel panel-info"> 58 <div class="panel panel-info">
22 - <div class="panel-heading"> 59 + <div class="panel-heading course-detail">
23 <div class="row"> 60 <div class="row">
24 <div class="col-md-10 col-sm-10"> 61 <div class="col-md-10 col-sm-10">
25 - <h3>{{subject}}</h3> 62 + <h4>{{subject}}</h4>
26 </div> 63 </div>
27 {% professor_subject subject user as subject_professor%} 64 {% professor_subject subject user as subject_professor%}
28 {% if subject_professor %} 65 {% if subject_professor %}
courses/templates/topic/index.html
  Diff comments   View file @07356d2
@@ -19,7 +19,7 @@ @@ -19,7 +19,7 @@
19 19
20 {% block sidebar %} 20 {% block sidebar %}
21 21
22 - <div class="panel panel-primary navigation"> 22 + <div class="panel panel-primary">
23 <div class="panel-heading"> 23 <div class="panel-heading">
24 <h5>{% trans 'Menu' %}</h5> 24 <h5>{% trans 'Menu' %}</h5>
25 </div> 25 </div>
@@ -32,7 +32,7 @@ @@ -32,7 +32,7 @@
32 </div> 32 </div>
33 33
34 {% if user|has_role:'professor' %} 34 {% if user|has_role:'professor' %}
35 - <div class="panel panel-primary navigation"> 35 + <div class="panel panel-primary ">
36 <div class="panel-heading"> 36 <div class="panel-heading">
37 <h3 class="panel-title">{% trans 'Actions' %}</h3> 37 <h3 class="panel-title">{% trans 'Actions' %}</h3>
38 </div> 38 </div>
@@ -47,7 +47,7 @@ @@ -47,7 +47,7 @@
47 </div> 47 </div>
48 </div> 48 </div>
49 {% endif %} 49 {% endif %}
50 - 50 +
51 {% endblock %} 51 {% endblock %}
52 52
53 {% block content %} 53 {% block content %}