Commit 065784518c74d29c55d4556e3a26fe99a0dd68e9
1 parent
10f221e3
Exists in
master
and in
5 other branches
modifying topic teacher #205
Showing
2 changed files
with
212 additions
and
206 deletions
Show diff stats
courses/templates/subject/form_view_teacher.html
1 | - {% load static i18n list_topic_foruns permission_tags widget_tweaks professor_access%} | 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 | - <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 %} | 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"> | 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"> | 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> | ||
27 | - </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> {% 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> {% 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> {% trans "Remove" %}</a></li> | ||
38 | - </ul> | ||
39 | - {% endif %} | 11 | + <div class="group"> |
12 | + <div class="panel panel-default"> | ||
13 | + <div class="panel-heading topic ui-sortable-handle" role="tab"> | ||
14 | + <div class="row"> | ||
15 | + <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}}"> | ||
16 | + <button class="btn btn-default btn-sm caret-square"><i class="fa fa-caret-square-o-down fa-2x" aria-hidden="true"></i></button> | ||
17 | + </div> | ||
18 | + <div class="col-xs-9 col-md-9 titleTopic"> | ||
19 | + <a role="button"> | ||
20 | + <h4>{{topic}}</h4> | ||
21 | + </a> | ||
22 | + </div> | ||
23 | + <div class="col-xs-3 col-md-2 divMoreActions"> | ||
24 | + <div class="btn-group"> | ||
25 | + <button type="button" class="btn btn-default btn-sm eye" data-toggle="tooltip" data-placement="bottom" title="Visible"> | ||
26 | + <i class="fa fa-eye fa-2x" aria-hidden="true"></i> | ||
27 | + </button> | ||
28 | + </div> | ||
29 | + <div class="btn-group"> | ||
30 | + <button class="btn btn-default btn-sm dropdown-toggle" type="button" id="moreActions" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> | ||
31 | + <i class="fa fa-ellipsis-v fa-2x" aria-hidden="true"></i> | ||
32 | + </button> | ||
33 | + {% professor_subject topic.subject user as dropdown_topic %} | ||
34 | + {% if dropdown_topic %} | ||
35 | + <ul class="dropdown-menu pull-right" aria-labelledby="moreActions"> | ||
36 | + <li><a href="javascript:void(0)" data-toggle="modal" data-target="#myModal4"><i class="fa fa-files-o fa-fw" aria-hidden="true"></i> {% trans "Replicate" %}</a></li> | ||
37 | + <li><a href="javascript:void(0)" class="edit_card"><i class="fa fa-pencil fa-fw" aria-hidden="true"></i> {% trans "Edit" %}</a></li> | ||
38 | + <li><a href="javascript:void(0)" data-toggle="modal" data-target="#removeTopic"><i class="fa fa-trash fa-fw" aria-hidden="true"></i> {% trans "Remove" %}</a></li> | ||
39 | + </ul> | ||
40 | + {% endif %} | ||
41 | + </div> | ||
42 | + </div> | ||
40 | </div> | 43 | </div> |
41 | </div> | 44 | </div> |
42 | - </div> | ||
43 | - <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-body"> | ||
45 | - <div class="presentation"> | ||
46 | - <p> | ||
47 | - <i> | ||
48 | - {{topic.description|linebreaks}} | ||
49 | - </i> | ||
50 | - </p> | ||
51 | - <div class="row"> | ||
52 | - <div class="col-xs-6 col-md-6"> | ||
53 | - <div class="resource_inline"> | ||
54 | - <h4>{% trans 'Material' %}</h4> | 45 | + <div class="panel-collapse collapseOne collapse in" role="tabpanel" aria-labelledby="headingOne" aria-expanded="false" aria-hidden="true" tabindex="-1" aria-selected="false"> |
46 | + <div class="panel-body"> | ||
47 | + <div class="presentation"> | ||
48 | + <p> | ||
49 | + <i> | ||
50 | + {{topic.description|linebreaks}} | ||
51 | + </i> | ||
52 | + </p> | ||
53 | + <div class="row"> | ||
54 | + <div class="col-xs-6 col-md-6"> | ||
55 | + <div class="resource_inline"> | ||
56 | + <h4>{% trans 'Material' %}</h4> | ||
57 | + </div> | ||
58 | + <div class="resource_inline"> | ||
59 | + <div class="dropdown"> | ||
60 | + <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> | ||
61 | + <ul class="dropdown-menu" aria-labelledby="dLabel"> | ||
62 | + <li><a href=" javascript:get_modal_link('{% url 'course:links:create_link' topic.slug %}', '#createLinksModal','#divModalLink') ">{% trans '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> | ||
63 | + <li> | ||
64 | + <a href="javascript:get_modal_file('{% url 'course:file:create_file' topic.slug %}', '#fileModal', '#divModalFile')"> | ||
65 | + {% trans "Create a file" %} | ||
66 | + <div class="ripple-container"> | ||
67 | + <div class="ripple ripple-on ripple-out" style="left: 33.5312px; top: 11px; background-color: rgb(0, 150, 136); transform: scale(20);"> | ||
68 | + </div> | ||
69 | + </div> | ||
70 | + </a> | ||
71 | + </li> | ||
72 | + </ul> | ||
73 | + </div> | ||
74 | + </div> | ||
75 | + <ul id="list-materials"> | ||
76 | + {% list_topic_file request topic %} | ||
77 | + {% list_topic_link request topic%} | ||
78 | + | ||
79 | + </ul> | ||
55 | </div> | 80 | </div> |
56 | - <div class="resource_inline"> | ||
57 | - <div class="dropdown"> | ||
58 | - <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> | ||
59 | - <ul class="dropdown-menu" aria-labelledby="dLabel"> | ||
60 | - <li><a href=" javascript:get_modal_link('{% url 'course:links:create_link' topic.slug %}', '#createLinksModal','#divModalLink') ">{% trans '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> | ||
61 | - <li> | ||
62 | - <a href="javascript:get_modal_file('{% url 'course:file:create_file' topic.slug %}', '#fileModal', '#divModalFile')"> | ||
63 | - {% trans "Create a file" %} | ||
64 | - <div class="ripple-container"> | ||
65 | - <div class="ripple ripple-on ripple-out" style="left: 33.5312px; top: 11px; background-color: rgb(0, 150, 136); transform: scale(20);"> | ||
66 | - </div> | ||
67 | - </div> | ||
68 | - </a> | ||
69 | - </li> | ||
70 | - </ul> | 81 | + <div class="col-xs-4 col-md-4"> |
82 | + <div class="resource_inline"> | ||
83 | + <h4>{% trans 'Activities' %}</h4> | ||
71 | </div> | 84 | </div> |
72 | </div> | 85 | </div> |
73 | <ul id="list-materials"> | 86 | <ul id="list-materials"> |
@@ -78,107 +91,103 @@ | @@ -78,107 +91,103 @@ | ||
78 | </div> | 91 | </div> |
79 | <div class="col-xs-4 col-md-4"> | 92 | <div class="col-xs-4 col-md-4"> |
80 | <div class="resource_inline"> | 93 | <div class="resource_inline"> |
81 | - <h4>{% trans 'Activities' %}</h4> | 94 | + <h4>Activities</h4> |
82 | </div> | 95 | </div> |
83 | - </div> | ||
84 | - <ul id="list-materials"> | ||
85 | - {% list_topic_file request topic %} | ||
86 | - {% list_topic_link request topic%} | ||
87 | - | ||
88 | - </ul> | ||
89 | - </div> | ||
90 | - <div class="col-xs-4 col-md-4"> | ||
91 | - <div class="resource_inline"> | ||
92 | - <h4>Activities</h4> | ||
93 | - </div> | ||
94 | - <div class="resource_inline"> | ||
95 | - <div class="dropdown"> | ||
96 | - <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> | ||
97 | - <ul class="dropdown-menu" aria-labelledby="dLabel"> | ||
98 | - <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> | ||
99 | - <li><a href="javascript:modal.get('{% url 'course:poll:create_poll' topic.slug%}','#poll','#modal_poll');">{% trans 'Create Poll' %}</a></li> | 96 | + <div class="resource_inline"> |
97 | + <div class="dropdown"> | ||
98 | + <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> | ||
99 | + <ul class="dropdown-menu" aria-labelledby="dLabel"> | ||
100 | + <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> | ||
101 | + <li><a href="javascript:modal.get('{% url 'course:poll:create_poll' topic.slug%}','#poll','#modal_poll');">{% trans 'Create Poll' %}</a></li> | ||
100 | 102 | ||
101 | - </ul> | 103 | + </ul> |
104 | + </div> | ||
102 | </div> | 105 | </div> |
103 | - </div> | ||
104 | - <ul> | 106 | + <ul> |
105 | 107 | ||
106 | - <div class="foruns_list"> | ||
107 | - {% list_topic_foruns request topic %} | ||
108 | - </div> | ||
109 | - </ul> | 108 | + <div class="foruns_list"> |
109 | + {% list_topic_foruns request topic %} | ||
110 | + </div> | ||
111 | + </ul> | ||
112 | + </div> | ||
113 | + {% list_topic_poll request topic %} | ||
110 | </div> | 114 | </div> |
111 | - {% list_topic_poll request topic %} | ||
112 | - </div> | ||
113 | - </div> | ||
114 | - <div class="editation" style="display: none"> | ||
115 | - <div class="form-group"> | ||
116 | - <label class="control-label" for="focusedInput2">Name Topic</label> | ||
117 | - <input type="text" class="form-control" value="Topic 1"> | ||
118 | - </div> | ||
119 | - <div class="form-group is-empty"> | ||
120 | - <label class="control-label" for="focusedInput2">Description</label> | ||
121 | - <textarea class="form-control" rows="3" id="textArea"></textarea> | ||
122 | - </div> | ||
123 | - <div class="row"> | ||
124 | - <div class=" col-xs-6 col-md-4"> | ||
125 | - <div class="resource_inline"> | ||
126 | - <h4>Material</h4> | 115 | + <div class="editation" style="display: none"> |
116 | + <div class="form-group"> | ||
117 | + <label class="control-label" for="focusedInput2">Name Topic</label> | ||
118 | + <input type="text" class="form-control" value="Topic 1"> | ||
119 | + </div> | ||
120 | + <div class="form-group is-empty"> | ||
121 | + <label class="control-label" for="focusedInput2">Description</label> | ||
122 | + <textarea class="form-control" rows="3" id="textArea"></textarea> | ||
127 | </div> | 123 | </div> |
128 | - <div class="resource_inline"> | ||
129 | - <div class="dropdown"> | ||
130 | - <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> | ||
131 | - <ul class="dropdown-menu" aria-labelledby="dLabel"> | ||
132 | - <li><a href="javascript:get_modal_link('{% url 'course:links:create_link' topic.slug %}', '#createLinksModal','#divModalLink')">Create a Link</a></li> | ||
133 | - <li> | ||
134 | - <a href="#"> | ||
135 | - {% trans "Create a file" %} | ||
136 | - <div class="ripple-container"> | ||
137 | - <div class="ripple ripple-on ripple-out" style="left: 33.5312px; top: 11px; background-color: rgb(0, 150, 136); transform: scale(20);"> | 124 | + <div class="row"> |
125 | + <div class=" col-xs-6 col-md-4"> | ||
126 | + <div class="resource_inline"> | ||
127 | + <h4>Material</h4> | ||
128 | + </div> | ||
129 | + <div class="resource_inline"> | ||
130 | + <div class="dropdown"> | ||
131 | + <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> | ||
132 | + <ul class="dropdown-menu" aria-labelledby="dLabel"> | ||
133 | + <li><a href="javascript:get_modal_link('{% url 'course:links:create_link' topic.slug %}', '#createLinksModal','#divModalLink')">Create a Link</a></li> | ||
134 | + <li> | ||
135 | + <a href="#"> | ||
136 | + {% trans "Create a file" %} | ||
137 | + <div class="ripple-container"> | ||
138 | + <div class="ripple ripple-on ripple-out" style="left: 33.5312px; top: 11px; background-color: rgb(0, 150, 136); transform: scale(20);"> | ||
139 | + </div> | ||
138 | </div> | 140 | </div> |
139 | - </div> | ||
140 | - </a> | ||
141 | - </li> | 141 | + </a> |
142 | + </li> | ||
143 | + </ul> | ||
144 | + </div> | ||
145 | + </div> | ||
146 | + <ul id="list-materials-edit"> | ||
147 | + {% list_topic_link_edit request topic%} | ||
148 | + {% list_topic_file_edit request topic %} | ||
142 | </ul> | 149 | </ul> |
143 | </div> | 150 | </div> |
144 | - </div> | ||
145 | - <ul id="list-materials-edit"> | ||
146 | - {% list_topic_link_edit request topic%} | ||
147 | - {% list_topic_file_edit request topic %} | ||
148 | - </ul> | ||
149 | - </div> | ||
150 | - <div class="col-xs-4 col-md-offset-1 col-md-4"> | ||
151 | - <div class="resource_inline"> | ||
152 | - <h4>Activities</h4> | ||
153 | - </div> | ||
154 | - <div class="resource_inline"> | ||
155 | - <div class="dropdown"> | ||
156 | - <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> | ||
157 | - <ul class="dropdown-menu" aria-labelledby="dLabel"> | ||
158 | - <li>Qualquer coisa</li> | 151 | + <div class="col-xs-4 col-md-offset-1 col-md-4"> |
152 | + <div class="resource_inline"> | ||
153 | + <h4>Activities</h4> | ||
154 | + </div> | ||
155 | + <div class="resource_inline"> | ||
156 | + <div class="dropdown"> | ||
157 | + <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> | ||
158 | + <ul class="dropdown-menu" aria-labelledby="dLabel"> | ||
159 | + <li>Qualquer coisa</li> | ||
160 | + </ul> | ||
161 | + </div> | ||
162 | + </div> | ||
163 | + <ul> | ||
164 | + <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> | ||
165 | + | ||
166 | + <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> | ||
167 | + | ||
159 | </ul> | 168 | </ul> |
160 | </div> | 169 | </div> |
161 | </div> | 170 | </div> |
162 | - <ul> | ||
163 | - <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> | ||
164 | - | ||
165 | - <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> | ||
166 | - | ||
167 | - </ul> | ||
168 | - </div> | ||
169 | - </div> | ||
170 | - <div class="form-group"> | ||
171 | - <div class="col-md-10"> | ||
172 | - <button type="button" class="btn btn-raised btn-default edit_card_end">Cancel</button> | ||
173 | - <button type="submit" class="btn btn-raised btn-primary edit_card_end">Submit</button> | 171 | + <div class="form-group"> |
172 | + <div class="col-md-10"> | ||
173 | + <button type="button" class="btn btn-raised btn-default edit_card_end">Cancel</button> | ||
174 | + <button type="submit" class="btn btn-raised btn-primary edit_card_end">Submit</button> | ||
175 | + </div> | ||
176 | + </div> | ||
174 | </div> | 177 | </div> |
175 | </div> | 178 | </div> |
176 | </div> | 179 | </div> |
177 | - </div> | ||
178 | - </div> | ||
179 | </div> | 180 | </div> |
181 | + {% professor_subject topic.subject user as professor_links %} | ||
182 | + {% if professor_links%} | ||
183 | + {% include "links/create_link.html" %} | ||
184 | + {% include "links/delete_link.html" %} | ||
185 | + {% endif %} | ||
186 | + </div> | ||
187 | +</div> | ||
188 | +</div> | ||
180 | 189 | ||
181 | - </div> | 190 | +<!-- MODALs --> |
182 | 191 | ||
183 | 192 | ||
184 | <!-- MODAL REMOVE TOPIC --> | 193 | <!-- MODAL REMOVE TOPIC --> |
@@ -201,11 +210,6 @@ | @@ -201,11 +210,6 @@ | ||
201 | </div> | 210 | </div> |
202 | </div> | 211 | </div> |
203 | <!-- END --> | 212 | <!-- END --> |
204 | - {% professor_subject topic.subject user as professor_links %} | ||
205 | - {% if professor_links%} | ||
206 | - {% include "links/create_link.html" %} | ||
207 | - {% include "links/delete_link.html" %} | ||
208 | - {% endif %} | ||
209 | 213 | ||
210 | <!-- MODAL EMBEED--> | 214 | <!-- MODAL EMBEED--> |
211 | <div class="modal fade" id="embedModal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel"> | 215 | <div class="modal fade" id="embedModal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel"> |
@@ -351,3 +355,5 @@ | @@ -351,3 +355,5 @@ | ||
351 | </div> | 355 | </div> |
352 | </div> | 356 | </div> |
353 | </div> | 357 | </div> |
358 | + | ||
359 | + |
courses/templates/subject/index.html
@@ -52,58 +52,58 @@ | @@ -52,58 +52,58 @@ | ||
52 | 52 | ||
53 | {% block content %} | 53 | {% block content %} |
54 | <div class="panel panel-info"> | 54 | <div class="panel panel-info"> |
55 | - <div class="panel-heading course-detail"> | ||
56 | - <div class="row"> | ||
57 | - <div class="col-md-10 col-sm-10"> | ||
58 | - <h4>{{subject}}</h4> | ||
59 | - </div> | ||
60 | - {% professor_subject subject user as subject_professor%} | ||
61 | - {% if subject_professor %} | ||
62 | - <div class="col-xs-4 col-md-2 divMoreActions"> | ||
63 | - <div class="btn-group"> | ||
64 | - <button class="btn btn-default btn-sm dropdown-toggle" type="button" id="moreActions" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> | ||
65 | - <i class="fa fa-ellipsis-v fa-2x" aria-hidden="true"></i> | ||
66 | - </button> | ||
67 | - <ul class="dropdown-menu pull-right" aria-labelledby="moreActions"> | ||
68 | - <li><a href="javascript:void(0)"><i class="fa fa-files-o fa-fw" aria-hidden="true"></i> {% trans "Replicate" %}</a></li> | ||
69 | - <li><a href="{% url 'course:update_subject' subject.slug %}" <i class="fa fa-pencil fa-fw" aria-hidden="true"></i> {% trans "Edit" %}</a></li> | ||
70 | - <li><a href="{% url 'course:delete_subject' subject.slug %}" ><i class="fa fa-trash fa-fw" aria-hidden="true"></i> {% trans "Remove" %}</a></li> | ||
71 | - </ul> | ||
72 | - </div> | ||
73 | - </div> | ||
74 | - {% endif %} | ||
75 | - </div> | ||
76 | - </div> | ||
77 | - <div class="panel-body"> | ||
78 | - <p><b>{% trans "Professor" %}:</b> {{subject.professors}}</p> | ||
79 | - <p> | ||
80 | - <b>{% trans "Description" %}:</b> | ||
81 | - {{subject.description|linebreaks}} | ||
82 | - </p> | ||
83 | - <div class="row"> | ||
84 | - <div class="col-xs-6 col-md-6"> | ||
85 | - <p><b>{% trans "Beginning" %}:</b> {{subject.init_date}}</p> | ||
86 | - </div> | ||
87 | - <div class="col-xs-6 col-md-6"> | ||
88 | - <p><b>{% trans "End" %}:</b> {{subject.end_date}}</p> | ||
89 | - </div> | ||
90 | - </div> | ||
91 | - </div> | ||
92 | - </div> | ||
93 | - | ||
94 | - {% for topic in topics %} | ||
95 | - {% professor_subject topic.subject user as topic_professor%} | ||
96 | - {% if topic_professor %} | ||
97 | - {% include "subject/form_view_teacher.html" %} | ||
98 | - {% else %} | ||
99 | - {% include "subject/form_view_student.html" %} | ||
100 | - {% endif %} | ||
101 | - {% endfor %} | ||
102 | - {% professor_subject subject user as professor_sub %} | ||
103 | - {% if professor_sub %} | ||
104 | - <div class="form-group"> | ||
105 | - <a href="{% url 'course:create_topic' subject.slug %}" data-toggle="modal" data-target="" class="btn btn-primary btn-lg btn-block btn-raised" name="create_topic">{% trans "Create Topic" %}<div class="ripple-container"></div></a> | 55 | + <div class="panel-heading course-detail"> |
56 | + <div class="row"> | ||
57 | + <div class="col-md-10 col-sm-10"> | ||
58 | + <h4>{{subject}}</h4> | ||
59 | + </div> | ||
60 | + <div class="col-xs-4 col-md-2 divMoreActions"> | ||
61 | + {% professor_subject subject user as subject_professor%} | ||
62 | + {% if subject_professor %} | ||
63 | + <div class="btn-group"> | ||
64 | + <button class="btn btn-default btn-sm dropdown-toggle" type="button" id="moreActions" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> | ||
65 | + <i class="fa fa-ellipsis-v fa-2x" aria-hidden="true"></i> | ||
66 | + </button> | ||
67 | + <ul class="dropdown-menu pull-right" aria-labelledby="moreActions"> | ||
68 | + <li><a href="javascript:void(0)"><i class="fa fa-files-o fa-fw" aria-hidden="true"></i> {% trans "Replicate" %}</a></li> | ||
69 | + <li><a href="{% url 'course:update_subject' subject.slug %}" <i class="fa fa-pencil fa-fw" aria-hidden="true"></i> {% trans "Edit" %}</a></li> | ||
70 | + <li><a href="{% url 'course:delete_subject' subject.slug %}" ><i class="fa fa-trash fa-fw" aria-hidden="true"></i> {% trans "Remove" %}</a></li> | ||
71 | + </ul> | ||
72 | + </div> | ||
73 | + {% endif %} | ||
74 | + </div> | ||
75 | + </div> | ||
76 | + </div> | ||
77 | + <div class="panel-body"> | ||
78 | + <p><b>{% trans "Professor" %}:</b> {{subject.professors}}</p> | ||
79 | + <p> | ||
80 | + <b>{% trans "Description" %}:</b> | ||
81 | + {{subject.description|linebreaks}} | ||
82 | + </p> | ||
83 | + <div class="row"> | ||
84 | + <div class="col-xs-6 col-md-6"> | ||
85 | + <p><b>{% trans "Beginning" %}:</b> {{subject.init_date}}</p> | ||
86 | + </div> | ||
87 | + <div class="col-xs-6 col-md-6"> | ||
88 | + <p><b>{% trans "End" %}:</b> {{subject.end_date}}</p> | ||
89 | + </div> | ||
106 | </div> | 90 | </div> |
107 | - {% endif %} | ||
108 | - | 91 | + </div> |
92 | + </div> | ||
93 | + {% for topic in topics %} | ||
94 | + {% professor_subject topic.subject user as topic_professor%} | ||
95 | + {% if topic_professor %} | ||
96 | + {% include "subject/form_view_teacher.html" %} | ||
97 | + {% else %} | ||
98 | + {% include "subject/form_view_student.html" %} | ||
99 | + {% endif %} | ||
100 | + {% endfor %} | ||
101 | + {% professor_subject subject user as professor_sub %} | ||
102 | + {% if professor_sub %} | ||
103 | + <div class="col-md-10"> | ||
104 | + <div class="form-group"> | ||
105 | + <a href="{% url 'course:create_topic' subject.slug %}" data-toggle="modal" data-target="" class="btn btn-primary btn-lg btn-block btn-raised" name="create_topic">{% trans "Create Topic" %}<div class="ripple-container"></div></a> | ||
106 | + </div> | ||
107 | + </div> | ||
108 | + {% endif %} | ||
109 | {% endblock %} | 109 | {% endblock %} |