Download as
Browse Code »

Commit 539ad5c5cb0db9811ac371753e1662449619a6b6

Authored by Jailson Dias
2 parents e6db2cc6 b1e465bc
Exists in master and in 5 other branches amadeus_univasf, dev, image-crop, pdf_file_html, refactoring

Merge branch 'master' of https://github.com/amadeusproject/amadeuslms

Showing 3 changed files with 8 additions and 2 deletions   Show diff stats
app/templates/home.html
  Diff comments   View file @539ad5c
@@ -108,7 +108,7 @@ @@ -108,7 +108,7 @@
108 <div id="timeline"> 108 <div id="timeline">
109 {% include page_template %} 109 {% include page_template %}
110 </div> 110 </div>
111 - <div id="loading" class="alert alert-primary" role="alert"> 111 + <div id="loading" class="alert alert-primary" role="alert" style="display: none">
112 <center> 112 <center>
113 <span class="fa fa-spin fa-circle-o-notch"></span> 113 <span class="fa fa-spin fa-circle-o-notch"></span>
114 </center> 114 </center>
app/templates/home_teacher_student_content.html 0 → 100644
  Diff comments   View file @539ad5c
@@ -32,11 +32,17 @@ class AppIndex(LoginRequiredMixin, LogMixin, ListView, NotificationMixin): @@ -32,11 +32,17 @@ class AppIndex(LoginRequiredMixin, LogMixin, ListView, NotificationMixin):
32 def render_to_response(self, context, **response_kwargs): 32 def render_to_response(self, context, **response_kwargs):
33 if self.request.user.is_staff: 33 if self.request.user.is_staff:
34 context['page_template'] = "home_admin_content.html" 34 context['page_template'] = "home_admin_content.html"
  35 + else:
  36 + context['page_template'] = "home_teacher_student_content.html"
35 37
36 context['title'] = 'Amadeus' 38 context['title'] = 'Amadeus'
37 39
38 if self.request.is_ajax(): 40 if self.request.is_ajax():
39 - self.template_name = "home_admin_content.html" 41 + if self.request.user.is_staff:
  42 + self.template_name = "home_admin_content.html"
  43 + else:
  44 + self.template_name = "home_teacher_student_content.html"
  45 +
40 46
41 super(AppIndex, self).createNotification("teste", not_resource="home", resource_link="/register") 47 super(AppIndex, self).createNotification("teste", not_resource="home", resource_link="/register")
42 48