Download as
Browse Code »

Commit b229219f09a715299875efd200e1ec1a539ed65d

Authored by Jailson Dias
1 parent 9adf508c
Exists in master and in 5 other branches amadeus_univasf, dev, image-crop, pdf_file_html, refactoring

#278 reorganização do menu

Showing 17 changed files with 57 additions and 263 deletions   Show diff stats
app/templates/home.html
  Diff comments   View file @b229219
... ... @@ -78,26 +78,27 @@
78 78 </div>
79 79 <div class="panel-body">
80 80 <ul class="nav nav-pills nav-stacked">
81   - {% if user|has_role:'student' or not user.is_staff %}
82   - <li><a href="{% url 'course:manage' %}">{% trans 'My courses' %}</a></li>
83   - <li><a href="{% url 'course:all_courses' %}">{% trans 'All Courses' %}</a></li>
84   - {% endif %}
  81 + <li>
  82 + <a href="#menu_courses" class="accordion" data-toggle="collapse">{% trans 'Courses' %}<span class="pull-right glyphicon glyphicon-chevron-down"></span></a>
  83 + <div id="menu_courses" class="collapse">
  84 + <ul class="nav nav-pill nav-stacked accordion_list">
  85 + <li><a href="{% url 'course:manage' %}">{% trans 'My courses' %}</a></li>
  86 + <li><a href="{% url 'course:all_courses' %}">{% trans 'All Courses' %}</a></li>
  87 + {% if user|has_role:'system_admin' or user|has_role:'professor'%}
  88 + <li><a href="{% url 'course:manage_cat' %}">{% trans 'List Category' %}</a></li>
  89 + <li><a href="{% url 'course:create' %}">{% trans 'Create Course' %}</a></li>
  90 + <li><a href="{% url 'course:create_cat' %}">{% trans 'Create Category' %}</a></li>
  91 + {% endif %}
  92 + </ul>
  93 + </div>
  94 + </li>
  95 + {% block menu %}
  96 +
  97 + {% endblock %}
85 98 {% if user|has_role:'system_admin' %}
86 99 <li> <a href="{% url 'users:manage' %}">{% trans 'Manage Users' %}</a></li>
87 100 <li> <a href="{% url 'app:settings' %}">{% trans 'Settings' %}</a></li>
88 101 {% endif %}
89   - {% if user|has_role:'system_admin' or user|has_role:'professor' %}
90   - <li>
91   - <a href="#courses_list" class="accordion" data-toggle="collapse">{% trans 'Manage Courses' %}</a>
92   - <div id="courses_list" class="collapse">
93   - <ul class="nav nav-pill nav-stacked accordion_list">
94   - {% for course in courses_list %}
95   - <li><a href="{% url 'course:view' course.slug %}">{{ course }}</a></li>
96   - {% endfor %}
97   - </ul>
98   - </div>
99   - </li>
100   - {% endif %}
101 102 </ul>
102 103 </div>
103 104 </div>
... ...
core/templates/base.html
  Diff comments   View file @b229219
... ... @@ -109,7 +109,15 @@
109 109 </li>
110 110  
111 111 <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>
112   - <li > <a class="link" href="{% url 'users:profile' %}">{{ user }}</a></li>
  112 + <li >
  113 + <a href="" data-toggle="dropdown">{{ user }}</a>
  114 + <ul class="dropdown-menu pull-right">
  115 + <li><a href="{% url 'users:profile' %}">{% trans 'Perfil' %}</a></li>
  116 + <li><a href="{% url 'users:update_profile' %}">{% trans 'Edit Profile' %}</a></li>
  117 + <li><a href="{% url 'users:change_password' %}">{% trans 'Change password' %}</a></li>
  118 + <li><a href="{% url 'users:remove_account' %}">{% trans 'Remove account' %}</a></li>
  119 + </ul>
  120 + </li>
113 121 <li data-toggle="tooltip" data-placement="bottom" title data-original-title="log out"> <a href="{% url 'core:logout' %}"><i class="fa fa-sign-out" aria-hidden="true"></i></a></li>
114 122 </ul>
115 123 </div>
... ...
courses/templates/category/create.html
  Diff comments   View file @b229219
... ... @@ -10,38 +10,6 @@
10 10 </ol>
11 11 {% endblock %}
12 12  
13   -{% block sidebar %}
14   -{{block.super}}
15   -
16   -{% if user|has_role:'professor' or user|has_role:'system_admin' %}
17   -
18   - <div class="panel panel-primary navigation">
19   - <div class="panel-heading">
20   - <h3 class="panel-title">{% trans 'Actions' %}</h3>
21   - </div>
22   - <div class="panel-body">
23   - <ul class="nav nav-pills nav-stacked">
24   - <li><a href="{% url 'course:create' %}">{% trans 'Create Course' %}</a></li>
25   - </ul>
26   - </div>
27   - </div>
28   -
29   -
30   - <div class="panel panel-primary navigation">
31   - <div class="panel-heading">
32   - <h3 class="panel-title">{% trans 'Category' %}</h3>
33   - </div>
34   - <div class="panel-body">
35   - <ul class="nav nav-pills nav-stacked">
36   - <li><a href="{% url 'course:create_cat' %}">{% trans 'Create Category' %}</a></li>
37   - <li><a href="{% url 'course:manage_cat' %}">{% trans 'List Category' %}</a></li>
38   - </ul>
39   - </div>
40   - </div>
41   -{% endif %}
42   -
43   -{% endblock %}
44   -
45 13 {% block content %}
46 14 <div class="card card-content">
47 15 <div class="card-body">
... ...
courses/templates/category/index.html
  Diff comments   View file @b229219
... ... @@ -11,36 +11,6 @@
11 11 </ol>
12 12 {% endblock %}
13 13  
14   -{% block sidebar %}
15   -{{block.super}}
16   -
17   - {% if user|has_role:'professor' or user|has_role:'system_admin' %}
18   -
19   - <div class="panel panel-primary navigation">
20   - <div class="panel-heading">
21   - <h3 class="panel-title">{% trans 'Actions' %}</h3>
22   - </div>
23   - <div class="panel-body">
24   - <ul class="nav nav-pills nav-stacked">
25   - <li><a href="{% url 'course:create' %}">{% trans 'Create Course' %}</a></li>
26   - </ul>
27   - </div>
28   - </div>
29   -
30   - <div class="panel panel-primary navigation">
31   - <div class="panel-heading">
32   - <h3 class="panel-title">{% trans 'Category' %}</h3>
33   - </div>
34   - <div class="panel-body">
35   - <ul class="nav nav-pills nav-stacked">
36   - <li><a href="{% url 'course:create_cat' %}">{% trans 'Create Category' %}</a></li>
37   - <li><a href="{% url 'course:manage_cat' %}">{% trans 'List Category' %}</a></li>
38   - </ul>
39   - </div>
40   - </div>
41   -{% endif %}
42   -{% endblock %}
43   -
44 14 {% block content %}
45 15 {% if messages %}
46 16 {% for message in messages %}
... ... @@ -104,4 +74,4 @@
104 74 </div>
105 75 <div class="row" id="modal_category">
106 76 <script src="{% static 'js/modal_category.js' %}"></script>
107   -{% endblock %}
108 77 \ No newline at end of file
  78 +{% endblock %}
... ...
courses/templates/category/update.html
  Diff comments   View file @b229219
1   -{% extends 'Home.html' %}
  1 +{% extends 'home.html' %}
2 2  
3 3 {% load static i18n %}
4 4 {% load static i18n permission_tags %}
... ... @@ -11,35 +11,6 @@
11 11 </ol>
12 12 {% endblock %}
13 13  
14   -{% block sidebar %}
15   -{{block.super}}
16   -
17   -{% if user|has_role:'professor' or user|has_role:'system_admin' %}
18   -
19   - <div class="panel panel-primary navigation">
20   - <div class="panel-heading">
21   - <h3 class="panel-title">{% trans 'Actions' %}</h3>
22   - </div>
23   - <div class="panel-body">
24   - <ul class="nav nav-pills nav-stacked">
25   - <li><a href="{% url 'course:create' %}">{% trans 'Create Course' %}</a></li>
26   - </ul>
27   - </div>
28   - </div>
29   - <div class="panel panel-primary navigation">
30   - <div class="panel-heading">
31   - <h3 class="panel-title">{% trans 'Category' %}</h3>
32   - </div>
33   - <div class="panel-body">
34   - <ul class="nav nav-pills nav-stacked">
35   - <li><a href="{% url 'course:create_cat' %}">{% trans 'Create Category' %}</a></li>
36   - <li><a href="{% url 'course:manage_cat' %}">{% trans 'List Category' %}</a></li>
37   - </ul>
38   - </div>
39   - </div>
40   -{% endif %}
41   -{% endblock %}
42   -
43 14 {% block content %}
44 15 {% if messages %}
45 16 {% for message in messages %}
... ...
courses/templates/course/course_card.html
  Diff comments   View file @b229219
... ... @@ -73,4 +73,4 @@
73 73 </div>
74 74 </div>
75 75 </div>
76   - <script type="text/javascript" src="{% static 'js/course.js' %}"></script>
77 76 \ No newline at end of file
  77 + <script type="text/javascript" src="{% static 'js/course.js' %}"></script>
... ...
courses/templates/course/home.html
View file @9adf508
... ... @@ -1,23 +0,0 @@
1   -{% extends 'app/base.html' %}
2   -
3   -{% load static i18n %}
4   -{% load widget_tweaks %}
5   -
6   -{% block breadcrumbs %}
7   - <ol class="breadcrumb">
8   - <li><a href="{% url 'app:index' %}">{% trans 'Home' %}</a></li>
9   - <li class="active">{% trans 'Home Course' %}</li>
10   - </ol>
11   -{% endblock %}
12   -
13   -{% block sidebar %}
14   - <div class="list-group">
15   - <a href="{% url 'course:manage' %}" class="list-group-item">
16   - {% trans 'Courses' %}
17   - </a>
18   - </div>
19   -{% endblock %}
20   -
21   -{% block content %}
22   -
23   -{% endblock %}
courses/templates/course/index.html
  Diff comments   View file @b229219
... ... @@ -63,9 +63,6 @@
63 63  
64 64 {% endfor %}
65 65 </div>
66   - {% if user|has_role:'professor' or user|has_role:'system_admin' %}
67   - <a href="{% url 'course:create' %}" class="btn btn-primary btn-fab float-button"><i class="fa fa-plus material-icons"></i></a>
68   - {% endif %}
69 66 <div class="col-md-12">
70 67 <nav aria-label="Page navigation">
71 68 <ul class="pagination">
... ...
courses/templates/course/view.html
  Diff comments   View file @b229219
... ... @@ -21,23 +21,6 @@
21 21 </ol>
22 22 {% endblock %}
23 23  
24   -{% block sidebar %}
25   -{{ block.super}}
26   - <div class="panel panel-primary">
27   - <div class="panel-heading">
28   - <h5>{% trans 'Categories' %}</h5>
29   - </div>
30   - <div class="panel-body">
31   - <ul class="nav nav-pills nav-stacked">
32   - <li {% if category is None %}class="active"{% endif %}><a href="{% url 'course:view' course.slug %}">{% trans 'All' %}</a></li>
33   - {% for cat in categorys_subjects %}
34   - <li {% if category == cat.slug %}class="active"{% endif %}><a href="{% url 'course:view_filter' course.slug cat.slug %}">{{ cat }}</a></li>
35   - {% endfor %}
36   - </ul>
37   - </div>
38   - </div>
39   -{% endblock %}
40   -
41 24 {% block content %}
42 25  
43 26 <div class="col-md-12 cards-content">
... ... @@ -132,7 +115,7 @@
132 115 <li><a href="{% url 'course:update_subject' subject.slug %}"> <i class="fa fa-pencil fa-fw" aria-hidden="true"></i>&nbsp; {% trans "Edit" %}</a></li>
133 116 <li><a href="{% url 'course:delete_subject' subject.slug %}" ><i class="fa fa-trash fa-fw" aria-hidden="true"></i>&nbsp; {% trans "Remove" %}</a></li>
134 117 </ul>
135   -
  118 +
136 119 </div>
137 120 </div>
138 121 {% endif %}
... ...
courses/templates/subject/index.html
  Diff comments   View file @b229219
... ... @@ -21,11 +21,6 @@
21 21 <li class="active">{{ subject }}</li>
22 22 </ol>
23 23 {% endblock %}
24   -{% block sidebar %}
25   -{{block.super}}
26   -
27   -
28   -{% endblock %}
29 24  
30 25 {% block content %}
31 26 <div class="panel panel-info">
... ...
courses/templates/subject_category/index.html
  Diff comments   View file @b229219
... ... @@ -11,10 +11,6 @@
11 11 </ol>
12 12 {% endblock %}
13 13  
14   -{% block sidebar %}
15   -{{block.super}}
16   -{% endblock %}
17   -
18 14 {% block content %}
19 15 <div class="panel panel-info">
20 16 <div class="panel-heading">
... ...
courses/templates/topic/index.html
  Diff comments   View file @b229219
... ... @@ -26,10 +26,6 @@
26 26 </ol>
27 27 {% endblock %}
28 28  
29   -{% block sidebar %}
30   -{{block.super}}
31   -{% endblock %}
32   -
33 29 {% block content %}
34 30 <div class="col-md-12 col-xs-12 col-sm-12">
35 31 <div class="panel panel-info">
... ...
forum/templates/forum/forum_view.html
  Diff comments   View file @b229219
1   -{% extends 'base.html' %}
  1 +{% extends 'home.html' %}
2 2  
3 3 {% load static i18n permission_tags list_post %}
4 4 {% load widget_tweaks %}
... ... @@ -21,32 +21,19 @@
21 21 </ol>
22 22 {% endblock %}
23 23  
24   -{% block sidebar %}
25   - <div class="panel panel-primary navigation">
26   - <div class="panel-heading">
27   - <h5>{% trans 'Menu' %}</h5>
28   - </div>
29   - <div class="panel-body">
30   - <ul class="nav nav-pills nav-stacked">
31   - <li><a href="{% url 'users:profile' %}">{% trans 'Profile' %}</a></li>
32   - <li><a href="{% url 'course:manage' %}">{% trans 'My Courses' %}</a></li>
33   - </ul>
34   - </div>
35   - </div>
36 24  
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">
39   - <div class="panel-heading">
40   - <h3 class="panel-title">{% trans 'Actions' %}</h3>
41   - </div>
42   - <div class="panel-body">
43   - <ul class="nav nav-pills nav-stacked">
44   - <li><a href="javascript:editForum('{% url 'course:forum:update' forum.id %}', '{{ forum.id }}', '{% trans 'Forum edited successfully!' %}')">{% trans 'Edit' %}</a></li>
45   - <li><a href="javascript:delete_forum('{% url 'course:forum:delete' forum.id %}', '{{ forum.id }}', '{% trans "Are you sure you want to delete this forum?" %}', '{% url 'course:view_subject' forum.topic.subject.slug %}')">{% trans 'Delete' %}</a></li>
46   - </ul>
47   - </div>
  25 +{% block menu %}
  26 + {% if user|has_role:'system_admin' or user|has_role:'professor'%}
  27 + <li>
  28 + <a href="#menu_forum" class="accordion" data-toggle="collapse">{% trans 'Forum' %}<span class="pull-right glyphicon glyphicon-chevron-down"></span></a>
  29 + <div id="menu_forum" class="collapse">
  30 + <ul class="nav nav-pill nav-stacked accordion_list">
  31 + <li><a href="javascript:editForum('{% url 'course:forum:update' forum.id %}', '{{ forum.id }}', '{% trans 'Forum edited successfully!' %}')">{% trans 'Edit' %}</a></li>
  32 + <li><a href="javascript:delete_forum('{% url 'course:forum:delete' forum.id %}', '{{ forum.id }}', '{% trans "Are you sure you want to delete this forum?" %}', '{% url 'course:view_subject' forum.topic.subject.slug %}')">{% trans 'Delete' %}</a></li>
  33 + </ul>
48 34 </div>
49   - {% endif %}
  35 + </li>
  36 + {% endif %}
50 37 {% endblock %}
51 38  
52 39 {% block content %}
... ... @@ -130,4 +117,3 @@
130 117 </div>
131 118 </div>
132 119 {% endblock %}
133   -
... ...
users/templates/list_users.html
  Diff comments   View file @b229219
... ... @@ -9,23 +9,11 @@
9 9  
10 10 {% endblock %}
11 11  
12   -{% if user|has_role:'system_admin' %}
13   - {% block sidebar %}
14   - <div class="panel panel-primary navigation">
15   - <div class="panel-heading">
16   - <h5>{% trans 'Menu' %}</h5>
17   - </div>
18   - <div class="panel-body">
19   - <ul class="nav nav-pills nav-stacked">
20   - <li><a href="{% url 'core:home' %}">{% trans "Home" %}</a></li>
21   - <li><a href="{% url 'users:create' %}">{% trans 'Add user' %}</a></li>
22   - <li><a href="javascript:void(0)">{% trans 'Send email' %}</a></li>
23   - </ul>
24   - </div>
25   - </div>
26   - {% endblock %}
27   -{% endif %}
28   -
  12 +{% block menu %}
  13 + {% if user|has_role:'system_admin' %}
  14 + <li> <a href="{% url 'users:create' %}">{% trans 'Add User' %}</a></li>
  15 + {% endif %}
  16 +{% endblock %}
29 17  
30 18 {% block content %}
31 19 {% if messages %}
... ... @@ -108,4 +96,3 @@
108 96 </div>
109 97 {% endif %}
110 98 {% endblock %}
111   -
... ...
users/templates/users/index.html
  Diff comments   View file @b229219
1   -{% extends 'app/base.html' %}
  1 +{% extends 'home.html' %}
2 2  
3 3 {% load static i18n %}
4 4  
... ... @@ -9,18 +9,8 @@
9 9 </ol>
10 10 {% endblock %}
11 11  
12   -{% block sidebar %}
13   - <div class="list-group">
14   - <a href="{% url 'users:manage' %}" class="list-group-item active">
15   - {% trans 'System Users' %}
16   - </a>
17   - <a href="{% url 'users:create' %}" class="list-group-item">
18   - {% trans 'New Account' %}
19   - </a>
20   - <a href="#" class="list-group-item">
21   - {% trans 'Send Mail' %}
22   - </a>
23   - </div>
  12 +{% block menu %}
  13 + <li> <a href="{% url 'users:create' %}">{% trans 'Add User' %}</a></li>
24 14 {% endblock %}
25 15  
26 16 {% block content %}
... ...
users/templates/users/profile.html
  Diff comments   View file @b229219
1   -{% extends 'home_student.html' %}
  1 +{% extends 'home.html' %}
2 2  
3 3 {% load static i18n %}
4 4 {% load widget_tweaks %}
5   -{% load django_bootstrap_breadcrumbs %}
  5 +{% load django_bootstrap_breadcrumbs permission_tags%}
6 6  
7 7 {% block breadcrumbs %}
8 8  
... ... @@ -11,21 +11,10 @@
11 11  
12 12 {% endblock %}
13 13  
14   -{% block sidebar %}
15   - <div class="panel panel-primary navigation">
16   - <div class="panel-heading">
17   - <h4>{% trans "Menu" %}</h4>
18   - </div>
19   - <div class="panel-body">
20   - <ul class="nav nav-pills nav-stacked">
21   - <li><a href="{% url 'app:index' %}">{% trans 'Home page' %}</a></li>
22   - <li><a href="{% url 'users:profile' %}">{% trans 'View Profile' %}</a></li>
23   - <li><a href="{% url 'users:update_profile' %}">{% trans 'Edit Profile' %}</a></li>
24   - <li><a href="{% url 'users:change_password' %}">{% trans 'Change Password' %}</a></li>
25   - <li><a href="{% url 'users:remove_account' %}">{% trans 'Remove account' %}</a></li>
26   - </ul>
27   - </div>
28   - </div>
  14 +{% block menu %}
  15 + {% if user|has_role:'system_admin' %}
  16 + <li> <a href="{% url 'users:create' %}">{% trans 'Add User' %}</a></li>
  17 + {% endif %}
29 18 {% endblock %}
30 19  
31 20 {% block content %}
... ...
users/templates/users/view.html
  Diff comments   View file @b229219
1   -{% extends 'app/base.html' %}
  1 +{% extends 'users/profile.html' %}
2 2  
3 3 {% load static i18n %}
4 4  
... ... @@ -9,26 +9,6 @@
9 9 </ol>
10 10 {% endblock %}
11 11  
12   -{% block sidebar %}
13   - <div class="list-group">
14   - <a href="{% url 'users:manage' %}" class="list-group-item">
15   - {% trans 'System Users' %}
16   - </a>
17   - <a href="{% url 'users:create' %}" class="list-group-item">
18   - {% trans 'New Account' %}
19   - </a>
20   - <a href="{% url 'users:view' acc.username %}" class="list-group-item active">
21   - {% trans 'View User Account' %}
22   - </a>
23   - <a href="{% url 'users:update' acc.username %}" class="list-group-item">
24   - {% trans 'Edit User Account' %}
25   - </a>
26   - <a href="#" class="list-group-item">
27   - {% trans 'Send Mail' %}
28   - </a>
29   - </div>
30   -{% endblock %}
31   -
32 12 {% block content %}
33 13 <div class="row">
34 14 <div class="col-sm-3">
... ...