Download as
Browse Code »

Commit 11b3072efafc7f6c2f5753b8c5f70bd0c17a75b6

Authored by Jailson Dias
2 parents 3689d839 f2de07f7
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 4 changed files with 41 additions and 16 deletions   Show diff stats
amadeus/settings.py
  Diff comments   View file @11b3072
... ... @@ -185,11 +185,13 @@ MESSAGE_TAGS = {
185 185  
186 186 #Send email for forgot Password
187 187 EMAIL_USE_TLS = True
  188 +DEFAULT_FROM_EMAIL = 'test@gmail.com'
  189 +SERVER_EMAIL = 'test@gmail.com'
188 190 EMAIL_HOST = 'smtp.gmail.com'
189   -EMAIL_PORT = 25
  191 +EMAIL_PORT = 587
190 192 EMAIL_HOST_USER = 'amadeusteste@gmail.com'
191 193 EMAIL_HOST_PASSWORD = 'amadeusteste'
192   -# EMAIL_BACKEND = 'django.core.mail.backends.smtp.EmailBackend'
  194 +EMAIL_BACKEND = 'django.core.mail.backends.smtp.EmailBackend'
193 195  
194 196 #s3direct
195 197  
... ...
courses/templates/subject/index.html
  Diff comments   View file @11b3072
... ... @@ -61,11 +61,21 @@
61 61 </div>
62 62 </div>
63 63 <div class="panel-body">
64   - <p>
65   - {{subject.description|linebreaks}}
66   - </p>
67   - </div>
68   - </div>
  64 + <p><b>Professor:</b> {{subject.professors}}</p>
  65 + <p>
  66 + <b>Description:</b>
  67 + {{subject.description|linebreaks}}
  68 + </p>
  69 + <div class="row">
  70 + <div class="col-xs-6 col-md-6">
  71 + <p><b>Begining:</b> {{subject.init_date}}</p>
  72 + </div>
  73 + <div class="col-xs-6 col-md-6">
  74 + <p><b>End:</b> {{subject.end_date}}</p>
  75 + </div>
  76 + </div>
  77 + </div>
  78 + </div>
69 79  
70 80 {% for topic in topics %}
71 81 {% if user|has_role:'system_admin' or topic.owner == user%}
... ...
links/admin.py
  Diff comments   View file @11b3072
1 1 from django.contrib import admin
2 2  
3   -# Register your models here.
  3 +from .models import Link
  4 +
  5 +class LinkAdmin(admin.ModelAdmin):
  6 + list_display = ['name', 'link','description']
  7 + search_fields = ['name', 'link','description']
  8 +
  9 +
  10 +admin.site.register(Link, LinkAdmin)
... ...
links/views.py
  Diff comments   View file @11b3072
... ... @@ -10,23 +10,29 @@ from .forms import *
10 10  
11 11 # Create your views here.
12 12 class CreateLink(generic.CreateView):
13   - template_name = 'links/'
  13 + template_name = 'links/link_modal.html'
14 14 form_class = CreateLinkForm
15 15 success_url = reverse_lazy()
  16 + context_object_name = 'links'
  17 +
16 18 def form_valid(self, form):
17   - form.save()
18   - messages.success(self.request, _('Link created successfully!'))
19   - return super(CreateLink, self).form_valid(form)
  19 + form.save()
  20 + messages.success(self.request, _('Link created successfully!'))
  21 + return super(CreateLink, self).form_valid(form)
  22 + def get_context_data(self, **kwargs):
  23 + context = {}
  24 + context['links'] = Link.objects.all()
  25 + return context
20 26  
21 27  
22 28 class DeleteLink(generic.DeleteView):
23   -
  29 + pass
24 30 class UpdateLink(generic.UpdateView):
25 31 template_name = 'links/'
26 32 form_class = UpdateLinkForm
27 33 success_url = reverse_lazy()
28 34 def form_valid(self, form):
29   - form.save()
30   - messages.success(self.request, _('Link updated successfully!'))
  35 + form.save()
  36 + messages.success(self.request, _('Link updated successfully!'))
31 37  
32   - return super(UpdateLink, self).form_valid(form)
  38 + return super(UpdateLink, self).form_valid(form)
... ...