Download as
Browse Code »

Commit 2ad34aec5ed7ef63af5ecc29c6177718a45262b1

Authored by Gustavo Bernardo
2 parents 45620fe1 f7a9cd80
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 2 changed files with 19 additions and 7 deletions   Show diff stats
amadeus/settings.py
  Diff comments   View file @2ad34ae
... ... @@ -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 @2ad34ae
... ... @@ -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%}
... ...