Commit f9cdc1b66ef7875cb2d226a3479e9dec6efde775
Exists in
master
and in
5 other branches
Merge branch 'dev' of https://github.com/amadeusproject/amadeuslms into dev
Showing
6 changed files
with
30 additions
and
28 deletions
Show diff stats
app/templates/home_teacher_student_content.html
| ... | ... | @@ -4,11 +4,7 @@ |
| 4 | 4 | |
| 5 | 5 | |
| 6 | 6 | <div class="well timeLine"> |
| 7 | - <div class="row"> | |
| 8 | - <div class="col-md-12"> | |
| 9 | - <p><a href="#"></a></p><h6><a href="#"><i>Default Path to Notification</i></a></h6><p></p> | |
| 10 | - </div> | |
| 11 | - </div> | |
| 7 | + | |
| 12 | 8 | <div class="row"> |
| 13 | 9 | <div class="col-xs-2 col-md-1"> |
| 14 | 10 | <img class="imgTimeLine" src="{{ notification.user.image_url }}"> | ... | ... |
app/views.py
| ... | ... | @@ -40,7 +40,6 @@ class AppIndex(LoginRequiredMixin, LogMixin, ListView, NotificationMixin): |
| 40 | 40 | else: |
| 41 | 41 | self.template_name = "home_teacher_student_content.html" |
| 42 | 42 | |
| 43 | - super(AppIndex, self).createNotification("you have just logged in", resource_name="home", resource_link="/") | |
| 44 | 43 | return self.response_class(request = self.request, template = self.template_name, context = context, using = self.template_engine, **response_kwargs) |
| 45 | 44 | |
| 46 | 45 | ... | ... |
core/views.py
| ... | ... | @@ -68,7 +68,6 @@ def remember_password(request): |
| 68 | 68 | context['danger'] = 'E-mail does not send' |
| 69 | 69 | return render(request, "remember_password.html",context) |
| 70 | 70 | |
| 71 | -@notification_decorator(message='just connected', not_action="logged in", not_resource="") | |
| 72 | 71 | @log_decorator('Acessar', 'Sistema') |
| 73 | 72 | def login(request): |
| 74 | 73 | context = {} | ... | ... |
courses/templates/subject/form_view_teacher.html
| ... | ... | @@ -4,7 +4,7 @@ |
| 4 | 4 | <script type="text/javascript" src="{% static 'js/forum.js' %}"></script> |
| 5 | 5 | <script src="{% static 'js/file.js' %}"></script> |
| 6 | 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 'link.js' %}"></script> | |
| 8 | 8 | {% endblock %} |
| 9 | 9 | |
| 10 | 10 | <div class="panel-group accordion ui-accordion ui-widget ui-helper-reset ui-sortable" role="tablist" aria-multiselectable="false"> |
| ... | ... | @@ -55,7 +55,7 @@ |
| 55 | 55 | <div class="dropdown"> |
| 56 | 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 | 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> | |
| 58 | + <li><a href=" javascript:get_modal_link('{% url 'course:links:create_link' %}', '#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 | 59 | <li> |
| 60 | 60 | <a href="javascript:get_modal_file('{% url 'course:file:create_file' topic.slug %}', '#fileModal', '#divModalFile')"> |
| 61 | 61 | {% trans "Create a file" %} |
| ... | ... | @@ -116,7 +116,7 @@ |
| 116 | 116 | <div class="dropdown"> |
| 117 | 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 | 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> | |
| 119 | + <li><a href="javascript:get_modal_link('{% url 'course:links:create_link' %}', '#createLinksModal','#divModalLink')">Create a Link</a></li> | |
| 120 | 120 | <li> |
| 121 | 121 | <a href="#"> |
| 122 | 122 | {% trans "Create a file" %} | ... | ... |
courses/templates/topic/index.html
| ... | ... | @@ -30,20 +30,24 @@ |
| 30 | 30 | </ul> |
| 31 | 31 | </div> |
| 32 | 32 | </div> |
| 33 | - <div class="panel panel-primary navigation"> | |
| 34 | - <div class="panel-heading"> | |
| 35 | - <h3 class="panel-title">Actions</h3> | |
| 36 | - </div> | |
| 37 | - <div class="panel-body"> | |
| 38 | - <ul class="nav nav-pills nav-stacked"> | |
| 39 | - <li><a href="javascript:void(0)">Participants</a></li> | |
| 40 | - <li><a href="javascript:void(0)">Replicate subject</a></li> | |
| 41 | - <li><a href="javascript:void(0)">Create subject</a></li> | |
| 42 | - <li><a href="javascript:void(0)">Edit subject</a></li> | |
| 43 | - <li><a href="javascript:void(0)">Remove subject</a></li> | |
| 44 | - </ul> | |
| 33 | + | |
| 34 | + {% if user|has_role:'professor' %} | |
| 35 | + <div class="panel panel-primary navigation"> | |
| 36 | + <div class="panel-heading"> | |
| 37 | + <h3 class="panel-title">Actions</h3> | |
| 38 | + </div> | |
| 39 | + <div class="panel-body"> | |
| 40 | + <ul class="nav nav-pills nav-stacked"> | |
| 41 | + <li><a href="javascript:void(0)">Participants</a></li> | |
| 42 | + <li><a href="javascript:void(0)">Replicate subject</a></li> | |
| 43 | + <li><a href="javascript:void(0)">Create subject</a></li> | |
| 44 | + <li><a href="javascript:void(0)">Edit subject</a></li> | |
| 45 | + <li><a href="javascript:void(0)">Remove subject</a></li> | |
| 46 | + </ul> | |
| 47 | + </div> | |
| 45 | 48 | </div> |
| 46 | -</div> | |
| 49 | + {% endif %} | |
| 50 | + | |
| 47 | 51 | {% endblock %} |
| 48 | 52 | |
| 49 | 53 | {% block content %} |
| ... | ... | @@ -132,11 +136,8 @@ |
| 132 | 136 | </div> |
| 133 | 137 | </fieldset> |
| 134 | 138 | </form> |
| 135 | -{% empty %} | |
| 136 | - {% trans 'No activity found' %} | |
| 137 | -{% endfor %} | |
| 138 | 139 | |
| 139 | -<ul class="pagination pagination-sm"> | |
| 140 | + <ul class="pagination pagination-sm"> | |
| 140 | 141 | <li class="disabled"><a href="javascript:void(0)">«</a></li> |
| 141 | 142 | <li class="active"><a href="javascript:void(0)">1</a></li> |
| 142 | 143 | <li><a href="javascript:void(0)">2</a></li> |
| ... | ... | @@ -145,6 +146,11 @@ |
| 145 | 146 | <li><a href="javascript:void(0)">5</a></li> |
| 146 | 147 | <li><a href="javascript:void(0)">»</a></li> |
| 147 | 148 | </ul> |
| 149 | +{% empty %} | |
| 150 | + {% trans 'No activity found' %} | |
| 151 | +{% endfor %} | |
| 152 | + | |
| 153 | + | |
| 148 | 154 | |
| 149 | 155 | </div> |
| 150 | 156 | ... | ... |
forum/views.py
| ... | ... | @@ -151,7 +151,7 @@ def load_posts(request, forum_id): |
| 151 | 151 | |
| 152 | 152 | return render(request, 'post/post_list.html', context) |
| 153 | 153 | |
| 154 | -class CreatePostView(LoginRequiredMixin, generic.edit.CreateView): | |
| 154 | +class CreatePostView(LoginRequiredMixin, generic.edit.CreateView, NotificationMixin): | |
| 155 | 155 | login_url = reverse_lazy("core:home") |
| 156 | 156 | redirect_field_name = 'next' |
| 157 | 157 | |
| ... | ... | @@ -162,6 +162,8 @@ class CreatePostView(LoginRequiredMixin, generic.edit.CreateView): |
| 162 | 162 | self.object.user = self.request.user |
| 163 | 163 | |
| 164 | 164 | self.object.save() |
| 165 | + #super(CreatePostView, self).createNotification(self.object.user.username + " posted on " + self.object.forum,name, | |
| 166 | + #resource_slug = self.object.forum.slug, actor=self.request.user, users= self.object.forum.topic.) | |
| 165 | 167 | |
| 166 | 168 | return super(CreatePostView, self).form_valid(form) |
| 167 | 169 | ... | ... |