Download as
Browse Code »

Commit f9cdc1b66ef7875cb2d226a3479e9dec6efde775

Authored by Gustavo Bernardo
2 parents d2d2e37e 3b391774
Exists in master and in 5 other branches amadeus_univasf, dev, image-crop, pdf_file_html, refactoring

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
  Diff comments   View file @f9cdc1b
@@ -4,11 +4,7 @@ @@ -4,11 +4,7 @@
4 4
5 5
6 <div class="well timeLine"> 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 <div class="row"> 8 <div class="row">
13 <div class="col-xs-2 col-md-1"> 9 <div class="col-xs-2 col-md-1">
14 <img class="imgTimeLine" src="{{ notification.user.image_url }}"> 10 <img class="imgTimeLine" src="{{ notification.user.image_url }}">
@@ -40,7 +40,6 @@ class AppIndex(LoginRequiredMixin, LogMixin, ListView, NotificationMixin): @@ -40,7 +40,6 @@ class AppIndex(LoginRequiredMixin, LogMixin, ListView, NotificationMixin):
40 else: 40 else:
41 self.template_name = "home_teacher_student_content.html" 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 return self.response_class(request = self.request, template = self.template_name, context = context, using = self.template_engine, **response_kwargs) 43 return self.response_class(request = self.request, template = self.template_name, context = context, using = self.template_engine, **response_kwargs)
45 44
46 45
@@ -68,7 +68,6 @@ def remember_password(request): @@ -68,7 +68,6 @@ def remember_password(request):
68 context['danger'] = 'E-mail does not send' 68 context['danger'] = 'E-mail does not send'
69 return render(request, "remember_password.html",context) 69 return render(request, "remember_password.html",context)
70 70
71 -@notification_decorator(message='just connected', not_action="logged in", not_resource="")  
72 @log_decorator('Acessar', 'Sistema') 71 @log_decorator('Acessar', 'Sistema')
73 def login(request): 72 def login(request):
74 context = {} 73 context = {}
courses/templates/subject/form_view_teacher.html
  Diff comments   View file @f9cdc1b
@@ -4,7 +4,7 @@ @@ -4,7 +4,7 @@
4 <script type="text/javascript" src="{% static 'js/forum.js' %}"></script> 4 <script type="text/javascript" src="{% static 'js/forum.js' %}"></script>
5 <script src="{% static 'js/file.js' %}"></script> 5 <script src="{% static 'js/file.js' %}"></script>
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 'link.js' %}"></script>
8 {% endblock %} 8 {% endblock %}
9 9
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">
@@ -55,7 +55,7 @@ @@ -55,7 +55,7 @@
55 <div class="dropdown"> 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> 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"> 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 <li> 59 <li>
60 <a href="javascript:get_modal_file('{% url 'course:file:create_file' topic.slug %}', '#fileModal', '#divModalFile')"> 60 <a href="javascript:get_modal_file('{% url 'course:file:create_file' topic.slug %}', '#fileModal', '#divModalFile')">
61 {% trans "Create a file" %} 61 {% trans "Create a file" %}
@@ -116,7 +116,7 @@ @@ -116,7 +116,7 @@
116 <div class="dropdown"> 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> 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"> 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 <li> 120 <li>
121 <a href="#"> 121 <a href="#">
122 {% trans "Create a file" %} 122 {% trans "Create a file" %}
courses/templates/topic/index.html
  Diff comments   View file @f9cdc1b
@@ -30,20 +30,24 @@ @@ -30,20 +30,24 @@
30 </ul> 30 </ul>
31 </div> 31 </div>
32 </div> 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 </div> 48 </div>
46 -</div> 49 + {% endif %}
  50 +
47 {% endblock %} 51 {% endblock %}
48 52
49 {% block content %} 53 {% block content %}
@@ -132,11 +136,8 @@ @@ -132,11 +136,8 @@
132 </div> 136 </div>
133 </fieldset> 137 </fieldset>
134 </form> 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 <li class="disabled"><a href="javascript:void(0)">«</a></li> 141 <li class="disabled"><a href="javascript:void(0)">«</a></li>
141 <li class="active"><a href="javascript:void(0)">1</a></li> 142 <li class="active"><a href="javascript:void(0)">1</a></li>
142 <li><a href="javascript:void(0)">2</a></li> 143 <li><a href="javascript:void(0)">2</a></li>
@@ -145,6 +146,11 @@ @@ -145,6 +146,11 @@
145 <li><a href="javascript:void(0)">5</a></li> 146 <li><a href="javascript:void(0)">5</a></li>
146 <li><a href="javascript:void(0)">»</a></li> 147 <li><a href="javascript:void(0)">»</a></li>
147 </ul> 148 </ul>
  149 +{% empty %}
  150 + {% trans 'No activity found' %}
  151 +{% endfor %}
  152 +
  153 +
148 154
149 </div> 155 </div>
150 156
forum/views.py
  Diff comments   View file @f9cdc1b
@@ -151,7 +151,7 @@ def load_posts(request, forum_id): @@ -151,7 +151,7 @@ def load_posts(request, forum_id):
151 151
152 return render(request, 'post/post_list.html', context) 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 login_url = reverse_lazy("core:home") 155 login_url = reverse_lazy("core:home")
156 redirect_field_name = 'next' 156 redirect_field_name = 'next'
157 157
@@ -162,6 +162,8 @@ class CreatePostView(LoginRequiredMixin, generic.edit.CreateView): @@ -162,6 +162,8 @@ class CreatePostView(LoginRequiredMixin, generic.edit.CreateView):
162 self.object.user = self.request.user 162 self.object.user = self.request.user
163 163
164 self.object.save() 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 return super(CreatePostView, self).form_valid(form) 168 return super(CreatePostView, self).form_valid(form)
167 169