Download as
Browse Code »

Commit 3b7e693d9baa3198b97ebe5678a3cf9f6a56097b

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

modifying home subject and card topic #205

Showing 4 changed files with 177 additions and 153 deletions   Show diff stats
core/static/css/base/amadeus.css
  Diff comments   View file @3b7e693
@@ -408,8 +408,7 @@ ul, li { @@ -408,8 +408,7 @@ ul, li {
408 .moreAccordion div button{ padding-left: 0px; padding-right: 0px;} 408 .moreAccordion div button{ padding-left: 0px; padding-right: 0px;}
409 .cards-content{ padding-left: 0px; padding-right: 0px; } 409 .cards-content{ padding-left: 0px; padding-right: 0px; }
410 .cards-detail{margin-left: 4%;} 410 .cards-detail{margin-left: 4%;}
411 -.cards-detail .panel .panel-heading{background-color:#81D4FA;} 411 +.cards-detail .panel .panel-heading{/*background-color:;*/}
412 .cards-detail .panel .panel-heading h4{color:black;} 412 .cards-detail .panel .panel-heading h4{color:black;}
413 -.subject{ padding-top: 0px; padding-bottom: 0px; }  
414 -.course{padding-top: 0px; padding-bottom: 0px;} 413 +.course, .subject, .topic{ padding-top: 0px; padding-bottom: 0px; }
415 .course-detail{padding-top: 10px; padding-bottom: 10px;} 414 .course-detail{padding-top: 10px; padding-bottom: 10px;}
416 \ No newline at end of file 415 \ No newline at end of file
courses/templates/course/view.html
  Diff comments   View file @3b7e693
@@ -124,7 +124,7 @@ @@ -124,7 +124,7 @@
124 <div class="cards-detail"> 124 <div class="cards-detail">
125 {% if request.GET.category == 'all' or none or request.GET.category == '' %} 125 {% if request.GET.category == 'all' or none or request.GET.category == '' %}
126 {% for subject in subjects %} 126 {% for subject in subjects %}
127 - <div class="panel panel-info panel_{{ subject.id }}"> 127 + <div class="panel panel-default panel_{{ subject.id }}">
128 <div class="panel-heading heading_{{subject.id}} subject ui-sortable-handle"> 128 <div class="panel-heading heading_{{subject.id}} subject ui-sortable-handle">
129 <div class="row"> 129 <div class="row">
130 <div class="col-md-1 moreAccordion" data-toggle="collapse" data-parent="#accordion-{{subject.slug}}" href=".collapseSubject-{{subject.slug}}" aria-expanded="false" aria-controls="collapseSubject-{{subject.slug}}"> 130 <div class="col-md-1 moreAccordion" data-toggle="collapse" data-parent="#accordion-{{subject.slug}}" href=".collapseSubject-{{subject.slug}}" aria-expanded="false" aria-controls="collapseSubject-{{subject.slug}}">
courses/templates/subject/form_view_teacher.html
  Diff comments   View file @3b7e693
@@ -6,165 +6,171 @@ @@ -6,165 +6,171 @@
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>
41 - <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">  
43 - <div class="presentation">  
44 - <p>  
45 - <i>  
46 - {{topic.description|linebreaks}}  
47 - </i>  
48 - </p>  
49 - <div class="row">  
50 - <div class="col-xs-6 col-md-6">  
51 - <div class="resource_inline">  
52 - <h4>Material</h4>  
53 - </div>  
54 - <div class="resource_inline">  
55 - <div class="dropdown">  
56 - <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>  
57 - <ul class="dropdown-menu" aria-labelledby="dLabel">  
58 - <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>  
59 - <li>  
60 - <a href="javascript:get_modal_file('{% url 'course:file:create_file' topic.slug %}', '#fileModal', '#divModalFile')">  
61 - {% trans "Create a file" %}  
62 - <div class="ripple-container">  
63 - <div class="ripple ripple-on ripple-out" style="left: 33.5312px; top: 11px; background-color: rgb(0, 150, 136); transform: scale(20);">  
64 - </div>  
65 - </div>  
66 - </a>  
67 - </li>  
68 - </ul>  
69 - </div>  
70 - </div>  
71 - <ul id="list-materials">  
72 - {% list_topic_file request topic %}  
73 - {% list_topic_link request topic%}  
74 -  
75 - </ul> 43 + </div>
  44 + <div class="panel-collapse collapseTopic-{{topic.slug}} collapse in" role="tabpanel" aria-labelledby="heading_{{topic.id}}" aria-expanded="true" aria-hidden="false">
  45 + <div class="panel-body">
  46 + <div class="presentation">
  47 + <p>
  48 + <i>
  49 + {{topic.description|linebreaks}}
  50 + </i>
  51 + </p>
  52 + <div class="row">
  53 + <div class="col-xs-6 col-md-6">
  54 + <div class="resource_inline">
  55 + <h4>Material</h4>
76 </div> 56 </div>
77 - <div class="col-xs-4 col-md-4">  
78 - <div class="resource_inline">  
79 - <h4>Activities</h4> 57 + <div class="resource_inline">
  58 + <div class="dropdown">
  59 + <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>
  60 + <ul class="dropdown-menu" aria-labelledby="dLabel">
  61 + <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>
  62 + <li>
  63 + <a href="javascript:get_modal_file('{% url 'course:file:create_file' topic.slug %}', '#fileModal', '#divModalFile')">
  64 + {% trans "Create a file" %}
  65 + <div class="ripple-container">
  66 + <div class="ripple ripple-on ripple-out" style="left: 33.5312px; top: 11px; background-color: rgb(0, 150, 136); transform: scale(20);">
  67 + </div>
  68 + </div>
  69 + </a>
  70 + </li>
  71 + </ul>
80 </div> 72 </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> 73 + </div>
  74 + <ul id="list-materials">
  75 + {% list_topic_file request topic %}
  76 + {% list_topic_link request topic%}
87 77
88 - </ul>  
89 - </div> 78 + </ul>
  79 + </div>
  80 + <div class="col-xs-4 col-md-4">
  81 + <div class="resource_inline">
  82 + <h4>Activities</h4>
  83 + </div>
  84 + <div class="resource_inline">
  85 + <div class="dropdown">
  86 + <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>
  87 + <ul class="dropdown-menu" aria-labelledby="dLabel">
  88 + <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>
  89 + <li><a href="javascript:modal.get('{% url 'course:poll:create_poll' topic.slug%}','#poll','#modal_poll');">{% trans 'Create Poll' %}</a></li>
  90 +
  91 + </ul>
90 </div> 92 </div>
91 - <ul>  
92 -  
93 - <div class="foruns_list">  
94 - {% list_topic_foruns request topic %}  
95 - </div>  
96 - </ul>  
97 </div> 93 </div>
98 - {% list_topic_poll request topic %} 94 + <ul>
  95 +
  96 + <div class="foruns_list">
  97 + {% list_topic_foruns request topic %}
  98 + </div>
  99 + </ul>
99 </div> 100 </div>
  101 + {% list_topic_poll request topic %}
100 </div> 102 </div>
101 - <div class="editation" style="display: none">  
102 - <div class="form-group">  
103 - <label class="control-label" for="focusedInput2">Name Topic</label>  
104 - <input type="text" class="form-control" value="Topic 1">  
105 - </div>  
106 - <div class="form-group is-empty">  
107 - <label class="control-label" for="focusedInput2">Description</label>  
108 - <textarea class="form-control" rows="3" id="textArea"></textarea>  
109 - </div>  
110 - <div class="row">  
111 - <div class=" col-xs-6 col-md-4">  
112 - <div class="resource_inline">  
113 - <h4>Material</h4>  
114 - </div>  
115 - <div class="resource_inline">  
116 - <div class="dropdown">  
117 - <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>  
118 - <ul class="dropdown-menu" aria-labelledby="dLabel">  
119 - <li><a href="javascript:get_modal_link('{% url 'course:links:create_link' topic.slug %}', '#createLinksModal','#divModalLink')">Create a Link</a></li>  
120 - <li>  
121 - <a href="#">  
122 - {% trans "Create a file" %}  
123 - <div class="ripple-container">  
124 - <div class="ripple ripple-on ripple-out" style="left: 33.5312px; top: 11px; background-color: rgb(0, 150, 136); transform: scale(20);">  
125 - </div>  
126 - </div>  
127 - </a>  
128 - </li>  
129 - </ul>  
130 - </div>  
131 - </div>  
132 - <ul id="list-materials-edit">  
133 - {% list_topic_link_edit request topic%}  
134 - {% list_topic_file_edit request topic %}  
135 - </ul> 103 + </div>
  104 + <div class="editation" style="display: none">
  105 + <div class="form-group">
  106 + <label class="control-label" for="focusedInput2">Name Topic</label>
  107 + <input type="text" class="form-control" value="Topic 1">
  108 + </div>
  109 + <div class="form-group is-empty">
  110 + <label class="control-label" for="focusedInput2">Description</label>
  111 + <textarea class="form-control" rows="3" id="textArea"></textarea>
  112 + </div>
  113 + <div class="row">
  114 + <div class=" col-xs-6 col-md-4">
  115 + <div class="resource_inline">
  116 + <h4>Material</h4>
136 </div> 117 </div>
137 - <div class="col-xs-4 col-md-offset-1 col-md-4">  
138 - <div class="resource_inline">  
139 - <h4>Activities</h4>  
140 - </div>  
141 - <div class="resource_inline">  
142 - <div class="dropdown">  
143 - <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>  
144 - <ul class="dropdown-menu" aria-labelledby="dLabel">  
145 - <li>Qualquer coisa</li>  
146 - </ul>  
147 - </div> 118 + <div class="resource_inline">
  119 + <div class="dropdown">
  120 + <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>
  121 + <ul class="dropdown-menu" aria-labelledby="dLabel">
  122 + <li><a href="javascript:get_modal_link('{% url 'course:links:create_link' topic.slug %}', '#createLinksModal','#divModalLink')">Create a Link</a></li>
  123 + <li>
  124 + <a href="#">
  125 + {% trans "Create a file" %}
  126 + <div class="ripple-container">
  127 + <div class="ripple ripple-on ripple-out" style="left: 33.5312px; top: 11px; background-color: rgb(0, 150, 136); transform: scale(20);">
  128 + </div>
  129 + </div>
  130 + </a>
  131 + </li>
  132 + </ul>
148 </div> 133 </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> 134 </div>
  135 + <ul id="list-materials-edit">
  136 + {% list_topic_link_edit request topic%}
  137 + {% list_topic_file_edit request topic %}
  138 + </ul>
156 </div> 139 </div>
157 - <div class="form-group">  
158 - <div class="col-md-10">  
159 - <button type="button" class="btn btn-raised btn-default edit_card_end">Cancel</button>  
160 - <button type="submit" class="btn btn-raised btn-primary edit_card_end">Submit</button> 140 + <div class="col-xs-4 col-md-offset-1 col-md-4">
  141 + <div class="resource_inline">
  142 + <h4>Activities</h4>
161 </div> 143 </div>
  144 + <div class="resource_inline">
  145 + <div class="dropdown">
  146 + <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>
  147 + <ul class="dropdown-menu" aria-labelledby="dLabel">
  148 + <li>Qualquer coisa</li>
  149 + </ul>
  150 + </div>
  151 + </div>
  152 + <ul>
  153 + <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>
  154 +
  155 + <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>
  156 +
  157 + </ul>
  158 + </div>
  159 + </div>
  160 + <div class="form-group">
  161 + <div class="col-md-10">
  162 + <button type="button" class="btn btn-raised btn-default edit_card_end">Cancel</button>
  163 + <button type="submit" class="btn btn-raised btn-primary edit_card_end">Submit</button>
162 </div> 164 </div>
163 </div> 165 </div>
164 </div> 166 </div>
165 </div> 167 </div>
  168 + </div>
  169 + </div>
166 170
167 </div> 171 </div>
  172 +
  173 +
168 <!-- MODAL REMOVE TOPIC --> 174 <!-- MODAL REMOVE TOPIC -->
169 <div class="modal" id="removeTopic"> 175 <div class="modal" id="removeTopic">
170 <div class="modal-dialog"> 176 <div class="modal-dialog">
courses/templates/subject/index.html
  Diff comments   View file @3b7e693
@@ -17,27 +17,46 @@ @@ -17,27 +17,46 @@
17 {% endblock %} 17 {% endblock %}
18 18
19 {% block sidebar %} 19 {% block sidebar %}
20 - <div class="panel panel-primary">  
21 - <div class="panel-heading">  
22 - <h5>{% trans 'Menu' %}</h5>  
23 - </div>  
24 - <div class="panel-body">  
25 - <ul class="nav nav-pills nav-stacked">  
26 - <li><a href="{% url 'users:profile' %}">{% trans 'Profile' %}</a></li>  
27 - <li><a href="{% url 'course:manage' %}">{% trans 'My Courses' %}</a></li>  
28 - </ul>  
29 - </div> 20 +<div class="panel panel-primary">
  21 + <div class="panel-heading">
  22 + <h4>Menu</h4>
30 </div> 23 </div>
  24 + <div class="panel-body">
  25 + <ul class="nav nav-pills nav-stacked">
  26 + <li><a href="{% url 'app:index' %}">{% trans 'Home' %}</a></li>
  27 + <li><a href="{% url 'users:profile' %}">{% trans 'Profile' %}</a></li>
  28 + {% if user|has_role:'student' or not user.is_staff %}
  29 + <li><a href="{% url 'course:manage' %}">{% trans 'My courses' %}</a></li>
  30 + <li><a href="{% url 'core:guest' %}">{% trans 'All Courses' %}</a></li>
  31 + {% endif %}
  32 + {% if user|has_role:'system_admin' %}
  33 + <li> <a href="{% url 'users:manage' %}">{% trans 'Manage Users' %}</a></li>
  34 + {% endif %}
  35 + {% if user|has_role:'system_admin' or user|has_role:'professor' %}
  36 + <li>
  37 + <a href="#courses_list" class="accordion" data-toggle="collapse">{% trans 'Manage Courses' %}</a>
  38 + <div id="courses_list" class="collapse">
  39 + <ul class="nav nav-pill nav-stacked accordion_list">
  40 + {% for course in courses_list %}
  41 + <li><a href="{% url 'course:view' course.slug %}">{{ course }}</a></li>
  42 + {% endfor %}
  43 + </ul>
  44 + </div>
  45 + </li>
  46 + {% endif %}
  47 + </ul>
  48 + </div>
  49 +</div>
31 50
32 51
33 {% endblock %} 52 {% endblock %}
34 53
35 {% block content %} 54 {% block content %}
36 <div class="panel panel-info"> 55 <div class="panel panel-info">
37 - <div class="panel-heading"> 56 + <div class="panel-heading course-detail">
38 <div class="row"> 57 <div class="row">
39 <div class="col-md-10 col-sm-10"> 58 <div class="col-md-10 col-sm-10">
40 - <h3>{{subject}}</h3> 59 + <h4>{{subject}}</h4>
41 </div> 60 </div>
42 {% professor_subject subject user as subject_professor%} 61 {% professor_subject subject user as subject_professor%}
43 {% if subject_professor %} 62 {% if subject_professor %}