Merge pull request #239 from amadeusproject/dev

Update from Sprint VII

Merge pull request #239 from amadeusproject/dev
Update from Sprint VII
Felipe Bormann · GitHub
2 parents 4f3b88fa 47ffc2aa
Showing 126 changed files with 4604 additions and 2296 deletions Show diff stats
amadeus/settings.py
amadeus/staticfiles/css/base/amadeus.css
amadeus/uploads/ciencia-da-computacao/teorica/tipfef/Apresentacao_da_Cadidatura_a_Marketing_-_Matheus_Lins.pptx
amadeus/uploads/ciencia-da-computacao/teorica/tipfef/Cartao_Outubro.pdf
amadeus/uploads/sistemas-de-informacao/algoritmo/topico-1/Riachuelo_Outubro.pdf
app/forms.py
app/locale/he_il/LC_MESSAGES/django.po
app/locale/pt_BR/LC_MESSAGES/django.po
app/models.py
app/templates/admin_settings.html
app/templates/home.html
app/templates/home_professor.html
app/templates/home_student.html
app/templates/home_teacher_student_content.html
app/urls.py
app/views.py
core/locale/he_il/LC_MESSAGES/django.po
core/locale/pt_BR/LC_MESSAGES/django.po
core/static/css/base/amadeus.css
core/static/js/base/amadeus.js
@@ -137,7 +137,7 @@ TIME_ZONE = &#39;America/Recife&#39;
  
 USE_I18N = True
  
-USE_L10N = False
+USE_L10N = True
  
 USE_TZ = True
  
@@ -18,9 +18,6 @@
     padding-bottom: 1%;
     width: 15%;
 }
-.navigation{
-    margin: 10% 10% 5% 5%;
-}
 .breadcrumb{
     margin-bottom: 5px;
 }
@@ -320,4 +317,4 @@ body .container .jumbotron-inverse, body .container .well-inverse, body .contain
  
 .notification-count {
     background-color: #FF0000;
 -}
+}
 \ No newline at end of file
@@ -0,0 +1,17 @@
+from django import forms
+from .models import EmailBackend
+from django.utils.translation import ugettext_lazy as _
+
+class EmailBackendForm(forms.ModelForm):
+
+    class Meta:
+        model = EmailBackend
+        fields = ('description', 'host', 'port', 'username', 'password', 'safe_conection', 'default_from_email')
+        help_texts = {
+			'host': _('A host name. Example: smtp.gmail.com'),
+			'port': _('A port number'),
+			'usermane': _('Your host username'),
+			'password': _('Your host password'),
+		}
+		
+    
 \ No newline at end of file
@@ -1,178 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-09-16 02:41-0300\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: app/templates/app/base.html:10
-msgid "The Project"
-msgstr ""
-
-#: app/templates/app/base.html:11
-msgid "CCTE Group"
-msgstr ""
-
-#: app/templates/app/base.html:14
-msgid "Hi"
-msgstr ""
-
-#: app/templates/app/base.html:16
-msgid "See Profile"
-msgstr ""
-
-#: app/templates/app/base.html:17
-msgid "Settings"
-msgstr ""
-
-#: app/templates/app/base.html:18
-msgid "Logout"
-msgstr ""
-
-#: app/templates/app/index.html:6
-msgid "You have:"
-msgstr ""
-
-#: app/templates/app/index.html:10 app/templates/home.html:88
-msgid "Pending Tasks"
-msgstr ""
-
-#: app/templates/app/index.html:14
-msgid "Users Online"
-msgstr ""
-
-#: app/templates/app/index.html:20
-msgid "You can:"
-msgstr ""
-
-#: app/templates/app/index.html:24 app/templates/home_professor.html:25
-msgid "Create Course"
-msgstr ""
-
-#: app/templates/app/index.html:29 app/templates/home.html:93
-msgid "Manage Users"
-msgstr ""
-
-#: app/templates/app/index.html:33 app/templates/home.html:96
-msgid "Manage Courses"
-msgstr ""
-
-#: app/templates/app/index.html:37
-msgid "Gerenciar Categorias"
-msgstr ""
-
-#: app/templates/app/index.html:45
-msgid "Your course(s):"
-msgstr ""
-
-#: app/templates/app/index.html:46
-msgid "No courses subscribed yet"
-msgstr ""
-
-#: app/templates/app/index.html:56
-msgid "Search course:"
-msgstr ""
-
-#: app/templates/app/index.html:62
-msgid "Search"
-msgstr ""
-
-#: app/templates/app/index.html:67
-msgid "Most popular keywords:"
-msgstr ""
-
-#: app/templates/home.html:86
-msgid "Home"
-msgstr ""
-
-#: app/templates/home.html:87 app/templates/home_student.html:25
-msgid "Profile"
-msgstr ""
-
-#: app/templates/home.html:90
-msgid "My courses"
-msgstr ""
-
-#: app/templates/home.html:105 app/templates/home_professor.html:33
-msgid "Courses"
-msgstr ""
-
-#: app/templates/home.html:131
-msgid "No pending tasks at the moment."
-msgstr ""
-
-#: app/templates/home_admin_content.html:10
-msgid "Students"
-msgstr ""
-
-#: app/templates/home_admin_content.html:11
-msgid "Beginning"
-msgstr ""
-
-#: app/templates/home_admin_content.html:12
-msgid "End"
-msgstr ""
-
-#: app/templates/home_admin_content.html:15
-msgid "Edit"
-msgstr ""
-
-#: app/templates/home_professor.html:20 app/templates/home_student.html:21
-msgid "Menu"
-msgstr ""
-
-#: app/templates/home_professor.html:24
-msgid "Pending tasks"
-msgstr ""
-
-#: app/templates/home_professor.html:26
-msgid "Manage Course"
-msgstr ""
-
-#: app/templates/home_professor.html:43
-msgid "Students:"
-msgstr ""
-
-#: app/templates/home_professor.html:44
-msgid "Beginning:"
-msgstr ""
-
-#: app/templates/home_professor.html:45
-msgid "End:"
-msgstr ""
-
-#: app/templates/home_professor.html:52
-msgid "You didn't create any course yet."
-msgstr ""
-
-#: app/templates/home_professor.html:58 app/templates/home_student.html:73
-msgid "Goals"
-msgstr ""
-
-#: app/templates/home_student.html:26
-msgid "My Courses"
-msgstr ""
-
-#: app/templates/home_student.html:27
-msgid "Google accounts"
-msgstr ""
-
-#: app/templates/home_student.html:34
-msgid "Notifications"
-msgstr ""
-
-#: app/templates/home_student.html:76
-msgid "Favorites"
-msgstr ""
@@ -8,7 +8,7 @@ msgid &quot;&quot;
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-09-07 00:13-0300\n"
+"POT-Creation-Date: 2016-10-26 14:47-0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,161 +18,198 @@ msgstr &quot;&quot;
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
  
-#: app/templates/app/base.html:10
-msgid "The Project"
-msgstr ""
-
-#: app/templates/app/base.html:11
-msgid "CCTE Group"
-msgstr ""
+#: app/templates/home.html:69 app/templates/home_professor.html:20
+#: app/templates/home_student.html:21
+msgid "Menu"
+msgstr "Menu"
  
-#: app/templates/app/base.html:14
-msgid "Hi"
-msgstr ""
+#: app/templates/home.html:73
+msgid "Home"
+msgstr "Início"
  
-#: app/templates/app/base.html:16
-#, fuzzy
-#| msgid "Profile"
-msgid "See Profile"
+#: app/templates/home.html:74 app/templates/home_student.html:25
+msgid "Profile"
 msgstr "Perfil"
  
-#: app/templates/app/base.html:17
-msgid "Settings"
-msgstr "Configurações"
-
-#: app/templates/app/base.html:18
-msgid "Logout"
-msgstr "Sair"
-
-#: app/templates/app/index.html:6
-msgid "You have:"
-msgstr ""
-
-#: app/templates/app/index.html:10
+#: app/templates/home.html:76
 #, fuzzy
-#| msgid "Pending tasks"
-msgid "Pending Tasks"
-msgstr "Tarefas Pendentes"
-
-#: app/templates/app/index.html:14
-msgid "Users Online"
-msgstr "Usuários Online"
-
-#: app/templates/app/index.html:20
-msgid "You can:"
-msgstr ""
+#| msgid "My Courses"
+msgid "My courses"
+msgstr "Meus Cursos"
  
-#: app/templates/app/index.html:24 app/templates/home_app.html:26
-#: app/templates/home_professor.html:23
-msgid "Create Course"
-msgstr "Criar Curso"
+#: app/templates/home.html:78 app/templates/home_student.html:27
+#, fuzzy
+#| msgid "Courses"
+msgid "All Courses"
+msgstr "Cursos"
  
-#: app/templates/app/index.html:29
+#: app/templates/home.html:80
 #, fuzzy
 #| msgid "Manage Course"
 msgid "Manage Users"
-msgstr "Gerenciar Curso"
+msgstr "Gerenciar Usuários"
  
-#: app/templates/app/index.html:33
+#: app/templates/home.html:84
 #, fuzzy
 #| msgid "Manage Course"
 msgid "Manage Courses"
-msgstr "Gerenciar Curso"
-
-#: app/templates/app/index.html:37
-msgid "Gerenciar Categorias"
-msgstr ""
-
-#: app/templates/app/index.html:45
-msgid "Your course(s):"
-msgstr ""
+msgstr "Gerenciar Cursos"
  
-#: app/templates/app/index.html:46
-msgid "No courses subscribed yet"
-msgstr ""
+#: app/templates/home.html:101 app/templates/home_professor.html:34
+msgid "Courses"
+msgstr "Cursos"
  
-#: app/templates/app/index.html:56
-msgid "Search course:"
-msgstr ""
+#: app/templates/home_admin_content.html:10
+#, fuzzy
+#| msgid "Students:"
+msgid "Students"
+msgstr "Alunos"
  
-#: app/templates/app/index.html:62
-msgid "Search"
-msgstr ""
+#: app/templates/home_admin_content.html:11
+#, fuzzy
+#| msgid "Beginning:"
+msgid "Beginning"
+msgstr "Começo"
  
-#: app/templates/app/index.html:67
-msgid "Most popular keywords:"
-msgstr ""
+#: app/templates/home_admin_content.html:12
+#, fuzzy
+#| msgid "End:"
+msgid "End"
+msgstr "Fim:"
  
-#: app/templates/home_app.html:14 app/templates/home_professor.html:9
-#: app/templates/home_student.html:9
-msgid "Home"
-msgstr "Início"
+#: app/templates/home_admin_content.html:15
+msgid "Edit"
+msgstr "Editar"
  
-#: app/templates/home_app.html:22 app/templates/home_professor.html:22
+#: app/templates/home_professor.html:24
 msgid "Pending tasks"
 msgstr "Tarefas Pendentes"
  
-#: app/templates/home_app.html:23
-#, fuzzy
-#| msgid "Users Online"
-msgid "Users Online (1)"
-msgstr "Usuários Online"
-
-#: app/templates/home_app.html:24
-#, fuzzy
-#| msgid "Courses"
-msgid "Course"
-msgstr "Cursos"
+#: app/templates/home_professor.html:25
+msgid "Create Course"
+msgstr "Criar Curso"
  
-#: app/templates/home_app.html:27 app/templates/home_professor.html:24
+#: app/templates/home_professor.html:26
 msgid "Manage Course"
 msgstr "Gerenciar Curso"
  
-#: app/templates/home_app.html:35 app/templates/home_professor.html:31
-msgid "Courses"
-msgstr "Cursos"
-
-#: app/templates/home_app.html:51 app/templates/home_professor.html:48
-msgid "You didn't create any course yet."
-msgstr "Você não criou nenhum curso ainda."
-
-#: app/templates/home_app.html:59 app/templates/home_professor.html:54
-#: app/templates/home_student.html:60
-msgid "Goals"
-msgstr "Metas"
-
-#: app/templates/home_professor.html:18 app/templates/home_student.html:18
-msgid "Menu"
-msgstr "Menu"
-
-#: app/templates/home_professor.html:40
+#: app/templates/home_professor.html:44
 msgid "Students:"
 msgstr "Alunos"
  
-#: app/templates/home_professor.html:41
+#: app/templates/home_professor.html:45
 msgid "Beginning:"
 msgstr "Começo"
  
-#: app/templates/home_professor.html:42
+#: app/templates/home_professor.html:46
 msgid "End:"
-msgstr "Fim"
+msgstr "Fim:"
  
-#: app/templates/home_student.html:22
-msgid "Profile"
-msgstr "Perfil"
+#: app/templates/home_professor.html:53
+msgid "You didn't create any course yet."
+msgstr "Você não criou nenhum curso ainda."
  
-#: app/templates/home_student.html:23
+#: app/templates/home_student.html:26
 msgid "My Courses"
 msgstr "Meus Cursos"
  
-#: app/templates/home_student.html:24
+#: app/templates/home_student.html:28
 msgid "Google accounts"
 msgstr "Contas do Google"
  
-#: app/templates/home_student.html:31
+#: app/templates/home_student.html:35
 msgid "Notifications"
 msgstr "Notificações"
  
-#: app/templates/home_student.html:63
-msgid "Favorites"
-msgstr "Favoritos"
+#: app/templates/home_student.html:48
+msgid "His course has notified a new activity!"
+msgstr "Seu curso tem uma nova atividade!"
+
+#: app/templates/home_student.html:51 app/templates/home_student.html:59
+#: app/templates/home_student.html:67
+msgid "Go"
+msgstr "Ir"
+
+#: app/templates/home_student.html:56
+msgid "His teacher has notified a new material!"
+msgstr "Seu professor adicionou um novo material!"
+
+#: app/templates/home_student.html:64
+msgid "You have a new guardian!"
+msgstr "Você tem um novo tutor!"
+
+#: app/templates/home_teacher_student_content.html:14
+msgid "at"
+msgstr "em"
+
+#: app/templates/home_teacher_student_content.html:15
+msgid "ago"
+msgstr "atrás"
+
+#~ msgid "The Project"
+#~ msgstr "O projeto"
+
+#~ msgid "CCTE Group"
+#~ msgstr "Grupo CCTE"
+
+#~ msgid "Hi"
+#~ msgstr "Olá"
+
+#, fuzzy
+#~| msgid "Profile"
+#~ msgid "See Profile"
+#~ msgstr "Perfil"
+
+#~ msgid "Settings"
+#~ msgstr "Configurações"
+
+#~ msgid "Logout"
+#~ msgstr "Sair"
+
+#~ msgid "You have:"
+#~ msgstr "Você tem:"
+
+#, fuzzy
+#~| msgid "Pending tasks"
+#~ msgid "Pending Tasks"
+#~ msgstr "Tarefas Pendentes"
+
+#~ msgid "Users Online"
+#~ msgstr "Usuários Online"
+
+#~ msgid "You can:"
+#~ msgstr "Você pode:"
+
+#~ msgid "Manage Categories"
+#~ msgstr "Gerenciar Categorias"
+
+#~ msgid "Your course(s):"
+#~ msgstr "Seus cursos:"
+
+#~ msgid "No courses subscribed yet"
+#~ msgstr "Nenhum curso inscrito ainda"
+
+#~ msgid "Search course:"
+#~ msgstr "Pesquisar curso"
+
+#~ msgid "Search"
+#~ msgstr "Pesquisar"
+
+#~ msgid "Most popular keywords:"
+#~ msgstr "Palavras mais populares:"
+
+#, fuzzy
+#~| msgid "Users Online"
+#~ msgid "Users Online (1)"
+#~ msgstr "Usuários Online"
+
+#, fuzzy
+#~| msgid "Courses"
+#~ msgid "Course"
+#~ msgstr "Cursos"
+
+#~ msgid "Goals"
+#~ msgstr "Metas"
+
+#~ msgid "Favorites"
+#~ msgstr "Favoritos"
 from django.db import models
-
+from django.utils.translation import ugettext_lazy as _
 # Create your models here.
+
+class EmailBackend(models.Model):
+    
+    SAFE_CONECTIONS = (
+        (0, _('No')),
+        (1, _('TLS, if available')),
+        (2, 'TLS'),
+        (3, 'SSL'),
+
+    )
+    description = models.CharField(_('Description'), max_length=100)
+    host = models.URLField(_('E-mail Host'))
+    port = models.CharField(_('Email Port'), max_length=4, blank=True)
+    username = models.CharField(_('Email host username'), max_length=30)
+    password = models.CharField(_('Email host password'), max_length=30, blank=True)
+    safe_conection = models.IntegerField(_('Use safe conection'), choices=SAFE_CONECTIONS, default=0)
+    default_from_email = models.EmailField(_('Default from email'), blank=True)
+
+    class Meta:
+        verbose_name = _('Amadeus SMTP setting')
+        verbose_name_plural = _('Amadeus SMTP settings')
+
+    def __str__(self):
+        return _('Custom email Backend')
@@ -0,0 +1,135 @@
+{% extends "home.html" %}
+
+{% load static i18n django_bootstrap_breadcrumbs permission_tags %}
+
+{% block breadcrumbs %}
+	{{ block.super }}
+  	{% breadcrumb 'Settings' 'app:settings' %}
+{% endblock %}
+
+{% block content %}
+	<!-- Nav tabs -->
+	<ul class="nav nav-tabs md-pills pills-ins" role="tablist">
+	    <li class="nav-item">
+	        <a class="nav-link active" data-toggle="tab" href="#panel1" role="tab"><i class="fa fa-cog"></i> System</a>
+	    </li>
+	    <li class="nav-item">
+	        <a class="nav-link" data-toggle="tab" href="#panel2" role="tab"><i class="fa fa-envelope"></i> Mail Sender</a>
+	    </li>
+	    <li class="nav-item">
+	        <a class="nav-link" data-toggle="tab" href="#panel3" role="tab"><i class="fa fa-lock"></i> Security</a>
+	    </li>
+	</ul>
+
+	<!-- Tab panels -->
+	<div class="tab-content">
+	    <!--Panel 1-->
+	    <div class="tab-pane fade in active" id="panel1" role="tabpanel">
+	        <div class="panel panel-default">
+	          	<div class="panel-body">
+	            	<h3><b>General</b></h3>
+	            	<div class="panel panel-default">
+	              		<div class="panel-body">
+	                		Content
+	                		<hr>
+	              		</div>
+	            	</div>
+	          	</div>
+	        </div>
+	    </div>
+	    <!--/.Panel 1-->
+
+	    <!--Panel 2-->
+	    <div class="tab-pane fade" id="panel2" role="tabpanel">
+	      	<div class="panel panel-default">
+	          	<div class="panel-body">
+	            	<h3><b>Outgoing Server (SMTP)</b></h3>
+	            	<div class="panel panel-default">
+	              		<div class="panel-body">
+	                		<h4><b>Settings</b></b></h4>
+                			<hr>
+		                	<div class="form-group label-floating">
+		                  		<label class="control-label" for="focusedInput1">Description</label>
+		                  		<input class="form-control" id="focusedInput1" type="text">
+		                	</div>
+		                	<div class="form-group label-floating">
+		                  		<label class="control-label" for="focusedInput1">Server</label>
+		                  		<input class="form-control" id="focusedInput1" type="text">
+		                	</div>
+		                	<div class="form-group label-floating">
+		                  		<label for="number" class="col-md_10 control-label">Port</label>
+		                  		<div class="col-md-2">
+		                    		<input type="number" class="form-control" id="inputNumber">
+		                  		</div>
+		                  		<div>
+		                    		<label for="number">Deafault:</label> 25
+		                  		</div>
+		                	</div>
+	              		</div>
+	            	</div>
+	        	</div>
+	        	<div class="panel-body">
+		            <div class="panel panel-default">
+		              	<div class="panel-body">
+		                	<h4><b>Security and Authentication</b></h4>
+		                	<hr>
+		                	<div class="form-group label-floating">
+		                  		<label class="control-label" for="focusedInput1">User Name</label>
+		                  		<input class="form-control" id="focusedInput1" type="text">
+		                	</div>
+		                	<div class="form-group label-floating">
+		                  		<label class="control-label" for="focusedInput1">Password</label>
+		                  		<input class="form-control" id="focusedInput1" type="password">
+		                	</div>
+		                	<div class="form-group">
+		                  		<p><b>Use safe contection</b></p>
+		                  		<div class="col-md-10">
+		                    		<div class="radio radio-primary">
+		                      			<label>
+		                        			<input type="radio" name="optionsRadios" id="optionsRadios1" value="option1">
+		                        			No
+		                      			</label>
+		                      			<label>
+		                        			<input type="radio" name="optionsRadios" id="optionsRadios2" value="option2">
+		                        			TSL, If available
+				    	                </label>
+		    		                    <label>
+		                        			<input type="radio" name="optionsRadios" id="optionsRadios3" value="option3">
+		                        			TSL
+		                      			</label>
+		                      			<label>
+		                        			<input type="radio" name="optionsRadios" id="optionsRadios4" value="option4" checked="">
+		                        			SSL
+		                      			</label>
+		                    		</div>
+		                  		</div>
+		                	</div>
+		            	</div>
+		          	</div>
+		          	<button type="button" class="btn btn-success btn-raised">Save changes</button>
+	        	</div>
+	    	</div>
+		</div>
+	  
+	    <!--/.Panel 2-->
+
+	    <!--Panel 3-->
+		<div class="tab-pane fade" id="panel3" role="tabpanel">
+	        <div class="panel panel-default">
+	            <div class="panel-body">
+		            <div class="togglebutton">
+		            	<label>
+		                	<input type="checkbox" checked> <b>Allow users self-enroll.</b>
+		              	</label>
+		            </div>
+		            <div class="togglebutton">
+		                <label>
+		                	<input type="checkbox"> <b>Put the system in maintenance mode.</b>
+		              	</label>
+		            </div>
+		            <button type="button" class="btn btn-primary">Save changes</button>
+		        </div>
+		    </div>
+		</div>
+	</div>
+{% endblock content %}
 \ No newline at end of file
@@ -3,55 +3,61 @@
 {% load static i18n django_bootstrap_breadcrumbs permission_tags %}
  
 {% block javascript %}
-	{% if page_obj %}
-		<script type="text/javascript">
-			var pageNum = {{ page_obj.number }}; // The latest page loaded
-			var numberPages = {{ paginator.num_pages }}; // Indicates the number of pages
-			var baseUrl = '{% url "app:index" %}';
+    {% if page_obj %}
+        <script type="text/javascript">
+            {% if page_obj and paginator %}
+                var pageNum = {{ page_obj.number }}; // The latest page loaded
+                var numberPages = {{ paginator.num_pages }}; // Indicates the number of pages    
+            {% else %}
+                var pageNum = 0 ; // The latest page loaded
+                var numberPages = 0 ; // Indicates the number of pages
+            {% endif %}
+            
+            var baseUrl = '{% url "app:index" %}';
  
-			// loadOnScroll handler
-			var loadOnScroll = function() {
-			   // If the current scroll position is past out cutoff point...
-			    if ($(window).scrollTop() >= $(document).height() - $(window).height() - 10) {
-			        // temporarily unhook the scroll event watcher so we don't call a bunch of times in a row
-			        $(window).unbind();
-			        // execute the load function below that will visit the view and return the content
-			        loadItems();
-			    }
-			};
+            // loadOnScroll handler
+            var loadOnScroll = function() {
+               // If the current scroll position is past out cutoff point...
+                if ($(window).scrollTop() >= $(document).height() - $(window).height() - 10) {
+                    // temporarily unhook the scroll event watcher so we don't call a bunch of times in a row
+                    $(window).unbind();
+                    // execute the load function below that will visit the view and return the content
+                    loadItems();
+                }
+            };
  
-			var loadItems = function() {
-			    // Check if page is equal to the number of pages
-			    if (pageNum == numberPages) {
-			        return false
-			    }
-			    // Update the page number
-			    pageNum = pageNum + 1;
+            var loadItems = function() {
+                // Check if page is equal to the number of pages
+                if (pageNum == numberPages) {
+                    return false
+                }
+                // Update the page number
+                pageNum = pageNum + 1;
  
-			    $("#loading").show();
-			    // Configure the url we're about to hit
-			    setTimeout(function (){
-				    $.ajax({
-				        url: baseUrl,
-				        data: {'page': pageNum},
-				        success: function(data) {
-				            $("#loading").hide();
+                $("#loading").show();
+                // Configure the url we're about to hit
+                setTimeout(function (){
+                    $.ajax({
+                        url: baseUrl,
+                        data: {'page': pageNum},
+                        success: function(data) {
+                            $("#loading").hide();
  
-				            $("#timeline").append(data);
-				        },
-				        complete: function(data, textStatus){
-				            // Turn the scroll monitor back on
-				            $(window).bind('scroll', loadOnScroll);
-				        }
-				    });
-			    }, 1000)
-			};
+                            $("#timeline").append(data);
+                        },
+                        complete: function(data, textStatus){
+                            // Turn the scroll monitor back on
+                            $(window).bind('scroll', loadOnScroll);
+                        }
+                    });
+                }, 1000)
+            };
  
-			$(document).ready(function(){
-			   $(window).bind('scroll', loadOnScroll);
-			});
-		</script>
-	{% endif %}
+            $(document).ready(function(){
+               $(window).bind('scroll', loadOnScroll);
+            });
+        </script>
+    {% endif %}
 {% endblock %}
  
 {% block breadcrumbs %}
@@ -64,9 +70,9 @@
 {% endblock %}
  
 {% block sidebar %}
-    <div class="panel panel-primary navigation">
+    <div class="panel panel-primary">
         <div class="panel-heading">
-            <h4>Menu</h4>
+            <h4>{% trans 'Menu' %}</h4>
         </div>
         <div class="panel-body">
             <ul class="nav nav-pills nav-stacked">
@@ -74,10 +80,12 @@
                 <li><a href="{% url 'users:profile' %}">{% trans 'Profile' %}</a></li>
                 {% if user|has_role:'student' or not user.is_staff %}
                     <li><a href="{% url 'course:manage' %}">{% trans 'My courses' %}</a></li>
+                    <li><a href="{% url 'course:all_courses' %}">{% trans 'All Courses' %}</a></li>
                 {% endif %}
-                <li><a href="{% url 'core:guest' %}">{% trans 'All Courses' %}</a></li>
+                    <li><a href="{% url 'core:guest' %}">{% trans 'Courses' %}</a></li>
                 {% if user|has_role:'system_admin' %}
                     <li> <a href="{% url 'users:manage' %}">{% trans 'Manage Users' %}</a></li>
+                    <li> <a href="{% url 'app:settings' %}">{% trans 'Settings' %}</a></li>
                 {% endif %}
                 {% if user|has_role:'system_admin' or user|has_role:'professor' %}
                     <li>
@@ -97,19 +105,19 @@
 {% endblock %}
  
 {% block content %}
-	{% if user|has_role:'system_admin' %}
+    {% if user|has_role:'system_admin' %}
                 <h3>{% trans 'Courses' %}</h3>
                 <div id="timeline">
-                	{% include page_template %}
+                    {% include page_template %}
                 </div>
-	{% else %}
+    {% else %}
                <div id="timeline">
                    {% include page_template %}
                </div>
-	{% endif %}
-	<div id="loading" class="alert alert-primary" role="alert" style="display: none">
-		<center>
-			<span class="fa fa-spin fa-circle-o-notch"></span>
-		</center>
-	</div>
+    {% endif %}
+    <div id="loading" class="alert alert-primary" role="alert" style="display: none">
+        <center>
+            <span class="fa fa-spin fa-circle-o-notch"></span>
+        </center>
+    </div>
 {% endblock %}
@@ -15,7 +15,7 @@
 {% endblock %}
  
 {% block sidebar %}
-    <div class="panel panel-primary navigation">
+    <div class="panel panel-primary">
         <div class="panel-heading">
             <h5>{% trans 'Menu' %}</h5>
         </div>
@@ -32,9 +32,9 @@
 {% block content %}
  
     <h3>{% trans 'Courses' %}</h3>
-  	{% if courses|length > 0 %}
-  		{% for course in courses %}
-		  	<a href="{% url 'course:view' course.slug %}">
+    {% if courses|length > 0 %}
+        {% for course in courses %}
+            <a href="{% url 'course:view' course.slug %}">
                 <div class="panel panel-default courseHome">
                     <div class="panel-body">
                         <p>{{ course }}</p>
@@ -48,9 +48,9 @@
                     </div>
                 </div>
             </a>
-		{% endfor %}
-	{% else %}
-		<p>{% trans "You didn't create any course yet." %}</p>
-	{% endif %}
+        {% endfor %}
+    {% else %}
+        <p>{% trans "You didn't create any course yet." %}</p>
+    {% endif %}
 {% endblock %}
  
@@ -16,23 +16,23 @@
  
  
 {% block sidebar %}
-    <div class="panel panel-primary navigation">
+    <div class="panel panel-primary">
         <div class="panel-heading">
             <h4>{% trans 'Menu' %}</h4>
         </div>
         <div class="panel-body">
-        	<ul class="nav nav-pills nav-stacked">
-              	<li><a href="{% url 'users:profile' %}">{% trans 'Profile' %}</a></li>
-              	<li><a href="{% url 'course:manage' %}">{% trans 'My Courses' %}</a></li>
-                <li><a href="{% url 'core:guest' %}">{% trans 'All Courses' %}</a></li>
-              	<li><a href="javascript:void(0)">{% trans 'Google accounts' %}</a></li>
+          <ul class="nav nav-pills nav-stacked">
+                <li><a href="{% url 'users:profile' %}">{% trans 'Profile' %}</a></li>
+                <li><a href="{% url 'course:manage' %}">{% trans 'My Courses' %}</a></li>
+                <li><a href="{% url 'course:all_courses' %}">{% trans 'All Courses' %}</a></li>
+                <li><a href="javascript:void(0)">{% trans 'Google accounts' %}</a></li>
             </ul>
         </div>
     </div>
 {% endblock %}
  
 {% block content %}
-	<h3>{% trans 'Notifications' %}</h3>
+  <h3>{% trans 'Notifications' %}</h3>
     {% if messages %}
       {% for message in messages %}
         <div class="alert alert-success alert-dismissible" role="alert">
@@ -44,27 +44,27 @@
       {% endfor %}
     {% endif %}
     <div class="panel panel-default">
-      	<div class="panel-body">
-        	His course has notified a new activity!
-      	</div>
-      	<div class="panel-footer">
-        	Go
-      	</div>
+        <div class="panel-body">
+          {% trans 'His course has notified a new activity!' %}
+        </div>
+        <div class="panel-footer">
+          {% trans 'Go' %}
+        </div>
     </div>
     <div class="panel panel-default">
-      	<div class="panel-body">
-        	His teacher has notified a new material!
-      	</div>
-      	<div class="panel-footer">
-        	Go
-      	</div>
+        <div class="panel-body">
+          {% trans 'His teacher has notified a new material!' %}
+        </div>
+        <div class="panel-footer">
+          {% trans 'Go' %}
+        </div>
     </div>
     <div class="panel panel-default">
-      	<div class="panel-body">
-            You have a new guardian!
-      	</div>
-      	<div class="panel-footer">
-        	Go
-      	</div>
+        <div class="panel-body">
+            {% trans 'You have a new guardian!' %}
+        </div>
+        <div class="panel-footer">
+          {% trans 'Go' %}
+        </div>
     </div>
 {% endblock %}
@@ -11,7 +11,7 @@
         </div>
         <div class="col-xs-10 col-md-11">
             <h4 class="resource_inline"><b>{{ notification.actor.username }}</b></h4>
-            <p class="resource_inline">{{notification.message}} em : <a href="{% url 'core:notification_read' notification.id  %}">{{ notification.action_resource.resource.name }}</a></p>
+            <p class="resource_inline">{{notification.message}} {% trans 'at' %} : <a href="{% url 'core:notification_read' notification.id  %}">{{ notification.action_resource.resource.name }}</a></p>
             <p class="timePost"><i> {{ notification.datetime|timesince }} {% trans "ago" %}  </i></p>
         </div>
     </div>
@@ -4,4 +4,5 @@ from . import views
  
 urlpatterns = [
     url(r'^$', views.AppIndex.as_view(), name='index'),
+    url(r'^settings$', views.AmadeusSettings.as_view(), name='settings'),
 ]
 from django.shortcuts import render
 from django.views.generic import ListView
+from django.views import View
+from rolepermissions.mixins import HasRoleMixin
 from django.contrib.auth.mixins import LoginRequiredMixin
 from django.core.urlresolvers import reverse_lazy
 from core.mixins import LogMixin, NotificationMixin
 from core.models import Notification, Action, Resource, Action_Resource
 from users.models import User
+from .models import EmailBackend
+from .forms import EmailBackendForm
 from courses.models import Course
  
 class AppIndex(LoginRequiredMixin, LogMixin, ListView, NotificationMixin):
@@ -42,4 +46,17 @@ class AppIndex(LoginRequiredMixin, LogMixin, ListView, NotificationMixin):
  
 		return self.response_class(request = self.request, template = self.template_name, context = context, using = self.template_engine, **response_kwargs)
  
+class AmadeusSettings(LoginRequiredMixin,  HasRoleMixin, View):
+	allowed_roles = ['system_admin']
+	login_url = reverse_lazy("core:home")
+	redirect_field_name = 'next'
+	model = EmailBackend
+	template_name = 'admin_settings.html'
+	form_class = EmailBackendForm
+	success_url = reverse_lazy('app:settings')
+
+	def get(self, request):
+		return render(request, self.template_name, )
+
+
  
@@ -1,66 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-09-16 02:41-0300\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: core/templates/base.html:97
-msgid "Log out"
-msgstr ""
-
-#: core/templates/index.html:38
-msgid "Username"
-msgstr ""
-
-#: core/templates/index.html:44
-msgid "Password"
-msgstr ""
-
-#: core/templates/index.html:52
-msgid "Remember Email"
-msgstr ""
-
-#: core/templates/index.html:61
-msgid "Guest"
-msgstr ""
-
-#: core/templates/index.html:64 core/templates/register_user.html:71
-msgid "Login"
-msgstr ""
-
-#: core/templates/index.html:73
-msgid "Sign Up"
-msgstr ""
-
-#: core/templates/register_user.html:29
-msgid "User Register"
-msgstr ""
-
-#: core/templates/register_user.html:68
-msgid "Save"
-msgstr ""
-
-#: core/templates/remember_password.html:27
-msgid "E-mail"
-msgstr ""
-
-#: core/templates/remember_password.html:31
-msgid "Registration"
-msgstr ""
-
-#: core/templates/remember_password.html:35
-msgid "Send"
-msgstr ""
@@ -8,7 +8,7 @@ msgid &quot;&quot;
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-09-07 00:13-0300\n"
+"POT-Creation-Date: 2016-10-26 14:47-0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,91 +17,391 @@ msgstr &quot;&quot;
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
+#: core/forms.py:12
+msgid "Password"
+msgstr "Senha"
+
+#: core/forms.py:13
+msgid "Password confirmation"
+msgstr "Confirmação de senha"
+
+#: core/forms.py:27
+msgid "There is already a registered User with this e-mail"
+msgstr "Já existe um usuário cadastrado com esse e-mail"
+
+#: core/forms.py:33
+msgid "Please enter a valid date"
+msgstr "Por favor, insira uma data válida"
+
+#: core/forms.py:40
+msgid "There is already a registeres User with this CPF"
+msgstr "Já existem usuários cadastrados com este CPF"
+
+#: core/forms.py:42
+msgid "Please enter a valid CPF"
+msgstr "Por favor, insira um CPF válido"
+
+#: core/forms.py:50
+#, python-format
+msgid "The password must contain at least % d characters."
+msgstr "A senha deve conter pelo menos % d caracteres"
+
+#: core/forms.py:55
+msgid ""
+"The password must contain at least one letter and at least one digit or a "
+"punctuation character."
+msgstr "A senha deve conter pelo menos uma letra, um dígito ou caracter de pontuação."
+
+#: core/forms.py:65
+msgid "The confirmation password is incorrect."
+msgstr "A confirmação de senha está incorreta."
+
+#: core/models.py:8
+msgid "Type"
+msgstr "Tipo"
  
-#: core/models.py:15 core/models.py:36
+#: core/models.py:9
+msgid "Icon"
+msgstr ""
+
+#: core/models.py:12
+msgid "Amadeus Mime Type"
+msgstr ""
+
+#: core/models.py:13
+msgid "Amadeus Mime Types"
+msgstr ""
+
+#: core/models.py:27 core/models.py:51
 msgid "Name"
 msgstr "Nome"
  
-#: core/models.py:16 core/models.py:37
-msgid "Created Date"
+#: core/models.py:28 core/models.py:52
+msgid "Slug"
 msgstr ""
  
-#: core/models.py:49
+#: core/models.py:29 core/models.py:53
+msgid "Created Date"
+msgstr "Data de criação"
+
+#: core/models.py:54
+msgid "URL"
+msgstr "URL"
+
+#: core/models.py:67
 msgid "Action_Applied"
 msgstr ""
  
-#: core/models.py:50
+#: core/models.py:68
 msgid "Resource"
 msgstr ""
  
-#: core/models.py:61
-msgid "message"
-msgstr "mensagem"
+#: core/models.py:89
+msgid "Message"
+msgstr "Mensagem"
  
-#: core/models.py:62
-msgid "Actor"
+#: core/models.py:90
+#, python-format
+msgid "%(class)s_Actor"
 msgstr ""
  
-#: core/models.py:63
+#: core/models.py:90
+msgid "User"
+msgstr "Usuário"
+
+#: core/models.py:91
 msgid "Read"
 msgstr ""
  
-#: core/models.py:64
+#: core/models.py:92 core/models.py:104
+msgid "Date and Time of action"
+msgstr "Data e hora da ação"
+
+#: core/models.py:93 core/models.py:106
 msgid "Action_Resource"
 msgstr ""
  
-#: core/templates/base.html:56
-msgid "Log out"
-msgstr "Sair"
+#: core/models.py:94
+#, python-format
+msgid "%(class)s_Performer"
+msgstr ""
+
+#: core/models.py:94
+msgid "Perfomer"
+msgstr "Ator"
+
+#: core/models.py:97
+msgid "Notification"
+msgstr "Notificação"
+
+#: core/models.py:98 core/templates/base.html:73 core/templates/guest.html:68
+msgid "Notifications"
+msgstr "Notificações"
+
+#: core/models.py:105
+msgid "Actor"
+msgstr "Ator"
+
+#: core/models.py:109
+msgid "Log"
+msgstr "Log"
+
+#: core/models.py:110
+msgid "Logs"
+msgstr "Logs"
+
+#: core/templates/base.html:80 core/templates/guest.html:75
+msgid "See More"
+msgstr "Ver Mais"
+
+#: core/templates/base.html:87 core/templates/guest.html:81
+msgid "messages"
+msgstr "Mensagens"
+
+#: core/templates/base.html:100 core/templates/guest.html:94
+msgid "Menu"
+msgstr "Menu"
+
+#: core/templates/base.html:104 core/templates/lembrar_senha.html:110
+msgid "Home"
+msgstr "Início"
+
+#: core/templates/base.html:105
+msgid "Profile"
+msgstr "Perfil"
+
+#: core/templates/base.html:107
+msgid "My courses"
+msgstr "Meus cursos"
+
+#: core/templates/base.html:108
+msgid "All Courses"
+msgstr "Cursos"
+
+#: core/templates/base.html:111
+msgid "Manage Users"
+msgstr "Gerenciar usuários"
+
+#: core/templates/base.html:115
+msgid "Manage Courses"
+msgstr "Gerenciar cursos"
+
+#: core/templates/base.html:133
+msgid "Category"
+msgstr "Categoria"
+
+#: core/templates/base.html:137
+msgid "Create Category"
+msgstr "Criar categorias"
+
+#: core/templates/base.html:138
+msgid "List Category"
+msgstr "Listar categoria"
+
+#: core/templates/guest.html:98
+msgid "Register"
+msgstr "Cadastrar"
  
-#: core/templates/index.html:30
+#: core/templates/guest.html:123
+msgid "All"
+msgstr "Todos"
+
+#: core/templates/guest.html:141
+msgid "Are you sure you want to subscribe to this course?"
+msgstr "Tem certeza que deseja se inscrever neste curso?"
+
+#: core/templates/guest.html:141
+msgid "Subscribe"
+msgstr "Inscrever"
+
+#: core/templates/guest.html:146
+msgid "Course Name"
+msgstr "Nome do curso"
+
+#: core/templates/guest.html:147
+msgid "Begining"
+msgstr "Início"
+
+#: core/templates/guest.html:148
+msgid "End"
+msgstr "Fim"
+
+#: core/templates/guest.html:149
+msgid "Professor"
+msgstr "Professor"
+
+#: core/templates/guest.html:151
+msgid "Description"
+msgstr "Descrição"
+
+#: core/templates/index.html:39
 msgid "Username"
-msgstr "Usuário"
+msgstr "Login"
  
-#: core/templates/index.html:36
-msgid "Password"
+#: core/templates/index.html:45
+msgid "password"
 msgstr "Senha"
  
-#: core/templates/index.html:44
+#: core/templates/index.html:52
 msgid "Remember Email"
-msgstr "Lembrar Senha"
+msgstr "Lembrar E-mail"
+
+#: core/templates/index.html:58
+msgid "Login"
+msgstr ""
  
-#: core/templates/index.html:53
+#: core/templates/index.html:61
 msgid "Guest"
 msgstr "Convidado"
  
-#: core/templates/index.html:56
-msgid "Login"
-msgstr "Entrar"
+#: core/templates/index.html:64
+msgid "Forgot your password?"
+msgstr "Esqueceu a senha?"
  
-#: core/templates/index.html:65
+#: core/templates/index.html:68
 msgid "Sign Up"
 msgstr "Cadastrar"
  
-#: core/templates/register_user.html:29
+#: core/templates/lembrar_senha.html:40
+msgid "Amadeus Project"
+msgstr "Projeto Amadeus"
+
+#: core/templates/lembrar_senha.html:65
+msgid "Enter"
+msgstr "Entrar"
+
+#: core/templates/lembrar_senha.html:101
+msgid "The Project"
+msgstr "O Projeto"
+
+#: core/templates/lembrar_senha.html:103
+msgid "CCTE Group"
+msgstr "Grupo CCTE"
+
+#: core/templates/lembrar_senha.html:106 core/templates/lembrar_senha.html:111
+msgid "Remember password"
+msgstr "Lembrar senha"
+
+#: core/templates/lembrar_senha.html:117
+msgid "New account"
+msgstr "Nova conta"
+
+#: core/templates/lembrar_senha.html:126
+msgid "Email"
+msgstr "E-mail"
+
+#: core/templates/lembrar_senha.html:128
+msgid "Your Email address (exemple@mail.com)"
+msgstr "Seu endereço de e-mail (exemplo@mail.com)"
+
+#: core/templates/lembrar_senha.html:163
+msgid "Copyright Amadeus. All rights reserved"
+msgstr "Copyright Amadeus. Todos os direitos reservados"
+
+#: core/templates/register_user.html:36
 msgid "User Register"
-msgstr "Registrar Usuário"
+msgstr "Cadastro de usuário"
  
-#: core/templates/register_user.html:53
+#: core/templates/register_user.html:88
 msgid "Save"
 msgstr "Salvar"
  
-#: core/templates/remember_password.html:18
+#: core/templates/register_user.html:91
+msgid "Cancel"
+msgstr "Cancelar"
+
+#: core/templates/registration/passwor_reset_complete.html:25
+msgid "Your password has been set. You can go ahead and go now."
+msgstr "Sua senha foi redefinida. Você pode prosseguir."
+
+#: core/templates/registration/passwor_reset_confirm.html:24
+msgid ""
+"Please enter your new password twice so we can verify you typed it in "
+"correctly."
+msgstr "Por favor, insira uma nova senha duas vezes para verificarmos que digitou corretamente."
+
+#: core/templates/registration/passwor_reset_confirm.html:28
+msgid "New password:"
+msgstr "Nova senha:"
+
+#: core/templates/registration/passwor_reset_confirm.html:30
+msgid "Confirm password:"
+msgstr "Confirmação de senha:"
+
+#: core/templates/registration/passwor_reset_confirm.html:31
+msgid "Change my password"
+msgstr "Mudar senha"
+
+#: core/templates/registration/passwor_reset_confirm.html:36
+msgid ""
+"The password reset link was invalid, possibly because it has already been "
+"used.  Please request a new password reset."
+msgstr "O link de redefinição de senha está inválido, possivelmente porque ele já foi utilizado. Por favor, solicite uma nova redefinição de senha."
+
+#: core/templates/registration/passwor_reset_done.html:39
+msgid ""
+"We have sent instructions to set up your password, if an account exists with "
+"the email entered. You should receive them soon."
+msgstr "Foi enviado as instruções para redefinição de senha, se a conta existe com o e-mail informado. Você deve receber a mensagem em breve."
+
+#: core/templates/registration/passwor_reset_done.html:40
+msgid ""
+"If you do not receive an email, please make sure you entered the address you "
+"registered, and check the spam folder."
+msgstr "Se você não recebeu a mensagem, certifique que informou o e-mail corretamente e cheque sua caixa de spam"
+
+#: core/templates/registration/passwor_reset_done.html:43
+#: core/templates/registration/passwor_reset_form.html:46
+msgid "Back"
+msgstr "Voltar"
+
+#: core/templates/registration/passwor_reset_form.html:39
 msgid "E-mail"
 msgstr "E-mail"
  
-#: core/templates/remember_password.html:22
-msgid "Registration"
-msgstr "Registrar"
-
-#: core/templates/remember_password.html:26
+#: core/templates/registration/passwor_reset_form.html:43
 msgid "Send"
 msgstr "Enviar"
  
-#: core/views.py:31
+#: core/templates/registration/password_reset_subject.txt:2
+#, python-format
+msgid "Password reset on %(site_name)s"
+msgstr "Senha redefinida em %(site_name)s"
+
+#: core/tests.py:97
+msgid "Enter a valid email address."
+msgstr "Insira um e-mail válido."
+
+#: core/tests.py:111 core/tests.py:204
+msgid "This field is required."
+msgstr "Este campo é obrigatório."
+
+#: core/views.py:41
 msgid "User successfully registered!"
-msgstr "Usuario cadastrado com sucesso"
+msgstr "Usuário cadastrado com sucesso!"
+
+#: core/views.py:56
+msgid "Recover your password"
+msgstr "Redefina sua senha"
+
+#: core/views.py:57
+#, python-brace-format
+msgid ""
+"Hello {0}, \n"
+"Recover your password to use your account.\n"
+"Number of registration: {1}\n"
+"Link for recuver password.\n"
+"\n"
+"Respectfully,\n"
+"Team Amadeus."
+msgstr "Olá, {0} \n"
+"Redefina a senha para utilizar sua conta.\n"
+"Número de registro: {1}\n"
+"Link para redefinição de senha.\n"
+"\n"
+"Atenciosamente,\n"
+"Equipe Amadeus."
  
-#: core/views.py:54
-msgid "E-mail or password are incorrect!"
-msgstr "O E-mail e/ou a senha estão incorretos"
+#: core/views.py:83
+msgid "E-mail or password are incorrect."
+msgstr "E-mail ou senha incorretos."
@@ -2,6 +2,10 @@
   clear: both;
 }
  
+.mg-b-5m{
+  margin-bottom: 5em;
+}
+
 .navbar .logo {position: absolute; top: 6px; text-align: center; height: 48px; width: 48px;}
  
 /* Modal */
@@ -30,7 +34,7 @@
     margin: 10% 10% 5% 5%;
 }
 .breadcrumb{
-    margin-bottom: 5px;
+    margin-bottom: 25px;
 }
 .courseHome{
     text-align: center;
@@ -394,4 +398,27 @@ ul, li {
     -webkit-animation-duration: 900ms;
     -webkit-animation-iteration-count: 3;
     -webkit-animation-timing-function: ease-in-out;
+}
+/* Icon Topic */
+.divMoreActions {text-align: right; height: 39px; float: right;}
+.divMoreActions div button {padding-left: 10px; padding-right: 10px; padding-bottom: 10px; margin-bottom: 4px; height: 31px;}
+.titleTopic {padding-top: 18px; padding-left: 0px;}
+.titleTopic-detail {padding-top: 8px;  color: white;}
+.titleTopic a h4 {margin-top: 0px; color: black; cursor:pointer;}
+.dropdown-menu .pull-right {
+    right: 0;
+  }
+  .editation{display: none}
+.moreAccordion{ padding-left: 0px; padding-right: 0px;}
+.moreAccordion div button{ padding-left: 0px; padding-right: 0px;}
+.cards-content{ padding-left: 0px; padding-right: 0px; }
+.cards-detail{margin-left: 4%;}
+.cards-detail .panel .panel-heading{/*background-color:;*/}
+.cards-detail .panel .panel-heading h4{color:black;}
+.course, .subject, .topic{ padding-top: 0px; padding-bottom: 0px; }
+.course-detail{padding-top: 10px; padding-bottom: 10px;}
+
+/* Menu link remove radius */
+.nav-pills > li > a {
+  border-radius: 0px;
 }
 \ No newline at end of file
@@ -14,6 +14,7 @@ function campoNumerico(campo, evento){
         return true;
     } else {
     	evento.returnValue = false;
+  	    evento.preventDefault();
   	    return false;
     }
 };
@@ -28,7 +29,7 @@ function formatarCpf(campo, evento){
 	}
 	else if( evento ) { // Firefox
         codTecla = evento.which;
-        }
+    }
 	tamanho = campo.value.length;
 	if( (codTecla > 47 && codTecla < 58)  || codTecla== 8 || codTecla == 0){
 		if(tamanho < 14 ){
@@ -41,8 +42,8 @@ function formatarCpf(campo, evento){
 			}
 		}else{
 			evento.returnValue = false;
+			return false;
 		}
-		return true;
 	} else {
 		return false;
 	}
@@ -61,30 +62,28 @@ function formatarTelefone(campo, evento){
 	}
 	tamanho = campo.value.length;
  
-	if(((codTecla > 47 && codTecla < 58) || (codTecla == 8)) && tamanho < 15){
+	if(((codTecla > 47 && codTecla < 58) && tamanho < 15)){
  
 		if(tamanho == 0){
 			campo.value = "(" + campo.value;
 		}else if( tamanho == 3 ){
 			campo.value = campo.value + ") ";
-		}else if(tamanho == 9){
+		}else if(tamanho == 10){
 			campo.value = campo.value + "-";
-		}else if(tamanho == 14){
-			// alert('oi');
-			campo.value = campo.value.slice(0, 4) + campo.value.slice(5, 14);
-			campo.value = campo.value.slice(0, 8) + campo.value.slice(9, 10) + campo.value.slice(8, 9) + campo.value.slice(10, 14)
 		}
 		return true;
  
+
 	} else if(codTecla == 0 || codTecla == 8){
 		return true;
 	} else {
 		evento.returnValue = false;
+		evento.preventDefault()
 		return false;
 	}
+	evento.preventDefault()
 	return false;
-}
-
+};
 /*
 This functions get the next 5 notifications from the user given a "step"(an amount) of previous notifications
 */
 <!DOCTYPE html>
  
 {% load static i18n %}
+{% load static i18n permission_tags %}
 {% get_current_language as LANGUAGE_CODE %}
  
 <html>
@@ -19,21 +20,27 @@
  
   	<!-- Bootstrap and themes (material) -->
 	<link rel="stylesheet" type="text/css" href="{% static 'bootstrap-3.3.7/css/bootstrap.css' %}">
-	<link rel="stylesheet" type="text/css" href="{% static 'css/vendor/material.min.css' %}">
-	<link rel="stylesheet" type="text/css" href="{% static 'css/vendor/ripples.min.css' %}">
+	<link rel="stylesheet" type="text/css" href="{% static 'material/css/bootstrap-material-design.css' %}">
+	<link rel="stylesheet" type="text/css" href="{% static 'material/css/bootstrap-material-design.min.css' %}">
+	<link rel="stylesheet" type="text/css" href="{% static 'material/css/ripples.css' %}">
+	<link rel="stylesheet" type="text/css" href="{% static 'material/css/ripples.min.css' %}">
+
+
 	<link rel="stylesheet" type="text/css" href="{% static 'css/vendor/bootstrap-datepicker.standalone.css' %}">
 	<link rel="stylesheet" type="text/css" href="{% static 'css/vendor/alertifyjs/alertify.min.css' %}">
 	<link rel="stylesheet" type="text/css" href="{% static 'css/vendor/alertifyjs/themes/bootstrap.css' %}">
 	<script type="text/javascript" src="{% static 'bootstrap-3.3.7/js/bootstrap.js' %}"></script>
 	<script type="text/javascript" src="{% static 'js/vendor/bootstrap-acessibility.min.js' %}"></script>
-	<script type="text/javascript" src="{% static 'js/vendor/material.min.js' %}"></script>
-	<script type="text/javascript" src="{% static 'js/vendor/ripples.min.js' %}"></script>
+	<script type="text/javascript" src="{% static 'material/js/material.js' %}"></script>
+	<script type="text/javascript" src="{% static 'material/js/material.min.js' %}"></script>
+	<script type="text/javascript" src="{% static 'material/js/ripples.js' %}"></script>
+	<script type="text/javascript" src="{% static 'material/js/ripples.min.js' %}"></script>
 	<script type="text/javascript" src="{% static 'js/vendor/bootstrap-datepicker.js' %}"></script>
  
 	{% with "js/vendor/locales/bootstrap-datepicker."|add:LANGUAGE_CODE|add:".js" as locale_datepicker %}
 		<script type="text/javascript" src="{% static locale_datepicker %}"></script>
 	{% endwith %}
-	
+
 	<script type="text/javascript" src="{% static 'js/vendor/alertify.min.js' %}"></script>
 	<script type="text/javascript" src="{% static 'js/vendor/jscookie.js' %}"></script>
  
@@ -69,14 +76,14 @@
              			 <li class="" data-toggle="tooltip" data-placement="bottom" title data-original-title="notifications">
                  <a  class="dropdown-toggle" data-toggle="dropdown"> <span id="notification-count" class="badge notification-count">{{notifications.count}}</span><i class="fa fa-bell" aria-hidden="true"></i></a>
                    <ul id="notification-dropdown" class="dropdown-menu">
-                   <li class="dropdown-header">Notifications</li>
+                   <li class="dropdown-header"> {% trans 'Notifications' %}</li>
                    		{% include "notifications.html" %}
  
                    		<li>
                    		 <a onclick="getNotifications(5)">
                    			<div id="notification-see-more" class="list-group-item">
                                   <div class="row-content">
-                                    <p class="list-group-item-text">See More</p>
+                                    <p class="list-group-item-text">{% trans 'See More' %}</p>
                                 </div>
                        </a>
                    		</li>
@@ -93,7 +100,55 @@
 	<div class="container-fluid">
 		<div class="row">
     		<div class="col-xs-2 col-sm-2 col-md-2 col-lg-2 col-xl-2">
-    			{% block sidebar %}{% endblock %}
+    			{% block sidebar %}
+    				    <div class="panel panel-primary navigation">
+					        <div class="panel-heading">
+					            <h4>{% trans "Menu" %}</h4>
+					        </div>
+					        <div class="panel-body">
+					            <ul class="nav nav-pills nav-stacked">
+					                <li><a href="{% url 'app:index' %}">{% trans 'Home' %}</a></li>
+					                <li><a href="{% url 'users:profile' %}">{% trans 'Profile' %}</a></li>
+					                {% if user|has_role:'student' or not user.is_staff %}
+					                    <li><a href="{% url 'course:manage' %}">{% trans 'My courses' %}</a></li>
+					                    <li><a href="{% url 'core:all_courses' %}">{% trans 'All Courses' %}</a></li>
+					                {% endif %}
+					                    <li><a href="{% url 'core:guest' %}">{% trans 'Courses' %}</a></li>
+					                {% if user|has_role:'system_admin' %}
+					                    <li> <a href="{% url 'users:manage' %}">{% trans 'Manage Users' %}</a></li>
+					                {% endif %}
+					                {% if user|has_role:'system_admin' or user|has_role:'professor' %}
+					                    <li>
+					                        <a href="#courses_list" class="accordion" data-toggle="collapse">{% trans 'Manage Courses' %}</a>
+					                        <div id="courses_list" class="collapse">
+					                            <ul class="nav nav-pill nav-stacked accordion_list">
+					                            {% for course in courses_list %}
+					                                <li><a href="{% url 'course:view' course.slug %}">{{ course }}</a></li>
+					                            {% endfor %}
+					                            </ul>
+					                        </div>
+					                    </li>
+					                {% endif %}
+					            </ul>
+					        </div>
+					    </div>
+
+					    {% if user|has_role:'professor' or user|has_role:'system_admin' %}
+
+						<div class="panel panel-primary navigation">
+						    <div class="panel-heading">
+						        <h3 class="panel-title">{% trans 'Category' %}</h3>
+						    </div>
+						    <div class="panel-body">
+						        <ul class="nav nav-pills nav-stacked">
+						            <li><a href="{% url 'course:create_cat' %}">{% trans 'Create Category'%}</a></li>
+						            <li><a href="{% url 'course:manage_cat' %}">{% trans 'List Category' %}</a></li>
+						        </ul>
+						    </div>
+						</div>
+
+						{% endif %}
+	    		{% endblock %}
     		</div>
 		   <div class="col-xs-10 col-sm-10 col-md-10 col-lg-10 col-xl-10">
 				{% block breadcrumbs %}{% endblock %}
@@ -109,6 +164,10 @@
 	{% block script_file %}
  
 	{% endblock script_file %}
+
+	{% block script_link %}
+
+	{% endblock script_link %}
 </body>
  
 </html>
 <!DOCTYPE html>
  
-{% load static i18n %}
+
 {% load i18n custom_filters %}
+{% load static i18n %}
  
 <html>
 <head>
-	<title>{{ title }}</title>
-
-	<meta http-equiv="Cache-Control" content="no-cache, no-store" />
-	<link href="{% static 'img/topo-amadeus.png' %}" rel="shortcut icon" />
-	<!-- Roboto font -->
-	<link rel="stylesheet" href="http://fonts.googleapis.com/css?family=Roboto:300,400,500,700" type="text/css">
-	<link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
-
-	<!-- jQuery & jQuery UI -->
-	<script type="text/javascript" src="{% static 'js/vendor/jquery-3.1.0.min.js' %}"></script>
-	<script type="text/javascript" src="{% static 'js/vendor/jquery-ui.js' %}"></script>
-
-  	<!-- Bootstrap and themes (material) -->
-	<link rel="stylesheet" type="text/css" href="{% static 'bootstrap-3.3.7/css/bootstrap.css' %}">
-	<link rel="stylesheet" type="text/css" href="{% static 'css/vendor/material.min.css' %}">
-	<link rel="stylesheet" type="text/css" href="{% static 'css/vendor/ripples.min.css' %}">
-	<link rel="stylesheet" type="text/css" href="{% static 'css/vendor/datepicker.css' %}">
-	<link rel="stylesheet" type="text/css" href="{% static 'css/vendor/alertifyjs/alertify.min.css' %}">
-	<link rel="stylesheet" type="text/css" href="{% static 'css/vendor/alertifyjs/themes/bootstrap.css' %}">
-	<script type="text/javascript" src="{% static 'bootstrap-3.3.7/js/bootstrap.js' %}"></script>
-	<script type="text/javascript" src="{% static 'js/vendor/bootstrap-acessibility.min.js' %}"></script>
-	<script type="text/javascript" src="{% static 'js/vendor/material.min.js' %}"></script>
-	<script type="text/javascript" src="{% static 'js/vendor/ripples.min.js' %}"></script>
-	<script type="text/javascript" src="{% static 'js/vendor/bootstrap-datepicker.js' %}"></script>
-	<script type="text/javascript" src="{% static 'js/vendor/alertify.min.js' %}"></script>
-
-  	<!-- Font awesome -->
-	<link rel="stylesheet" type="text/css" href="{% static 'font-awesome-4.6.3/css/font-awesome.min.css' %}">
-
-	<!-- Custom styles -->
-  	<link rel="stylesheet" type="text/css" href="{% static 'css/base/amadeus.css' %}">
-
-	<!-- Init material Bootstrap -->
-	<script type="text/javascript">$.material.init()</script>
-
-	<!--Javascript block for specific-app ones -->
-	<script src="{% static 'js/base/amadeus.js' %}"></script>
-	{% block style %}
-	{% endblock %}
-	{% block javascript %}
-		<script type="text/javascript" src="{% static 'js/course.js' %}"></script>
-	{% endblock %}
+    <title>{{ title }}</title>
+
+    <meta http-equiv="Cache-Control" content="no-cache, no-store" />
+    <link href="{% static 'img/favicon.ico' %}" rel="shortcut icon" />
+    <!-- Roboto font -->
+    <link rel="stylesheet" href="http://fonts.googleapis.com/css?family=Roboto:300,400,500,700" type="text/css">
+    <link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
+
+    <!-- jQuery & jQuery UI -->
+    <script type="text/javascript" src="{% static 'js/vendor/jquery-3.1.0.min.js' %}"></script>
+    <script type="text/javascript" src="{% static 'js/vendor/jquery-ui.js' %}"></script>
+
+    <!-- Bootstrap and themes (material) -->
+    <link rel="stylesheet" type="text/css" href="{% static 'bootstrap-3.3.7/css/bootstrap.css' %}">
+    <link rel="stylesheet" type="text/css" href="{% static 'css/vendor/material.min.css' %}">
+    <link rel="stylesheet" type="text/css" href="{% static 'css/vendor/ripples.min.css' %}">
+    <link rel="stylesheet" type="text/css" href="{% static 'css/vendor/datepicker.css' %}">
+    <link rel="stylesheet" type="text/css" href="{% static 'css/vendor/alertifyjs/alertify.min.css' %}">
+    <link rel="stylesheet" type="text/css" href="{% static 'css/vendor/alertifyjs/themes/bootstrap.css' %}">
+    <script type="text/javascript" src="{% static 'bootstrap-3.3.7/js/bootstrap.js' %}"></script>
+    <script type="text/javascript" src="{% static 'js/vendor/bootstrap-acessibility.min.js' %}"></script>
+    <script type="text/javascript" src="{% static 'js/vendor/material.min.js' %}"></script>
+    <script type="text/javascript" src="{% static 'js/vendor/ripples.min.js' %}"></script>
+    <script type="text/javascript" src="{% static 'js/vendor/bootstrap-datepicker.js' %}"></script>
+    <script type="text/javascript" src="{% static 'js/vendor/alertify.min.js' %}"></script>
+
+    <!-- Font awesome -->
+    <link rel="stylesheet" type="text/css" href="{% static 'font-awesome-4.6.3/css/font-awesome.min.css' %}">
+
+    <!-- Custom styles -->
+    <link rel="stylesheet" type="text/css" href="{% static 'css/base/amadeus.css' %}">
+
+    <!-- Init material Bootstrap -->
+    <script type="text/javascript">$.material.init()</script>
+
+    <!--Javascript block for specific-app ones -->
+    <script src="{% static 'js/base/amadeus.js' %}"></script>
+    {% block style %}
+    {% endblock %}
+    {% block javascript %}
+        <script type="text/javascript" src="{% static 'js/course.js' %}"></script>
+    {% endblock %}
+
 </head>
 <body>
-	{% block nav %}
-   	<div class="navbar navbar-default">
-         		<div class="navbar-header">
-           		<button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-responsive-collapse">
-             			<span class="icon-bar"></span>
-             			<span class="icon-bar"></span>
-             			<span class="icon-bar"></span>
-           		</button>
-           		<a class="navbar-brand" href="{% url 'app:index' %}"><img class="logo" src="{% static 'img/topo-amadeus-white.png'  %}" alt="Logo"/></a>
-         		</div>
-         		<div class="navbar-collapse collapse navbar-responsive-collapse">
-           		<ul class="nav navbar-nav navbar-right notifications">
-             			 <li class="" data-toggle="tooltip" data-placement="bottom" title data-original-title="notifications">
+    {% block nav %}
+    <div class="navbar navbar-default">
+                <div class="navbar-header">
+                <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-responsive-collapse">
+                        <span class="icon-bar"></span>
+                        <span class="icon-bar"></span>
+                        <span class="icon-bar"></span>
+                </button>
+                <a class="navbar-brand" href="{% url 'app:index' %}"><img class="logo" src="{% static 'img/topo-amadeus-white.png'  %}" alt="Logo"/></a>
+                </div>
+                <div class="navbar-collapse collapse navbar-responsive-collapse">
+                <ul class="nav navbar-nav navbar-right notifications">
+                         <li class="" data-toggle="tooltip" data-placement="bottom" title data-original-title="notifications">
                  <a  class="dropdown-toggle" data-toggle="dropdown"> <span id="notification-count" class="badge notification-count">{{notifications.count}}</span><i class="fa fa-bell" aria-hidden="true"></i></a>
                    <ul id="notification-dropdown" class="dropdown-menu">
-                   <li class="dropdown-header">Notifications</li>
-                   		{% include "notifications.html" %}
+                   <li class="dropdown-header">{% trans 'Notifications' %}</li>
+                        {% include "notifications.html" %}
  
-                   		<li>
-                   		 <a onclick="getNotifications(5)">
-                   			<div id="notification-see-more" class="list-group-item">
+                        <li>
+                         <a onclick="getNotifications(5)">
+                            <div id="notification-see-more" class="list-group-item">
                                   <div class="row-content">
-                                    <p class="list-group-item-text">See More</p>
+                                    <p class="list-group-item-text">{% trans 'See More' %}</p>
                                 </div>
                        </a>
-                   		</li>
+                        </li>
                     </ul>
                </li>
-
              			<li  data-toggle="tooltip" data-placement="bottom" title data-original-title="{% trans 'messages' %}"> <a href="#"><i class="fa fa-comments" aria-hidden="true"></i></a> </li>
              			<li > <a  class="link" href="{% url 'app:index' %}">{{ user }}</a></li>
-             			
+                        <li data-toggle="tooltip" data-placement="bottom" title data-original-title="log out"> <a href="{% url 'app:index' %}"><i class="fa fa-sign-out" aria-hidden="true"></i></a></li>
            		</ul>
          		</div>
    	</div>
@@ -90,9 +91,9 @@
  
     		<div class="col-xs-2 col-sm-2 col-md-2 col-lg-2 col-xl-2">
     			{% block sidebar %}
-    				<div class="panel panel-primary navigation">
+    				<div class="panel panel-primary">
 				        <div class="panel-heading">
-				            <h4>Menu</h4>
+				            <h4>{% trans 'Menu' %}</h4>
 				        </div>
 				        <div class="panel-body">
 				            <ul class="nav nav-pills nav-stacked">
@@ -119,9 +120,9 @@
 						</form>
 					</div>
  
-				<div class="col-md-12">
+				<div class="col-md-10">
 					<div class="btn-group btn-group-justified btn-group-raised">
-						<a href="?category=all" class="btn btn-raised btn-info">Todos</a>
+						<a href="?category=all" class="btn btn-raised btn-info">{% trans 'All' %}</a>
 						{% for category in categories %}
 							<a href="?category={{category.name}}" class="btn btn-raised btn-primary">{{category.name}}</a>
 						{% endfor %}
@@ -132,7 +133,7 @@
 				{% block render_breadcrumbs %}{% endblock %}
 			<div>
 			</div>
-			<div class="col-xs-12 col-sm-12 col-md-12 col-lg-12 col-xl-12">
+			<div class="col-xs-12 col-sm-12 col-md-10 col-lg-10 col-xl-12">
 				{% block content %}
 					{% for course in courses %}
 						<div class="panel panel-info panel_{{ course.id }}">
@@ -142,14 +143,14 @@
 				                    <a onclick="subscribe($(this), '{% url 'course:subscribe' course.slug %}', {{ course.id}}, '{% trans 'Are you sure you want to subscribe to this course?' %}')" class="btn btn-sm btn-primary btn-raised pull-right" style="margin-top:-4px">{% trans 'Subscribe' %}</a>
 				                {% endif %}
 					  		</div>
-					       
+
 						  	<div class="panel-body">
-						    	<p><b>Course Name: </b>{{course.name}}</p>
-						    	<p><b>Begining: </b>{{course.init_date}}</p>
-						    	<p><b>End: </b>{{course.end_date}}</p>
-						    	<p><b>Professor: </b>{{course.professors.name}}</p>
+						    	<p><b>{% trans 'Course Name' %}: </b>{{course.name}}</p>
+						    	<p><b>{% trans 'Begining' %}: </b>{{course.init_date}}</p>
+						    	<p><b>{% trans 'End' %}: </b>{{course.end_date}}</p>
+						    	<p><b>{% trans 'Professor' %}: </b>{{course.professors.name}}</p>
 						    	<p>
-							    <b>Description:</b>
+							    <b>{% trans 'Description' %}:</b>
 							    <i>
 							        {{course.content}}
 							    </i>
@@ -42,7 +42,7 @@
                                     </div>
                                     <div class="col-md-12 col-xs-12 col-lg-10 col-lg-offset-1 col-sm-12">
                                       <div class="form-group">
-                                        <label for="inputPassword" class="control-label"> {% trans 'Password' %}</label>
+                                        <label for="inputPassword" class="control-label"> {% trans 'password' %}</label>
                                         <input form="form-login" for="inputSmall" type="password" name="password" class="form-control" id="inputPassword" placeholder="Password">
                                       </div>
                                     </div>
@@ -61,7 +61,7 @@
                                   <a class="btn btn-default btn-raised btn-block" href="{% url 'core:guest' %}" formaction="#" style="position: initial;">{% trans 'Guest' %}</a>
                               </div>
                               <div class="col-md-10 col-sm-10 col-xs-10 col-lg-6 col-lg-offset-7 forgotPassword">
-                                  <a href="{% url 'core:password_reset' %}">{% trans "Forgot your password?" %}</a>
+                                  <a href="{% url 'core:password_reset' %}">{% trans 'Forgot your password?' %}</a>
                               </div>
                 </div>
               </div>
@@ -37,7 +37,7 @@ Você deve ter recebido uma cópia da Licença Pública Geral GNU, sob o título
  
  
  
-	<title>Projeto Amadeus</title>
+	<title>{% trans 'Amadeus Project' %}</title>
  
 	<meta http-equiv="Cache-Control" content="no-cache, no-store" />
  
@@ -62,7 +62,7 @@ Você deve ter recebido uma cópia da Licença Pública Geral GNU, sob o título
 					<form name="logonForm" method="post" action="/amadeuslms/validateLogin.do">
 			  		<dt><input type="text" name="login" maxlength="15" size="15" value="" class="inputlogin"> </dt>
 	      			<dt><input type="password" name="password" maxlength="15" size="15" value="" class="inputlogin">&nbsp;
-						<br /><a href="{% url 'index' %}" name="logonForm" class="button">Entrar</a></dt>
+						<br /><a href="{% url 'index' %}" name="logonForm" class="button">{% trans 'Enter' %}</a></dt>
 		            </form>
 <script type="text/javascript" language="JavaScript">
   <!--
@@ -98,23 +98,23 @@ Você deve ter recebido uma cópia da Licença Pública Geral GNU, sob o título
  
 <div id="institutional_menu">
  
-	<span><a href="/amadeuslms/fProject.do" target="_blank">O Projeto</a></span>
+	<span><a href="/amadeuslms/fProject.do" target="_blank">{% trans 'The Project' %}</a></span>
 	<span>&nbsp;|&nbsp;</span>
-	<span><a href="/amadeuslms/fCCTE.do" target="_blank">Grupo CCTE</a></span>
+	<span><a href="/amadeuslms/fCCTE.do" target="_blank">{% trans 'CCTE Group' %}</a></span>
 </div>
 		<div id="pTitle" class="pTitle">
-			<h2>Lembrar senha</h2>
+			<h2>{% trans 'Remember password' %}</h2>
 		</div>
 		<div id="pBreadCrumbs" class="pBreadCrumbs">
 			<ul id="breadcrumb">
-				<li><a href="{% url 'home' %}">Página Inicial</a></li>
-				<li>Lembrar senha</li>
+				<li><a href="{% url 'home' %}">{% trans 'Home' %}</a></li>
+				<li>{%trans 'Remember password' %}</li>
 			</ul>
 		</div>
 		<div id="pLeftMenu" class="pLeftMenu">
 			<div id="side_menu_1">
 				<ul id="menu_sessoes">
-					<li><a href="{% url 'create_account' %}" class="insert">Nova conta</a></li>
+					<li><a href="{% url 'create_account' %}" class="insert">{% trans 'New account' %}</a></li>
 			    </ul>
 			</div>
 		</div>
@@ -123,9 +123,9 @@ Você deve ter recebido uma cópia da Licença Pública Geral GNU, sob o título
  
  
 				<form name="remindPasswordForm" method="post" action="/amadeuslms/remindPassword.do">
-				<dt>Endereço de e-mail</dt>
+				<dt>{% trans 'Email' %}</dt>
 					<dd><input type="text" name="email" value="" class="formfield2" id="username"></dd>
-					<dd class="description">Seu endereço de e-mail (exemplo@mail.com)</dd>
+					<dd class="description">{% trans 'Your Email address (exemple@mail.com)' %}</dd>
 					<dt class="field"><input type="submit" name="remindPassword" value="Enviar e-mail" class="button"></dt>
 				</form>
 <script type="text/javascript" language="JavaScript">
@@ -160,7 +160,7 @@ Você deve ter recebido uma cópia da Licença Pública Geral GNU, sob o título
  
  
 <div id="footnote">
-	<dl><dd>Copyright Amadeus. Todos os direitos reservados<dd></dl>
+	<dl><dd>{% trans 'Copyright Amadeus. All rights reserved' %}<dd></dl>
 </div>
  
 	</div>
@@ -6,6 +6,10 @@
 {% block nav %}
 {% endblock %}
  
+{% block sidebar %}
+	
+{% endblock sidebar %}
+
  
 {% block content %}
 	{% if messages %}
@@ -19,84 +23,81 @@
         {% endfor %}
     {% endif %}
 	<div class="row">
-      <div class="col-sm-6 col-sm-offset-4 col-md-6 col-md-offset-4 col-xs-6 col-xs-offset-4 col-lg-6 col-lg-offset-4  col-xl-6 col-xl-offset-4 ">
-          <div class="col-sm-8 col-sm-offset-2 col-md-8 col-md-offset-2 col-xs-8 col-xs-offset-2  col-lg-8 col-lg-offset-2  col-xl-8 col-xl-offset-2">
-            <img src="{% static 'img/amadeus.png' %}" class="img-responsive center-block logo-login " alt="logo amadeus">
-          </div>
-      </div>
+        <div class="col-lg-offset-4 col-lg-8 col-md-offset-4 col-md-8 col-xs-offset-4 col-xs-8 col-sm-offset-4 col-sm-8">
+        	<div class="col-lg-8 col-md-8 col-xs-8 col-sm-8">
+            <img src="{% static 'img/amadeus.png' %}" class="img-responsive center-block " alt="logo amadeus" id="logo">
+        	</div>
+        </div>
     </div>
  
 	<div class="row">
-		<div class="col-md-8 col-md-offset-3 col-sm-10 col-sm-offset-2  col-xs-12 col-xs-offset-1 col-lg-10 col-lg-offset-2 col-xl-8 col-xl-offset-3">
+		<div class="col-lg-8 col-lg-offset-3 col-md-8 col-md-offset-3 col-sm-8 col-sm-offset-3 col-xs-8 col-xs-offset-3">
 			<div class="card">
-				<div class="card-content">
 					<div class="card-body">
-						<form class="form-horizontal" name="registerForm" method="post" id="register-user" enctype="multipart/form-data">
+						<form class="form-horizontal" name="registerForm" method="post" action="" enctype="multipart/form-data">
 						{% csrf_token %}
-							<h2>{% trans 'User Register' %}</h2>
-							<hr>
+							<legend>{% trans 'User Register' %}</legend>
+							{% for field in form %}
 							<div class="row">
-								<div class="col-xs-12 col-sm-12 col-md-12 col-lg-12">
-									{% for field in form %}
-										<div class="form-group {% if form.has_error %} has-error {% endif %} is-fileinput block-register-inline">
-											{% if field.field.required %}
-												<label for="{{ field.auto_id }}" class="col-md-4 control-label">{{ field.label }}<span>*</span></label>
-											{% else %}
-												<label for="{{ field.auto_id }}" class="col-md-4 control-label">{{ field.label }}</label>
-											{% endif %}
-											<div class="col-md-8 col-lg-10 col-lg-offset-2">
-												{% if field.auto_id == 'id_birth_date' %}
-													{% render_field field class='form-control input-sm date-picker' %}
-													<span id="helpBlock" class="help-block">{{ field.help_text }}</span>
-												{% elif field.auto_id == 'id_image' %}
-													{% render_field field class='form-control input-sm' %}
-													<div class="input-group">
-									                    <input type="text" readonly="" class="form-control" placeholder="Choose your photo...">
-									                    <span class="input-group-btn input-group-sm">
-									                        <button type="button" class="btn btn-fab btn-fab-mini">
-									                          	<i class="material-icons">attach_file</i>
-									                        </button>
-									                    </span>
-									                </div>
-									            {% elif field.auto_id == 'id_cpf' %}
-					                				{% render_field field class='form-control' onkeypress='campoNumerico(this,event); formatarCpf(this,event);' %}
-
-					                			{% elif field.auto_id == 'id_phone' %}
-					                				{% render_field field class='form-control' onkeypress='campoNumerico(this,event); formatarTelefone(this,event);' %}
-												{% else %}
-													{% render_field field class='form-control' %}
-													<span id="helpBlock" class="help-block">{{ field.help_text }}</span>
-												{% endif %}
-											</div>
+							<div class="form-group is-empty {% if form.has_error %} has-error {% endif %} is-fileinput">
+								{% if field.field.required %}
+									<label for="{{ field.auto_id }}" class="col-md-2 control-label">{{ field.label }}<span>*</span></label>
+								{% else %}
+									<label for="{{ field.auto_id }}" class="col-md-2 control-label">{{ field.label }}</label>
+								{% endif %}
+								<div class="col-md-10">
+									{% if field.auto_id == 'id_birth_date' %}
+										{% render_field field class='form-control input-sm date-picker' %}
+										
+										<span id="helpBlock" class="help-block">{{ field.help_text }}</span>
+									{% elif field.auto_id == 'id_image' %}
+										{% render_field field class='form-control input-sm' %}
+										<div class="input-group">
+						                    <input type="text" readonly="" class="form-control" placeholder="Choose your photo...">
+						                    <span class="input-group-btn input-group-sm">
+						                        <button type="button" class="btn btn-fab btn-fab-mini">
+						                          	<i class="material-icons">attach_file</i>
+						                        </button>
+						                    </span>
+						                </div>
+						            {% elif field.auto_id == 'id_cpf' %}
+		                				{% render_field field class='form-control' onkeypress='campoNumerico(this,event); formatarCpf(this,event);' %}
  
-											{% if field.errors %}
-											<div class="alert alert-danger alert-dismissible col-md-offset-4 col-md-8" role="alert">
-							  					<button type="button" class="close" data-dismiss="alert" aria-label="Close">
-							  						<span aria-hidden="true">&times;</span>
-						  						</button>
-												<ul>
-													{% for error in field.errors %}
-														<li>{{ error }}</li>
-													{% endfor %}
-												</ul>
-											</div>
-											{% endif %}
-										</div>
+		                			{% elif field.auto_id == 'id_phone' %}
+		                				{% render_field field class='form-control' onkeypress='campoNumerico(this,event); formatarTelefone(this,event);' %}
+									{% else %}
+										{% render_field field class='form-control' %}
+										<span id="helpBlock" class="help-block">{{ field.help_text }}</span>
+									{% endif %}
+								</div>
+								
+								{% if field.errors %}
+								<div class="alert alert-danger alert-dismissible col-md-offset-1 col-md-10 col-sm-offset-1 col-sm-10 col-xs-offset-1 col-xs-10" role="alert">
+				  					<button type="button" class="close" data-dismiss="alert" aria-label="Close">
+				  						<span aria-hidden="true">&times;</span>
+			  						</button>
+									<ul>
+										{% for error in field.errors %}
+											<li>{{ error }}</li>
 										{% endfor %}
-										<div class="col-md-6 col-xs-6 col-sm-6 col-lg-5 col-lg-offset-1 text-center">
-											<input type="submit" value="{% trans 'Save' %}" class="btn btn-success btn-raised" />
-										</div>
-										<div class="col-md-6 col-xs-6 col-sm-6 col-lg-5 text-center">
-											<a href="{% url 'core:home' %}" class="btn btn-default btn-raised" >{% trans 'Cancel' %}</a>
-										</div>
+									</ul>
 								</div>
+								{% endif %}
+							</div>
 							</div>
+							{% endfor %}
+							<div class="col-md-offset-2 col-md-6 col-sm-offset-2 col-sm-6 col-xs-6 col-xs-offset-2 col-xs-6">
+								<input type="submit" value="{% trans 'Save' %}" class="btn btn-raised btn-primary" />	
+							</div>
+							<div class=" col-md-4 col-sm-4 col-xs-4">
+								<a href="{% url 'core:home' %}" class="  btn btn-danger btn-raised" >{% trans 'Cancel' %}</a>	
+							</div>
+							
 						</form>
 					</div>
-				</div>
 			</div>
 		</div>
 	</div>
-
+	
 	<br clear="all" />
 {% endblock %}
-To initiate the password reset process for your {{ user.get_username }} TestSite Account,
-click the link below:
+{% load static i18n %}
+
+{% trans 'To initiate the password reset process for your {{ user.get_username }} TestSite Account,
+click the link below:' %}
  
 {% block reset_link %}
 {{ protocol }}://{{ domain }}{% url 'core:password_reset_confirm' uidb64=uid token=token %}
  
 {% endblock %}
  
-If clicking the link above doesn't work, please copy and paste the URL in a new browser
+{% trans 'If clicking the link above doesnt work, please copy and paste the URL in a new browser
 window instead.
  
  
 Sincerely,
-Amadeus.
+Amadeus.' %}
@@ -54,7 +54,7 @@ def remember_password(request):
 		registration = request.POST['registration']
 		if email and registration:
 			subject = _('Recover your password')
-			message = _('Hello %s, \nRecover your password to use your account.\nNumber of registration: %s\nLink for recuver password.\n\nRespectfully,\nTeam Amadeus.' % (request.user,registration))
+			message = _('Hello {0}, \nRecover your password to use your account.\nNumber of registration: {1}\nLink for recuver password.\n\nRespectfully,\nTeam Amadeus.'.format(request.user,registration))
 			try:
 				send_mail(subject, message, settings.DEFAULT_FROM_EMAIL, [email],fail_silently=False)
 				context['success'] = 'Email successfully sent'
@@ -1,229 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-09-16 02:41-0300\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: courses/templates/category/create.html:8
-#: courses/templates/category/delete.html:7
-#: courses/templates/category/index.html:7
-#: courses/templates/category/update.html:8
-#: courses/templates/category/view.html:7
-#: courses/templates/course/create.html:8
-#: courses/templates/course/delete.html:7 courses/templates/course/home.html:8
-#: courses/templates/course/update.html:8
-#: courses/templates/course/view.html:39
-#: courses/templates/subject/index.html:8
-msgid "Home"
-msgstr ""
-
-#: courses/templates/category/create.html:9
-#: courses/templates/category/delete.html:18
-#: courses/templates/category/index.html:18
-#: courses/templates/category/view.html:18
-msgid "Create Category"
-msgstr ""
-
-#: courses/templates/category/create.html:16
-#: courses/templates/category/delete.html:15
-#: courses/templates/category/index.html:15
-#: courses/templates/category/update.html:16
-#: courses/templates/category/view.html:15
-msgid "Categories"
-msgstr ""
-
-#: courses/templates/category/create.html:26
-#: courses/templates/category/update.html:26
-#: courses/templates/course/create.html:26
-#: courses/templates/course/update.html:32
-msgid "All fields are required"
-msgstr ""
-
-#: courses/templates/category/create.html:51
-#: courses/templates/category/update.html:51
-#: courses/templates/course/create.html:51
-#: courses/templates/course/update.html:57
-msgid "Save"
-msgstr ""
-
-#: courses/templates/category/delete.html:8
-#: courses/templates/category/index.html:8
-msgid "Manage Categories"
-msgstr ""
-
-#: courses/templates/category/delete.html:26
-#: courses/templates/subject/delete.html:11
-msgid "Are you sure you want to delete the category"
-msgstr ""
-
-#: courses/templates/category/delete.html:27
-#: courses/templates/course/delete.html:28
-#: courses/templates/subject/delete.html:12
-msgid "Yes"
-msgstr ""
-
-#: courses/templates/category/delete.html:28
-#: courses/templates/course/delete.html:29
-#: courses/templates/subject/delete.html:13
-msgid "No"
-msgstr ""
-
-#: courses/templates/category/index.html:38
-msgid "Name"
-msgstr ""
-
-#: courses/templates/category/index.html:39
-msgid "Slug"
-msgstr ""
-
-#: courses/templates/category/index.html:40
-msgid "Actions"
-msgstr ""
-
-#: courses/templates/category/index.html:59
-msgid "No categories found"
-msgstr ""
-
-#: courses/templates/category/update.html:9
-#: courses/templates/category/view.html:21
-msgid "Edit Category"
-msgstr ""
-
-#: courses/templates/category/view.html:24
-msgid "Remove Category"
-msgstr ""
-
-#: courses/templates/category/view.html:32
-msgid "Name:"
-msgstr ""
-
-#: courses/templates/category/view.html:33
-msgid "Slug:"
-msgstr ""
-
-#: courses/templates/course/create.html:9
-#: courses/templates/course/delete.html:18
-#: courses/templates/course/filtered.html:11
-#: courses/templates/course/index.html:19
-msgid "Create Course"
-msgstr ""
-
-#: courses/templates/course/create.html:16
-#: courses/templates/course/delete.html:15
-#: courses/templates/course/filtered.html:8
-#: courses/templates/course/home.html:16
-#: courses/templates/course/index.html:16
-#: courses/templates/course/update.html:16
-#: courses/templates/course/view.html:48
-msgid "Courses"
-msgstr ""
-
-#: courses/templates/course/delete.html:27
-msgid "Are you sure you want to delete the couse"
-msgstr ""
-
-#: courses/templates/course/filtered.html:19
-#: courses/templates/course/index.html:27
-msgid "Categories:"
-msgstr ""
-
-#: courses/templates/course/home.html:9
-msgid "Home Course"
-msgstr ""
-
-#: courses/templates/course/index.html:81
-msgid "students tops"
-msgstr ""
-
-#: courses/templates/course/index.html:87
-msgid "Subscribe Period:"
-msgstr ""
-
-#: courses/templates/course/index.html:89
-msgid "Period:"
-msgstr ""
-
-#: courses/templates/course/index.html:105
-msgid "No courses found"
-msgstr ""
-
-#: courses/templates/course/update.html:9
-msgid "Edit Course"
-msgstr ""
-
-#: courses/templates/course/update.html:19
-msgid "Manage Modules"
-msgstr ""
-
-#: courses/templates/course/update.html:22
-msgid "Participants"
-msgstr ""
-
-#: courses/templates/course/view.html:40
-msgid "Profile"
-msgstr ""
-
-#: courses/templates/course/view.html:62
-msgid "Subjects"
-msgstr ""
-
-#: courses/templates/course/view.html:85
-msgid "Professor"
-msgstr ""
-
-#: courses/templates/course/view.html:88
-msgid "Description"
-msgstr ""
-
-#: courses/templates/course/view.html:110
-#: courses/templates/subject/index.html:78
-msgid "Pending Stuffs"
-msgstr ""
-
-#: courses/templates/course/view.html:113
-msgid "No pending tasks at the moment."
-msgstr ""
-
-#: courses/templates/subject/create.html:20
-#: courses/templates/topic/create.html:20
-msgid "Create"
-msgstr ""
-
-#: courses/templates/subject/form_view_teacher.html:10
-#: courses/templates/subject/index.html:47
-msgid "edit"
-msgstr ""
-
-#: courses/templates/subject/index.html:10
-msgid "Manage Subjects"
-msgstr ""
-
-#: courses/templates/subject/index.html:34
-msgid "Create Subject"
-msgstr ""
-
-#: courses/templates/subject/index.html:52
-msgid "delete"
-msgstr ""
-
-#: courses/templates/subject/index.html:71
-msgid "Create Topic"
-msgstr ""
-
-#: courses/templates/subject/update.html:20
-#: courses/templates/topic/update.html:20
-msgid "Update"
-msgstr ""
@@ -8,7 +8,7 @@ msgid &quot;&quot;
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-09-07 00:13-0300\n"
+"POT-Creation-Date: 2016-10-26 14:47-0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,290 +18,564 @@ msgstr &quot;&quot;
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
  
-#: courses/forms.py:11 courses/forms.py:25 courses/forms.py:58
-#: courses/models.py:7 courses/models.py:20 courses/models.py:44
-#: courses/templates/category/index.html:38
+#: courses/forms.py:13 courses/forms.py:56 courses/forms.py:96
+#: courses/forms.py:133 courses/forms.py:153 courses/models.py:14
+#: courses/models.py:26 courses/models.py:39 courses/models.py:75
+#: courses/models.py:103 courses/models.py:165
+#: courses/templates/course/replicate.html:18
+#: courses/templates/subject/form_view_teacher.html:224
+#: courses/templates/subject/form_view_teacher.html:279
 msgid "Name"
 msgstr "Nome"
  
-#: courses/forms.py:14
-msgid "Category name"
-msgstr ""
+#: courses/forms.py:16
+#, fuzzy
+#| msgid "Category name"
+msgid "CourseCategory name"
+msgstr "Nome da categoria"
+
+#: courses/forms.py:26 courses/forms.py:42
+msgid "The end date may not be before the start date."
+msgstr "A data final não pode anteceder a data inicial."
+
+#: courses/forms.py:34
+msgid "The course start date must be after the end of registration."
+msgstr "A data de início do curso deve ocorrer após as inscrições."
  
-#: courses/forms.py:26
+#: courses/forms.py:57 courses/forms.py:97
+#: courses/templates/course/replicate.html:28
 msgid "Objectives"
 msgstr "Objetivos"
  
-#: courses/forms.py:27 courses/models.py:23
+#: courses/forms.py:58 courses/forms.py:98 courses/models.py:42
+#: courses/templates/course/replicate.html:37
 msgid "Content"
 msgstr "Conteúdo"
  
-#: courses/forms.py:28
+#: courses/forms.py:59 courses/forms.py:99
+#: courses/templates/course/replicate.html:47
 msgid "Number of studets maximum"
 msgstr "Número máximo de estudantes"
  
-#: courses/forms.py:29
+#: courses/forms.py:60 courses/forms.py:100
+#: courses/templates/course/replicate.html:57
 msgid "Course registration start date"
 msgstr "Início das inscrições"
  
-#: courses/forms.py:30
+#: courses/forms.py:61 courses/forms.py:101
+#: courses/templates/course/replicate.html:67
 msgid "Course registration end date"
 msgstr "Fim da Inscrições"
  
-#: courses/forms.py:31
+#: courses/forms.py:62 courses/forms.py:102
+#: courses/templates/course/replicate.html:77
 msgid "Course start date"
 msgstr "Data de inicio do Curso"
  
-#: courses/forms.py:32
+#: courses/forms.py:63 courses/forms.py:103
+#: courses/templates/course/replicate.html:87
 msgid "Course end date"
 msgstr "Data de termino do curso"
  
-#: courses/forms.py:33 courses/models.py:30
+#: courses/forms.py:64 courses/forms.py:104 courses/models.py:49
 msgid "Image"
 msgstr "Imagem"
  
-#: courses/forms.py:34 courses/models.py:12 courses/models.py:31
-msgid "Category"
-msgstr "Categoria"
+#: courses/forms.py:65 courses/forms.py:105
+#: courses/templates/course/replicate.html:115
+#, fuzzy
+#| msgid "Create Category"
+msgid "CourseCategory"
+msgstr "Criar Categoria"
  
-#: courses/forms.py:37
+#: courses/forms.py:68 courses/forms.py:109
+#: courses/templates/course/replicate.html:23
 msgid "Course name"
 msgstr "Nome do Curso"
  
-#: courses/forms.py:38
+#: courses/forms.py:69 courses/forms.py:110
+#: courses/templates/course/replicate.html:32
 msgid "Course objective"
 msgstr "Objetivo do Curso"
  
-#: courses/forms.py:39
+#: courses/forms.py:70 courses/forms.py:111
+#: courses/templates/course/replicate.html:42
 msgid "Course modules"
 msgstr "Ḿódulos do curso"
  
-#: courses/forms.py:40
+#: courses/forms.py:71 courses/forms.py:112
+#: courses/templates/course/replicate.html:52
 msgid "Max number of students that a class can have"
 msgstr "Número máximo de estudantes que uma classe pode ter"
  
-#: courses/forms.py:41
+#: courses/forms.py:72 courses/forms.py:113
+#: courses/templates/course/replicate.html:62
 msgid "Date that starts the registration period of the course (dd/mm/yyyy)"
 msgstr "Data do começo do período de inscrição do curso (dia/mês/ano)"
  
-#: courses/forms.py:42
+#: courses/forms.py:73 courses/forms.py:114
+#: courses/templates/course/replicate.html:72
 msgid "Date that ends the registration period of the course (dd/mm/yyyy)"
 msgstr "Data do termino do período de inscrição do curso (dia/mês/ano)"
  
-#: courses/forms.py:43
+#: courses/forms.py:74 courses/forms.py:115
+#: courses/templates/course/replicate.html:82
 msgid "Date that the course starts (dd/mm/yyyy)"
 msgstr "Data que o curso começa (dia/mês/ano)"
  
-#: courses/forms.py:44
+#: courses/forms.py:75 courses/forms.py:116
+#: courses/templates/course/replicate.html:92
 msgid "Date that the course ends (dd/mm/yyyy)"
 msgstr "Data que o curso termina (dia/mês/ano)"
  
-#: courses/forms.py:45
+#: courses/forms.py:76 courses/forms.py:117
+#: courses/templates/course/replicate.html:110
 msgid "Representative image of the course"
 msgstr "Imagem representativa do curso"
  
-#: courses/forms.py:46
-msgid "Category which the course belongs"
+#: courses/forms.py:77 courses/forms.py:118
+#: courses/templates/course/replicate.html:124
+#, fuzzy
+#| msgid "Category which the course belongs"
+msgid "CourseCategory which the course belongs"
 msgstr "Categoria ao qual o curso pertence"
  
-#: courses/forms.py:59 courses/models.py:46
+#: courses/forms.py:106
+#, fuzzy
+#| msgid "Maximum Students"
+msgid "Student"
+msgstr "Quantidade máxima de estudantes"
+
+#: courses/forms.py:119
+#, fuzzy
+#| msgid "Course modules"
+msgid "Course's Students"
+msgstr "Ḿódulos do curso"
+
+#: courses/forms.py:134 courses/forms.py:154 courses/models.py:77
+#: courses/models.py:105 courses/models.py:167
+#: courses/templates/course/course_card.html:35
+#: courses/templates/course/view.html:69
+#: courses/templates/course/view.html:164
+#: courses/templates/course/view.html:220
+#: courses/templates/subject/form_view_teacher.html:121
+#: courses/templates/subject/index.html:80
 msgid "Description"
 msgstr "Descrição"
  
-#: courses/forms.py:60
+#: courses/forms.py:135
+#, fuzzy
+#| msgid "Course start date"
+msgid "Start date"
+msgstr "Data de inicio do Curso"
+
+#: courses/forms.py:136
+#, fuzzy
+#| msgid "Course end date"
+msgid "End date"
+msgstr "Data de termino do curso"
+
+#: courses/forms.py:137
 msgid "Is it visible?"
 msgstr "Visível?"
  
-#: courses/forms.py:63
-msgid "Module's name"
-msgstr "nome do módulo"
+#: courses/forms.py:140
+#, fuzzy
+#| msgid "Module's name"
+msgid "Subjects's name"
+msgstr "Nome do módulo"
  
-#: courses/forms.py:64
-msgid "Modules's description"
-msgstr "descrição do módulo"
+#: courses/forms.py:141
+#, fuzzy
+#| msgid "Modules's description"
+msgid "Subjects's description"
+msgstr "Descrição do módulo"
  
-#: courses/forms.py:65
-msgid "Is the module visible?"
-msgstr ""
+#: courses/forms.py:142
+msgid "Start date of the subject"
+msgstr "Data de início do assunto"
  
-#: courses/models.py:8 courses/models.py:21 courses/models.py:45
-#: courses/templates/category/index.html:39
+#: courses/forms.py:143
+msgid "End date of the subject"
+msgstr "Data final do assunto"
+
+#: courses/forms.py:144
+#, fuzzy
+#| msgid "Is the module visible?"
+msgid "Is the subject visible?"
+msgstr "O módulo é visível?"
+
+#: courses/forms.py:157
+#, fuzzy
+#| msgid "Module's name"
+msgid "Topic's name"
+msgstr "nome do módulo"
+
+#: courses/forms.py:158
+#, fuzzy
+#| msgid "Modules's description"
+msgid "Topic's description"
+msgstr "Descrição do módulo"
+
+#: courses/models.py:15 courses/models.py:27 courses/models.py:40
+#: courses/models.py:76 courses/models.py:104 courses/models.py:166
 msgid "Slug"
 msgstr ""
  
-#: courses/models.py:9 courses/models.py:25 courses/models.py:48
+#: courses/models.py:16 courses/models.py:28 courses/models.py:44
+#: courses/models.py:81 courses/models.py:106
 msgid "Creation Date"
-msgstr ""
+msgstr "Data de criação"
  
-#: courses/models.py:13 courses/templates/category/create.html:16
-#: courses/templates/category/delete.html:15
-#: courses/templates/category/index.html:15
-#: courses/templates/category/update.html:16
-#: courses/templates/category/view.html:15
+#: courses/models.py:19 courses/models.py:31 courses/models.py:50
+#: courses/models.py:84 courses/templates/category/create.html:43
+#: courses/templates/category/index.html:44
+#: courses/templates/category/update.html:43
+#: courses/templates/course/index.html:48
+msgid "Category"
+msgstr "Categoria"
+
+#: courses/models.py:20 courses/models.py:32
 msgid "Categories"
 msgstr "Categorias"
  
-#: courses/models.py:22
+#: courses/models.py:41
 msgid "Objectivies"
-msgstr ""
+msgstr "Objetivos"
  
-#: courses/models.py:24
+#: courses/models.py:43
 msgid "Maximum Students"
 msgstr "Quantidade máximo de estudantes"
  
-#: courses/models.py:26
+#: courses/models.py:45
 msgid "Register Date (Begin)"
-msgstr ""
+msgstr "Data de inscrição (Início)"
  
-#: courses/models.py:27
+#: courses/models.py:46
 msgid "Register Date (End)"
-msgstr ""
+msgstr "Data de inscrição (término)"
  
-#: courses/models.py:28
+#: courses/models.py:47
 msgid "Begin of Course Date"
-msgstr ""
+msgstr "Início do curso"
  
-#: courses/models.py:29
+#: courses/models.py:48
 msgid "End of Course Date"
-msgstr ""
+msgstr "Término do curso"
  
-#: courses/models.py:32
-msgid "User"
-msgstr ""
+#: courses/models.py:51 courses/models.py:85
+msgid "Professors"
+msgstr "Professores"
  
-#: courses/models.py:36 courses/models.py:49
+#: courses/models.py:52 courses/models.py:86 courses/models.py:127
+#: courses/models.py:147
+#, fuzzy
+#| msgid "Maximum Students"
+msgid "Students"
+msgstr "Quantidade máximo de estudantes"
+
+#: courses/models.py:53
+msgid "Public"
+msgstr "Público"
+
+#: courses/models.py:57 courses/models.py:83
 msgid "Course"
 msgstr "Curso"
  
-#: courses/models.py:37 courses/templates/course/create.html:16
-#: courses/templates/course/delete.html:15
-#: courses/templates/course/filtered.html:8
-#: courses/templates/course/home.html:16 courses/templates/course/index.html:15
-#: courses/templates/course/update.html:16
-#: courses/templates/course/view.html:15
-#: courses/templates/module/create.html:17
-#: courses/templates/module/delete.html:16
-#: courses/templates/module/index.html:16
-#: courses/templates/module/update.html:17
+#: courses/models.py:58 courses/templates/course/filtered.html:8
+#: courses/templates/course/home.html:16
 msgid "Courses"
 msgstr "Cursos"
  
-#: courses/models.py:47 courses/templates/module/index.html:107
+#: courses/models.py:78 courses/models.py:110
 msgid "Visible"
 msgstr "Visível"
  
-#: courses/models.py:53
-msgid "Module"
-msgstr "Modulo"
+#: courses/models.py:79
+#, fuzzy
+#| msgid "Begin of Course Date"
+msgid "Begin of Subject Date"
+msgstr "Início do curso"
+
+#: courses/models.py:80
+#, fuzzy
+#| msgid "End of Course Date"
+msgid "End of Subject Date"
+msgstr "Término do curso"
+
+#: courses/models.py:82 courses/models.py:107
+msgid "Date of last update"
+msgstr "Data da última atualização"
+
+#: courses/models.py:90 courses/models.py:108
+msgid "Subject"
+msgstr "Assunto"
+
+#: courses/models.py:91
+#, fuzzy
+#| msgid "Objectives"
+msgid "Subjects"
+msgstr "Objetivos"
+
+#: courses/models.py:109
+msgid "Owner"
+msgstr "Proprietário"
  
-#: courses/models.py:54 courses/templates/module/index.html:92
-msgid "Modules"
-msgstr "Modulos"
+#: courses/models.py:114 courses/models.py:125 courses/models.py:146
+msgid "Topic"
+msgstr "Tópico"
+
+#: courses/models.py:115
+msgid "Topics"
+msgstr "Tópicos"
+
+#: courses/models.py:126
+msgid "Deliver Date"
+msgstr "Data de entrega"
+
+#: courses/models.py:128 courses/models.py:148
+#, fuzzy
+#| msgid "Maximum Students"
+msgid "All Students"
+msgstr "Quantidade máximo de estudantes"
+
+#: courses/models.py:151 courses/models.py:156
+#: courses/templates/subject/form_view_student.html:35
+#: courses/templates/subject/form_view_teacher.html:56
+#: courses/templates/subject/form_view_teacher.html:127
+msgid "Material"
+msgstr "Material"
+
+#: courses/models.py:171
+#, fuzzy
+#| msgid "Create Category"
+msgid "subject category"
+msgstr "Criar Categoria"
+
+#: courses/models.py:172
+#, fuzzy
+#| msgid "Categories"
+msgid "subject categories"
+msgstr "Categorias"
  
 #: courses/templates/category/create.html:8
-#: courses/templates/category/delete.html:7
-#: courses/templates/category/index.html:7
-#: courses/templates/category/update.html:8
-#: courses/templates/category/view.html:7
+#: courses/templates/category/index.html:9
+#: courses/templates/category/update.html:9
 #: courses/templates/course/create.html:8
 #: courses/templates/course/delete.html:7 courses/templates/course/home.html:8
-#: courses/templates/course/index.html:7 courses/templates/course/update.html:8
-#: courses/templates/course/view.html:7 courses/templates/module/create.html:8
-#: courses/templates/module/delete.html:7 courses/templates/module/index.html:7
-#: courses/templates/module/update.html:8
+#: courses/templates/course/index.html:20
+#: courses/templates/course/replicate.html:8
+#: courses/templates/course/view.html:28
+#: courses/templates/subject/index.html:8
+#: courses/templates/subject/index.html:25
+#: courses/templates/subject_category/index.html:8
+#: courses/templates/topic/index.html:8
 msgid "Home"
 msgstr "Inicio"
  
 #: courses/templates/category/create.html:9
-#: courses/templates/category/delete.html:18
-#: courses/templates/category/index.html:18
-#: courses/templates/category/view.html:18
+#: courses/templates/category/create.html:36
+#: courses/templates/category/create.html:47
+#: courses/templates/category/index.html:37
+#: courses/templates/category/index.html:48
+#: courses/templates/category/update.html:37
+#: courses/templates/category/update.html:47
+#: courses/templates/course/index.html:52
 msgid "Create Category"
 msgstr "Criar Categoria"
  
-#: courses/templates/category/create.html:26
-#: courses/templates/category/update.html:26
-#: courses/templates/course/create.html:26
-#: courses/templates/course/update.html:32
-#: courses/templates/module/create.html:52
-#: courses/templates/module/update.html:52
-msgid "All fields are required"
-msgstr "Todos os campos são obrigatótios"
-
-#: courses/templates/category/create.html:51
-#: courses/templates/category/update.html:51
-#: courses/templates/course/create.html:51
-#: courses/templates/course/update.html:57
-#: courses/templates/module/create.html:77
-#: courses/templates/module/update.html:77
+#: courses/templates/category/create.html:16
+#: courses/templates/category/index.html:17
+#: courses/templates/category/update.html:17
+#: courses/templates/course/index.html:16
+#: courses/templates/course/view.html:24
+#: courses/templates/subject/index.html:21
+#: courses/templates/topic/index.html:24
+msgid "Menu"
+msgstr "Menu"
+
+#: courses/templates/category/create.html:20
+#: courses/templates/category/index.html:21
+#: courses/templates/category/update.html:21
+#: courses/templates/course/index.html:21
+#: courses/templates/course/view.html:29
+#: courses/templates/subject/index.html:26
+#: courses/templates/topic/index.html:28
+msgid "Profile"
+msgstr "Perfil"
+
+#: courses/templates/category/create.html:21
+#: courses/templates/category/index.html:22
+#: courses/templates/category/update.html:22
+#: courses/templates/course/view.html:30 courses/templates/topic/index.html:29
+#, fuzzy
+#| msgid "Courses"
+msgid "My Courses"
+msgstr "Meus Cursos"
+
+#: courses/templates/category/create.html:30
+#: courses/templates/category/index.html:31
+#: courses/templates/category/update.html:31
+#: courses/templates/topic/index.html:37
+msgid "Actions"
+msgstr "Ações"
+
+#: courses/templates/category/create.html:34
+#: courses/templates/category/index.html:35
+#: courses/templates/category/update.html:35
+#: courses/templates/course/replicate.html:9 courses/views.py:133
+#, fuzzy
+#| msgid "Duplicate Course"
+msgid "Replicate Course"
+msgstr "Duplicar curso"
+
+#: courses/templates/category/create.html:35
+#: courses/templates/category/index.html:36
+#: courses/templates/category/update.html:36
+#: courses/templates/course/create.html:9
+#: courses/templates/course/filtered.html:11 courses/views.py:104
+msgid "Create Course"
+msgstr "Criar curso"
+
+#: courses/templates/category/create.html:48
+#: courses/templates/category/index.html:49
+#: courses/templates/category/update.html:48
+#: courses/templates/course/index.html:53
+#, fuzzy
+#| msgid "Edit Category"
+msgid "List Category"
+msgstr "Editar categoria"
+
+#: courses/templates/category/create.html:77
+#: courses/templates/category/update.html:90
 msgid "Save"
 msgstr "Salvar"
  
-#: courses/templates/category/delete.html:8
-#: courses/templates/category/index.html:8
-msgid "Manage Categories"
-msgstr ""
+#: courses/templates/category/delete.html:10
+#, fuzzy
+#| msgid "Create Category"
+msgid "Delete Category"
+msgstr "Criar Categoria"
  
-#: courses/templates/category/delete.html:26
-msgid "Are you sure you want to delete the category"
-msgstr ""
+#: courses/templates/category/delete.html:17
+#: courses/templates/subject/delete.html:11
+#, fuzzy
+#| msgid "Are you sure you want to delete the couse"
+msgid "Are you sure you want to delete the subject"
+msgstr "Você tem certeza que deseja deletar o curso"
  
-#: courses/templates/category/delete.html:27
-#: courses/templates/course/delete.html:28
-#: courses/templates/module/delete.html:50
-msgid "Yes"
-msgstr "Sim"
+#: courses/templates/category/delete.html:23
+#: courses/templates/course/course_card.html:57
+#: courses/templates/subject/form_view_teacher.html:352
+msgid "Close"
+msgstr "Fechar"
  
-#: courses/templates/category/delete.html:28
-#: courses/templates/course/delete.html:29
-#: courses/templates/module/delete.html:51
-msgid "No"
-msgstr "Não"
+#: courses/templates/category/delete.html:24
+#, fuzzy
+#| msgid "Delete Course"
+msgid "Delete"
+msgstr "Deletar curso"
  
-#: courses/templates/category/index.html:40
-msgid "Actions"
-msgstr ""
+#: courses/templates/category/index.html:10
+msgid "Manage Categories"
+msgstr "Gerenciar categorias"
  
-#: courses/templates/category/index.html:59
-msgid "No categories found"
-msgstr ""
+#: courses/templates/category/index.html:84
+#: courses/templates/course/update.html:54
+#: courses/templates/subject/update.html:20
+#: courses/templates/topic/update.html:20
+msgid "Update"
+msgstr "Atualizar"
  
-#: courses/templates/category/update.html:9
-#: courses/templates/category/view.html:21
+#: courses/templates/category/index.html:85
+#, fuzzy
+#| msgid "Remove Category"
+msgid "Remover"
+msgstr "Remover categoria"
+
+#: courses/templates/category/update.html:10
 msgid "Edit Category"
-msgstr ""
+msgstr "Editar categoria"
  
-#: courses/templates/category/view.html:24
-msgid "Remove Category"
-msgstr ""
+#: courses/templates/course/course_card.html:22
+#: courses/templates/course/view.html:56
+#: courses/templates/course/view.html:145
+#: courses/templates/course/view.html:202
+#: courses/templates/subject/form_view_teacher.html:36
+#: courses/templates/subject/index.html:68
+#: courses/templates/topic/index.html:69
+msgid "Replicate"
+msgstr "Repetir"
+
+#: courses/templates/course/course_card.html:23
+#, fuzzy
+#| msgid "Are you sure you want to delete the couse"
+msgid "Are you sure you want to delete this course?"
+msgstr "Você tem certeza que deseja deletar o curso"
+
+#: courses/templates/course/course_card.html:23
+#: courses/templates/course/view.html:58
+#: courses/templates/course/view.html:146
+#: courses/templates/course/view.html:203
+#: courses/templates/subject/form_view_teacher.html:38
+#: courses/templates/subject/index.html:70
+#: courses/templates/topic/index.html:71
+msgid "Remove"
+msgstr "Remover"
+
+#: courses/templates/course/course_card.html:32
+#: courses/templates/course/view.html:66
+#, fuzzy
+#| msgid "Course name"
+msgid "Course Name"
+msgstr "Nome do Curso"
  
-#: courses/templates/category/view.html:32
-msgid "Name:"
-msgstr ""
+#: courses/templates/course/course_card.html:33
+#: courses/templates/course/view.html:67
+msgid "Coordinator"
+msgstr "Coordenador"
+
+#: courses/templates/course/course_card.html:49
+#, fuzzy
+#| msgid "Duplicate Course"
+msgid "Repicate Course"
+msgstr "Duplicar Curso"
+
+#: courses/templates/course/course_card.html:58
+#: courses/templates/course/create.html:55
+#: courses/templates/subject/create.html:20
+#: courses/templates/subject/form_view_teacher.html:353
+#: courses/templates/topic/create.html:20
+#, fuzzy
+#| msgid "Create Course"
+msgid "Create"
+msgstr "Criar curso"
  
-#: courses/templates/category/view.html:33
-msgid "Slug:"
+#: courses/templates/course/create.html:29
+#: courses/templates/course/replicate.html:105
+#: courses/templates/course/update.html:28
+msgid "attach_file"
 msgstr ""
  
-#: courses/templates/course/create.html:9
+#: courses/templates/course/delete.html:17
+#, fuzzy
+#| msgid "Are you sure you want to delete the couse"
+msgid "Are you sure you want to delete the course"
+msgstr "Você tem certeza que deseja deletar o curso"
+
 #: courses/templates/course/delete.html:18
-#: courses/templates/course/filtered.html:11
-#: courses/templates/course/index.html:18 courses/templates/course/view.html:25
-#: courses/templates/module/create.html:20
-#: courses/templates/module/delete.html:19
-#: courses/templates/module/index.html:26
-#: courses/templates/module/update.html:20
-msgid "Create Course"
-msgstr ""
+#: courses/templates/subject/delete.html:12
+msgid "Yes"
+msgstr "Sim"
  
-#: courses/templates/course/delete.html:27
-msgid "Are you sure you want to delete the couse"
-msgstr ""
+#: courses/templates/course/delete.html:19
+#: courses/templates/subject/delete.html:13
+msgid "No"
+msgstr "Não"
  
 #: courses/templates/course/filtered.html:19
-#: courses/templates/course/index.html:26
 msgid "Categories:"
-msgstr ""
+msgstr "Categorias:"
  
 #: courses/templates/course/home.html:9
 #, fuzzy
@@ -309,155 +583,398 @@ msgstr &quot;&quot;
 msgid "Home Course"
 msgstr "Curso"
  
-#: courses/templates/course/index.html:8
-msgid "Manage Courses"
-msgstr ""
+#: courses/templates/course/index.html:23
+#: courses/templates/subject/index.html:28
+#, fuzzy
+#| msgid "Courses"
+msgid "My courses"
+msgstr "Cursos"
  
-#: courses/templates/course/index.html:80
-msgid "students tops"
-msgstr ""
+#: courses/templates/course/index.html:24
+#: courses/templates/course/view.html:31
+#: courses/templates/subject/index.html:29
+#, fuzzy
+#| msgid "Courses"
+msgid "All Courses"
+msgstr "Cursos"
  
-#: courses/templates/course/index.html:86
-msgid "Subscribe Period:"
-msgstr ""
+#: courses/templates/course/index.html:27
+#: courses/templates/subject/index.html:32
+#, fuzzy
+#| msgid "Manage Courses"
+msgid "Manage Users"
+msgstr "Gerenciar cursos"
  
-#: courses/templates/course/index.html:88 courses/templates/course/view.html:59
-#: courses/templates/module/index.html:83
-msgid "Period:"
-msgstr ""
+#: courses/templates/course/index.html:31
+#: courses/templates/subject/index.html:36
+msgid "Manage Courses"
+msgstr "Gerenciar cursos"
  
 #: courses/templates/course/index.html:104
 msgid "No courses found"
-msgstr ""
+msgstr "Nenhum curso encontrado"
  
-#: courses/templates/course/update.html:9 courses/templates/course/view.html:28
-#: courses/templates/module/create.html:26
-#: courses/templates/module/delete.html:25
-#: courses/templates/module/index.html:29
-#: courses/templates/module/update.html:26
-msgid "Edit Course"
-msgstr ""
+#: courses/templates/course/replicate.html:97
+#, fuzzy
+#| msgid "Image"
+msgid "Imagem"
+msgstr "Imagem"
  
-#: courses/templates/course/update.html:19
-#: courses/templates/course/view.html:21
-#: courses/templates/module/create.html:29
-#: courses/templates/module/delete.html:9
-#: courses/templates/module/delete.html:28
-#: courses/templates/module/index.html:9 courses/templates/module/index.html:22
-#: courses/templates/module/update.html:29
-msgid "Manage Modules"
-msgstr ""
+#: courses/templates/course/view.html:55
+#: courses/templates/course/view.html:243
+#, fuzzy
+#| msgid "Create Course"
+msgid "Create Subject"
+msgstr "Criar curso"
+
+#: courses/templates/course/view.html:57
+#: courses/templates/subject/form_view_teacher.html:37
+#: courses/templates/subject/index.html:69
+#: courses/templates/topic/index.html:70
+msgid "Edit"
+msgstr "Editar"
+
+#: courses/templates/course/view.html:83
+msgid "Create a New Subject"
+msgstr "Criar novo assunto"
+
+#: courses/templates/course/view.html:89
+#: courses/templates/subject/form_view_teacher.html:173
+#: courses/templates/subject/form_view_teacher.html:313
+msgid "Cancel"
+msgstr "Cancelar"
+
+#: courses/templates/course/view.html:90
+#: courses/templates/course/view.html:117
+#: courses/templates/course/view.html:260
+#: courses/templates/subject/form_view_teacher.html:206
+#: courses/templates/subject/form_view_teacher.html:258
+msgid "Confirm"
+msgstr "Confirmar"
+
+#: courses/templates/course/view.html:113
+#: courses/templates/course/view.html:256
+#, fuzzy
+#| msgid "Are you sure you want to delete the couse"
+msgid "Are you sure you want to remove this subject?"
+msgstr "Você tem certeza que deseja deletar o curso"
  
-#: courses/templates/course/update.html:22
-#: courses/templates/course/view.html:31
-#: courses/templates/module/create.html:32
-#: courses/templates/module/delete.html:31
-#: courses/templates/module/index.html:32
-#: courses/templates/module/update.html:32
-msgid "Participants"
-msgstr ""
+#: courses/templates/course/view.html:154
+#: courses/templates/course/view.html:210
+#, fuzzy
+#| msgid "Are you sure you want to delete the couse"
+msgid "Are you sure you want to subscribe to this subject?"
+msgstr "Você tem certeza que deseja deletar o curso"
  
-#: courses/templates/course/view.html:18
-#: courses/templates/module/create.html:23
-#: courses/templates/module/delete.html:22
-#: courses/templates/module/index.html:19
-#: courses/templates/module/update.html:23
-msgid "Course Info"
-msgstr ""
+#: courses/templates/course/view.html:154
+#: courses/templates/course/view.html:210
+#, fuzzy
+#| msgid "Subscribes:"
+msgid "Subscribe"
+msgstr "Inscrições:"
+
+#: courses/templates/course/view.html:161
+#: courses/templates/course/view.html:217
+#: courses/templates/subject/index.html:78
+msgid "Professor"
+msgstr "Professor"
+
+#: courses/templates/course/view.html:171
+#: courses/templates/course/view.html:227
+msgid "Begining"
+msgstr "Início"
+
+#: courses/templates/course/view.html:174
+#: courses/templates/course/view.html:230
+#: courses/templates/subject/index.html:88
+msgid "End"
+msgstr "Final"
+
+#: courses/templates/subject/form_view_student.html:45
+#: courses/templates/subject/form_view_teacher.html:83
+#: courses/templates/subject/form_view_teacher.html:94
+#: courses/templates/subject/form_view_teacher.html:153
+#, fuzzy
+#| msgid "Objectivies"
+msgid "Activities"
+msgstr "Objetivos"
  
-#: courses/templates/course/view.html:34
-#: courses/templates/module/create.html:35
-#: courses/templates/module/delete.html:34
-#: courses/templates/module/index.html:35
-#: courses/templates/module/update.html:35
-msgid "Course avaliations"
-msgstr ""
+#: courses/templates/subject/form_view_teacher.html:62
+#: courses/templates/subject/form_view_teacher.html:133
+msgid "Create a Link"
+msgstr "Criar link"
  
-#: courses/templates/course/view.html:37
-#: courses/templates/module/create.html:38
-#: courses/templates/module/delete.html:37
-#: courses/templates/module/index.html:38
-#: courses/templates/module/update.html:38
-msgid "Duplicate Course"
-msgstr ""
+#: courses/templates/subject/form_view_teacher.html:65
+#: courses/templates/subject/form_view_teacher.html:136
+#, fuzzy
+#| msgid "Create Module"
+msgid "Create a file"
+msgstr "Criar módulos"
  
-#: courses/templates/course/view.html:40
-#: courses/templates/module/create.html:41
-#: courses/templates/module/delete.html:40
-#: courses/templates/module/index.html:41
-#: courses/templates/module/update.html:41
-msgid "Delete Course"
-msgstr ""
+#: courses/templates/subject/form_view_teacher.html:100
+#, fuzzy
+#| msgid "Create Course"
+msgid "Create Forum"
+msgstr "Criar curso"
  
-#: courses/templates/course/view.html:56
-msgid "Subscribes:"
-msgstr ""
+#: courses/templates/subject/form_view_teacher.html:101
+#, fuzzy
+#| msgid "Create Module"
+msgid "Create Poll"
+msgstr "Criar módulos"
  
-#: courses/templates/course/view.html:66
-msgid "Objectives:"
-msgstr ""
+#: courses/templates/subject/form_view_teacher.html:117
+msgid "Name Topic"
+msgstr "Nome do tópico"
  
-#: courses/templates/course/view.html:69
-msgid "Work Plan:"
-msgstr ""
+#: courses/templates/subject/form_view_teacher.html:159
+msgid "Anything"
+msgstr "Qualquer coisa"
  
-#: courses/templates/module/create.html:10
-#: courses/templates/module/index.html:70
-msgid "Create Module"
-msgstr ""
+#: courses/templates/subject/form_view_teacher.html:174
+#: courses/templates/subject/form_view_teacher.html:314
+msgid "Submit"
+msgstr "Enviar"
  
-#: courses/templates/module/delete.html:49
-msgid "Are you sure you want to delete the module"
-msgstr ""
+#: courses/templates/subject/form_view_teacher.html:202
+#, fuzzy
+#| msgid "Delete Course"
+msgid "Delete your Topic?"
+msgstr "Deletar curso"
  
-#: courses/templates/module/index.html:80
-msgid "students maximum"
+#: courses/templates/subject/form_view_teacher.html:220
+msgid "Material EMBED"
 msgstr ""
  
-#: courses/templates/module/index.html:109
-msgid "Invisible"
+#: courses/templates/subject/form_view_teacher.html:231
+msgid "Code"
 msgstr ""
  
-#: courses/templates/module/index.html:125
-msgid "No modules found"
-msgstr ""
+#: courses/templates/subject/form_view_teacher.html:235
+#, fuzzy
+#| msgid "Modules's description"
+msgid "Material description"
+msgstr "Descrição do módulo"
  
-#: courses/templates/module/update.html:10
-msgid "Edit Module"
-msgstr ""
+#: courses/templates/subject/form_view_teacher.html:277
+msgid "Proposal Activity"
+msgstr "Atividade proposta"
  
-#: courses/views.py:48
-msgid "Course created successfully!"
-msgstr ""
+#: courses/templates/subject/form_view_teacher.html:285
+#, fuzzy
+#| msgid "Description"
+msgid "Describe"
+msgstr "Descrição"
+
+#: courses/templates/subject/form_view_teacher.html:291
+msgid "Opening"
+msgstr "Abertura"
+
+#: courses/templates/subject/form_view_teacher.html:297
+msgid "Ending"
+msgstr "Final"
+
+#: courses/templates/subject/form_view_teacher.html:306
+msgid "Send Later"
+msgstr "Enviar depois"
+
+#: courses/templates/subject/form_view_teacher.html:344
+msgid "Forum"
+msgstr "Fórum"
+
+#: courses/templates/subject/index.html:11
+#, fuzzy
+#| msgid "Manage Courses"
+msgid "Manage Subjects"
+msgstr "Gerenciar cursos"
+
+#: courses/templates/subject/index.html:85
+msgid "Beginning"
+msgstr "Início"
  
-#: courses/views.py:70
-msgid "Course edited successfully!"
+#: courses/templates/subject/index.html:105
+#, fuzzy
+#| msgid "Create Course"
+msgid "Create Topic"
+msgstr "Criar curso"
+
+#: courses/templates/subject/poll_item_actions.html:9
+#: courses/templates/subject/poll_item_actions.html:11
+msgid "poll"
+msgstr "Enquete"
+
+#: courses/templates/subject_category/index.html:34
+#, fuzzy
+#| msgid "Create Category"
+msgid "Create Subject Category"
+msgstr "Criar Categoria"
+
+#: courses/templates/subject_category/index.html:48
+msgid "edit"
+msgstr "Editar"
+
+#: courses/templates/subject_category/index.html:54
+msgid "delete"
+msgstr "Deletar"
+
+#: courses/templates/topic/index.html:12
+#, fuzzy
+#| msgid "Manage Categories"
+msgid "Manage Topic"
+msgstr "Gerenciar categorias"
+
+#: courses/templates/topic/index.html:41
+msgid "Participants"
+msgstr "Participantes"
+
+#: courses/templates/topic/index.html:42
+#, fuzzy
+#| msgid "Duplicate Course"
+msgid "Replicate subject"
+msgstr "Duplicar curso"
+
+#: courses/templates/topic/index.html:43
+#, fuzzy
+#| msgid "Create Course"
+msgid "Create subject"
+msgstr "Criar curso"
+
+#: courses/templates/topic/index.html:44
+#, fuzzy
+#| msgid "Edit Course"
+msgid "Edit subject"
+msgstr "Editar curso"
+
+#: courses/templates/topic/index.html:45
+msgid "Remove subject"
+msgstr "Remover assunto"
+
+#: courses/templates/topic/index.html:112
+msgid "Atividade.doc"
 msgstr ""
  
-#: courses/views.py:92
+#: courses/templates/topic/index.html:117
+msgid "Grade"
+msgstr "Nota"
+
+#: courses/templates/topic/index.html:127
+msgid "Send"
+msgstr "Enviar"
+
+#: courses/templates/topic/index.html:150
+#, fuzzy
+#| msgid "No categories found"
+msgid "No activity found"
+msgstr "Nenhuma categoria encontrada"
+
+#: courses/views.py:265
 msgid "Course deleted successfully!"
-msgstr ""
+msgstr "Curso deletado com sucesso!"
+
+#: courses/views.py:276
+msgid "Successfully subscribed to the course!"
+msgstr "Inscrição no curso realizada com sucesso!"
+
+#: courses/views.py:278
+msgid ""
+"An error has occured. Could not subscribe to this course, try again later"
+msgstr "Ocorreu um erro. Não pôde inscrever no curso, tente novamente"
  
-#: courses/views.py:142
+#: courses/views.py:336
 msgid "Category created successfully!"
-msgstr ""
+msgstr "Categoria criada com sucesso!"
  
-#: courses/views.py:164
-msgid "Category edited successfully!"
-msgstr ""
+#: courses/views.py:349
+#, fuzzy
+#| msgid "Category edited successfully!"
+msgid "Category updated successfully!"
+msgstr "Categoria editada com sucesso!"
  
-#: courses/views.py:185
+#: courses/views.py:374
 msgid "Category deleted successfully!"
-msgstr ""
+msgstr "Categoria deletada com sucesso!"
  
-#: courses/views.py:237
-msgid "Module created successfully!"
-msgstr ""
+#: courses/views.py:633
+msgid "Successfully subscribed to the subject!"
+msgstr "Inscrição no assunto realizada com sucesso!"
  
-#: courses/views.py:268
-msgid "Module edited successfully!"
-msgstr ""
+#: courses/views.py:635
+msgid ""
+"An error has occured. Could not subscribe to this subject, try again later"
+msgstr "Ocorreu um erro. Não pôde inscrever no assunto, tente novamente"
  
-#: courses/views.py:291
-msgid "Module deleted successfully!"
-msgstr ""
+#: courses/views.py:637
+msgid "You're not subscribed in the course yet."
+msgstr "Você não está inscrito no curso ainda."
+
+#~ msgid "User"
+#~ msgstr "Usuário"
+
+#~ msgid "Module"
+#~ msgstr "Modulo"
+
+#~ msgid "Modules"
+#~ msgstr "Modulos"
+
+#~ msgid "All fields are required"
+#~ msgstr "Todos os campos são obrigatótios"
+
+#~ msgid "Are you sure you want to delete the category"
+#~ msgstr "Você tem certeza que deseja deletar a categoria"
+
+#~ msgid "Name:"
+#~ msgstr "Nome:"
+
+#~ msgid "students tops"
+#~ msgstr "Melhores estudantes"
+
+#~ msgid "Subscribe Period:"
+#~ msgstr "Inscrever período:"
+
+#~ msgid "Period:"
+#~ msgstr "Período:"
+
+#~ msgid "Manage Modules"
+#~ msgstr "Gerenciar módulos"
+
+#~ msgid "Course Info"
+#~ msgstr "Informações do curso"
+
+#~ msgid "Course avaliations"
+#~ msgstr "Avaliações do curso"
+
+#~ msgid "Objectives:"
+#~ msgstr "Objetivos:"
+
+#~ msgid "Work Plan:"
+#~ msgstr "Plano de trabalho:"
+
+#~ msgid "Are you sure you want to delete the module"
+#~ msgstr "Você tem certeza que deseja deletar o módulo"
+
+#~ msgid "students maximum"
+#~ msgstr "Capacidade de estudantes"
+
+#~ msgid "Invisible"
+#~ msgstr "Invisível"
+
+#~ msgid "No modules found"
+#~ msgstr "Nenhum módulo encontrado"
+
+#~ msgid "Edit Module"
+#~ msgstr "Editar módulo"
+
+#~ msgid "Course created successfully!"
+#~ msgstr "Curso criado com sucesso!"
+
+#~ msgid "Course edited successfully!"
+#~ msgstr "Curso editado com sucesso!"
+
+#~ msgid "Module created successfully!"
+#~ msgstr "Módulo criado com sucesso!"
+
+#~ msgid "Module edited successfully!"
+#~ msgstr "Módulo editado com sucesso!"
+
+#~ msgid "Module deleted successfully!"
+#~ msgstr "Módulo deletado com sucesso!"
 from rolepermissions.permissions import register_object_checker
-from amadeus.roles import SystemAdmin
+from amadeus.roles import SystemAdmin, Professor
+
+@register_object_checker()
+def view_topic(role, user, topic):
+    if (role == SystemAdmin):
+        return True
+
+    if (user in topic.subject.course.professors.all() and user in topic.subject.professors.all()):
+        return True
+
+    if (user in topic.subject.course.students.all() and user in topic.subject.students.all()):
+        return True
+
+    return False
  
 @register_object_checker()
 def edit_topic(role, user, topic):
@@ -12,6 +25,19 @@ def edit_topic(role, user, topic):
     return False
  
 @register_object_checker()
+def view_subject(role, user, subject):
+    if (role == SystemAdmin):
+        return True
+
+    if (user in subject.course.professors.all() and user in subject.professors.all()):
+        return True
+
+    if (user in subject.course.students.all() and user in subject.students.all()):
+        return True
+
+    return False
+
+@register_object_checker()
 def edit_subject(role, user, subject):
     if (role == SystemAdmin):
         return True
@@ -32,6 +58,13 @@ def delete_subject(role, user, subject):
     return False
  
 @register_object_checker()
+def delete_category(role, user, category):
+    if (role == SystemAdmin or role == Professor):
+        return True
+
+    return False
+
+@register_object_checker()
 def update_course(role, user, course):
     if (role == SystemAdmin):
         return True
+var locale = navigator.language || navigator.userLanguage;
+
+$('.date-picker').datepicker({
+    language: locale,
+});
+
 /*
 *
 * Function to get a cookie stored on browser
@@ -49,13 +55,13 @@ function subscribe(elem, url, id, confirm_message) {
 function delete_course(url, course, message, return_url) {
     alertify.confirm(message, function(){
         var csrftoken = getCookie('csrftoken');
-        
+
         $.ajax({
             method: 'post',
             beforeSend: function (request) {
                 request.setRequestHeader('X-CSRFToken', csrftoken);
             },
-            url: url, 
+            url: url,
             success: function(data) {
                 alertify.alert('Remove Course', 'Course removed successfully!', function(){
                     window.location.href = return_url;
@@ -64,14 +70,14 @@ function delete_course(url, course, message, return_url) {
         });
     });
 }
-/*
+/* 
 *
 * Function to load create course's form
 *
 */
 function replicate_course(url, course) {
     $.ajax({
-        url: url, 
+        url: url,
         data: {'form': course},
         success: function(data) {
             $(".course_replicate_form").html(data);
@@ -6,6 +6,7 @@ var Submite = {
         $(id_li_link).remove();
         $("#modal_category").empty();
         $("#accordion").remove();
+        $(".modal-backdrop.in").remove();
         alertify.success("Category removed successfully!");
       }).fail(function(){
         $("#modal_category").empty();
-$(".edit_card").on('click', function() {
-    $(".presentation").css('display','none');
-    $(".editation").css('display','block');
-})
-$(".edit_card_end").on('click', function() {
-    $(".editation").css('display','none');
-    $(".presentation").css('display','block');
-})
 \ No newline at end of file
+function show_editation(id_topic){
+    $("#presentation_"+ id_topic).css('display','none');
+    $("#editation_"+ id_topic).css('display','block');
+}
+
+function show_presentation(id_topic){
+    $("#editation_"+ id_topic).css('display','none');
+    $("#presentation_"+ id_topic).css('display','block');
+}
 \ No newline at end of file
@@ -27,25 +27,25 @@
  
     <div class="panel panel-primary navigation">
 	    <div class="panel-heading">
-	        <h3 class="panel-title">Actions</h3>
+	        <h3 class="panel-title">{% trans 'Actions' %}</h3>
 	    </div>
 	    <div class="panel-body">
 	        <ul class="nav nav-pills nav-stacked">
-	            <li><a href="javascript:void(0)">Replicate Course</a></li>
-	            <li><a href="{% url 'course:create' %}">Create Course</a></li>
-	            <li><a href="{% url 'course:create_cat' %}">Create Category</a></li>
+	            <li><a href="javascript:void(0)">{% trans 'Replicate Course' %}</a></li>
+	            <li><a href="{% url 'course:create' %}">{% trans 'Create Course' %}</a></li>
+	            <li><a href="{% url 'course:create_cat' %}">{% trans 'Create Category' %}</a></li>
 	        </ul>
 	    </div>
 	</div>
  
 	<div class="panel panel-primary navigation">
 	    <div class="panel-heading">
-	        <h3 class="panel-title">Category</h3>
+	        <h3 class="panel-title">{% trans 'Category' %}</h3>
 	    </div>
 	    <div class="panel-body">
 	        <ul class="nav nav-pills nav-stacked">
-	            <li><a href="{% url 'course:create_cat' %}">Create Category</a></li>
-	            <li><a href="{% url 'course:manage_cat' %}">List Category</a></li>
+	            <li><a href="{% url 'course:create_cat' %}">{% trans 'Create Category' %}</a></li>
+	            <li><a href="{% url 'course:manage_cat' %}">{% trans 'List Category' %}</a></li>
 	        </ul>
 	    </div>
 	</div>
@@ -28,25 +28,25 @@
  
     <div class="panel panel-primary navigation">
 	    <div class="panel-heading">
-	        <h3 class="panel-title">Actions</h3>
+	        <h3 class="panel-title">{% trans 'Actions' %}</h3>
 	    </div>
 	    <div class="panel-body">
 	        <ul class="nav nav-pills nav-stacked">
-	            <li><a href="javascript:void(0)">Replicate Course</a></li>
-	            <li><a href="{% url 'course:create' %}">Create Course</a></li>
-	            <li><a href="{% url 'course:create_cat' %}">Create Category</a></li>
+	            <li><a href="javascript:void(0)">{% trans 'Replicate Course' %}</a></li>
+	            <li><a href="{% url 'course:create' %}">{% trans 'Create Course' %}</a></li>
+	            <li><a href="{% url 'course:create_cat' %}">{% trans 'Create Category' %}</a></li>
 	        </ul>
 	    </div>
 	</div>
  
 	<div class="panel panel-primary navigation">
 	    <div class="panel-heading">
-	        <h3 class="panel-title">Category</h3>
+	        <h3 class="panel-title">{% trans 'Category' %}</h3>
 	    </div>
 	    <div class="panel-body">
 	        <ul class="nav nav-pills nav-stacked">
-	            <li><a href="{% url 'course:create_cat' %}">Create Category</a></li>
-	            <li><a href="{% url 'course:manage_cat' %}">List Category</a></li>
+	            <li><a href="{% url 'course:create_cat' %}">{% trans 'Create Category' %}</a></li>
+	            <li><a href="{% url 'course:manage_cat' %}">{% trans 'List Category' %}</a></li>
 	        </ul>
 	    </div>
 	</div>
@@ -72,7 +72,7 @@
 					    <div class="panel-heading" role="tab">
 					      <div class="row">
 					        <div class="col-xs-9 col-md-10 titleTopic">
-					          <h4 style="color:white">{{category}}</h4>
+					          <h4 style="color:white; margin-left: 20px;">{{category}}</h4>
 					        </div>
  
 						        <div class="col-xs-4 col-md-2" id="divMoreActions">
@@ -28,24 +28,24 @@
  
     <div class="panel panel-primary navigation">
 	    <div class="panel-heading">
-	        <h3 class="panel-title">Actions</h3>
+	        <h3 class="panel-title">{% trans 'Actions' %}</h3>
 	    </div>
 	    <div class="panel-body">
 	        <ul class="nav nav-pills nav-stacked">
-	            <li><a href="javascript:void(0)">Replicate Course</a></li>
-	            <li><a href="{% url 'course:create' %}">Create Course</a></li>
-	            <li><a href="{% url 'course:create_cat' %}">Create Category</a></li>
+	            <li><a href="javascript:void(0)">{% trans 'Replicate Course' %}</a></li>
+	            <li><a href="{% url 'course:create' %}">{% trans 'Create Course' %}</a></li>
+	            <li><a href="{% url 'course:create_cat' %}">{% trans 'Create Category' %}</a></li>
 	        </ul>
 	    </div>
 	</div>
 	<div class="panel panel-primary navigation">
 	    <div class="panel-heading">
-	        <h3 class="panel-title">Category</h3>
+	        <h3 class="panel-title">{% trans 'Category' %}</h3>
 	    </div>
 	    <div class="panel-body">
 	        <ul class="nav nav-pills nav-stacked">
-	            <li><a href="{% url 'course:create_cat' %}">Create Category</a></li>
-	            <li><a href="{% url 'course:manage_cat' %}">List Category</a></li>
+	            <li><a href="{% url 'course:create_cat' %}">{% trans 'Create Category' %}</a></li>
+	            <li><a href="{% url 'course:manage_cat' %}">{% trans 'List Category' %}</a></li>
 	        </ul>
 	    </div>
 	</div>
 {% load static i18n permission_tags %}
 {% load django_bootstrap_breadcrumbs %}
-
-<div class="panel-group ui-accordion ui-widget ui-helper-reset ui-sortable" id="accordion-{{course.slug}}" role="tablist" aria-multiselectable="false">
-    <div class="group">
-		<div class="panel panel-info">
-		    <div class="panel-heading" role="tab">
-		      <div class="row">
-		        <div class="col-xs-9 col-md-10 titleTopic">
-		          <a role="button" data-toggle="collapse" data-parent="#accordion-{{course.slug}}" href=".collapseOne-{{course.slug}}" aria-expanded="false" aria-controls="collapseOne-{{course.slug}}" class="collapsed">
-		          <h4 style="color:white">{{course.name}}</h4>
-		          </a>
-		        </div>
-		        {% if user|has_role:'professor' or user|has_role:'system_admin' %}
-			        <div class="col-xs-4 col-md-2" id="divMoreActions">
-			            <div class="btn-group">
-			              <button class="btn btn-default btn-sm dropdown-toggle" type="button" id="moreActions" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-			                <i class="fa fa-ellipsis-v fa-2x" aria-hidden="true"></i>
-			              </button>
-			              <ul class="dropdown-menu" aria-labelledby="moreActions">
-			                <li><a href="{% url 'course:replicate_course' course.slug %}"><i class="fa fa-files-o fa-fw" aria-hidden="true"></i>{% trans 'Replicate' %}</a></li>
-			                <li><a href="javascript:delete_course('{% url 'course:delete' course.slug %}', '{{ course.slug }}', '{% trans "Are you sure you want to delete this course?" %}', '{% url 'course:manage' %}')"><i class="fa fa-trash fa-fw" aria-hidden="true"></i>{% trans 'Remove' %}</a></li>
-			              </ul>
-			            </div>
-			        </div>
-		        {% endif %}
-		      </div>
-		    </div>
-		    <div class="panel-collapse collapseOne-{{course.slug}} collapse in" role="tabpanel" aria-labelledby="headingOne" aria-expanded="true" aria-hidden="false" tabindex="0">
-		      <div class="panel-body">
-		        <p><b>Course Name: </b>{{course.name}}</p>
-		        <p><b>Coordinator: </b>{{course.professors.all.0}}</p>
-		        <p>
-		          <b>Description:</b>
-		          <i>
-		            {{course.content}}
-		          </i>
-		        </p>
-				<a href="{% url 'course:view' course.slug %}" class="btn btn-raised btn-default center-block">{% trans 'View Course' %}<div class="ripple-container"></div></a>
-		      </div>
-		    </div>
-		</div>
-	</div>
+<div class="group">
+    <div class="panel panel-info">
+        <div class="panel-heading course">
+          <div class="row">
+            <div class="col-md-1 moreAccordion" data-toggle="collapse" data-parent="#accordion-{{course.slug}}" href=".collapseOne-{{course.slug}}" aria-expanded="false" aria-controls="collapseOne-{{course.slug}}">
+                <button class="btn btn-default btn-sm caret-square"><i class="fa fa-caret-square-o-down fa-2x" aria-hidden="true"></i></button>
+            </div>
+            <div class="col-xs-9 col-md-4 titleTopic">
+              <a role="button" href="{% url 'course:view' course.slug %}">
+                  <h4>{{course.name}}</h4>
+              </a>
+            </div>
+            {% if user|has_role:'professor' or user|has_role:'system_admin' %}
+            <div class="col-xs-4 col-md-6 divMoreActions" >
+                <div class="btn-group">
+                  <button class="btn btn-default btn-sm dropdown-toggle" type="button" id="moreActions" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+                    <i class="fa fa-ellipsis-v fa-2x" aria-hidden="true"></i>
+                   </button>
+                  <ul class="dropdown-menu pull-right" aria-labelledby="moreActions">
+                    <li><a href="{% url 'course:replicate_course' course.slug %}"><i class="fa fa-files-o fa-fw" aria-hidden="true"></i>{% trans 'Replicate' %}</a></li>
+                    <li><a href="javascript:delete_course('{% url 'course:delete' course.slug %}', '{{ course.slug }}', '{% trans "Are you sure you want to delete this course?" %}', '{% url 'course:manage' %}')"><i class="fa fa-trash fa-fw" aria-hidden="true"></i>&nbsp;{% trans 'Remove' %}</a></li>
+                  </ul>
+                </div>
+            </div>
+            {% elif user|has_role:'student' %}
+              {% if not request.user in course.students.all %}
+                <a onclick="subscribe($(this), '{% url 'course:subscribe' course.slug %}', {{ course.id}}, '{% trans 'Are you sure you want to subscribe to this course?' %}')"><button class="btn btn-sm btn-primary btn-raised pull-right">{% trans 'Subscribe' %}</button></a>                
+              {% endif %}
+            {% endif %}
+          </div>
+        </div>
+        <div class="panel-collapse collapseOne-{{course.slug}} collapse in" role="tabpanel" aria-labelledby="headingOne" aria-expanded="true" aria-hidden="false" tabindex="0">
+          <div class="panel-body">
+            <p><b>{% trans 'Course Name' %}: </b>{{course.name}}</p>
+            <p><b>{% trans 'Coordinator' %}: </b>{{course.professors.all.0}}</p>
+            <p>
+              <b>{% trans 'Description' %}:</b>
+              <i>
+                {{course.content}}
+              </i>
+            </p>
+          </div>
+        </div>
+    </div>
 </div>
  
 <div class="modal fade" id="replicateCourse" tabindex="-1" role="dialog" aria-labelledby="myModalLabel">
@@ -26,7 +26,7 @@
 										<input type="text" readonly="" class="form-control" placeholder="Choose your photo..."/>
 										<span class="input-group-btn input-group-sm">
 												<button type="button" class="btn btn-fab btn-fab-mini">
-														<i class="material-icons">attach_file</i>
+														<i class="material-icons">{% trans 'attach_file' %}</i>
 												</button>
 										</span>
 									</div>
@@ -19,5 +19,5 @@
 {% endblock %}
  
 {% block content %}
-	
+
 {% endblock %}
@@ -11,9 +11,9 @@
 {% endblock %}
  
 {% block sidebar %}
-    <div class="panel panel-primary navigation">
+    <div class="panel panel-primary">
         <div class="panel-heading">
-            <h4>Menu</h4>
+            <h4>{% trans 'Menu' %}</h4>
         </div>
         <div class="panel-body">
             <ul class="nav nav-pills nav-stacked">
@@ -21,8 +21,9 @@
                 <li><a href="{% url 'users:profile' %}">{% trans 'Profile' %}</a></li>
                 {% if user|has_role:'student' or not user.is_staff %}
                     <li><a href="{% url 'course:manage' %}">{% trans 'My courses' %}</a></li>
-                    <li><a href="{% url 'core:guest' %}">{% trans 'All Courses' %}</a></li>
+                    <li><a href="{% url 'course:all_courses' %}">{% trans 'All Courses' %}</a></li>
                 {% endif %}
+                <li><a href="{% url 'core:guest' %}">{% trans 'Courses' %}</a></li>
                 {% if user|has_role:'system_admin' %}
                     <li> <a href="{% url 'users:manage' %}">{% trans 'Manage Users' %}</a></li>
                 {% endif %}
@@ -42,89 +43,108 @@
         </div>
     </div>
  
-    	{% if user|has_role:'professor' or user|has_role:'system_admin' %}
+        {% if user|has_role:'professor' or user|has_role:'system_admin' %}
+            <div class="panel panel-primary">
+                <div class="panel-heading">
+                    <h3 class="panel-title">{% trans 'Category' %}</h3>
+                </div>
+                <div class="panel-body">
+                    <ul class="nav nav-pills nav-stacked">
+                        <li><a href="{% url 'course:create_cat' %}">{% trans 'Create Category' %}</a></li>
+                        <li><a href="{% url 'course:manage_cat' %}">{% trans 'List Category' %}</a></li>
+                    </ul>
+                </div>
+            </div>
+        {% endif %}
+         <div class="panel-group" id="accordion">
+                <div class="panel panel-primary">
+                    <div class="panel-heading">
+                        <h4 class="panel-title">
+                            <a data-toggle="collapse" data-parent="#accordion" href="#collapseOne">
+                            </span>{% trans 'Categorys' %}</a>
+                        </h4>
+                    </div>
+                    <div id="collapseOne" class="panel-collapse collapse in">
+                        <div class="panel-body">
+                            <table class="table">
+                            {% for category in categorys_courses %}
+                                <tr>
+                                    <td>
+                                        <a href="?category={{category.name}}">{{category.name}}</a>
+                                    </td>
+                                </tr>
+                            {% endfor %}
+                            </table>
+                        </div>
+                    </div>
+                </div>
+            </div>
  
-		<div class="panel panel-primary navigation">
-		    <div class="panel-heading">
-		        <h3 class="panel-title">Category</h3>
-		    </div>
-		    <div class="panel-body">
-		        <ul class="nav nav-pills nav-stacked">
-		            <li><a href="{% url 'course:create_cat' %}">Create Category</a></li>
-		            <li><a href="{% url 'course:manage_cat' %}">List Category</a></li>
-		        </ul>
-		    </div>
-		</div>
-	{% endif %}
 {% endblock %}
  
 {% block content %}
-	{% if messages %}
-		{% for message in messages %}
-			<div class="alert alert-success alert-dismissible" role="alert">
-				<button type="button" class="close" data-dismiss="alert" aria-label="Close">
-					<span aria-hidden="true">&times;</span>
-				</button>
-				<p>{{ message }}</p>
-			</div>
-		{% endfor %}
-	{% endif %}
+    {% if messages %}
+        {% for message in messages %}
+            <div class="alert alert-success alert-dismissible" role="alert">
+                <button type="button" class="close" data-dismiss="alert" aria-label="Close">
+                    <span aria-hidden="true">&times;</span>
+                </button>
+                <p>{{ message }}</p>
+            </div>
+        {% endfor %}
+    {% endif %}
  
-<div class="col-md-12">
-	<form id="searchform" action="{% url 'course:manage' %}" method="get" accept-charset="utf-8">
-		<div class="input-group">
-		  <div class="form-group is-empty">
-		  <input type="search" class="form-control" placeholder="Search Courses" name="q" id="searchbox"></div>
-		    <span class="input-group-btn input-group-sm">
-		      <button type="button" class="btn btn-fab btn-fab-mini">
-		        <i class="material-icons">search</i>
-		      </button>
-		    </span>
-		</div>
-	</form>
+<div class="col-md-12 cards-content">
+    <form id="searchform" action="{% url 'course:manage' %}" method="get" accept-charset="utf-8">
+        <div class="input-group">
+          <div class="form-group is-empty">
+          <input type="text" class="form-control" placeholder="Search Courses" name="q"></div>
+            <span class="input-group-btn input-group-sm">
+              <button type="submit" class="btn btn-fab btn-fab-mini">
+                <i class="fa fa-search" aria-hidden="true"></i>
+              </button>
+            </span>
+        </div>
+    </form>
 </div>
-	
  
 </fieldset>
-	<div class="col-md-12">
-		{% if courses|length > 0 %}
-			{% if request.GET.category == 'all' or none or request.GET.category == '' %}
-				{% for course in list_courses %}
-		          	{% include "course/course_card.html" %}
-				{% endfor %}
-			{% else %}
-				{% for course in courses_category %}
-    				{% if course.category.name == request.GET.category %}
-    					<!-- Put your content here! -->
-    					{% include "course/course_card.html" %}
-    				{% endif %}
-				{% endfor %}
-			{% endif %}
-		{% else %}
-			{% trans 'No courses found' %}
-		{% endif %}
-	</div>
-	<div class="col-md-12">
-		<nav aria-label="Page navigation">
-			<ul class="pagination">
-				{% if page_obj.has_previous %}
-				    <li>
-				        <a href="?page={{ page_obj.previous_page_number }}"><span><<</span></a>
-				    </li>
-				{% endif %}
-			    {% for page_number in paginator.page_range %}
-					<li{% if page_obj.number == page_number %} class="active"{% endif %}>
-	    				<a href="?page={{ page_number }}">{{ page_number }}</a>
-					</li>
-				{% endfor %}
-				{% if page_obj.has_next %}
-				    <li>
-				        <a href="?page={{ page_obj.next_page_number }}"><span>>></span></a>
-				    </li>
-				{% endif %}
-			</ul>
-		</nav>
-	</div>
-
-	<script type="text/javascript" src="{% static 'js/course.js' %}"></script>
+    <div class="col-md-12 cards-content">
+        {% if courses|length > 0 %}
+            {% if request.GET.category == '' or aparece or request.GET.q == '' %}
+                {% for course in list_courses %}
+                    {% include "course/course_card.html" %}
+                {% endfor %}
+            {% endif %}
+            {% if request.GET.category or request.GET.q %}
+                {% for course in courses %}
+                    {% include "course/course_card.html" %}
+                {% endfor %}
+            {% endif %}
+        {% else %}
+            {% trans 'No courses found' %}
+        {% endif %}
+    </div>
+        <div class="col-md-12">
+        <nav aria-label="Page navigation">
+            <ul class="pagination">
+                {% if page_obj.has_previous %}
+                    <li>
+                        <a href="?page={{ page_obj.previous_page_number }}"><span><<</span></a>
+                    </li>
+                {% endif %}
+                {% for page_number in paginator.page_range %}
+                    <li{% if page_obj.number == page_number %} class="active"{% endif %}>
+                        <a href="?page={{ page_number }}">{{ page_number }}</a>
+                    </li>
+                {% endfor %}
+                {% if page_obj.has_next %}
+                    <li>
+                        <a href="?page={{ page_obj.next_page_number }}"><span>>></span></a>
+                    </li>
+                {% endif %}
+            </ul>
+        </nav>
+    </div>
+    <script type="text/javascript" src="{% static 'js/course.js' %}"></script>
 {% endblock %}
@@ -15,86 +15,86 @@
         <div class="card-body">
 					<form method="post" action="" enctype="multipart/form-data">{% csrf_token %}						
 							<div class="form-group  is-fileinput">
-								<label for="id_name">Name</label>
+								<label for="id_name">{% trans 'Name' %}</label>
  
  
 									<input class="form-control" id="id_name" maxlength="100" name="name" type="text" required="" value="{{course.name}}">
  
-								<span class="help-block">Course name</span>
+								<span class="help-block">{% trans 'Course name' %}</span>
  
 							</div>
  
 							<div class="form-group  is-fileinput">
-								<label for="id_objectivies">Objectives</label>
+								<label for="id_objectivies">{% trans 'Objectives' %}</label>
  
 									<textarea class="form-control" cols="80" id="id_objectivies" name="objectivies" rows="5">{{course.objectivies}}</textarea>
  
-								<span class="help-block">Course objective</span>
+								<span class="help-block">{% trans 'Course objective' %}</span>
  
 							</div>
  
 							<div class="form-group  is-fileinput">
-								<label for="id_content">Content</label>
+								<label for="id_content">{% trans 'Content' %}</label>
  
  
 									<textarea class="form-control" cols="80" id="id_content" name="content" rows="5">{{course.content}}</textarea>
  
-								<span class="help-block">Course modules</span>
+								<span class="help-block">{% trans 'Course modules' %}</span>
  
 							</div>
  
 							<div class="form-group  is-fileinput">
-								<label for="id_max_students">Number of studets maximum</label>
+								<label for="id_max_students">{% trans 'Number of studets maximum' %}</label>
  
  
 									<input class="form-control" id="id_max_students" min="0" name="max_students" type="number" value="{{course.max_students}}">
  
-								<span class="help-block">Max number of students that a class can have</span>
+								<span class="help-block">{% trans 'Max number of students that a class can have' %}</span>
  
 							</div>
  
 							<div class="form-group  is-fileinput">
-								<label for="id_init_register_date">Course registration start date</label>
+								<label for="id_init_register_date">{% trans 'Course registration start date' %}</label>
  
  
 									<input type="date" class="form-control" name="init_register_date" value="None" min="2016-10-24">
  
-								<span class="help-block">Date that starts the registration period of the course (dd/mm/yyyy)</span>
+								<span class="help-block">{% trans 'Date that starts the registration period of the course (dd/mm/yyyy)' %}</span>
  
 							</div>
  
 							<div class="form-group  is-fileinput">
-								<label for="id_end_register_date">Course registration end date</label>
+								<label for="id_end_register_date">{% trans 'Course registration end date' %}</label>
  
  
 									<input type="date" class="form-control" name="end_register_date" value="None" min="2016-10-24">
  
-								<span class="help-block">Date that ends the registration period of the course (dd/mm/yyyy)</span>
+								<span class="help-block">{% trans 'Date that ends the registration period of the course (dd/mm/yyyy)' %}</span>
  
 							</div>
  
 							<div class="form-group  is-fileinput">
-								<label for="id_init_date">Course start date</label>
+								<label for="id_init_date">{% trans 'Course start date' %}</label>
  
  
 									<input type="date" class="form-control" name="init_date" value="None" min="2016-10-24">
  
-								<span class="help-block">Date that the course starts (dd/mm/yyyy)</span>
+								<span class="help-block">{% trans 'Date that the course starts (dd/mm/yyyy)' %}</span>
  
 							</div>
  
 							<div class="form-group  is-fileinput">
-								<label for="id_end_date">Course end date</label>
+								<label for="id_end_date">{% trans 'Course end date' %}</label>
  
  
 									<input type="date" class="form-control" name="end_date" value="None" min="2016-10-24">
  
-								<span class="help-block">Date that the course ends (dd/mm/yyyy)</span>
+								<span class="help-block">{% trans 'Date that the course ends (dd/mm/yyyy)' %}</span>
  
 							</div>
  
 							<div class="form-group  is-fileinput">
-								<label for="id_image">Imagem</label>
+								<label for="id_image">{% trans 'Imagem' %}</label>
  
  
 									<input class="form-control" id="id_image" name="image" type="file">
@@ -102,17 +102,17 @@
 										<input type="text" readonly="" class="form-control" placeholder="Choose your photo...">
 										<span class="input-group-btn input-group-sm">
 												<button type="button" class="btn btn-fab btn-fab-mini">
-														<i class="material-icons">attach_file</i>
+														<i class="material-icons">{% trans 'attach_file' %}</i>
 												</button>
 										</span>
 									</div>
  
-								<span class="help-block">Representative image of the course</span>
+								<span class="help-block">{% trans 'Representative image of the course' %}</span>
  
 							</div>
  
 							<div class="form-group  is-fileinput">
-								<label for="id_category">CourseCategory</label>
+								<label for="id_category">{% trans 'CourseCategory' %}</label>
  
  
 									<select class="form-control" id="id_category" name="category" required="">
@@ -121,7 +121,7 @@
 										{% endfor %}
 									</select>
  
-								<span class="help-block">CourseCategory which the course belongs</span>
+								<span class="help-block">{% trans 'CourseCategory which the course belongs' %}</span>
  
 							</div>
  
@@ -18,14 +18,14 @@
 				<div class="form-group {% if form.has_error %} has-error {% endif %} is-fileinput">
 					<label for="{{ field.auto_id }}">{{ field.label }}</label>
 					{% if field.auto_id == 'id_init_register_date' or field.auto_id == 'id_end_register_date' or field.auto_id == 'id_init_date' or field.auto_id == 'id_end_date'%}
-						<input type="date" class="form-control"name="{{field.name}}" value="{% if field.value.year %}{{field.value|date:'Y-m-d'}}{% else %}{{field.value}}{% endif %}" min="{{now|date:'Y-m-d'}}">
+						<input type="text" class="form-control date-picker" name="{{field.name}}" value="{{field.value|date:'SHORT_DATE_FORMAT'}}" min="{{now|date:'SHORT_DATE_FORMAT'}}">
 					{% elif field.auto_id == 'id_image' %}
 						{% render_field field class='form-control' %}
 						<div class="input-group">
 							<input type="text" readonly="" class="form-control" placeholder="Choose your photo..."/>
 							<span class="input-group-btn input-group-sm">
 									<button type="button" class="btn btn-fab btn-fab-mini">
-											<i class="material-icons">attach_file</i>
+											<i class="material-icons">{% trans 'attach_file' %}</i>
 									</button>
 							</span>
 						</div>
@@ -12,16 +12,17 @@
 {% endblock %}
  
 {% block breadcrumbs %}
-
-  {{ block.super }}
-  {% breadcrumb 'Course detail' 'course:view' %}
-
+  <ol class="breadcrumb">
+    <li><a href="{% url 'app:index' %}">{% trans 'Home' %}</a></li>
+    <li><a href="{% url 'course:manage' %}">{% trans 'Courses' %}</a></li>
+    <li><a href="{% url 'course:view' course.slug %}">{{ course }}</a></li>
+  </ol>
 {% endblock %}
  
 {% block sidebar %}
-  <div class="panel panel-primary navigation">
+    <div class="panel panel-primary">
         <div class="panel-heading">
-            <h5>{% trans 'Menu' %}</h5>
+            <h4>{% trans 'Menu' %}</h4>
         </div>
         <div class="panel-body">
             <ul class="nav nav-pills nav-stacked">
@@ -33,20 +34,32 @@
         </div>
     </div>
  
-
+    <div class="panel panel-primary">
+        <div class="panel-heading">
+            <h5>{% trans 'Categories' %}</h5>
+        </div>
+        <div class="panel-body">
+            <ul class="nav nav-pills nav-stacked">
+                <li {% if category is None %}class="active"{% endif %}><a href="{% url 'course:view' course.slug %}">{% trans 'All' %}</a></li>
+                {% for cat in categorys_subjects %}
+                    <li {% if category == cat.slug %}class="active"{% endif %}><a href="{% url 'course:view_filter' course.slug cat.slug %}">{{ cat }}</a></li>
+                {% endfor %}
+            </ul>
+        </div>
+    </div>
 {% endblock %}
  
 {% block content %}
  
-  <div class="col-md-12">
+  <div class="col-md-12 cards-content">
     <div class="panel panel-info">
-      <div class="panel-heading headingOne">
+      <div class="panel-heading course-detail">
         <div class="row">
-          <div class="col-xs-8 col-md-10 titleTopic">
-            <h4>{{course}}</h4>
+          <div class="col-xs-8 col-md-4 .titleTopic-detail">
+            <h4>{{course.name}}</h4>
           </div>
           {% if user|has_role:'professor' and user in course.professors or user|has_role:'system_admin' %}
-            <div class="col-xs-4 col-md-2" id="divMoreActions">
+            <div class="col-xs-4 col-md-8" id="divMoreActions">
               <div class="btn-group">
                 <button class="btn btn-default btn-sm dropdown-toggle" type="button" id="moreActions" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
                   <i class="fa fa-ellipsis-v fa-2x" aria-hidden="true"></i>
@@ -63,18 +76,18 @@
       </div>
     </div>
     <div class="panel-body">
-      <p><b>Course Name: </b>{{course.name}}</p>
-      <p><b>Coordinator: </b>{{course.professors}}</p>
+      <p><b>{% trans 'Coordinator' %}: </b>{% for professor in course.professors.all %}{% if not forloop.first %},{% endif %}
+              {{professor}}{% if forloop.last %}.{% endif %}{% endfor %}</p>
       <p>
-        <b>Description:</b>
+        <b>{% trans 'Description' %}:</b>
         <i>
-          {{course.description}}
+          {{ course.objectivies }}
         </i>
       </p>
  
     </div>
   </div>
- 
+
 <!-- MODAL CREATE SUBJECT -->
 <div class="modal" tabindex="-1" role="dialog  " id="createSubject">
   <div class="modal-dialog">
@@ -121,26 +134,28 @@
   </div>
 </div>
 </div>
-<div>
-    {% if request.GET.category == 'all' or none or request.GET.category == '' %}
-      {% for subject in subjects %}
-        <div class="panel panel-info panel_{{ subject.id }}">
-          <div class="panel-heading headingTwo ui-sortable-handle" role="tab">
+<div class="cards-detail">
+    {% for subject in subjects %}
+        <div class="panel panel-default panel_{{ subject.id }}">
+          <div class="panel-heading heading_{{subject.id}} subject ui-sortable-handle">
             <div class="row">
-                <div class="col-xs-9 col-md-10 titleTopic">
-                  <a role="button" data-toggle="collapse" data-parent="#accordion" href=".collapseTwo" aria-expanded="true" aria-controls="collapseTwo">
-                  <h4 style="color:white">{{subject.name}}</h4>
+                <div class="col-md-1 moreAccordion" data-toggle="collapse" data-parent="#accordion-{{subject.slug}}" href=".collapseSubject-{{subject.slug}}" aria-expanded="false" aria-controls="collapseSubject-{{subject.slug}}">
+                  <button class="btn btn-default btn-sm caret-square"><i class="fa fa-caret-square-o-down fa-2x" aria-hidden="true"></i></button>
+                </div>
+                <div class="col-xs-9 col-md-4 titleTopic">
+                  <a role="button" href="{% url 'course:view_subject' subject.slug %}">
+                    <h4>{{subject.name}}</h4>
                   </a>
                 </div>
                 {% if user|has_role:'professor' and user in subject.professors or user|has_role:'system_admin' %}
-                  <div class="col-xs-3 col-md-2" id="divMoreActions">
+                  <div class="col-xs-3 col-md-6" id="divMoreActions">
                     <div class="btn-group">
                       <button class="btn btn-default btn-sm dropdown-toggle" type="button" id="moreActions" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
                         <i class="fa fa-ellipsis-v fa-2x" aria-hidden="true"></i>
                       </button>
                       <ul class="dropdown-menu" aria-labelledby="moreActions">
-                        <li><a href="javascript:void(0)" data-toggle="modal" data-target="#myModal3"><i class="fa fa-pencil fa-fw" aria-hidden="true"></i>&nbsp; Replicate</a></li>
-                        <li><a href="javascript:void(0)" data-toggle="modal" data-target="#removeSubject2"><i class="fa fa-trash fa-fw" aria-hidden="true"></i>&nbsp; Remove</a></li>
+                        <li><a href="javascript:void(0)" data-toggle="modal" data-target="#myModal3"><i class="fa fa-pencil fa-fw" aria-hidden="true"></i>&nbsp; {% trans 'Replicate' %}</a></li>
+                        <li><a href="javascript:void(0)" data-toggle="modal" data-target="#removeSubject2"><i class="fa fa-trash fa-fw" aria-hidden="true"></i>&nbsp; {% trans 'Remove' %}</a></li>
                       </ul>
                     </div>
                   </div>
@@ -153,81 +168,32 @@
                 {% endif %}
             </div>
           </div>
-          <div class="panel-body">
-              <p><b>{% trans "Professor" %}: </b>{% for professor in subject.professors.all %}{% if not forloop.first %},{% endif %}
-                {{professor}}{% if forloop.last %}.{% endif %}{% endfor %}</p>
-                <p>
-                  <b>{% trans "Description" %}: </b>
-                  <i>
-                    {{subject.description}}
-                  </i>
-                </p>
-                <div class="row">
-                  <div class="col-xs-6 col-md-6">
-                    <p><b>{% trans "Begining" %}: </b>{{subject.init_date}}</p>
-                  </div>
-                  <div class="col-xs-6 col-md-6">
-                    <p><b>{% trans "End" %}: </b>{{subject.end_date}}</p>
-                  </div>
+          <div class="panel-collapse collapseSubject-{{subject.slug}} collapse in" aria-labelledby="heading_{{subject.id}}" aria-expanded="true" aria-hidden="false">
+           <div class="panel-body">
+            <p><b>{% trans "Professor" %}: </b>{% for professor in subject.professors.all %}{% if not forloop.first %},{% endif %}
+              {{professor}}{% if forloop.last %}.{% endif %}{% endfor %}</p>
+              <p>
+                <b>{% trans 'Category' %}: </b><i>{{ subject.category }}</i>
+              </p>
+              <p>
+                <b>{% trans "Description" %}: </b>
+                <i>
+                  {{subject.description}}
+                </i>
+              </p>
+              <div class="row">
+                <div class="col-xs-6 col-md-6">
+                  <p><b>{% trans "Begining" %}: </b>{{subject.init_date}}</p>
                 </div>
-                <a href="{% url 'course:view_subject' subject.slug %}" class="btn btn-raised btn-default center-block view_btn" {% if user|show_subject_subscribe:subject %}style="display:none"{% endif %}>{% trans 'View Subject' %}<div class="ripple-container"></div></a>
-            </div>
-        </div>
-      {% endfor %}
-  {% else %}
-        {% for subject in subjects_category %}
-            {% if subject.category.name == request.GET.category %}
-              <div class="panel panel-info panel_{{ subject.id }}">
-          <div class="panel-heading headingTwo ui-sortable-handle" role="tab">
-            <div class="row">
-                <div class="col-xs-9 col-md-10 titleTopic">
-                  <a role="button" data-toggle="collapse" data-parent="#accordion" href=".collapseTwo" aria-expanded="true" aria-controls="collapseTwo">
-                  <h4 style="color:white">{{subject.name}}</h4>
-                  </a>
+                <div class="col-xs-6 col-md-6">
+                  <p><b>{% trans "End" %}: </b>{{subject.end_date}}</p>
                 </div>
-                {% if user|has_role:'professor' and user in subject.professors or user|has_role:'system_admin' %}
-                  <div class="col-xs-3 col-md-2" id="divMoreActions">
-                    <div class="btn-group">
-                      <button class="btn btn-default btn-sm dropdown-toggle" type="button" id="moreActions" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                        <i class="fa fa-ellipsis-v fa-2x" aria-hidden="true"></i>
-                      </button>
-                      <ul class="dropdown-menu" aria-labelledby="moreActions">
-                        <li><a href="javascript:void(0)" data-toggle="modal" data-target="#myModal3"><i class="fa fa-pencil fa-fw" aria-hidden="true"></i>&nbsp; Replicate</a></li>
-                        <li><a href="javascript:void(0)" data-toggle="modal" data-target="#removeSubject2"><i class="fa fa-trash fa-fw" aria-hidden="true"></i>&nbsp; Remove</a></li>
-                      </ul>
-                    </div>
-                  </div>
-                {% endif %}
-                {% if user|show_subject_subscribe:subject %}
-                  <div class="col-xs-3 col-md-2">
-                    <a onclick="subscribe($(this), '{% url 'course:subscribe_subject' subject.slug %}', {{ subject.id }}, '{% trans 'Are you sure you want to subscribe to this subject?' %}')" class="btn btn-sm btn-primary btn-raised">{% trans 'Subscribe' %}</a>
-                  </div>
-                {% endif %}
-            </div>
+              </div>
           </div>
-          <div class="panel-body">
-              <p><b>{% trans "Professor" %}: </b>{% for professor in subject.professors.all %}{% if not forloop.first %},{% endif %}
-                {{professor}}{% if forloop.last %}.{% endif %}{% endfor %}</p>
-                <p>
-                  <b>{% trans "Description" %}: </b>
-                  <i>
-                    {{subject.description}}
-                  </i>
-                </p>
-                <div class="row">
-                  <div class="col-xs-6 col-md-6">
-                    <p><b>{% trans "Begining" %}: </b>{{subject.init_date}}</p>
-                  </div>
-                  <div class="col-xs-6 col-md-6">
-                    <p><b>{% trans "End" %}: </b>{{subject.end_date}}</p>
-                  </div>
-                </div>
-                <a href="{% url 'course:view_subject' subject.slug %}" class="btn btn-raised btn-default center-block view_btn" {% if user|show_subject_subscribe:subject %}style="display:none"{% endif %}>{% trans 'View Subject' %}<div class="ripple-container"></div></a>
-            </div>
+         </div>
         </div>
-            {% endif %}
-        {% endfor %}
-  {% endif %}
+    {% endfor %}
+
  
 {% if  user|has_role:'professor' and user in course.professors.all or user|has_role:'system_admin' %}
  
-{% load static i18n list_topic_foruns %}
+    {% load static i18n list_topic_foruns permission_tags widget_tweaks professor_access%}
  
-{% block javascript %}
-    <script type="text/javascript" src="{% static 'js/forum.js' %}"></script>
-{% endblock %}
  
-<div class="panel panel-default">
-        <a href="{% url 'course:view_topic' topic.slug %}">
-            <div class="panel-heading">
-                <div class="row">
-                    <div class="col-md-9 col-sm-9">
-                        <h3>{{topic}}</h3>
-                    </div>
-                </div>
-            </div>
-        </a>
-        <div class="panel-body">
-            <p>{{topic.description|linebreaks}}</p>
+    {% block javascript %}
+        <script type="text/javascript" src="{% static 'js/forum.js' %}"></script>
+        <script src="{% static 'js/file.js' %}"></script>
+        <script type="text/javascript" src="{% static 'js/material.js' %}"></script>
+        <script type = "text/javascript" src="{% static 'links.js' %}"></script>
+    {% endblock %}
+<div class="cards-detail">
+  <div class="panel-group accordion ui-accordion ui-widget ui-helper-reset ui-sortable" role="tablist" aria-multiselectable="false">
+    <div class="group"><div class="panel panel-default">
+      <div class="panel-heading topic ui-sortable-handle" role="tab">
+      <div class="row">
+        <div class="col-md-1 moreAccordion" data-toggle="collapse" data-parent="#accordion-{{topic.slug}}" href=".collapseTopic-{{topic.slug}}" aria-expanded="false" aria-controls="collapseTopic-{{topic.slug}}">
+          <button class="btn btn-default btn-sm caret-square"><i class="fa fa-caret-square-o-down fa-2x" aria-hidden="true"></i></button>
         </div>
-    
-</div>
-
+        <div class="col-xs-9 col-md-9 titleTopic">
+          <a href="{% url 'course:view_topic' topic.slug %}" role="button">
+            <h4>{{topic}}</h4>
+          </a>
+        </div>
+      </div>
+    </div>
+    <div class="panel-collapse collapseTopic-{{topic.slug}} collapse in" role="tabpanel" aria-labelledby="heading_{{topic.id}}" aria-expanded="true" aria-hidden="false">
+      <div class="panel-body">
+        <div class="presentation">
+          <p>
+            <i>
+              {{topic.description|linebreaks}}
+            </i>
+          </p>
  
-<div class="modal fade" id="forumModal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel">
-    <div class="modal-dialog" role="document">
-        <div class="modal-content">
-            <div class="modal-header">
-                <h4 class="modal-title" id="myModalLabel">{% trans 'Forum' %}</h4>
-            </div>
-            <div class="modal-body">
-                <section>
-                    <div class="forum_topics"></div>
-                </section>
+        </div>
+        <div class="row">
+          <div class="col-xs-6 col-md-6">
+            <div class="resource_inline">
+              <h4>{% trans 'Material' %}</h4>
             </div>
-            <div class="modal-footer">
-                <button type="button" class="btn btn-danger btn-raised" data-dismiss="modal">{% trans 'Close' %}</button>
-                <button type="button" class="btn btn-primary btn-raised">{% trans 'Save changes' %}</button>
+            <ul>
+              {% list_topic_file request topic %}
+              {% list_topic_link request topic%}
+            </ul>
+          </div>
+          <div class="col-xs-4 col-md-4">
+            <div class="resource_inline">
+              <h4>{% trans 'Activities' %}</h4>
             </div>
+            <ul>
+              {% list_topic_poll request topic %}
+              {% list_topic_foruns request topic %}
+            </ul>
+          </div>
         </div>
+      </div>
+    </div>
+    </div>
+    </div>
+    {% professor_subject topic.subject user as professor_links %}
+    {% if professor_links %}
+        {% include "links/create_link.html" %}
+        {% include "links/delete_link.html" %}
+    {% endif %}
+
+
+    <!-- MODAL LINK EDIT-->
+    {% professor_subject topic.subject user as links_update %}
+    {% if links_update%}
+        {% include "links/update_link.html" %}
+    {% endif %}
     </div>
-</div>
+    </div>
 \ No newline at end of file
-    {% load static i18n list_topic_foruns permission_tags widget_tweaks professor_access%}
+{% load static i18n list_topic_foruns permission_tags widget_tweaks professor_access%}
  
-    {% block javascript %}
-        <script type="text/javascript" src="{% static 'js/forum.js' %}"></script>
-        <script src="{% static 'js/file.js' %}"></script>
-        <script type="text/javascript" src="{% static 'js/material.js' %}"></script>
-        <script type = "text/javascript" src="{% static 'links.js' %}"></script>
-    {% endblock %}
-
-    <div class="panel-group accordion ui-accordion ui-widget ui-helper-reset ui-sortable" role="tablist" aria-multiselectable="false">
-            <div class="group"><div class="panel panel-default">
-      <div class="panel-heading headingOne ui-sortable-handle" role="tab">
+{% block javascript %}
+   <script type="text/javascript" src="{% static 'js/forum.js' %}"></script>
+   <script src="{% static 'js/file.js' %}"></script>
+   <script type="text/javascript" src="{% static 'js/material.js' %}"></script>
+   <script type = "text/javascript" src="{% static 'js/links.js' %}"></script>
+{% endblock %}
+<div class="panel panel-default cards-detail">
+  <div class="panel-heading topic">
+    <div class="row">
+      <div class="col-md-1 moreAccordion" data-toggle="collapse" data-parent="#accordion-{{topic.slug}}" href=".collapseTopic-{{topic.slug}}" aria-expanded="false" aria-controls="collapseTopic-{{topic.slug}}">
+        <button class="btn btn-default btn-sm caret-square"><i class="fa fa-caret-square-o-down fa-2x" aria-hidden="true"></i></button>
+      </div>
+      <div class="col-xs-9 col-md-9 titleTopic">
+        <a role="button">
+          <h4>{{topic}}</h4>
+        </a>
+      </div><!--column -->
+      <div class="col-xs-3 col-md-2 divMoreActions">
+        <div class="btn-group">
+          <button type="button" class="btn btn-default btn-sm eye" data-toggle="tooltip" data-placement="bottom" title="Visible">
+            <i class="fa fa-eye fa-2x" aria-hidden="true"></i>
+          </button>
+        </div>
+        <div class="btn-group">
+          <button class="btn btn-default btn-sm dropdown-toggle" type="button" id="moreActions" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+            <i class="fa fa-ellipsis-v fa-2x" aria-hidden="true"></i>
+          </button>
+          {% professor_subject topic.subject user as dropdown_topic %}
+          {% if dropdown_topic %}
+          <ul class="dropdown-menu pull-right" aria-labelledby="moreActions">
+            <li><a href="javascript:void(0)" data-toggle="modal" data-target="#myModal4"><i class="fa fa-files-o fa-fw" aria-hidden="true"></i>&nbsp; {% trans "Replicate" %}</a></li>
+            <li><a href="javascript:show_editation('{{topic.slug}}')"><i class="fa fa-pencil fa-fw" aria-hidden="true"></i>&nbsp; {% trans "Edit" %}</a></li>
+            <li><a href="javascript:void(0)" data-toggle="modal" data-target="#removeTopic"><i class="fa fa-trash fa-fw" aria-hidden="true"></i>&nbsp; {% trans "Remove" %}</a></li>
+          </ul>
+          {% endif %}
+        </div>
+      </div><!--column-->
+    </div><!--row-->
+  </div>
+  <div class="panel-collapse collapseTopic-{{topic.slug}} topic_{{ topic.id }} collapse in" role="tabpanel" aria-labelledby="heading_{{topic.id}}" aria-expanded="true" aria-hidden="false">
+    <div class="panel-body">
+      <div class="presentation" id="presentation_{{topic.slug}}">
+        <p>
+          <i>
+            {{topic.description|linebreaks}}
+          </i>
+        </p>
         <div class="row">
-          <div class="col-xs-9 col-md-10 titleTopic">
-            <a role="button" data-toggle="collapse" data-parent=".accordion" href=".collapseOne" aria-expanded="false" aria-controls="collapseOne" class="" aria-selected="false" tabindex="-1">
-            {{topic}}
-            </a>
-          </div>
-          <div class="col-xs-3 col-md-2 divMoreActions">
-            <div class="btn-group">
-              <button type="button" class="btn btn-default btn-sm eye" data-toggle="tooltip" data-placement="bottom" title="Visible">
-                <i class="fa fa-eye fa-2x" aria-hidden="true"></i>
-              </button>
-            </div>
-            <div class="btn-group">
-              <button class="btn btn-default btn-sm dropdown-toggle" type="button" id="moreActions" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                <i class="fa fa-ellipsis-v fa-2x" aria-hidden="true"></i>
-              </button>
-              {% professor_subject topic.subject user as dropdown_topic %}
-              {% if dropdown_topic %}
-                  <ul class="dropdown-menu pull-right" aria-labelledby="moreActions">
-                  <li><a href="javascript:void(0)" data-toggle="modal" data-target="#myModal4"><i class="fa fa-files-o fa-fw" aria-hidden="true"></i>&nbsp; {% trans "Replicate" %}</a></li>
-                    <li><a href="javascript:void(0)" class="edit_card"><i class="fa fa-pencil fa-fw" aria-hidden="true"></i>&nbsp; {% trans "Edit" %}</a></li>
-                    <li><a href="javascript:void(0)" data-toggle="modal" data-target="#removeTopic"><i class="fa fa-trash fa-fw" aria-hidden="true"></i>&nbsp; {% trans "Remove" %}</a></li>
-                  </ul>
-              {% endif %}
+          <div class="col-xs-6 col-md-6">
+            <div class="resource_inline">
+              <h4>{% trans 'Material' %}</h4>
             </div>
-          </div>
-        </div>
-      </div>
-      <div class="panel-collapse collapseOne collapse in" role="tabpanel" aria-labelledby="headingOne" aria-expanded="false" aria-hidden="true" tabindex="-1" aria-selected="false">
-        <div class="panel-body">
-          <div class="presentation">
-            <p>
-              <i>
-                {{topic.description|linebreaks}}
-              </i>
-            </p>
-            <div class="row">
-              <div class="col-xs-6 col-md-6">
-                <div class="resource_inline">
-                  <h4>Material</h4>
-                </div>
-                <div class="resource_inline">
-                  <div class="dropdown">
-                    <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>
-                    <ul class="dropdown-menu" aria-labelledby="dLabel">
-                        <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>
-                        <li>
-                            <a href="javascript:get_modal_file('{% url 'course:file:create_file' topic.slug %}', '#fileModal', '#divModalFile')">
-                                {% trans "Create a file" %}
-                                <div class="ripple-container">
-                                    <div class="ripple ripple-on ripple-out" style="left: 33.5312px; top: 11px; background-color: rgb(0, 150, 136); transform: scale(20);">
-                                    </div>
-                                </div>
-                            </a>
-                        </li>
-                    </ul>
-                  </div>
-                </div>
-                <ul id="list-materials">
-                    {% list_topic_file request topic %}
-                    {% list_topic_link request topic%}
-                  
-                </ul>
-              </div>
-              <div class="col-xs-4 col-md-4">
-                <div class="resource_inline">
-                  <h4>Activities</h4>
-                </div>
-                <div class="resource_inline">
-                  <div class="dropdown">
-                    <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>
-                    <ul class="dropdown-menu" aria-labelledby="dLabel">
-                      <li><a href="javascript:createForum('{% url 'course:forum:create' %}', '{{ topic.id }}')">{% trans 'Create Forum' %}<div class="ripple-container"><div class="ripple ripple-on ripple-out" style="left: 33.5312px; top: 11px; background-color: rgb(0, 150, 136); transform: scale(20);"></div></div></a></li>
-                      <li><a href="javascript:modal.get('{% url 'course:poll:create_poll' topic.slug%}','#poll','#modal_poll');">{% trans 'Create Poll' %}</a></li>
-
-                    </ul>
-                  </div>
-                </div>
-                <ul>
-                   
-                    <div class="foruns_list">
-                        {% list_topic_poll request topic %}
-                        {% list_topic_foruns request topic %}
-                    </div>
+            <div class="resource_inline">
+              <div class="dropdown">
+                <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>
+                <ul class="dropdown-menu" aria-labelledby="dLabel">
+                  <li><a href="javascript:get_modal_link('{% url 'course:links:create_link' topic.slug %}', '#createLinksModal','#divModalLink')  ">{% trans 'Create a Link' %}</a></li>
+                  <li><a href="javascript:get_modal_file('{% url 'course:file:create_file' topic.slug %}', '#fileModal', '#divModalFile')">{% trans "Create a file" %}</a></li>
                 </ul>
               </div>
-             
             </div>
+            <ul>
+              {% list_topic_file request topic %}
+              {% list_topic_link request topic%}
+            </ul>
           </div>
-          <div class="editation" style="display: none">
-            <div class="form-group">
-              <label class="control-label" for="focusedInput2">Name Topic</label>
-              <input type="text" class="form-control" value="Topic 1">
+          <div class="col-xs-4 col-md-4">
+            <div class="resource_inline">
+              <h4>{% trans 'Activities' %}</h4>
             </div>
-            <div class="form-group is-empty">
-              <label class="control-label" for="focusedInput2">Description</label>
-              <textarea class="form-control" rows="3" id="textArea"></textarea>
-            </div>
-            <div class="row">
-              <div class=" col-xs-6 col-md-4">
-                <div class="resource_inline">
-                  <h4>Material</h4>
-                </div>
-                <div class="resource_inline">
-                  <div class="dropdown">
-                    <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>
-                    <ul class="dropdown-menu" aria-labelledby="dLabel">
-                      <li><a href="javascript:get_modal_link('{% url 'course:links:create_link' topic.slug %}', '#createLinksModal','#divModalLink')">Create a Link</a></li>
-                      <li>
-                        <a href="#">
-                            {% trans "Create a file" %}
-                            <div class="ripple-container">
-                                <div class="ripple ripple-on ripple-out" style="left: 33.5312px; top: 11px; background-color: rgb(0, 150, 136); transform: scale(20);">
-                                </div>
-                            </div>
-                        </a>
-                      </li>
-                    </ul>
-                  </div>
-                </div>
-                <ul id="list-materials-edit">
-                    {% list_topic_link_edit request topic%}
-                    {% list_topic_file_edit request topic %}
+            <div class="resource_inline">
+              <div class="dropdown">
+                <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>
+                <ul class="dropdown-menu" aria-labelledby="dLabel">
+                  <li><a href="javascript:createForum('{% url 'course:forum:create' %}', '{{ topic.id }}')">{% trans 'Create Forum' %}</a></li>
+                  <li><a href="javascript:modal.get('{% url 'course:poll:create_poll' topic.slug%}','#poll','#modal_poll');">{% trans 'Create Poll' %}</a></li>
                 </ul>
               </div>
-              <div class="col-xs-4 col-md-offset-1 col-md-4">
-                <div class="resource_inline">
-                  <h4>Activities</h4>
-                </div>
-                <div class="resource_inline">
-                  <div class="dropdown">
-                    <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>
-                    <ul class="dropdown-menu" aria-labelledby="dLabel">
-                      <li>Qualquer coisa</li>
-                    </ul>
-                  </div>
-                </div>
-                <ul>
-                  <li class="icon_edit_remove"><i class="fa fa-pencil fa-lg" aria-hidden="true"></i>  <i class="fa fa-trash fa-lg" aria-hidden="true"></i></li>
-                 
-                  <li class="icon_edit_remove"><i class="fa fa-pencil fa-lg" aria-hidden="true"></i>  <i class="fa fa-trash fa-lg" aria-hidden="true"></i></li>
-
+            </div>
+            <ul>
+              {% list_topic_poll request topic %}
+              {% list_topic_foruns request topic %}
+            </ul>
+          </div>
+        </div>
+      </div><!--EndPresentation-->
+      <div class="editation topic_{{ topic.id }}" id="editation_{{topic.slug}}">
+        <div class="form-group">
+          <label class="control-label" for="focusedInput2">{% trans 'Name Topic' %}</label>
+          <input type="text" class="form-control" value="{{topic}}">
+        </div>
+        <div class="form-group">
+          <label class="control-label" for="focusedInput2">{% trans 'Description' %}</label>
+          <textarea class="form-control" rows="3" id="textArea">{{topic.description}}</textarea>
+        </div>
+        <div class="row">
+          <div class=" col-xs-6 col-md-4">
+            <div class="resource_inline">
+              <h4>{% trans 'Material' %}</h4>
+            </div>
+            <div class="resource_inline">
+              <div class="dropdown">
+                <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>
+                <ul class="dropdown-menu" aria-labelledby="dLabel">
+                  <li><a href="javascript:get_modal_link('{% url 'course:links:create_link' topic.slug %}', '#createLinksModal','#divModalLink')  ">{% trans 'Create a Link' %}</a></li>
+                  <li><a href="javascript:get_modal_file('{% url 'course:file:create_file' topic.slug %}', '#fileModal', '#divModalFile')">{% trans "Create a file" %}</a></li>
                 </ul>
               </div>
             </div>
-            <div class="form-group">
-              <div class="col-md-10">
-                <button type="button" class="btn btn-raised btn-default edit_card_end">Cancel</button>
-                <button type="submit" class="btn btn-raised btn-primary edit_card_end">Submit</button>
+            <ul>
+              {% list_topic_file_edit request topic %}
+              {% list_topic_link_edit request topic%}
+            </ul>
+          </div>
+          <div class="col-xs-4 col-md-offset-1 col-md-4">
+            <div class="resource_inline">
+              <h4>{% trans 'Activities' %}</h4>
+            </div>
+            <div class="resource_inline">
+              <div class="dropdown">
+                <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>
+                <ul class="dropdown-menu" aria-labelledby="dLabel">
+                  <li><a href="javascript:createForum('{% url 'course:forum:create' %}', '{{ topic.id }}')">{% trans 'Create Forum' %}</a></li>
+                  <li><a href="javascript:modal.get('{% url 'course:poll:create_poll' topic.slug%}','#poll','#modal_poll');">{% trans 'Create Poll' %}</a></li>
+                </ul>
               </div>
             </div>
+            <ul>
+              {% list_topic_poll request topic %}
+              {% list_topic_foruns request topic %}
+            </ul>
           </div>
         </div>
-      </div>
-
-    </div>
-    <!-- MODAL REMOVE TOPIC -->
-    <div class="modal" id="removeTopic">
-      <div class="modal-dialog">
-        <div class="modal-content">
-          <div class="modal-header">
-            <button type="button" class="close" data-dismiss="modal" aria-hidden="true">X</button>
-            <h4 class="modal-title"></h4>
-          </div>
-          <div class="modal-body">
-            <p>Delete your Topic?</p>
-          </div>
-          <div class="modal-footer">
-
-            <a href="" target="_self"><button type="button" class="btn btn-primary">Confirm</button></a>
-
+        <div class="form-group">
+          <div class="col-md-10">
+            <a href="javascript:show_presentation('{{topic.slug}}')" class="btn btn-raised btn-default">{% trans 'Cancel' %}</a>
+            <a href="javascript:show_presentation('{{topic.slug}}')" class="btn btn-raised btn-primary">{% trans 'Submit' %}</a>
           </div>
         </div>
-      </div>
+      </div><!--EndEditation-->
+
     </div>
-    <!-- END -->
-    {% professor_subject topic.subject user as professor_links %}
-    {% if professor_links%}
-        {% include "links/create_link.html" %}
-        {% include "links/delete_link.html" %}
-    {% endif %}
+  </div>
+</div>
  
-    <!-- MODAL EMBEED-->
-    <div class="modal fade" id="embedModal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel">
-      <div class="modal-dialog" role="document">
-        <div class="modal-content">
-          <div class="modal-header">
-            <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">×</span></button>
-            <h4 class="modal-title" id="myModalLabel">Material EMBED</h4>
-          </div>
-          <div class="modal-body">
-            <div class="form-group is-empty">
-              <label for="inputEmail" class="col-md-2 control-label">Name:</label>
-              <div class="col-md-10">
-                <input type="text" class="form-control" id="inputEmail" placeholder="Name">
-              </div>
-            </div>
-            <form class="form-horizontal">
-              <div class="form-group is-empty">
-                <label for="textArea" class="col-md-2 control-label">Code:</label>
+<!-- MODALs -->
  
-                <div class="col-md-10">
-                    <textarea class="form-control" rows="2" id="textArea"></textarea>
-                    <span class="help-block">Material description</span>
-                </div>
-              </div>
-              <div class="form-group is-empty">
-              <label for="number" class="col-md-2 control-label">Height</label>
-                <div class="col-md-4">
-                  <input type="number" class="form-control" id="inputNumber" placeholder="Heiht">
-                </div>
-              </div>
-              <div class="form-group is-empty">
-              <label for="number" class="col-md-2 control-label">Weight</label>
-                <div class="col-md-4">
-                  <input type="number" class="form-control" id="inputNumber" placeholder="Weight">
-                </div>
-              </div>
-            </form>
  
-          </div>
-          <div class="modal-footer">
-            <!-- Don't remove that!!!
-            <button type="button" class="btn btn-danger btn-raised" data-dismiss="modal">Close</button>-->
+<!-- MODAL REMOVE TOPIC -->
+<div class="modal" id="removeTopic">
+  <div class="modal-dialog">
+    <div class="modal-content">
+      <div class="modal-header">
+        <button type="button" class="close" data-dismiss="modal" aria-hidden="true">X</button>
+        <h4 class="modal-title"></h4>
+      </div>
+      <div class="modal-body">
+        <p>{% trans 'Delete your Topic?' %}</p>
+      </div>
+      <div class="modal-footer">
+
+        <a href="" target="_self"><button type="button" class="btn btn-primary">{% trans 'Confirm' %}</button></a>
  
-            <!-- Put curtom buttons here!!!  -->
-            <button type="button" class="btn btn-primary btn-raised">Confirm</button>
-          </div>
-        </div>
       </div>
     </div>
-    <!-- EndModal -->
+  </div>
+</div>
+<!-- END -->
  
-    <!-- MODAL ACTIVITIES-->
-   <div class="modal fade" id="ActivityModal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel">
-      <div class="modal-dialog" role="document">
-        <div class="modal-content">
-          <div class="modal-header">
-              <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">×</span></button>
-              <h4 class="modal-title" id="myModalLabel"></h4>
+<!-- MODAL EMBEED-->
+<div class="modal fade" id="embedModal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel">
+  <div class="modal-dialog" role="document">
+    <div class="modal-content">
+      <div class="modal-header">
+        <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">×</span></button>
+        <h4 class="modal-title" id="myModalLabel">{% trans 'Material EMBED' %}</h4>
+      </div>
+      <div class="modal-body">
+        <div class="form-group is-empty">
+          <label for="inputEmail" class="col-md-2 control-label">{% trans 'Name' %}:</label>
+          <div class="col-md-10">
+            <input type="text" class="form-control" id="inputEmail" placeholder="Name">
           </div>
-          <div class="modal-body">
-            <form class="form-horizontal">
+        </div>
+        <form class="form-horizontal">
+          <div class="form-group is-empty">
+            <label for="textArea" class="col-md-2 control-label">{% trans 'Code' %}:</label>
  
-          <fieldset>
-            <legend>Atividade Proposta</legend>
-            <div class="form-group is-empty">
-              <label for="NameIn" class="col-md-2 control-label">Name:</label>
-              <div class="col-md-10">
-                <input type="text" id="NameIn" class="form-control">
-              </div>
-            </div>
-            <div class="form-group is-empty">
-              <label for="DescIn" class="col-md-2 control-label">Describe:</label>
-              <div class="col-md-10">
-                <textarea class="form-control" id="DescIn" rows="2"></textarea>
-              </div>
-            </div>
-            <div class="form-group is-empty">
-              <label for="DateIn" class="col-md-2 control-label">Opening: </label>
-              <div class="col-md-10">
-                <input type="text" id="DateIn" class="form-control date-picker" requerid="">
-              </div>
-            </div>
-            <div class="form-group is-empty">
-              <label for="DateIn" class="col-md-2 control-label">Ending: </label>
-              <div class="col-md-10">
-                <input type="text" id="DateIn" class="form-control date-picker" requerid="">
-              </div>
+            <div class="col-md-10">
+                <textarea class="form-control" rows="2" id="textArea"></textarea>
+                <span class="help-block">{% trans 'Material description' %}</span>
             </div>
-            <div class="form-group" style="margin-top: 0;">
-              <div class="col-md-offset-2 col-md-10">
-                <div class="checkbox">
-                  <label>
-                    <input type="checkbox"><span class="checkbox-material"><span class="check"></span></span> Send Later
-                  </label>
-                </div>
-              </div>
+          </div>
+          <div class="form-group is-empty">
+          <label for="number" class="col-md-2 control-label">{% trans 'Height' %}</label>
+            <div class="col-md-4">
+              <input type="number" class="form-control" id="inputNumber" placeholder="Heiht">
             </div>
-            <div class="form-group">
-              <div class="col-md-10 col-md-offset-2">
-                <button type="button" class="btn btn-default">Cancel</button>
-                <button type="submit" class="btn btn-primary">Submit</button>
-              </div>
+          </div>
+          <div class="form-group is-empty">
+          <label for="number" class="col-md-2 control-label">{% trans 'Weight' %}</label>
+            <div class="col-md-4">
+              <input type="number" class="form-control" id="inputNumber" placeholder="Weight">
             </div>
+          </div>
+        </form>
  
+      </div>
+      <div class="modal-footer">
+        <!-- Don't remove that!!!
+        <button type="button" class="btn btn-danger btn-raised" data-dismiss="modal">Close</button>-->
  
-          </fieldset>
-        </form>
-          </div>
-        </div>
+        <!-- Put curtom buttons here!!!  -->
+        <button type="button" class="btn btn-primary btn-raised">{% trans 'Confirm' %}</button>
       </div>
     </div>
-    <!--EndModal-->
+  </div>
+</div>
+<!-- EndModal -->
  
+<!-- MODAL ACTIVITIES-->
+<div class="modal fade" id="ActivityModal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel">
+  <div class="modal-dialog" role="document">
+    <div class="modal-content">
+      <div class="modal-header">
+          <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">×</span></button>
+          <h4 class="modal-title" id="myModalLabel"></h4>
+      </div>
+      <div class="modal-body">
+        <form class="form-horizontal">
  
+      <fieldset>
+        <legend>{% trans 'Proposal Activity' %}</legend>
+        <div class="form-group is-empty">
+          <label for="NameIn" class="col-md-2 control-label">{% trans 'Name' %}:</label>
+          <div class="col-md-10">
+            <input type="text" id="NameIn" class="form-control">
+          </div>
+        </div>
+        <div class="form-group is-empty">
+          <label for="DescIn" class="col-md-2 control-label">{% trans 'Describe' %}:</label>
+          <div class="col-md-10">
+            <textarea class="form-control" id="DescIn" rows="2"></textarea>
+          </div>
+        </div>
+        <div class="form-group is-empty">
+          <label for="DateIn" class="col-md-2 control-label">{% trans 'Opening' %}: </label>
+          <div class="col-md-10">
+            <input type="text" id="DateIn" class="form-control date-picker" requerid="">
+          </div>
+        </div>
+        <div class="form-group is-empty">
+          <label for="DateIn" class="col-md-2 control-label">{% trans 'Ending' %}: </label>
+          <div class="col-md-10">
+            <input type="text" id="DateIn" class="form-control date-picker" requerid="">
+          </div>
+        </div>
+        <div class="form-group" style="margin-top: 0;">
+          <div class="col-md-offset-2 col-md-10">
+            <div class="checkbox">
+              <label>
+                <input type="checkbox"><span class="checkbox-material"><span class="check"></span></span> {% trans 'Send Later' %}
+              </label>
+            </div>
+          </div>
+        </div>
+        <div class="form-group">
+          <div class="col-md-10 col-md-offset-2">
+            <button type="button" class="btn btn-default">{% trans 'Cancel' %}</button>
+            <button type="submit" class="btn btn-primary">{% trans 'Submit' %}</button>
+          </div>
+        </div>
  
-    <!-- MODAL LINK EDIT-->
-    {% professor_subject topic.subject user as links_update %}
-    {% if links_update%}
-        {% include "links/update_link.html" %}
-    {% endif %}
  
-    <!-- EndModal -->
-    </div>
+      </fieldset>
+    </form>
+      </div>
     </div>
+  </div>
+</div>
+<!--EndModal-->
+
+<!-- MODAL LINK EDIT-->
  
  
-    <div class="modal fade" id="createForum" tabindex="-1" role="dialog" aria-labelledby="myModalLabel">
-        <div class="modal-dialog" role="document">
-            <div class="modal-content">
-                <div class="modal-header">
-                    <h4 class="modal-title" id="myModalLabel">{% trans 'Forum' %}</h4>
-                </div>
-                <div class="modal-body">
-                    <section>
-                        <div class="forum_form"></div>
-                    </section>
-                </div>
-                <div class="modal-footer">
-                    <button type="button" class="btn btn-danger btn-raised" data-dismiss="modal">{% trans 'Close' %}</button>
-                    <button type="button" onclick="$('#forum_create').submit();" class="btn btn-primary btn-raised">{% trans 'Create' %}</button>
-                </div>
+<!-- EndModal -->
+
+
+<div class="modal fade" id="createForum" tabindex="-1" role="dialog" aria-labelledby="myModalLabel">
+    <div class="modal-dialog" role="document">
+        <div class="modal-content">
+            <div class="modal-header">
+                <h4 class="modal-title" id="myModalLabel">{% trans 'Forum' %}</h4>
+            </div>
+            <div class="modal-body">
+                <section>
+                    <div class="forum_form"></div>
+                </section>
+            </div>
+            <div class="modal-footer">
+                <button type="button" class="btn btn-danger btn-raised" data-dismiss="modal">{% trans 'Close' %}</button>
+                <button type="button" onclick="$('#forum_create').submit();" class="btn btn-primary btn-raised">{% trans 'Create' %}</button>
             </div>
         </div>
     </div>
+</div>
@@ -3,89 +3,101 @@
 {% load static i18n permission_tags professor_access %}
  
 {% block breadcrumbs %}
-
-	<ol class="breadcrumb">
-	  	<li><a href="{% url 'app:index' %}">{% trans 'Home' %}</a></li>
-	  	<li><a href="{% url 'course:view' course.slug %}">{{ course }}</a></li>
-	  	{% if user|has_role:'professor' or user|has_role:'system_admin' %}
-	  		<li class="active">{% trans 'Manage Subjects' %}</li>
-	  	{% else %}
-	  		<li class="active">{{ subject.name }}</li>
-	  	{% endif %}
-
-	</ol>
+<ol class="breadcrumb">
+  <li><a href="{% url 'app:index' %}">{% trans 'Home' %}</a></li>
+  <li><a href="{% url 'course:manage' %}">{% trans 'Courses' %}</a></li>
+  <li><a href="{% url 'course:view' course.slug %}">{{ course }}</a></li>
+  <li class="active">{{ subject }}</li>
+</ol>
 {% endblock %}
-
 {% block sidebar %}
-	<div class="panel panel-primary navigation">
-        <div class="panel-heading">
-            <h5>{% trans 'Menu' %}</h5>
-        </div>
-        <div class="panel-body">
-        	<ul class="nav nav-pills nav-stacked">
-              	<li><a href="{% url 'users:profile' %}">{% trans 'Profile' %}</a></li>
-              	<li><a href="{% url 'course:manage' %}">{% trans 'My Courses' %}</a></li>
-            </ul>
-        </div>
+<div class="panel panel-primary">
+    <div class="panel-heading">
+        <h4>{% trans 'Menu' %}</h4>
+    </div>
+    <div class="panel-body">
+        <ul class="nav nav-pills nav-stacked">
+            <li><a href="{% url 'app:index' %}">{% trans 'Home' %}</a></li>
+            <li><a href="{% url 'users:profile' %}">{% trans 'Profile' %}</a></li>
+            {% if user|has_role:'student' or not user.is_staff %}
+                <li><a href="{% url 'course:manage' %}">{% trans 'My courses' %}</a></li>
+                <li><a href="{% url 'core:guest' %}">{% trans 'All Courses' %}</a></li>
+            {% endif %}
+            {% if user|has_role:'system_admin' %}
+                <li> <a href="{% url 'users:manage' %}">{% trans 'Manage Users' %}</a></li>
+            {% endif %}
+            {% if user|has_role:'system_admin' or user|has_role:'professor' %}
+                <li>
+                    <a href="#courses_list" class="accordion" data-toggle="collapse">{% trans 'Manage Courses' %}</a>
+                    <div id="courses_list" class="collapse">
+                        <ul class="nav nav-pill nav-stacked accordion_list">
+                        {% for course in courses_list %}
+                            <li><a href="{% url 'course:view' course.slug %}">{{ course }}</a></li>
+                        {% endfor %}
+                        </ul>
+                    </div>
+                </li>
+            {% endif %}
+        </ul>
     </div>
+</div>
  
  
 {% endblock %}
  
 {% block content %}
   	<div class="panel panel-info">
-    	<div class="panel-heading">
-			<div class="row">
-	      		<div class="col-md-10 col-sm-10">
-	        		<h3>{{subject}}</h3>
-	      		</div>
-				{% professor_subject subject user as subject_professor%}
-	      		{% if subject_professor %}
-		         	 <div class="col-xs-4 col-md-2 divMoreActions">
-			            <div class="btn-group">
-			              <button class="btn btn-default btn-sm dropdown-toggle" type="button" id="moreActions" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-			                <i class="fa fa-ellipsis-v fa-2x" aria-hidden="true"></i>
-			              </button>
-			              <ul class="dropdown-menu pull-right" aria-labelledby="moreActions">
-			                <li><a href="javascript:void(0)"><i class="fa fa-files-o fa-fw" aria-hidden="true"></i>&nbsp; {% trans "Replicate" %}</a></li>
-			                <li><a href="{% url 'course:update_subject' subject.slug %}" <i class="fa fa-pencil fa-fw" aria-hidden="true"></i>&nbsp; {% trans "Edit" %}</a></li>
-			                <li><a href="{% url 'course:delete_subject' subject.slug %}" ><i class="fa fa-trash fa-fw" aria-hidden="true"></i>&nbsp; {% trans "Remove" %}</a></li>
-			              </ul>
-			            </div>
-    				</div>
-				{% endif %}
-	    	</div>
-    	</div>
-    	<div class="panel-body">
-	      <p><b>{% trans "Professor" %}:</b> {{subject.professors}}</p>
-	      <p>
-	        <b>{% trans "Description" %}:</b>
-	          {{subject.description|linebreaks}}
-	      </p>
-	      <div class="row">
-	        <div class="col-xs-6 col-md-6">
-	          <p><b>{% trans "Beginning" %}:</b> {{subject.init_date}}</p>
-	        </div>
-	        <div class="col-xs-6 col-md-6">
-	          <p><b>{% trans "End" %}:</b> {{subject.end_date}}</p>
-	        </div>
-	      </div>
-	    </div>
-	</div>
-
-	{% for topic in topics %}
-		{% professor_subject topic.subject user as topic_professor%}
-		{% if topic_professor %}
-			{% include "subject/form_view_teacher.html" %}
-		{% else %}
-			{% include "subject/form_view_student.html" %}
-		{% endif %}
-	{% endfor %}
-	{% professor_subject subject user as professor_sub %}
-	{% if professor_sub %}
-		<div class="form-group">
-            <a href="{% url 'course:create_topic' subject.slug %}" data-toggle="modal" data-target="" class="btn btn-primary btn-lg btn-block btn-raised" name="create_topic">{% trans "Create Topic" %}<div class="ripple-container"></div></a>
+     <div class="panel-heading course-detail">
+      <div class="row">
+       <div class="col-md-10 col-sm-10">
+        <h4>{{subject}}</h4>
+       </div>
+       <div class="col-xs-4 col-md-2 divMoreActions">
+        {% professor_subject subject user as subject_professor%}
+        {% if subject_professor %}
+         <div class="btn-group">
+          <button class="btn btn-default btn-sm dropdown-toggle" type="button" id="moreActions" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+           <i class="fa fa-ellipsis-v fa-2x" aria-hidden="true"></i>
+          </button>
+          <ul class="dropdown-menu pull-right" aria-labelledby="moreActions">
+           <li><a href="javascript:void(0)"><i class="fa fa-files-o fa-fw" aria-hidden="true"></i>&nbsp; {% trans "Replicate" %}</a></li>
+           <li><a href="{% url 'course:update_subject' subject.slug %}" <i class="fa fa-pencil fa-fw" aria-hidden="true"></i>&nbsp; {% trans "Edit" %}</a></li>
+           <li><a href="{% url 'course:delete_subject' subject.slug %}" ><i class="fa fa-trash fa-fw" aria-hidden="true"></i>&nbsp; {% trans "Remove" %}</a></li>
+          </ul>
+         </div>
+         {% endif %}
+       </div>
+       </div>
+      </div>
+      <div class="panel-body">
+          <p><b>{% trans "Professor" %}:</b> {% for professor in subject.professors.all %}{% if not forloop.first %},{% endif %}
+              {{professor}}{% if forloop.last %}.{% endif %}{% endfor %}</p>
+          <p>
+            <b>{% trans "Description" %}:</b>
+              {{subject.description|linebreaks}}
+          </p>
+          <div class="row">
+            <div class="col-xs-6 col-md-6">
+              <p><b>{% trans "Beginning" %}:</b> {{subject.init_date}}</p>
+            </div>
+            <div class="col-xs-6 col-md-6">
+              <p><b>{% trans "End" %}:</b> {{subject.end_date}}</p>
+            </div>
           </div>
-	{% endif %}
-
+     </div>
+    </div>
+     {% for topic in topics %}
+      {% professor_subject topic.subject user as topic_professor%}
+      {% if topic_professor %}
+       {% include "subject/form_view_teacher.html" %}
+      {% else %}
+       {% include "subject/form_view_student.html" %}
+      {% endif %}
+     {% endfor %}
+     {% professor_subject subject user as professor_sub %}
+     {% if professor_sub %}
+      <div class="form-group">
+       <a href="{% url 'course:create_topic' subject.slug %}" data-toggle="modal" data-target="" class="btn btn-primary btn-lg btn-block btn-raised" name="create_topic">{% trans "Create Topic" %}<div class="ripple-container"></div></a>
+      </div>
+     {% endif %}
 {% endblock %}
@@ -6,9 +6,9 @@
 {% for poll in polls %}
   {% professor_subject poll.topic.subject request.user as permission%}
   {% if permission %}
-    <li id="poll_{{poll.slug}}"><i class="material-icons">poll</i> <a href="javascript:modal.get('{% url 'course:poll:update_poll' poll.slug %}','#poll','#modal_poll');">{{ poll.name }}</a><a href="javascript:modal.get('{% url 'course:poll:delete_poll' poll.slug %}','#poll','#modal_poll');"><span class="glyphicon glyphicon-remove"></span></a></li>
+    <li id="poll_{{poll.slug}}"><i class="material-icons">{% trans 'poll' %}</i> <a href="javascript:modal.get('{% url 'course:poll:update_poll' poll.slug %}','#poll','#modal_poll');">{{ poll.name }}</a><a href="javascript:modal.get('{% url 'course:poll:delete_poll' poll.slug %}','#poll','#modal_poll');"><span class="glyphicon glyphicon-remove"></span></a></li>
   {% else %}
-    <li id="poll_{{poll.slug}}"><i class="material-icons">poll</i> <a href="javascript:modal.get('{% url 'course:poll:view_poll' poll.slug %}','#poll','#modal_poll');">{{ poll.name }}</a></li>
+    <li id="poll_{{poll.slug}}"><i class="material-icons">{% trans 'poll' %}</i> <a href="javascript:modal.get('{% url 'course:poll:view_poll' poll.slug %}','#poll','#modal_poll');">{{ poll.name }}</a></li>
   {% endif %}
   {% endfor %}
 {# <button class="btn btn-primary btn-raised" onclick="javascript:modal.get('{% url 'course:poll:create_poll' topic.slug%}','#poll','#modal_poll');">{% trans '+ Create Poll' %}</button> #}
@@ -0,0 +1,110 @@
+{% extends 'subject/index.html' %}
+
+{% load static i18n permission_tags widget_tweaks %}
+
+{% block breadcrumbs %}
+
+  <ol class="breadcrumb">
+      <li><a href="">{% trans 'Home' %}</a></li>
+      <li><a href="">{{ subject }}</a></li>
+        <li class="active">{% trans 'Manage Topic' %}</li>
+        <li class="active">{{ topic.name }}</li>
+  </ol>
+{% endblock %}
+
+
+{% block content %}
+
+<div class="col-md-12">
+          <div><div class="well">
+    <div class="row">
+      <div class="col-md-offset-2 col-md-9">
+        <h2 class="resource_inline"><b>Book 1</b></h2>
+      </div>
+      <div class="col-md-offset-2 col-md-8">
+          <a href="{{ file.file_url }}">{{ file.url }}</a>
+      </div>
+    </div>
+</div></div>
+          <div><div class="well">
+    <div class="row">
+        <div class="list-group">
+          <div class="list-group-item">
+              <div class="form-group is-empty">
+                  <div class="row">
+                      <div class="col-md-1">
+                          <span class="input-group-btn">
+                              <button type="button" class="btn btn-fab btn-fab-mini">
+                                  <i class="material-icons">send</i>
+                              </button>
+                          </span>
+                      </div>
+                      <div class="col-md-10">
+                          <input type="text" id="addon3a" class="form-control" placeholder="Add Comment">
+                      </div>
+                  </div>
+                </div>
+          </div>
+        </div>
+    </div>
+</div>
+<div class="well timeLine">
+    <div class="row">
+        <div class="col-xs-2 col-md-1">
+            <img class="imgTimeLine" src="http://localhost:8080/assets/img/images/team-avatar-2.jpg">
+        </div>
+        <div class="col-xs-10 col-md-11">
+            <i class="fa fa-flag-o" aria-hidden="true"></i>
+            <a href="#"><h4 class="resource_inline"><b>Beltrano Camargo</b></h4></a>
+            <p class="timePost"><i>Há 11 horas</i></p>
+            <!--ListComents -->
+            <div class="list-group">
+              <div class="list-group-item">
+                <div class="row-picture">
+                  <img class="circle" src="http://localhost:8080/assets/img/images/team-avatar-1.jpg" alt="icon">
+                </div>
+                <div class="row-content">
+                  <h4 class="list-group-item-heading">Sicrano da Silva</h4>
+                  <div class="least-content">11 horas</div>
+
+                  <p class="list-group-item-text">Quais capítulos devo estudar?</p>
+                </div>
+              </div>
+              <div class="list-group-separator"></div>
+              <div class="list-group-item">
+                <div class="row-picture">
+                  <img class="circle" src="http://localhost:8080/assets/img/images/team-avatar-2.jpg" alt="icon">
+                </div>
+                <div class="row-content">
+                  <h4 class="list-group-item-heading">Beltrano Camargo</h4>
+                  <div class="least-content">11 horas</div>
+
+                  <p class="list-group-item-text">capítulos 5 e 6</p>
+                </div>
+              </div>
+              <div class="list-group-separator"></div>
+              <div class="list-group">
+                <div class="list-group-item">
+                    <div class="form-group is-empty">
+                        <div class="row">
+                            <div class="col-md-1 col-md-offset-1">
+                                <span class="input-group-btn">
+                                    <button type="button" class="btn btn-fab btn-fab-mini">
+                                        <i class="material-icons">send</i>
+                                    </button>
+                                </span>
+                            </div>
+                            <div class="col-md-10">
+                                <input type="text" id="addon3a" class="form-control" placeholder="Add Comment">
+                            </div>
+                        </div>
+                      </div>
+                </div>
+              </div>
+            </div>
+            <!-- endListComents -->
+        </div>
+    </div>
+</div></div>
+        </div>
+{% endblock %}
 \ No newline at end of file
@@ -28,7 +28,7 @@
  
 {% block sidebar %}
  
-    <div class="panel panel-primary navigation">
+    <div class="panel panel-primary">
         <div class="panel-heading">
             <h5>{% trans 'Menu' %}</h5>
         </div>
@@ -41,6 +41,7 @@
     </div>
  
  
+
 {% endblock %}
  
 {% block content %}
@@ -105,12 +106,12 @@
                     <div class="panel-body">
                      <div class="row">
                       <div class="col-md-4">
-                       <i class="fa fa-file-archive-o fa-lg" aria-hidden="true">Atividade.doc</i>
+                       <i class="fa fa-file-archive-o fa-lg" aria-hidden="true">{% trans 'Atividade.doc' %}</i>
                      </div>
 										 {% professor_subject subject user as permi_test%}
                      {% if permi_test %}
                         <div class="col-md-4">
-                          <label> Nota:</label>
+                          <label> {% trans 'Grade' %}:</label>
                           <input type="number" step="0.01">
                         </div>
                       {% else %}
@@ -120,7 +121,7 @@
                         <div class="form-group {% if form.pdf.errors %} has-error {% endif %}">
                             {{ form.as_p }}
                         </div>
-                        <button type="submit" class="btn btn-success" id="send_button">Enviar</button>
+                        <button type="submit" class="btn btn-success" id="send_button">{% trans 'Send' %}</button>
                       </div>
                      {% endif %}
                   </div>
 {% load static i18n list_topic_foruns permission_tags %}
 <div id="list-topic{{ topic.id }}-links">
 {% for link in links%}
-        <li><i class="fa fa-link" aria-hidden="true"></i>  <a href="javascript:get_modal_link('{% url 'course:links:view_link' link.slug %}', '#viewLinkModal','#divModalLink')">{{link}}</a></li>
+        <li id = "link_{{ link.slug }}"><i class="fa fa-link" aria-hidden="true"></i>  <a href="javascript:get_modal_link('{% url 'course:links:view_link' link.slug %}', '#viewLinkModal','#divModalLink')">{{link.name}}</a></li>
 {% endfor %}
 </div>
 <div class = 'row' id ="divModalLink">
@@ -2,8 +2,12 @@
 <div id="list-topic{{ topic.id }}-links-edit">
 {% for link in links%}
  
-        <li class="icon_edit_remove"> <a href="#" data-toggle="modal" data-target="#linksModalEdit"><i class="fa fa-pencil fa-lg" aria-hidden="true"></i></a>  <a href="#" data-toggle="modal" data-target="#removeLink"><i class="fa fa-trash fa-lg" aria-hidden="true"></i></a></li>
-        <li><i class="fa fa-link" aria-hidden="true"></i>  <a href="javascript:get_modal_link('{% url 'course:links:view_link' link.slug %}', '#viewLinkModal','#divModalLink')">{{link}}</a></li>
+        <li class="icon_edit_remove" id = "link_edit_icon_{{ link.slug }}"> <a href="javascript:get_modal_link('{% url 'course:links:update_link' link.slug %}', '#linksModalEdit', '#divModalLinkUpdate')"><i class="fa fa-pencil fa-lg" aria-hidden="true"></i></a>  <a href="javascript:get_modal_link('{% url 'course:links:delete_link' link.slug %}', '#linkDeleteModal', '#divModalLinkUpdate')"><i class="fa fa-trash fa-lg" aria-hidden="true"></i></a></li>
+        <li id="link_edit_{{ link.slug }}"><i class="fa fa-link" aria-hidden="true"></i>  <a href="javascript:get_modal_link('{% url 'course:links:view_link' link.slug %}', '#viewLinkModal','#divModalLink')">{{link.name}}</a></li>
  
 {% endfor %}
 </div>
+
+<div class="row" id="divModalLinkUpdate">
+
+</div>
@@ -2,7 +2,7 @@
  
 	<div id="list-topic{{ topic.id }}-files">
 		{% for file in files %}
-	  		<li id="file_{{ file.slug }}"><i class="material-icons">{{ file.file_type.icon }}</i> <a href="{{ file.file_url.url }}" target="_blank">{{ file.name }}</a></li>
+	  		<li id="file_{{ file.slug }}"><i class="material-icons">{{ file.file_type.icon }}</i> <a href="{% url 'course:file_material_view' file.slug %}" target="_blank">{{ file.name }}</a></li>
 		{% endfor %}	
 	</div>
  
-{% for forum in foruns %}
-	<li><i class="fa fa-commenting" aria-hidden="true"></i> <a id="forum_{{ forum.id }}" href="{% url 'course:forum:view' forum.slug %}"> {{ forum }}</a></li>
-{% endfor %}
 \ No newline at end of file
+<div class="foruns_list">
+	{% for forum in foruns %}
+		<li><i class="fa fa-commenting" aria-hidden="true"></i> <a id="forum_{{ forum.id }}" href="{% url 'course:forum:view' forum.slug %}"> {{ forum }}</a></li>
+	{% endfor %}
+</div>
 \ No newline at end of file
@@ -4,6 +4,19 @@ from rolepermissions.verifications import has_role
 register = template.Library()
  
 @register.filter
+def hide_subscribe_view_btn(user, subject):
+	if not user is None:
+		if user.is_authenticated:
+			if has_role(user, 'student') and not user.is_staff:
+				if user in subject.course.students.all():
+					if not user in subject.students.all():
+						return True
+				else:
+					return True
+
+	return False
+
+@register.filter
 def show_subject_subscribe(user, subject):
 	if not user is None:
 		if user.is_authenticated:
@@ -3,10 +3,10 @@ from django.conf.urls import url, include
 from . import views
 urlpatterns = [
 	url(r'^$', views.IndexView.as_view(), name='manage'),
+	url(r'^all-courses/$', views.AllCoursesView.as_view(), name='all_courses'),
 	url(r'^create/$', views.CreateCourseView.as_view(), name='create'),
 	url(r'^replicate_course/(?P<slug>[\w_-]+)/$', views.ReplicateCourseView.as_view(), name='replicate_course'),
 	url(r'^edit/(?P<slug>[\w_-]+)/$', views.UpdateCourseView.as_view(), name='update'),
-	url(r'^(?P<slug>[\w_-]+)/$', views.CourseView.as_view(), name='view'),
 	url(r'^delete/(?P<slug>[\w_-]+)/$', views.DeleteCourseView.as_view(), name='delete'),
 	url(r'^subscribe/(?P<slug>[\w_-]+)/$', views.subscribe_course, name='subscribe'),
 	url(r'^category/(?P<slug>[\w_-]+)/$', views.FilteredView.as_view(), name='filter'),
@@ -28,5 +28,10 @@ urlpatterns = [
 	url(r'^exam/', include('exam.urls', namespace = 'exam')),
 	url(r'^files/', include('files.urls', namespace = 'file')),
 	url(r'^upload-material/$', views.UploadMaterialView.as_view(), name='upload_material'),
+	url(r'^subjects/file-material-view/(?P<slug>[\w_-]+)/$', views.FileMaterialView.as_view(), name='file_material_view'),
 	url(r'^links/',include('links.urls',namespace = 'links')),
+	url(r'^(?P<slug>[\w_-]+)/', include([
+		url(r'^$', views.CourseView.as_view(), name='view'),
+		url(r'^(?P<category>[\w_-]+)/$', views.CourseView.as_view(), name='view_filter')
+	])),
 ]
@@ -9,9 +9,10 @@ from django.core.urlresolvers import reverse_lazy
 from django.utils.translation import ugettext_lazy as _
 from rolepermissions.verifications import has_role
 from django.db.models import Q
+import operator
+from functools import reduce
 from rolepermissions.verifications import has_object_permission
 from django.http import HttpResponseRedirect, JsonResponse
-
 from .forms import CourseForm, UpdateCourseForm, CategoryCourseForm, SubjectForm,TopicForm,ActivityForm
 from .models import Course, Subject, CourseCategory,Topic, SubjectCategory,Activity, CategorySubject
 from core.mixins import NotificationMixin
@@ -30,7 +31,30 @@ class IndexView(LoginRequiredMixin, NotificationMixin, generic.ListView):
 	queryset = Course.objects.all()
 	template_name = 'course/index.html'
 	context_object_name = 'courses'
-	paginate_by = 2
+	paginate_by = 10
+	aparece = True
+
+
+	def get_queryset(self):
+		result = super(IndexView, self).get_queryset()
+
+		course_search = self.request.GET.get('q', None)
+		category_search = self.request.GET.get('category', None)
+		if course_search:
+			self.aparece = False
+			query_list = course_search.split()
+			result = result.filter(
+			reduce(operator.and_,
+				(Q(name__icontains=q) for q in query_list))
+			)
+		if category_search:
+			self.aparece = False
+			query_list = category_search.split()
+			result = result.filter(
+			reduce(operator.and_,
+				(Q(category__name=category) for category in query_list))
+			)
+		return result
  
 	def get_context_data(self, **kwargs):
 		context = super(IndexView, self).get_context_data(**kwargs)
@@ -42,17 +66,10 @@ class IndexView(LoginRequiredMixin, NotificationMixin, generic.ListView):
 		elif has_role(self.request.user,'system_admin'):
 			list_courses = queryset.order_by('name')
 			categorys_courses = CourseCategory.objects.all()
-		else:
+		elif has_role(self.request.user, 'student'):
 			list_courses = Course.objects.filter(Q(students = True)|Q(students__name = self.request.user.name)).order_by('name')
 			categorys_courses = CourseCategory.objects.filter(course_category__students__name = self.request.user.name).distinct()
  
-		courses_category = Course.objects.filter(category__name = self.request.GET.get('category'))
-		none = None
-		q = self.request.GET.get('category', None)
-		if q is  None:
-			none = True
-		context['none'] = none
-
 		paginator = Paginator(list_courses, self.paginate_by)
 		page = self.request.GET.get('page')
  
@@ -63,23 +80,67 @@ class IndexView(LoginRequiredMixin, NotificationMixin, generic.ListView):
 		except EmptyPage:
 		    list_courses = paginator.page(paginator.num_pages)
  
-		context['courses_category'] = courses_category
 		context['list_courses'] = list_courses
 		context['categorys_courses'] = categorys_courses
+		context['aparece'] = self.aparece
  
 		return context
  
+class AllCoursesView(LoginRequiredMixin, NotificationMixin, generic.ListView):
+
+	login_url = reverse_lazy("core:home")
+	redirect_field_name = 'next'
+	queryset = Course.objects.all()
+	template_name = 'course/index.html'
+	context_object_name = 'courses'
+	paginate_by = 5
+	aparece = True
+
+
 	def get_queryset(self):
+		result = super(AllCoursesView, self).get_queryset()
+
+		course_search = self.request.GET.get('q', None)
+		category_search = self.request.GET.get('category', None)
+		if course_search:
+			self.aparece = False
+			query_list = course_search.split()
+			result = result.filter(
+			reduce(operator.and_,
+				(Q(name__icontains=q) for q in query_list))
+			)
+		if category_search:
+			self.aparece = False
+			query_list = category_search.split()
+			result = result.filter(
+			reduce(operator.and_,
+				(Q(category__name=category) for category in query_list))
+			)
+		return result
+
+	def get_context_data(self, **kwargs):
+		context = super(AllCoursesView, self).get_context_data(**kwargs)
+		list_courses = None
+		categorys_courses = None
+		list_courses = Course.objects.all().order_by('name')
+		categorys_courses = CourseCategory.objects.all().distinct().order_by('name')
+
+		paginator = Paginator(list_courses, self.paginate_by)
+		page = self.request.GET.get('page')
+
 		try:
-		    name = self.kwargs['q']
-		except:
-		    name = ''
-		if (name != ''):
-		    object_list = Course.objects.filter(name__icontains = name)
-		else:
-		    object_list = Course.objects.all()
-		return object_list
+		    list_courses = paginator.page(page)
+		except PageNotAnInteger:
+		    list_courses = paginator.page(1)
+		except EmptyPage:
+		    list_courses = paginator.page(paginator.num_pages)
+
+		context['list_courses'] = list_courses
+		context['categorys_courses'] = categorys_courses
+		context['aparece'] = self.aparece
  
+		return context
+		
 class CreateCourseView(LoginRequiredMixin, HasRoleMixin, NotificationMixin,generic.edit.CreateView):
  
 	allowed_roles = ['professor', 'system_admin']
@@ -125,7 +186,7 @@ class ReplicateCourseView(LoginRequiredMixin, HasRoleMixin, NotificationMixin,ge
 		if has_role(self.request.user,'system_admin'):
 			courses = Course.objects.all()
 		elif has_role(self.request.user,'professor'):
-			courses = self.request.user.courses.all()
+			courses = self.request.user.courses_professors.all()
 		categorys_courses = CourseCategory.objects.all()
 		context['courses'] = courses
 		context['course'] = course
@@ -197,7 +258,7 @@ class DeleteCourseView(LoginRequiredMixin, HasRoleMixin, generic.DeleteView):
 		return context
  
  
-class CourseView( NotificationMixin, generic.DetailView):
+class CourseView(NotificationMixin, generic.DetailView):
  
 	login_url = reverse_lazy("core:home")
 	redirect_field_name = 'next'
@@ -210,12 +271,20 @@ class CourseView( NotificationMixin, generic.DetailView):
 		courses = None
 		context = super(CourseView, self).get_context_data(**kwargs)
 		course = get_object_or_404(Course, slug = self.kwargs.get('slug'))
+
+		category_sub = self.kwargs.get('category', None)
+
 		if has_role(self.request.user,'system_admin'):
 			subjects = course.subjects.all()
 		elif has_role(self.request.user,'professor'):
 			subjects = course.subjects.filter(professors__in=[self.request.user])
 		elif has_role(self.request.user, 'student') or self.request.user is None:
 			subjects = course.subjects.filter(visible=True)
+
+		if not category_sub is None:
+			cat = get_object_or_404(CategorySubject, slug = category_sub)
+			subjects = subjects.filter(category = cat)
+				
 		context['subjects'] = subjects
  
 		if has_role(self.request.user,'system_admin'):
@@ -237,13 +306,7 @@ class CourseView( NotificationMixin, generic.DetailView):
  
 		subjects_category = Subject.objects.filter(category__name = self.request.GET.get('category'))
  
-		none = None
-		q = self.request.GET.get('category', None)
-		if q is  None:
-			none = True
-		context['none'] = none
-
-		context['subjects_category'] = subjects_category
+		context['category'] = category_sub
 		context['categorys_subjects'] = categorys_subjects
 		context['courses'] = courses
 		context['course'] = course
@@ -381,6 +444,14 @@ class SubjectsView(LoginRequiredMixin, generic.ListView):
 	context_object_name = 'subjects'
 	model = Subject
  
+	def dispatch(self, *args, **kwargs):
+		subject = get_object_or_404(Subject, slug = self.kwargs.get('slug'))
+
+		if(not has_object_permission('view_subject', self.request.user, subject)):
+			return self.handle_no_permission()
+
+		return super(SubjectsView, self).dispatch(*args, **kwargs)
+
 	def get_queryset(self):
 		subject = get_object_or_404(Subject, slug = self.kwargs.get('slug'))
 		course = subject.course
@@ -428,6 +499,14 @@ class TopicsView(LoginRequiredMixin, generic.ListView):
 	context_object_name = 'topics'
 	model = Topic
  
+	def dispatch(self, *args, **kwargs):
+		topic = get_object_or_404(Topic, slug = self.kwargs.get('slug'))
+
+		if(not has_object_permission('view_topic', self.request.user, topic)):
+			return self.handle_no_permission()
+
+		return super(TopicsView, self).dispatch(*args, **kwargs)
+
 	def get_queryset(self):
 		topic = get_object_or_404(Topic, slug = self.kwargs.get('slug'))
 		subject = topic.subject
@@ -633,3 +712,12 @@ class IndexSubjectCategoryView(LoginRequiredMixin, generic.ListView):
 		context = super(IndexSubjectCategoryView, self).get_context_data(**kwargs)
 		context['subject_categories'] = SubjectCategory.objects.all()
 		return context
+
+class FileMaterialView(LoginRequiredMixin, generic.DetailView):
+
+	allowed_roles = ['professor', 'system_admin', 'student']
+	login_url = reverse_lazy("core:home")
+	redirect_field_name = 'next'
+	model = Material
+	context_object_name = 'file'
+	template_name = 'topic/file_material_view.html'
 \ No newline at end of file
@@ -0,0 +1,167 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-10-26 14:47-0300\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+
+#: exam/forms.py:18 exam/forms.py:22
+msgid "It is required one these fields."
+msgstr ""
+
+#: exam/forms.py:33
+msgid "Start date to resolve the exam"
+msgstr "Data de início para resolver o exame"
+
+#: exam/forms.py:35
+msgid "Maximum date permited to resolve the exam"
+msgstr "Data máxima permitida para resolver o exame"
+
+#: exam/models.py:9
+msgid "Begin of Course Date"
+msgstr "Data de início do curso"
+
+#: exam/models.py:10
+msgid "Exibe?"
+msgstr "Exibir?"
+
+#: exam/models.py:13 exam/models.py:35
+msgid "Exam"
+msgstr "Exame"
+
+#: exam/models.py:14
+msgid "Exams"
+msgstr "Exames"
+
+#: exam/models.py:21 exam/models.py:27
+msgid "Answer"
+msgstr "Resposta"
+
+#: exam/models.py:22
+msgid "Order"
+msgstr "Ordem"
+
+#: exam/models.py:23 exam/models.py:28
+msgid "Answers"
+msgstr "Respostas"
+
+#: exam/models.py:34
+msgid "Answered"
+msgstr "Respondida"
+
+#: exam/models.py:36
+msgid "Answers Students"
+msgstr "Resposta dos estudantes"
+
+#: exam/models.py:37
+msgid "Student"
+msgstr "Estudante"
+
+#: exam/models.py:38
+msgid "Answered Date"
+msgstr "Data da resposta"
+
+#: exam/models.py:41
+msgid "Answer Stundent"
+msgstr "Resposta do estudante"
+
+#: exam/models.py:42
+msgid "Answers Student"
+msgstr "Respostas dos estudantes"
+
+#: exam/templates/exam/create.html:9
+msgid "New Exam"
+msgstr "Novo exame"
+
+#: exam/templates/exam/create.html:14 exam/templates/exam/create.html:16
+msgid "Exam Name"
+msgstr "Nome do exame"
+
+#: exam/templates/exam/create.html:20
+msgid "Exam's begin date"
+msgstr "Data de início do exame"
+
+#: exam/templates/exam/create.html:22
+msgid "Begin Date"
+msgstr "Data de início"
+
+#: exam/templates/exam/create.html:26
+msgid "Exam's end date"
+msgstr "Data final do exame"
+
+#: exam/templates/exam/create.html:28
+msgid "End Date"
+msgstr "Data final"
+
+#: exam/templates/exam/create.html:35
+msgid "Allow submissions after deadline?"
+msgstr "Permitir submissões após o prazo?"
+
+#: exam/templates/exam/create.html:44 exam/templates/exam/create.html:47
+msgid "Question Type"
+msgstr "Tipo de questão"
+
+#: exam/templates/exam/create.html:48
+msgid "Multiple Choice"
+msgstr "Múltipla escolha"
+
+#: exam/templates/exam/create.html:49
+msgid "True or False"
+msgstr "Verdadeiro ou falso"
+
+#: exam/templates/exam/create.html:50
+msgid "Gap Filling"
+msgstr "Preenchimento de lacunas"
+
+#: exam/templates/exam/create.html:51
+msgid "Discursive Question"
+msgstr "Questão discursiva"
+
+#: exam/templates/exam/create.html:57
+msgid "add question"
+msgstr "Adicionar questão"
+
+#: exam/templates/exam/create.html:62
+msgid "Create"
+msgstr "Criar"
+
+#: exam/templates/exam/discursive_question.html:2
+#: exam/templates/exam/discursive_question.html:4
+#: exam/templates/exam/multiple_choice_question.html:5
+#: exam/templates/exam/true_or_false_question.html:20
+#: exam/templates/exam/true_or_false_question.html:25
+msgid "Question"
+msgstr "Questão"
+
+#: exam/templates/exam/gap_filling_question.html:2
+msgid "Gap Filling Question"
+msgstr "Questão de preenchimento de lacunas"
+
+#: exam/templates/exam/multiple_choice_question.html:15
+msgid "Alternatives"
+msgstr "Alternativas"
+
+#: exam/templates/exam/true_or_false_answer.html:9
+msgid "Write your alternative"
+msgstr "Escreva sua alternativa"
+
+#: exam/templates/exam/true_or_false_question.html:37
+msgid "Alternatives: T/F"
+msgstr "Alternativas: V/F"
+
+#: exam/templates/exam/true_or_false_question.html:45
+msgid "New Alternative"
+msgstr "Nova alternativa"
@@ -74,9 +74,7 @@ XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
     XXXXXXXXXXXXXXXXXXXXXXXXX X XXXXXX
   XXX
 XXX
-
 XXX XXXXXXXXXXXXXXXX X XX
-
 XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX XX X
   XXX XXXXXXX X XXXXX XXXXXXXXXXXX XXXXXXXXXXXXXXXX X
   XXXXXXXXX X
@@ -85,12 +83,9 @@ XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX XX X
   XXXXXXXXXX X
   XXXXXXXXX
   XXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-
   XXXXXXXXXXXXXXXXXXX
 XXX
-
 XXX XXXXXXXXXXXXXXXXXX X XX
-
 XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX XX X
   XXX XXXXXXX X XXXXX XXXXXXXXXXXX XXXXXXXXXXXXXXXX X
   XXXXXXXXX X
@@ -104,10 +99,8 @@ XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX XX X
   XXXXXXXXXX X
   XXXXXXXXX
   XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-
   XXXXXXXXXXXXXXXXXXXXX
 XXX
-
 XXXXXXXXXXXX X
   XX XXXXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXX
 XXX
 <div class="form-group" id="gapFilling" style="display: none;">
-  <p>Gap Filling Question</p>
+  <p>{% trans 'Gap Filling Question' %}</p>
 </div>
 XXXX XXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXX XXXXXXXXXXXXXXX XXXXXXX
-  XXXXXX XXXXXXX XXXXXXXXXXXX
+  XXX gettext(u'Gap Filling Question') XXXX
 XXXXXX
+{% load i18n %}
+
 <div class="form-group" id="multipleChoice">
  
-  <label for="questionName" class="col-md-2 control-label">Question</label>
+  <label for="questionName" class="col-md-2 control-label">{% trans 'Question' %}</label>
  
  
   <div class="col-md-10">
@@ -10,7 +12,7 @@
  
 </div>
 <div class="form-group">
-  <label for="alternative" class="col-md-2 control-label">Alternatives</label>
+  <label for="alternative" class="col-md-2 control-label">{% trans 'Alternatives' %}</label>
   <div class="col-md-10" id="radios">
     <div class="radio radio-primary">
       <label>
@@ -29,7 +31,7 @@
 <!-- new alternative button -->
 <div class="form-group">
   <div class="col-md-12 col-md-offset-2">
-  <button type="button" class="btn btn-primary" id="newAlternative">New Alternative</button>
+  <button type="button" class="btn btn-primary" id="newAlternative">{% trans 'New Alternative' %]</button>
   </div>
 </div>
 <div class="form-group">
+BBBB BBBB
+
 XXXX XXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXX
  
-  XXXXXX XXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+  XXXXXX XXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXX XXXXXXXXXXXXXXX gettext(u'Question') XXXXXXXX
  
  
   XXXX XXXXXXXXXXXXXXXXXX
@@ -10,7 +12,7 @@ XXXX XXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXX
  
 XXXXXX
 XXXX XXXXXXXXXXXXXXXXXXX
-  XXXXXX XXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+  XXXXXX XXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXX XXXXXXXXXXXXXXX gettext(u'Alternatives') XXXXXXXX
   XXXX XXXXXXXXXXXXXXXXX XXXXXXXXXXXX
     XXXX XXXXXXXXXXXX XXXXXXXXXXXXXXX
       XXXXXXX
@@ -29,7 +31,7 @@ XXXXXX
 XXXX XXX XXXXXXXXXXX XXXXXX XXX
 XXXX XXXXXXXXXXXXXXXXXXX
   XXXX XXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXX
-  XXXXXXX XXXXXXXXXXXXX XXXXXXXXXX XXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXX
+  XXXXXXX XXXXXXXXXXXXX XXXXXXXXXX XXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXX XXXXX XXXX XXXXXXXXXXXX XXXXXXXXXXX
   XXXXXX
 XXXXXX
 XXXX XXXXXXXXXXXXXXXXXXX
@@ -0,0 +1,88 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-10-26 14:47-0300\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+
+#: files/forms.py:12 files/forms.py:29
+msgid "File too large (Max 10MB)"
+msgstr "Arquivo muito grande (máximo de 10MB)"
+
+#: files/models.py:20
+msgid "Professors"
+msgstr "Professores"
+
+#: files/models.py:21
+msgid "Description"
+msgstr "Descrição"
+
+#: files/models.py:22 files/models.py:27
+msgid "File"
+msgstr "Arquivo"
+
+#: files/models.py:23
+msgid "Type file"
+msgstr "Tipo de arquivo"
+
+#: files/models.py:28
+msgid "Files"
+msgstr "Arquivos"
+
+#: files/templates/files/create_file.html:10
+msgid "Add File"
+msgstr "Adicionar arquivo"
+
+#: files/templates/files/create_file.html:38
+#: files/templates/files/update_file.html:40
+msgid "Choose your file..."
+msgstr "Escolha seu arquivo..."
+
+#: files/templates/files/create_file.html:68
+#: files/templates/files/update_file.html:73
+msgid "The file size shouldnt exceed 10MB"
+msgstr "O tamanho máximo não pode exceder 10MB"
+
+#: files/templates/files/create_file.html:74
+#: files/templates/files/delete_file.html:34
+#: files/templates/files/update_file.html:79
+msgid "Close"
+msgstr "Fechar"
+
+#: files/templates/files/create_file.html:75
+#: files/templates/files/update_file.html:80
+msgid "Submit"
+msgstr "Enviar"
+
+#: files/templates/files/delete_file.html:12
+msgid "Delete File"
+msgstr "Deletar arquivo"
+
+#: files/templates/files/delete_file.html:30
+msgid "Are you sure to delete "
+msgstr "Tem certeza que deseja deletar "
+
+#: files/templates/files/delete_file.html:35
+msgid "Delete"
+msgstr "Deletar"
+
+#: files/templates/files/update_file.html:12
+msgid "Edit File"
+msgstr "Editar arquivo"
+
+#: files/templates/files/update_file.html:48
+msgid "See current file"
+msgstr "Visualizar arquivo atual"
@@ -65,14 +65,14 @@
  
                             <div class="form-group">
                                 <div class="col-md-12 text-center">
-                                    <p><b>The file size shouldn't exceed 10MB</b></p>
+                                    <p><b>{% trans 'The file size shouldnt exceed 10MB' %}</b></p>
                                 </div>
                             </div>
  
                             <div class="form-group">
                                 <div class="col-md-12">
                                      <button type="button" class="btn btn-danger btn-raised" data-dismiss="modal">{% trans "Close" %}</button>
-                                    <button class="btn btn-raised btn-primary" type="submit">Submit</button>
+                                    <button class="btn btn-raised btn-primary" type="submit">{% trans 'Submit' %}</button>
                                 </div>
                             </div>
                         </fieldset>
@@ -65,14 +65,14 @@ XXXX XXXXXXXXXXXXX
  
                             XXXX XXXXXXXXXXXXXXXXXXX
                                 XXXX XXXXXXXXXXXXXXXX XXXXXXXXXXXXX
-                                    XXXXXXXXX XXXX XXXX XXXXXXXXX XXXXXX XXXXXXXXXXXX
+                                    XXXXXX gettext(u'The file size shouldnt exceed 10MB') XXXXXXXX
                                 XXXXXX
                             XXXXXX
  
                             XXXX XXXXXXXXXXXXXXXXXXX
                                 XXXX XXXXXXXXXXXXXXXXXX
                                      XXXXXXX XXXXXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXX gettext(u'Close') XXXXXXXXX
-                                    XXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+                                    XXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXXXX XXXXXXXXXXXXXX gettext(u'Submit') XXXXXXXXX
                                 XXXXXX
                             XXXXXX
                         XXXXXXXXXXX
@@ -32,7 +32,7 @@
                             <div class="form-group">
                                 <div class="col-md-12">
                                      <button type="button" class="btn btn-danger btn-raised" data-dismiss="modal">{% trans "Close" %}</button>
-                                    <button class="btn btn-raised btn-primary" type="submit">Delete</button>
+                                    <button class="btn btn-raised btn-primary" type="submit">{% trans 'Delete' %}</button>
                                 </div>
                             </div>
                         </fieldset>
@@ -32,7 +32,7 @@ XXXX XXXXXXXXXXXXXXXXXXXX
                             XXXX XXXXXXXXXXXXXXXXXXX
                                 XXXX XXXXXXXXXXXXXXXXXX
                                      XXXXXXX XXXXXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXX gettext(u'Close') XXXXXXXXX
-                                    XXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+                                    XXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXXXX XXXXXXXXXXXXXX gettext(u'Delete') XXXXXXXXX
                                 XXXXXX
                             XXXXXX
                         XXXXXXXXXXX
@@ -70,14 +70,14 @@
  
                             <div class="form-group">
                                 <div class="col-md-12 text-center">
-                                    <p><b>The file size shouldn't exceed 10MB</b></p>
+                                    <p><b>{% trans 'The file size shouldnt exceed 10MB' %}</b></p>
                                 </div>
                             </div>
  
                             <div class="form-group">
                                 <div class="col-md-12">
                                      <button type="button" class="btn btn-danger btn-raised" data-dismiss="modal">{% trans "Close" %}</button>
-                                    <button class="btn btn-raised btn-primary" type="submit">Submit</button>
+                                    <button class="btn btn-raised btn-primary" type="submit">{% trans 'Submit' %}</button>
                                 </div>
                             </div>
                         </fieldset>
@@ -70,14 +70,14 @@ XXXX XXXXXXXXXXXXXXXXXXXX
  
                             XXXX XXXXXXXXXXXXXXXXXXX
                                 XXXX XXXXXXXXXXXXXXXX XXXXXXXXXXXXX
-                                    XXXXXXXXX XXXX XXXX XXXXXXXXX XXXXXX XXXXXXXXXXXX
+                                    XXXXXX gettext(u'The file size shouldnt exceed 10MB') XXXXXXXX
                                 XXXXXX
                             XXXXXX
  
                             XXXX XXXXXXXXXXXXXXXXXXX
                                 XXXX XXXXXXXXXXXXXXXXXX
                                      XXXXXXX XXXXXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXX gettext(u'Close') XXXXXXXXX
-                                    XXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+                                    XXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXXXX XXXXXXXXXXXXXX gettext(u'Submit') XXXXXXXXX
                                 XXXXXX
                             XXXXXX
                         XXXXXXXXXXX
@@ -0,0 +1,250 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-10-26 14:47-0300\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+
+#: forum/forms.py:11
+msgid "Title"
+msgstr "Título"
+
+#: forum/forms.py:12 forum/models.py:14
+#: forum/templates/forum/forum_list.html:23
+#: forum/templates/forum/forum_view.html:58
+#: forum/templates/forum/render_forum.html:4
+msgid "Description"
+msgstr "Descrição"
+
+#: forum/forms.py:13
+msgid "Limit Date"
+msgstr "Data limite"
+
+#: forum/forms.py:16
+msgid "Forum title"
+msgstr "Título do fórum"
+
+#: forum/forms.py:17
+msgid "What is this forum about?"
+msgstr "Qual o assunto deste fórum?"
+
+#: forum/forms.py:18
+msgid "Limit date for students post on this forum"
+msgstr "Data limite para estudantes postarem neste fórum"
+
+#: forum/forms.py:33 forum/forms.py:46
+msgid "Message"
+msgstr "Mensagem"
+
+#: forum/models.py:15 forum/models.py:33 forum/models.py:61
+msgid "Modification Date"
+msgstr "Data de modificação"
+
+#: forum/models.py:16
+msgid "Create Date"
+msgstr "Data de criação"
+
+#: forum/models.py:19 forum/models.py:35
+#: forum/templates/forum/forum_view.html:16
+#: forum/templates/forum/forum_view.html:116
+msgid "Forum"
+msgstr "Fórum"
+
+#: forum/models.py:20
+msgid "Foruns"
+msgstr "Fóruns"
+
+#: forum/models.py:31 forum/models.py:58
+msgid "Autor"
+msgstr "Autor"
+
+#: forum/models.py:32
+msgid "Post message"
+msgstr "Postar mensagem"
+
+#: forum/models.py:34
+msgid "Post Date"
+msgstr "Data de postagem"
+
+#: forum/models.py:38 forum/models.py:59
+msgid "Post"
+msgstr "Postar"
+
+#: forum/models.py:39
+msgid "Posts"
+msgstr "Postagens"
+
+#: forum/models.py:60
+msgid "Answer message"
+msgstr "Resposta"
+
+#: forum/models.py:62
+msgid "Answer Date"
+msgstr "Data da resposta"
+
+#: forum/models.py:65
+msgid "Post Answer"
+msgstr "Postar resposta"
+
+#: forum/models.py:66
+msgid "Post Answers"
+msgstr "Postar respostas"
+
+#: forum/templates/forum/forum_list.html:16
+#: forum/templates/forum/forum_view.html:44
+#: forum/templates/post/post_list.html:20
+#: forum/templates/post/post_load_more_render.html:20
+#: forum/templates/post/post_render.html:18
+#: forum/templates/post_answers/post_answer_list.html:17
+#: forum/templates/post_answers/post_answer_load_more_render.html:17
+#: forum/templates/post_answers/post_answer_render.html:15
+msgid "Edit"
+msgstr "Editar"
+
+#: forum/templates/forum/forum_list.html:17
+#: forum/templates/forum/forum_view.html:45
+msgid "Are you sure you want to delete this forum?"
+msgstr "Tem certeza que deseja deletar este fórum?"
+
+#: forum/templates/forum/forum_list.html:17
+#: forum/templates/forum/forum_view.html:45
+msgid "Delete"
+msgstr "Deletar"
+
+#: forum/templates/forum/forum_list.html:24
+#: forum/templates/forum/forum_view.html:59
+#: forum/templates/forum/render_forum.html:5
+msgid "Opened in"
+msgstr "Aberto em"
+
+#: forum/templates/forum/forum_list.html:59
+#: forum/templates/forum/forum_view.html:91
+#: forum/templates/post_answers/post_answer_form.html:38
+msgid "send"
+msgstr "Enviar"
+
+#: forum/templates/forum/forum_view.html:13
+msgid "Home"
+msgstr "Início"
+
+#: forum/templates/forum/forum_view.html:27
+msgid "Menu"
+msgstr "Menu"
+
+#: forum/templates/forum/forum_view.html:31
+msgid "Profile"
+msgstr "Perfil"
+
+#: forum/templates/forum/forum_view.html:32
+msgid "My Courses"
+msgstr "Meus cursos"
+
+#: forum/templates/forum/forum_view.html:40
+msgid "Actions"
+msgstr "Ações"
+
+#: forum/templates/forum/forum_view.html:44
+msgid "Forum edited successfully!"
+msgstr "Fórum editado com sucesso!"
+
+#: forum/templates/forum/forum_view.html:124
+msgid "Close"
+msgstr "Fechar"
+
+#: forum/templates/forum/forum_view.html:125
+msgid "Update"
+msgstr "Atualizar"
+
+#: forum/templates/post/post_list.html:11
+#: forum/templates/post/post_load_more_render.html:11
+#: forum/templates/post/post_render.html:9
+msgid "reply"
+msgstr "Responder"
+
+#: forum/templates/post/post_list.html:20
+#: forum/templates/post/post_load_more_render.html:20
+#: forum/templates/post/post_render.html:18
+msgid "Post edited successfully!"
+msgstr "Post editado com sucesso!"
+
+#: forum/templates/post/post_list.html:21
+#: forum/templates/post/post_load_more_render.html:21
+#: forum/templates/post/post_render.html:19
+#: forum/templates/post_answers/post_answer_list.html:18
+#: forum/templates/post_answers/post_answer_load_more_render.html:18
+#: forum/templates/post_answers/post_answer_render.html:16
+msgid "Remove"
+msgstr "Remover"
+
+#: forum/templates/post/post_list.html:30
+#: forum/templates/post/post_load_more_render.html:30
+#: forum/templates/post/post_render.html:28
+#: forum/templates/post_answers/post_answer_list.html:26
+#: forum/templates/post_answers/post_answer_load_more_render.html:26
+#: forum/templates/post_answers/post_answer_render.html:24
+msgid "ago"
+msgstr "atrás"
+
+#: forum/templates/post/post_list.html:32
+#: forum/templates/post/post_load_more_render.html:32
+#: forum/templates/post/post_render.html:30
+#: forum/templates/post_answers/post_answer_list.html:28
+#: forum/templates/post_answers/post_answer_load_more_render.html:28
+#: forum/templates/post_answers/post_answer_render.html:26
+msgid "Edited"
+msgstr "Editado"
+
+#: forum/templates/post/post_list.html:54 forum/views.py:196
+msgid "Load more posts"
+msgstr "Carregar mais postagens"
+
+#: forum/templates/post/post_update_form.html:32
+#: forum/templates/post_answers/post_answer_form.html:32
+msgid "Cancel"
+msgstr "Cancelar"
+
+#: forum/templates/post/post_update_form.html:33
+#: forum/templates/post_answers/post_answer_form.html:33
+msgid "Save changes"
+msgstr "Salvar mudanças"
+
+#: forum/templates/post_answers/post_answer_list.html:17
+#: forum/templates/post_answers/post_answer_load_more_render.html:17
+#: forum/templates/post_answers/post_answer_render.html:15
+msgid "Answer edited sucessfully!"
+msgstr "Resposta editada com sucesso!"
+
+#: forum/templates/post_answers/post_answer_list.html:18
+#: forum/templates/post_answers/post_answer_load_more_render.html:18
+#: forum/templates/post_answers/post_answer_render.html:16
+msgid "Are you sure you want to delete this answer?"
+msgstr "Tem certeza que deseja deletar esta resposta?"
+
+#: forum/templates/post_answers/post_answer_list.html:42 forum/views.py:295
+msgid "Load more answers"
+msgstr "Carregar mais respostas"
+
+#: forum/views.py:130
+msgid "Forum deleted successfully."
+msgstr "Fórum deletado com sucesso."
+
+#: forum/views.py:253
+msgid "Post deleted successfully."
+msgstr "Postagem deletada com sucesso."
+
+#: forum/views.py:365
+msgid "Post answer deleted successfully."
+msgstr "Resposta deletada com sucesso."
@@ -0,0 +1,32 @@
+from rolepermissions.permissions import register_object_checker
+from amadeus.roles import SystemAdmin
+
+@register_object_checker()
+def view_forum(role, user, forum):
+    if (role == SystemAdmin):
+        return True
+
+    if (user in forum.topic.subject.professors.all() or user in forum.topic.subject.students.all()):
+        return True
+
+    return False
+
+@register_object_checker()
+def edit_forum(role, user, forum):
+    if (role == SystemAdmin):
+        return True
+
+    if (user in forum.topic.subject.professors.all()):
+        return True
+
+    return False
+
+@register_object_checker()
+def delete_forum(role, user, forum):
+    if (role == SystemAdmin):
+        return True
+
+    if (user in forum.topic.subject.professors.all()):
+        return True
+
+    return False
@@ -47,7 +47,7 @@ function createForum(url, topic) {
             $(".forum_form").html(data);
             $("#id_topic").val(topic);
  
-            setForumCreateFormSubmit();
+            setForumCreateFormSubmit(topic);
         }
     });
  
@@ -59,7 +59,7 @@ function createForum(url, topic) {
 * Function to set the forum's create form submit function
 *
 */
-function setForumCreateFormSubmit() {
+function setForumCreateFormSubmit(topic) {
     $('.date-picker').datepicker({
         language: locale,
     });
@@ -70,16 +70,15 @@ function setForumCreateFormSubmit() {
             type: frm.attr('method'),
             url: frm.attr('action'),
             data: frm.serialize(),
+            dataType: "json",
             success: function (data) {
-                data = data.split('-');
-
-                $('.foruns_list').append("<li><i class='fa fa-commenting' aria-hidden='true'></i> <a id='forum_"+data[1]+"' href='"+data[0]+"'> "+data[2]+"</a></li>");
+                $(".topic_" + topic).find('.foruns_list').append("<li><i class='fa fa-commenting' aria-hidden='true'></i> <a id='forum_"+data.forum_id+"' href='"+data.url+"'> "+data.name+"</a></li>");
  
                 $("#createForum").modal('hide');
             },
             error: function(data) {
                 $(".forum_form").html(data.responseText);
-                setForumCreateFormSubmit();
+                setForumCreateFormSubmit(topic);
             }
         });
         return false;
@@ -183,7 +182,7 @@ function edit_post(url, post_id, success_message) {
                     success: function (data) {
                         alertify.success(success_message);
  
-                        $("#post_"+post_id).parent().after(data);
+                        $("#post_"+post_id).parent().after(data.html);
                         frm.parent().parent().remove();
                     },
                     error: function(data) {
@@ -345,7 +344,7 @@ function edit_post_answer(url, answer_id, success_message) {
                     success: function (data) {
                         alertify.success(success_message);
  
-                        $("#answer_"+answer_id).parent().after(data);
+                        $("#answer_"+answer_id).parent().after(data.html);
                         frm.parent().parent().remove();
                     },
                     error: function(data) {
@@ -7,6 +7,10 @@
 		<div class="form-group {% if form.has_error %} has-error {% endif %} is-fileinput">
 			{% if field.field.widget.input_type == 'hidden' %}
 	            {% render_field field class='form-control' %}
+           	{% elif field.auto_id == 'id_limit_date' %}
+           		<label for="{{ field.auto_id }}">{{ field.label }}</label>
+           		<input type="text" class="form-control date-picker"name="{{field.name}}" value="{{field.value|date:'SHORT_DATE_FORMAT'}}" id="{{ field.auto_id }}">
+				<span id="helpBlock" class="help-block">{{ field.help_text }}</span>
 	        {% else %}
 				<label for="{{ field.auto_id }}">{{ field.label }}</label>
 				{% render_field field %}
@@ -56,7 +56,7 @@
                     {% endif %}
                     <span class="input-group-btn">
                         <button type="submit" class="btn btn-fab btn-fab-mini">
-                            <i class="material-icons">send</i>
+                            <i class="material-icons">{% trans 'send' %}</i>
                         </button>
                     </span>
                 </div>
@@ -56,7 +56,7 @@ XXXXX XXXXXXXXXXXXXX XXXXXXXXXXXXX XXXXXXXXBBB BBBBBBBBBBBBBBBBBBBBBBBBBBX XXXXX
                     BBBBB
                     XXXXX XXXXXXXXXXXXXXXXXXXXXXXX
                         XXXXXXX XXXXXXXXXXXXX XXXXXXXXXX XXXXXXX XXXXXXXXXXXXXX
-                            XX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+                            XX XXXXXXXXXXXXXXXXXXXXXXX gettext(u'send') XXXX
                         XXXXXXXXX
                     XXXXXXX
                 XXXXXX
@@ -34,7 +34,7 @@
         </div>
     </div>
  
-    {% if request.user|has_role:'system_admin' or request.user|has_role:'professor' and request.user == post.user %}
+    {% if request.user|has_role:'system_admin' or request.user|has_role:'professor' and request.user in forum.topic.subject.professors.all %}
         <div class="panel panel-primary navigation">
             <div class="panel-heading">
                 <h3 class="panel-title">{% trans 'Actions' %}</h3>
@@ -88,7 +88,7 @@
                                     {% endif %}
                                     <span class="input-group-btn">
                                         <button type="submit" class="btn btn-fab btn-fab-mini">
-                                            <i class="material-icons">send</i>
+                                            <i class="material-icons">{% trans 'send' %}</i>
                                         </button>
                                     </span>
                                 </div>
@@ -34,7 +34,7 @@ BBBBB BBBBBBB
         XXXXXX
     XXXXXX
  
-    BB BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB BB BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB BBB BBBBBBBBBBBB BB BBBBBBBBB
+    BB BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB BB BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB BBB BBBBBBBBBBBB BB BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB
         XXXX XXXXXXXXXXXX XXXXXXXXXXXXX XXXXXXXXXXXX
             XXXX XXXXXXXXXXXXXXXXXXXXXX
                 XXX XXXXXXXXXXXXXXXXXXXX gettext(u'Actions') XXXXX
@@ -88,7 +88,7 @@ BBBBB BBBBBBB
                                     BBBBB
                                     XXXXX XXXXXXXXXXXXXXXXXXXXXXXX
                                         XXXXXXX XXXXXXXXXXXXX XXXXXXXXXX XXXXXXX XXXXXXXXXXXXXX
-                                            XX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+                                            XX XXXXXXXXXXXXXXXXXXXXXXX gettext(u'send') XXXX
                                         XXXXXXXXX
                                     XXXXXXX
                                 XXXXXX
@@ -8,7 +8,7 @@
                     {{ post.user }}
                     <div class="pull-right">
                         <a href="javascript:answer('{{ post.id }}', '{% url 'course:forum:reply_post' %}');">
-                            <i class="material-icons">reply</i>
+                            <i class="material-icons">{% trans 'reply' %}</i>
                         </a>
                         {% if request.user|has_role:'system_admin' or request.user == post.user %}
                             {% csrf_token %}
@@ -8,7 +8,7 @@ BB BBBBBBBBBBBB B B
  
                     XXXX XXXXXXXXXXXXXXXXXXX
                         XX XXXXXXXXXXXXXXXXXXXXXXXXXXX XBBB BBBBBBBBBBBBBBBBBBBBBBBBBXXXXX
-                            XX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+                            XX XXXXXXXXXXXXXXXXXXXXXXX gettext(u'reply') XXXX
                         XXXX
                         BB BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB BB BBBBBBBBBBBB BB BBBBBBBBB
                             BBBBBBBBBB
@@ -8,7 +8,7 @@
                     {{ post.user }}
                     <div class="pull-right">
                         <a href="javascript:answer('{{ post.id }}', '{% url 'course:forum:reply_post' %}');">
-                            <i class="material-icons">reply</i>
+                            <i class="material-icons">{% trans 'reply' %}</i>
                         </a>
                         {% if request.user|has_role:'system_admin' or request.user == post.user %}
                             {% csrf_token %}
@@ -0,0 +1,50 @@
+BBBB BBBB BBBBBBBBBBBBBBB BBBBBBBBBBBBBBBB
+
+BB BBBBBBBBBBBB B B
+    BBB BBBB BB BBBBB
+        XXXX XXXXXXXXXX XXXXXXXX
+            XXXX XXXXXXXXXX XXXXXXXXXXXXXXXX XXXXXXXXXXX
+                XXX XXXXXXXXXXXXXXXXXX
+                    
+                    XXXX XXXXXXXXXXXXXXXXXXX
+                        XX XXXXXXXXXXXXXXXXXXXXXXXXXXX XBBB BBBBBBBBBBBBBBBBBBBBBBBBBXXXXX
+                            XX XXXXXXXXXXXXXXXXXXXXXXX gettext(u'reply') XXXX
+                        XXXX
+                        BB BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB BB BBBBBBBBBBBB BB BBBBBBBBB
+                            BBBBBBBBBB
+                            XXXX XXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXX
+                                XX XXXXXXXXXX XXXXXXXXXXX XXXXXX XXXXXXXXXXXXXXXX XXXXXXXXXXXXX XXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXX
+                                    XX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+                                XXXX
+                                XXX XXXXXXXXXXXXXXXXXXXX XXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+                                    XXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXBBB BBBBBBBBBBBBBBBBBBBBBBBBBB BBBBBBBXX XXX X gettext(u'Post edited successfully!') XXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX  gettext(u'Edit') XXXXXXXXX
+                                    XXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXBBB BBBBBBBBBBBBBBBBBBBBBBBBBB BBBBBBBXX XXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX  gettext(u'Remove') XXXXXXXXX
+                                XXXXX
+                            XXXXXX
+                        BBBBB
+                    XXXXXX
+                XXXXX
+                XXXX XXXXXXXXXXXXXXXXXXXXX
+                    XXXX XXXXXXXXXXXXXXXXXX
+                        XX XXXXXXXXXXXXXXXXXXXXX
+                            XX XXXXXXXXX XXXXXXXXXXXXXXXX FFFFFFFFF  gettext(u'ago') 
+                            BB BBBBBBBBBBBBBBBB
+                                XXXX X  gettext(u'Edited') XXXXX
+                            BBBBB
+                        XXXX
+                    XXXXXX
+                    XX XXXXXXXXXXXXXXXXXXXXXFFFFFFFFFFXXXX
+                XXXXXX
+                XXXX XXXXXXXXXXXXXXXXXXXXXXXXXX
+                XXXX XXXXXXXXXXXXXXXXXXXX
+                    BBBBBBBBBBBBBBBB BBBBBBB BBBB
+                XXXXXX
+                XXXX XXXXXXXXXXXX XXXXXXXXXXXXX XXXXXXXXXXXXXXXX XXXXXXXXXXXX XXXXXXXXXXXXXXX XXXXXX
+                    XXXXXXXX
+                        XXXXX XXXXXXXXX XXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXX
+                    XXXXXXXXX
+                XXXXXX
+            XXXXXX
+        XXXXXX
+    BBBBBB
+BBBBB
 \ No newline at end of file
@@ -6,7 +6,7 @@
             {{ post.user }}
             <div class="pull-right">
                 <a href="javascript:answer('{{ post.id }}', '{% url 'course:forum:reply_post' %}');">
-                    <i class="material-icons">reply</i>
+                    <i class="material-icons">{% trans 'reply' %}</i>
                 </a>
                 {% if request.user|has_role:'system_admin' or request.user|has_role:'professor' and request.user == post.user %}
                     {% csrf_token %}
 BBBB BBBB BBBBBBBBBBBBBBB BBBBBBBBBBBBBBBB
  
-XXXX  XXXXXXXXXXXX
+XXXX XXXXXXXXXX XXXXXXXXXX
     XXXX XXXXXXXXXX XXXXXXXXXXXXXXXX XXXXXXXXXXX
         XXX XXXXXXXXXXXXXXXXXX
  
             XXXX XXXXXXXXXXXXXXXXXXX
                 XX XXXXXXXXXXXXXXXXXXXXXXXXXXX XBBB BBBBBBBBBBBBBBBBBBBBBBBBBXXXXX
-                    XX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+                    XX XXXXXXXXXXXXXXXXXXXXXXX gettext(u'reply') XXXX
                 XXXX
                 BB BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB BB BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB BBB BBBBBBBBBBBB BB BBBBBBBBB
                     BBBBBBBBBB
@@ -15,7 +15,7 @@ XXXX  XXXXXXXXXXXX
                             XX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
                         XXXX
                         XXX XXXXXXXXXXXXXXXXXXXX XXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-                            XXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXBBB BBBBBBBBBBBBBBBBBBBBBBBBBB BBBBBBBXX XXX X gettext(u'Post edited successfully!') XXXXXXXXX
+                            XXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXBBB BBBBBBBBBBBBBBBBBBBBBBBBBB BBBBBBBXX XXX X gettext(u'Post edited successfully!') XXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX  gettext(u'Edit') XXXXXXXXX
                             XXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXBBB BBBBBBBBBBBBBBBBBBBBBBBBBB BBBBBBBXX XXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX  gettext(u'Remove') XXXXXXXXX
                         XXXXX
                     XXXXXX
@@ -26,7 +26,7 @@ XXXX  XXXXXXXXXXXX
             XXXX XXXXXXXXXXXXXXXXXX
                 XX XXXXXXXXXXXXXXXXXXXXX
                     XX XXXXXXXXX XXXXXXXXXXXXXXXX FFFFFFFFF  gettext(u'ago') 
-                    BB BBBBBBBBBBBBBB BB BBBBBBBBBBBBBBBBBBBBB
+                    BB BBBBBBBBBBBBBBBB
                         XXXX X  gettext(u'Edited') XXXXX
                     BBBBB
                 XXXX
@@ -35,7 +35,7 @@
 					{% else %}
 						<span class="input-group-btn">
 					        <button type="submit" class="btn btn-fab btn-fab-mini">
-					            <i class="material-icons">send</i>
+					            <i class="material-icons">{% trans 'send' %}</i>
 					        </button>
 					    </span>
 					{% endif %}
@@ -35,7 +35,7 @@ XXXXX XXXXXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXX XXXXXXXXBB BBBBBBBBB BBBBBBBBBBBBBB
 					BBBB
 						XXXXX XXXXXXXXXXXXXXXXXXXXXXXX
 					        XXXXXXX XXXXXXXXXXXXX XXXXXXXXXX XXXXXXX XXXXXXXXXXXXXX
-					            XX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+					            XX XXXXXXXXXXXXXXXXXXXXXXX gettext(u'send') XXXX
 					        XXXXXXXXX
 					    XXXXXXX
 					BBBBB
@@ -0,0 +1,38 @@
+BBBB BBBB BBBBBBBBBBBBBBB
+
+BB BBBBBBBBBBBBBB B B
+    BBB BBBBBB BB BBBBBBB
+        XXXX XXXXXXXXXXXXXXX
+            XXXX XXXXXXXXXXXX XXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXX XXXXXXXXX
+                XXXX XXXXXXXXXXXXXXXX XXXXXXXXXXX
+                    XXX XXXXXXXXXXXXXXXXXX
+                        
+                        BB BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB BB BBBBBBBBBBBB BB BBBBBBBBBBB
+                            XXXX XXXXXXXXXXXXXXXXXXX
+                                XXXX XXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXX
+                                    XX XXXXXXXXXX XXXXXXXXXXX XXXXXX XXXXXXXXXXXXXXXX XXXXXXXXXXXXX XXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXX
+                                        XX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+                                    XXXX
+                                    XXX XXXXXXXXXXXXXXXXXXXX XXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+                                        XXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXBBB BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB BBBBBBBBBXX XXX X gettext(u'Answer edited sucessfully!') XXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX  gettext(u'Edit') XXXXXXXXX
+                                        XXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXBBB BBBBBBBBBBBBBBBBBBBBBBBBBBBB BBBBBBBBBXX XXX X gettext(u'Are you sure you want to delete this answer?') XXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX  gettext(u'Remove') XXXXXXXXX
+                                    XXXXX
+                                XXXXXX
+                            XXXXXX
+                        BBBBB
+                    XXXXX
+                    XXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXX
+                        XXXX XXXXXXXXXXXXXXXXXX
+                            XX XXXXXXXXXXXXXXXXXXXXXXX XXXXXXXXX XXXXXXXXXXXXXXXX FFFFFFFFF  gettext(u'ago') 
+                                BB BBBBBBBBBBBBBBBBBB
+                                    XXXX X  gettext(u'Edited') XXXXX
+                                BBBBB
+                            XXXX
+                        XXXXXX
+                        XX XXXXXXXXXXXXXXXXXXXXXFFFFFFFFFFXXXX
+                    XXXXXX
+                XXXXXX
+            XXXXXX
+        XXXXXX
+    BBBBBB
+BBBBB
 \ No newline at end of file
 BBBB BBBB BBBBBBBBBBBBBBB
  
-XXXXX
+XXXX XXXXXXXXXXXXXXXXXXX
     XXXX XXXXXXXXXXXX XXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXX XXXXXXXXX
         XXXX XXXXXXXXXXXXXXXX XXXXXXXXXXX
             XXX XXXXXXXXXXXXXXXXXX
@@ -36,7 +36,6 @@ class PostAnswerTestCase (TestCase):
  
         self.course = Course.objects.create(
             name = 'Curso Teste',
-            slug = 'curso_teste',
             max_students = 50,
             init_register_date = '2016-08-26',
             end_register_date = '2016-10-01',
@@ -37,7 +37,6 @@ class ForumTestCase (TestCase):
  
         self.course = Course.objects.create(
             name = 'Curso Teste',
-            slug = 'curso_teste',
             max_students = 50,
             init_register_date = '2016-08-26',
             end_register_date = '2016-10-01',
@@ -36,7 +36,6 @@ class PostTestCase (TestCase):
  
         self.course = Course.objects.create(
             name = 'Curso Teste',
-            slug = 'curso_teste',
             max_students = 50,
             init_register_date = '2016-08-26',
             end_register_date = '2016-10-01',
@@ -42,13 +42,11 @@ class ForumViewTestCase (TestCase):
  
 		self.category = CourseCategory.objects.create(
 			name = 'Category test',
-			slug = 'category_test'
 		)
 		self.category.save()
  
 		self.course = Course.objects.create(
 			name = 'Course Test',
-			slug = 'course_test',
 			max_students = 50,
 			init_register_date = '2016-08-26',
 			end_register_date = '2016-10-01',
@@ -60,7 +58,6 @@ class ForumViewTestCase (TestCase):
  
 		self.subject = Subject.objects.create(
             name = 'Subject Test',
-            slug='subject-test',
             description = "description of the subject test",
             visible = True,
             course = self.course,
@@ -80,7 +77,6 @@ class ForumViewTestCase (TestCase):
 		self.forum = Forum.objects.create(
         	topic=self.topic,
         	name = 'forum test',
-        	slug='forum-test',
         	description = 'description of the forum test',
         	create_date = '2016-10-02',
         	modification_date = '2016-10-03',
@@ -124,22 +120,16 @@ class ForumViewTestCase (TestCase):
 		self.assertEquals(response.status_code, 200)
  
 		response = self.client_professor.get(url)
-		self.assertEquals(response.status_code, 200)
+		self.assertEquals(response.status_code, 302)
  
 		response = self.client_student.get(url)
-		self.assertEquals(response.status_code, 200)
+		self.assertEquals(response.status_code, 302)
  
 	def test_ForumDetail_context(self):
 		url = reverse('course:forum:view', kwargs={'slug':self.forum.slug})
  
 		response = self.client.get(url)
-		self.assertTrue('forum' in response.context)
-
-		response = self.client_professor.get(url)
-		self.assertTrue('forum' in response.context)
-
-		response = self.client_student.get(url)
-		self.assertTrue('forum' in response.context)
+		self.assertTrue('form' in response.context)
  
  
 ######################### CreateForumView #########################
@@ -180,7 +170,7 @@ class ForumViewTestCase (TestCase):
 		self.assertEquals(list_forum, Forum.objects.all().count())
  
 		response = self.client_student.post(url, data)
-		self.assertEquals (response.status_code, 400)
+		self.assertEquals (response.status_code, 403)
 		self.assertEquals(list_forum, Forum.objects.all().count())
  
 	def test_CreateForum_form_ok (self):
@@ -214,20 +204,7 @@ class ForumViewTestCase (TestCase):
 		self.assertEquals(response.status_code, 200)
  
 		response = self.client_professor.get(url)
-		self.assertEquals(response.status_code, 200)
-
-		#response = self.client_student.get(url)
-		#self.assertEquals(response.status_code, 400)
-		
-
-	def test_UpdateForum_context(self):
-		url = reverse('course:forum:update', kwargs={'pk':self.forum.pk})
-
-		response = self.client.get(url)
-		self.assertTrue('form' in response.context)
-
-		response = self.client_professor.get(url)
-		self.assertTrue('form' in response.context)
+		self.assertEquals(response.status_code, 302)
  
  
 	def test_UpdateForum_form_error (self):
@@ -238,10 +215,10 @@ class ForumViewTestCase (TestCase):
 		self.assertEquals (response.status_code, 400)
  
 		response = self.client_professor.post(url, data)
-		self.assertEquals (response.status_code, 400)
+		self.assertEquals (response.status_code, 302)
  
 		response = self.client_student.post(url, data)
-		self.assertEquals (response.status_code, 400)
+		self.assertEquals (response.status_code, 302)
  
 	def test_UpdateForum_form_ok (self):
 		url = reverse('course:forum:update', kwargs={'pk':self.forum.pk})
@@ -260,16 +237,16 @@ class ForumViewTestCase (TestCase):
  
 		data['name'] = 'Forum Updated as professor'
 		self.assertEquals(Forum.objects.all()[0].name, 'Forum Updated')
-		response = self.client_professor.post(url, data)
+		response = self.client.post(url, data)
 		self.assertEquals (response.status_code, 302)
 		self.assertEquals(Forum.objects.all()[0].name, 'Forum Updated as professor')
 		forum = Forum.objects.get(name='Forum Updated as professor')
  
-		#data['name'] = 'Forum Updated as student'
-		#self.assertEquals(Forum.objects.all()[0].name, 'Forum Updated as professor')
-		#response = self.client_student.post(url, data)
-		#self.assertEquals (response.status_code, 400)
-		#self.assertNotEquals(Forum.objects.all()[0].name, 'Forum Updated as student')
+		data['name'] = 'Forum Updated as student'
+		self.assertEquals(Forum.objects.all()[0].name, 'Forum Updated as professor')
+		response = self.client_student.post(url, data)
+		self.assertEquals (response.status_code, 302)
+		self.assertNotEquals(Forum.objects.all()[0].name, 'Forum Updated as student')
 		forum = Forum.objects.get(name='Forum Updated as professor')
  
 ######################### CreatePostView #########################
@@ -9,6 +9,9 @@ from django.http import Http404, JsonResponse
 from django.urls import reverse
 from django.template.loader import render_to_string
  
+from rolepermissions.mixins import HasRoleMixin
+from rolepermissions.verifications import has_object_permission
+
 from .models import Forum, Post, PostAnswer
 from courses.models import Topic
 from core.models import Action, Resource
@@ -41,7 +44,9 @@ class ForumIndex(LoginRequiredMixin, generic.ListView):
  
 		return context
  
-class CreateForumView(LoginRequiredMixin, generic.edit.CreateView, NotificationMixin):
+class CreateForumView(LoginRequiredMixin, HasRoleMixin, generic.edit.CreateView, NotificationMixin):
+	allowed_roles = ['professor', 'system_admin']
+
 	login_url = reverse_lazy("core:home")	
 	redirect_field_name = 'next'
  
@@ -67,9 +72,11 @@ class CreateForumView(LoginRequiredMixin, generic.edit.CreateView, NotificationM
 def render_forum(request, forum):
 	last_forum = get_object_or_404(Forum, id = forum)
  
-	return HttpResponse(str(reverse_lazy('course:forum:view', args = (), kwargs = {'slug': last_forum.slug})) + '-' + str(forum) + '-' + str(last_forum.name))
+	return JsonResponse({'url': str(reverse_lazy('course:forum:view', args = (), kwargs = {'slug': last_forum.slug})), 'forum_id': str(forum), 'name': str(last_forum.name)})
+
+class UpdateForumView(LoginRequiredMixin, HasRoleMixin, generic.UpdateView):
+	allowed_roles = ['professor', 'system_admin']
  
-class UpdateForumView(LoginRequiredMixin, generic.UpdateView):
 	login_url = reverse_lazy("core:home")	
 	redirect_field_name = 'next'
  
@@ -77,6 +84,14 @@ class UpdateForumView(LoginRequiredMixin, generic.UpdateView):
 	form_class = ForumForm
 	model = Forum
  
+	def dispatch(self, *args, **kwargs):
+		forum = get_object_or_404(Forum, id = self.kwargs.get('pk'))
+
+		if(not has_object_permission('edit_forum', self.request.user, forum)):
+			return self.handle_no_permission()
+
+		return super(UpdateForumView, self).dispatch(*args, **kwargs)
+
 	def form_invalid(self, form):
 		return self.render_to_response(self.get_context_data(form = form), status = 400)
  
@@ -93,7 +108,9 @@ def render_edit_forum(request, forum):
  
 	return render(request, 'forum/render_forum.html', context)
  
-class ForumDeleteView(LoginRequiredMixin, generic.DeleteView):
+class ForumDeleteView(LoginRequiredMixin, HasRoleMixin, generic.DeleteView):
+	allowed_roles = ['professor', 'system_admin']
+
 	login_url = reverse_lazy("core:home")
 	redirect_field_name = 'next'
  
@@ -101,6 +118,14 @@ class ForumDeleteView(LoginRequiredMixin, generic.DeleteView):
 	pk_url_kwarg = 'pk'	
 	success_url = reverse_lazy('course:forum:deleted_forum')
  
+	def dispatch(self, *args, **kwargs):
+		forum = get_object_or_404(Forum, id = self.kwargs.get('pk'))
+
+		if(not has_object_permission('delete_forum', self.request.user, forum)):
+			return self.handle_no_permission()
+
+		return super(ForumDeleteView, self).dispatch(*args, **kwargs)
+
 def forum_deleted(request):
 	return HttpResponse(_("Forum deleted successfully."))
  
@@ -112,6 +137,14 @@ class ForumDetailView(LoginRequiredMixin, generic.DetailView):
 	template_name = 'forum/forum_view.html'
 	context_object_name = 'forum'
  
+	def dispatch(self, *args, **kwargs):
+		forum = get_object_or_404(Forum, slug = self.kwargs.get('slug'))
+
+		if(not has_object_permission('view_forum', self.request.user, forum)):
+			return self.handle_no_permission()
+
+		return super(ForumDetailView, self).dispatch(*args, **kwargs)
+
 	def get_context_data(self, **kwargs):
 		context = super(ForumDetailView, self).get_context_data(**kwargs)
 		forum = get_object_or_404(Forum, slug = self.kwargs.get('slug'))
@@ -3,8 +3,8 @@ from django.contrib import admin
 from .models import Link
  
 class LinkAdmin(admin.ModelAdmin):
-	list_display = ['name', 'link_url','link_description']
-	search_fields = ['name', 'link_url','link_description']
+	list_display = ['name', 'slug','link_url','link_description']
+	search_fields = ['name','slug' ,'link_url','link_description']
  
  
 admin.site.register(Link, LinkAdmin)
 from django import forms
 from .models import Link
-import validators
+from django.utils.translation import ugettext_lazy as _
+from django.core.exceptions import ValidationError, FieldError
+import requests
  
 class CreateLinkForm(forms.ModelForm):
  
-    def clean_link(self):
+    def clean_link_url(self):
         link_url = self.cleaned_data['link_url']
-        if not validators.url(link_url):
-            raise forms.ValidationError(_('Please enter a valid URL'))
+        try:
+            response = requests.head(link_url)
+            if response.status_code >= 400:
+                raise forms.ValidationError(_('Invalid url!'))
+        except requests.ConnectionError:
+            raise forms.ValidationError(_('Invalid url!'))
         return link_url
  
     class Meta:
@@ -15,6 +21,15 @@ class CreateLinkForm(forms.ModelForm):
         fields = ['name','link_url','link_description']
  
 class UpdateLinkForm(forms.ModelForm):
+    def clean_link_url(self):
+        link_url = self.cleaned_data['link_url']
+        try:
+            resposta = requests.head(link_url)
+            if resposta.status_code >= 400:
+                raise forms.ValidationError(_('Invalid url!'))
+        except requests.ConnectionError:
+            raise forms.ValidationError(_('Invalid url!'))
+        return link_url
     class Meta:
         model = Link
         fields = ['name','link_url','link_description']
@@ -0,0 +1,60 @@
+from bs4 import BeautifulSoup
+from urllib.request import urlopen
+import urllib.request
+
+def make_soup(url):
+    try:
+        html = urlopen(url).read()
+        return BeautifulSoup(html,"lxml")
+
+    except urllib.error.HTTPError as e:
+        return "Use default image"
+
+def get_images(url,slug):
+    downloaded = False
+    try:
+        soup = make_soup(url)
+    except:
+        return("Use default image",downloaded)
+    if soup == None or type(soup) == str:
+        return ("Use default image",downloaded)
+    images = [img for img in soup.findAll('img')]
+    image_links = [each.get('src') for each in images]
+    link_slug = slug
+    filename = ''
+    for each in image_links:
+        if downloaded:
+            break
+        booleano = False
+        if each != "":
+            if each == None:
+                continue
+            if 'jpg' in each:
+                booleano = True
+                pos = each.index("jpg")
+                each = each[0:pos+3]
+                filename = '.jpg'
+            elif 'png' in each:
+                booleano = True
+                pos = each.index("png")
+                each = each[0:pos+3]
+                filename = '.png'
+            elif 'jpeg' in each:
+                booleano = True
+                pos = each.index('jpeg')
+                each = each[0:pos+4]
+                filename = '.jpeg'
+            if not booleano:
+                continue
+
+            if each[0] + each[1] == '//' or each[0] == '/':
+                each = 'http:'+each
+            if each[0:4] != 'http' and each[0:5] != 'https':
+                each = url[0:url.index('/',8)] + each
+            caminho = "links/static/images/"
+            try:
+                urllib.request.urlretrieve(each,"%s"%(caminho)+str(link_slug)+filename)
+                downloaded = True
+            except Exception:
+                continue
+    return filename,downloaded
@@ -0,0 +1,80 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-10-27 23:54-0300\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+
+#: .\forms.py:16 .\forms.py:22
+msgid "Invalid url!"
+msgstr "Url inválida!"
+
+#: .\templates\links\create_link.html:9
+msgid "Create a New Link"
+msgstr "Criar um novo link"
+
+#: .\templates\links\create_link.html:46 .\templates\links\delete_link.html:15
+#: .\templates\links\update_link.html:25
+msgid "Cancel"
+msgstr "Cancelar"
+
+#: .\templates\links\delete_link.html:11
+msgid "Do you really want to delete this link?"
+msgstr "Você realmente deseja apagar este link?"
+
+#: .\templates\links\delete_link.html:16
+msgid "Confirm"
+msgstr "Confirmar"
+
+#: .\templates\links\update_link.html:8
+msgid "Links"
+msgstr "Links"
+
+#: .\templates\links\update_link.html:13
+msgid "Name"
+msgstr "Nome"
+
+#: .\templates\links\update_link.html:17
+msgid "URL"
+msgstr "URL"
+
+#: .\templates\links\update_link.html:21
+msgid "Description"
+msgstr "Descrição"
+
+#: .\templates\links\update_link.html:26
+msgid "Submit"
+msgstr "Enviar"
+
+#: .\templates\links\view_link.html:8
+msgid "Link"
+msgstr "Link"
+
+#: .\templates\links\view_link.html:17
+msgid "Read more"
+msgstr "Ler mais"
+
+#: .\views.py:28
+msgid "Link created successfully!"
+msgstr "Link criado com sucesso!"
+
+#: .\views.py:50
+msgid "Link deleted Successfully!"
+msgstr "Link apagado com sucesso!"
+
+#: .\views.py:69
+msgid "Link updated successfully!"
+msgstr "Link atualizado com sucesso!"
@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.10 on 2016-10-28 18:34
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('links', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='link',
+            name='image',
+            field=models.ImageField(blank=True, upload_to='links/'),
+        ),
+    ]
@@ -5,6 +5,7 @@ from autoslug.fields import AutoSlugField
 class Link(Material):
 	link_url = models.URLField()
 	link_description = models.CharField(max_length=200)
+	image = models.ImageField(upload_to = 'links/',blank = True)
 	class Meta:
 		verbose_name = 'Link'
 		verbose_name_plural = "Links"
@@ -0,0 +1,3 @@
+.modal-backdrop{
+	z-index: 0;
+}
 \ No newline at end of file
...	...	@@ -137,7 +137,7 @@ TIME_ZONE = 'America/Recife'
137	137
138	138	USE_I18N = True
139	139
140		-USE_L10N = False
	140	+USE_L10N = True
141	141
142	142	USE_TZ = True
143	143
...	...
...	...	@@ -18,9 +18,6 @@
18	18	padding-bottom: 1%;
19	19	width: 15%;
20	20	}
21		-.navigation{
22		- margin: 10% 10% 5% 5%;
23		-}
24	21	.breadcrumb{
25	22	margin-bottom: 5px;
26	23	}
...	...	@@ -320,4 +317,4 @@ body .container .jumbotron-inverse, body .container .well-inverse, body .contain
320	317
321	318	.notification-count {
322	319	background-color: #FF0000;
323	320	-}
	321	+}
324	322	\ No newline at end of file
...	...
...	...	@@ -0,0 +1,17 @@
	1	+from django import forms
	2	+from .models import EmailBackend
	3	+from django.utils.translation import ugettext_lazy as _
	4	+
	5	+class EmailBackendForm(forms.ModelForm):
	6	+
	7	+ class Meta:
	8	+ model = EmailBackend
	9	+ fields = ('description', 'host', 'port', 'username', 'password', 'safe_conection', 'default_from_email')
	10	+ help_texts = {
	11	+ 'host': _('A host name. Example: smtp.gmail.com'),
	12	+ 'port': _('A port number'),
	13	+ 'usermane': _('Your host username'),
	14	+ 'password': _('Your host password'),
	15	+ }
	16	+
	17	+
0	18	\ No newline at end of file
...	...
...	...	@@ -1,178 +0,0 @@
1		-# SOME DESCRIPTIVE TITLE.
2		-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
3		-# This file is distributed under the same license as the PACKAGE package.
4		-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
5		-#
6		-#, fuzzy
7		-msgid ""
8		-msgstr ""
9		-"Project-Id-Version: PACKAGE VERSION\n"
10		-"Report-Msgid-Bugs-To: \n"
11		-"POT-Creation-Date: 2016-09-16 02:41-0300\n"
12		-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13		-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14		-"Language-Team: LANGUAGE <LL@li.org>\n"
15		-"Language: \n"
16		-"MIME-Version: 1.0\n"
17		-"Content-Type: text/plain; charset=UTF-8\n"
18		-"Content-Transfer-Encoding: 8bit\n"
19		-
20		-#: app/templates/app/base.html:10
21		-msgid "The Project"
22		-msgstr ""
23		-
24		-#: app/templates/app/base.html:11
25		-msgid "CCTE Group"
26		-msgstr ""
27		-
28		-#: app/templates/app/base.html:14
29		-msgid "Hi"
30		-msgstr ""
31		-
32		-#: app/templates/app/base.html:16
33		-msgid "See Profile"
34		-msgstr ""
35		-
36		-#: app/templates/app/base.html:17
37		-msgid "Settings"
38		-msgstr ""
39		-
40		-#: app/templates/app/base.html:18
41		-msgid "Logout"
42		-msgstr ""
43		-
44		-#: app/templates/app/index.html:6
45		-msgid "You have:"
46		-msgstr ""
47		-
48		-#: app/templates/app/index.html:10 app/templates/home.html:88
49		-msgid "Pending Tasks"
50		-msgstr ""
51		-
52		-#: app/templates/app/index.html:14
53		-msgid "Users Online"
54		-msgstr ""
55		-
56		-#: app/templates/app/index.html:20
57		-msgid "You can:"
58		-msgstr ""
59		-
60		-#: app/templates/app/index.html:24 app/templates/home_professor.html:25
61		-msgid "Create Course"
62		-msgstr ""
63		-
64		-#: app/templates/app/index.html:29 app/templates/home.html:93
65		-msgid "Manage Users"
66		-msgstr ""
67		-
68		-#: app/templates/app/index.html:33 app/templates/home.html:96
69		-msgid "Manage Courses"
70		-msgstr ""
71		-
72		-#: app/templates/app/index.html:37
73		-msgid "Gerenciar Categorias"
74		-msgstr ""
75		-
76		-#: app/templates/app/index.html:45
77		-msgid "Your course(s):"
78		-msgstr ""
79		-
80		-#: app/templates/app/index.html:46
81		-msgid "No courses subscribed yet"
82		-msgstr ""
83		-
84		-#: app/templates/app/index.html:56
85		-msgid "Search course:"
86		-msgstr ""
87		-
88		-#: app/templates/app/index.html:62
89		-msgid "Search"
90		-msgstr ""
91		-
92		-#: app/templates/app/index.html:67
93		-msgid "Most popular keywords:"
94		-msgstr ""
95		-
96		-#: app/templates/home.html:86
97		-msgid "Home"
98		-msgstr ""
99		-
100		-#: app/templates/home.html:87 app/templates/home_student.html:25
101		-msgid "Profile"
102		-msgstr ""
103		-
104		-#: app/templates/home.html:90
105		-msgid "My courses"
106		-msgstr ""
107		-
108		-#: app/templates/home.html:105 app/templates/home_professor.html:33
109		-msgid "Courses"
110		-msgstr ""
111		-
112		-#: app/templates/home.html:131
113		-msgid "No pending tasks at the moment."
114		-msgstr ""
115		-
116		-#: app/templates/home_admin_content.html:10
117		-msgid "Students"
118		-msgstr ""
119		-
120		-#: app/templates/home_admin_content.html:11
121		-msgid "Beginning"
122		-msgstr ""
123		-
124		-#: app/templates/home_admin_content.html:12
125		-msgid "End"
126		-msgstr ""
127		-
128		-#: app/templates/home_admin_content.html:15
129		-msgid "Edit"
130		-msgstr ""
131		-
132		-#: app/templates/home_professor.html:20 app/templates/home_student.html:21
133		-msgid "Menu"
134		-msgstr ""
135		-
136		-#: app/templates/home_professor.html:24
137		-msgid "Pending tasks"
138		-msgstr ""
139		-
140		-#: app/templates/home_professor.html:26
141		-msgid "Manage Course"
142		-msgstr ""
143		-
144		-#: app/templates/home_professor.html:43
145		-msgid "Students:"
146		-msgstr ""
147		-
148		-#: app/templates/home_professor.html:44
149		-msgid "Beginning:"
150		-msgstr ""
151		-
152		-#: app/templates/home_professor.html:45
153		-msgid "End:"
154		-msgstr ""
155		-
156		-#: app/templates/home_professor.html:52
157		-msgid "You didn't create any course yet."
158		-msgstr ""
159		-
160		-#: app/templates/home_professor.html:58 app/templates/home_student.html:73
161		-msgid "Goals"
162		-msgstr ""
163		-
164		-#: app/templates/home_student.html:26
165		-msgid "My Courses"
166		-msgstr ""
167		-
168		-#: app/templates/home_student.html:27
169		-msgid "Google accounts"
170		-msgstr ""
171		-
172		-#: app/templates/home_student.html:34
173		-msgid "Notifications"
174		-msgstr ""
175		-
176		-#: app/templates/home_student.html:76
177		-msgid "Favorites"
178		-msgstr ""
...	...	@@ -8,7 +8,7 @@ msgid ""
8	8	msgstr ""
9	9	"Project-Id-Version: PACKAGE VERSION\n"
10	10	"Report-Msgid-Bugs-To: \n"
11		-"POT-Creation-Date: 2016-09-07 00:13-0300\n"
	11	+"POT-Creation-Date: 2016-10-26 14:47-0300\n"
12	12	"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13	13	"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14	14	"Language-Team: LANGUAGE <LL@li.org>\n"
...	...	@@ -18,161 +18,198 @@ msgstr ""
18	18	"Content-Transfer-Encoding: 8bit\n"
19	19	"Plural-Forms: nplurals=2; plural=(n > 1);\n"
20	20
21		-#: app/templates/app/base.html:10
22		-msgid "The Project"
23		-msgstr ""
24		-
25		-#: app/templates/app/base.html:11
26		-msgid "CCTE Group"
27		-msgstr ""
	21	+#: app/templates/home.html:69 app/templates/home_professor.html:20
	22	+#: app/templates/home_student.html:21
	23	+msgid "Menu"
	24	+msgstr "Menu"
28	25
29		-#: app/templates/app/base.html:14
30		-msgid "Hi"
31		-msgstr ""
	26	+#: app/templates/home.html:73
	27	+msgid "Home"
	28	+msgstr "Início"
32	29
33		-#: app/templates/app/base.html:16
34		-#, fuzzy
35		-#\| msgid "Profile"
36		-msgid "See Profile"
	30	+#: app/templates/home.html:74 app/templates/home_student.html:25
	31	+msgid "Profile"
37	32	msgstr "Perfil"
38	33
39		-#: app/templates/app/base.html:17
40		-msgid "Settings"
41		-msgstr "Configurações"
42		-
43		-#: app/templates/app/base.html:18
44		-msgid "Logout"
45		-msgstr "Sair"
46		-
47		-#: app/templates/app/index.html:6
48		-msgid "You have:"
49		-msgstr ""
50		-
51		-#: app/templates/app/index.html:10
	34	+#: app/templates/home.html:76
52	35	#, fuzzy
53		-#\| msgid "Pending tasks"
54		-msgid "Pending Tasks"
55		-msgstr "Tarefas Pendentes"
56		-
57		-#: app/templates/app/index.html:14
58		-msgid "Users Online"
59		-msgstr "Usuários Online"
60		-
61		-#: app/templates/app/index.html:20
62		-msgid "You can:"
63		-msgstr ""
	36	+#\| msgid "My Courses"
	37	+msgid "My courses"
	38	+msgstr "Meus Cursos"
64	39
65		-#: app/templates/app/index.html:24 app/templates/home_app.html:26
66		-#: app/templates/home_professor.html:23
67		-msgid "Create Course"
68		-msgstr "Criar Curso"
	40	+#: app/templates/home.html:78 app/templates/home_student.html:27
	41	+#, fuzzy
	42	+#\| msgid "Courses"
	43	+msgid "All Courses"
	44	+msgstr "Cursos"
69	45
70		-#: app/templates/app/index.html:29
	46	+#: app/templates/home.html:80
71	47	#, fuzzy
72	48	#\| msgid "Manage Course"
73	49	msgid "Manage Users"
74		-msgstr "Gerenciar Curso"
	50	+msgstr "Gerenciar Usuários"
75	51
76		-#: app/templates/app/index.html:33
	52	+#: app/templates/home.html:84
77	53	#, fuzzy
78	54	#\| msgid "Manage Course"
79	55	msgid "Manage Courses"
80		-msgstr "Gerenciar Curso"
81		-
82		-#: app/templates/app/index.html:37
83		-msgid "Gerenciar Categorias"
84		-msgstr ""
85		-
86		-#: app/templates/app/index.html:45
87		-msgid "Your course(s):"
88		-msgstr ""
	56	+msgstr "Gerenciar Cursos"
89	57
90		-#: app/templates/app/index.html:46
91		-msgid "No courses subscribed yet"
92		-msgstr ""
	58	+#: app/templates/home.html:101 app/templates/home_professor.html:34
	59	+msgid "Courses"
	60	+msgstr "Cursos"
93	61
94		-#: app/templates/app/index.html:56
95		-msgid "Search course:"
96		-msgstr ""
	62	+#: app/templates/home_admin_content.html:10
	63	+#, fuzzy
	64	+#\| msgid "Students:"
	65	+msgid "Students"
	66	+msgstr "Alunos"
97	67
98		-#: app/templates/app/index.html:62
99		-msgid "Search"
100		-msgstr ""
	68	+#: app/templates/home_admin_content.html:11
	69	+#, fuzzy
	70	+#\| msgid "Beginning:"
	71	+msgid "Beginning"
	72	+msgstr "Começo"
101	73
102		-#: app/templates/app/index.html:67
103		-msgid "Most popular keywords:"
104		-msgstr ""
	74	+#: app/templates/home_admin_content.html:12
	75	+#, fuzzy
	76	+#\| msgid "End:"
	77	+msgid "End"
	78	+msgstr "Fim:"
105	79
106		-#: app/templates/home_app.html:14 app/templates/home_professor.html:9
107		-#: app/templates/home_student.html:9
108		-msgid "Home"
109		-msgstr "Início"
	80	+#: app/templates/home_admin_content.html:15
	81	+msgid "Edit"
	82	+msgstr "Editar"
110	83
111		-#: app/templates/home_app.html:22 app/templates/home_professor.html:22
	84	+#: app/templates/home_professor.html:24
112	85	msgid "Pending tasks"
113	86	msgstr "Tarefas Pendentes"
114	87
115		-#: app/templates/home_app.html:23
116		-#, fuzzy
117		-#\| msgid "Users Online"
118		-msgid "Users Online (1)"
119		-msgstr "Usuários Online"
120		-
121		-#: app/templates/home_app.html:24
122		-#, fuzzy
123		-#\| msgid "Courses"
124		-msgid "Course"
125		-msgstr "Cursos"
	88	+#: app/templates/home_professor.html:25
	89	+msgid "Create Course"
	90	+msgstr "Criar Curso"
126	91
127		-#: app/templates/home_app.html:27 app/templates/home_professor.html:24
	92	+#: app/templates/home_professor.html:26
128	93	msgid "Manage Course"
129	94	msgstr "Gerenciar Curso"
130	95
131		-#: app/templates/home_app.html:35 app/templates/home_professor.html:31
132		-msgid "Courses"
133		-msgstr "Cursos"
134		-
135		-#: app/templates/home_app.html:51 app/templates/home_professor.html:48
136		-msgid "You didn't create any course yet."
137		-msgstr "Você não criou nenhum curso ainda."
138		-
139		-#: app/templates/home_app.html:59 app/templates/home_professor.html:54
140		-#: app/templates/home_student.html:60
141		-msgid "Goals"
142		-msgstr "Metas"
143		-
144		-#: app/templates/home_professor.html:18 app/templates/home_student.html:18
145		-msgid "Menu"
146		-msgstr "Menu"
147		-
148		-#: app/templates/home_professor.html:40
	96	+#: app/templates/home_professor.html:44
149	97	msgid "Students:"
150	98	msgstr "Alunos"
151	99
152		-#: app/templates/home_professor.html:41
	100	+#: app/templates/home_professor.html:45
153	101	msgid "Beginning:"
154	102	msgstr "Começo"
155	103
156		-#: app/templates/home_professor.html:42
	104	+#: app/templates/home_professor.html:46
157	105	msgid "End:"
158		-msgstr "Fim"
	106	+msgstr "Fim:"
159	107
160		-#: app/templates/home_student.html:22
161		-msgid "Profile"
162		-msgstr "Perfil"
	108	+#: app/templates/home_professor.html:53
	109	+msgid "You didn't create any course yet."
	110	+msgstr "Você não criou nenhum curso ainda."
163	111
164		-#: app/templates/home_student.html:23
	112	+#: app/templates/home_student.html:26
165	113	msgid "My Courses"
166	114	msgstr "Meus Cursos"
167	115
168		-#: app/templates/home_student.html:24
	116	+#: app/templates/home_student.html:28
169	117	msgid "Google accounts"
170	118	msgstr "Contas do Google"
171	119
172		-#: app/templates/home_student.html:31
	120	+#: app/templates/home_student.html:35
173	121	msgid "Notifications"
174	122	msgstr "Notificações"
175	123
176		-#: app/templates/home_student.html:63
177		-msgid "Favorites"
178		-msgstr "Favoritos"
	124	+#: app/templates/home_student.html:48
	125	+msgid "His course has notified a new activity!"
	126	+msgstr "Seu curso tem uma nova atividade!"
	127	+
	128	+#: app/templates/home_student.html:51 app/templates/home_student.html:59
	129	+#: app/templates/home_student.html:67
	130	+msgid "Go"
	131	+msgstr "Ir"
	132	+
	133	+#: app/templates/home_student.html:56
	134	+msgid "His teacher has notified a new material!"
	135	+msgstr "Seu professor adicionou um novo material!"
	136	+
	137	+#: app/templates/home_student.html:64
	138	+msgid "You have a new guardian!"
	139	+msgstr "Você tem um novo tutor!"
	140	+
	141	+#: app/templates/home_teacher_student_content.html:14
	142	+msgid "at"
	143	+msgstr "em"
	144	+
	145	+#: app/templates/home_teacher_student_content.html:15
	146	+msgid "ago"
	147	+msgstr "atrás"
	148	+
	149	+#~ msgid "The Project"
	150	+#~ msgstr "O projeto"
	151	+
	152	+#~ msgid "CCTE Group"
	153	+#~ msgstr "Grupo CCTE"
	154	+
	155	+#~ msgid "Hi"
	156	+#~ msgstr "Olá"
	157	+
	158	+#, fuzzy
	159	+#~\| msgid "Profile"
	160	+#~ msgid "See Profile"
	161	+#~ msgstr "Perfil"
	162	+
	163	+#~ msgid "Settings"
	164	+#~ msgstr "Configurações"
	165	+
	166	+#~ msgid "Logout"
	167	+#~ msgstr "Sair"
	168	+
	169	+#~ msgid "You have:"
	170	+#~ msgstr "Você tem:"
	171	+
	172	+#, fuzzy
	173	+#~\| msgid "Pending tasks"
	174	+#~ msgid "Pending Tasks"
	175	+#~ msgstr "Tarefas Pendentes"
	176	+
	177	+#~ msgid "Users Online"
	178	+#~ msgstr "Usuários Online"
	179	+
	180	+#~ msgid "You can:"
	181	+#~ msgstr "Você pode:"
	182	+
	183	+#~ msgid "Manage Categories"
	184	+#~ msgstr "Gerenciar Categorias"
	185	+
	186	+#~ msgid "Your course(s):"
	187	+#~ msgstr "Seus cursos:"
	188	+
	189	+#~ msgid "No courses subscribed yet"
	190	+#~ msgstr "Nenhum curso inscrito ainda"
	191	+
	192	+#~ msgid "Search course:"
	193	+#~ msgstr "Pesquisar curso"
	194	+
	195	+#~ msgid "Search"
	196	+#~ msgstr "Pesquisar"
	197	+
	198	+#~ msgid "Most popular keywords:"
	199	+#~ msgstr "Palavras mais populares:"
	200	+
	201	+#, fuzzy
	202	+#~\| msgid "Users Online"
	203	+#~ msgid "Users Online (1)"
	204	+#~ msgstr "Usuários Online"
	205	+
	206	+#, fuzzy
	207	+#~\| msgid "Courses"
	208	+#~ msgid "Course"
	209	+#~ msgstr "Cursos"
	210	+
	211	+#~ msgid "Goals"
	212	+#~ msgstr "Metas"
	213	+
	214	+#~ msgid "Favorites"
	215	+#~ msgstr "Favoritos"
...	...
1	1	from django.db import models
2		-
	2	+from django.utils.translation import ugettext_lazy as _
3	3	# Create your models here.
	4	+
	5	+class EmailBackend(models.Model):
	6	+
	7	+ SAFE_CONECTIONS = (
	8	+ (0, _('No')),
	9	+ (1, _('TLS, if available')),
	10	+ (2, 'TLS'),
	11	+ (3, 'SSL'),
	12	+
	13	+ )
	14	+ description = models.CharField(_('Description'), max_length=100)
	15	+ host = models.URLField(_('E-mail Host'))
	16	+ port = models.CharField(_('Email Port'), max_length=4, blank=True)
	17	+ username = models.CharField(_('Email host username'), max_length=30)
	18	+ password = models.CharField(_('Email host password'), max_length=30, blank=True)
	19	+ safe_conection = models.IntegerField(_('Use safe conection'), choices=SAFE_CONECTIONS, default=0)
	20	+ default_from_email = models.EmailField(_('Default from email'), blank=True)
	21	+
	22	+ class Meta:
	23	+ verbose_name = _('Amadeus SMTP setting')
	24	+ verbose_name_plural = _('Amadeus SMTP settings')
	25	+
	26	+ def __str__(self):
	27	+ return _('Custom email Backend')
...	...
...	...	@@ -0,0 +1,135 @@
	1	+{% extends "home.html" %}
	2	+
	3	+{% load static i18n django_bootstrap_breadcrumbs permission_tags %}
	4	+
	5	+{% block breadcrumbs %}
	6	+ {{ block.super }}
	7	+ {% breadcrumb 'Settings' 'app:settings' %}
	8	+{% endblock %}
	9	+
	10	+{% block content %}
	11	+ <!-- Nav tabs -->
	12	+ <ul class="nav nav-tabs md-pills pills-ins" role="tablist">
	13	+ <li class="nav-item">
	14	+ <a class="nav-link active" data-toggle="tab" href="#panel1" role="tab"><i class="fa fa-cog"></i> System</a>
	15	+ </li>
	16	+ <li class="nav-item">
	17	+ <a class="nav-link" data-toggle="tab" href="#panel2" role="tab"><i class="fa fa-envelope"></i> Mail Sender</a>
	18	+ </li>
	19	+ <li class="nav-item">
	20	+ <a class="nav-link" data-toggle="tab" href="#panel3" role="tab"><i class="fa fa-lock"></i> Security</a>
	21	+ </li>
	22	+ </ul>
	23	+
	24	+ <!-- Tab panels -->
	25	+ <div class="tab-content">
	26	+ <!--Panel 1-->
	27	+ <div class="tab-pane fade in active" id="panel1" role="tabpanel">
	28	+ <div class="panel panel-default">
	29	+ <div class="panel-body">
	30	+ <h3><b>General</b></h3>
	31	+ <div class="panel panel-default">
	32	+ <div class="panel-body">
	33	+ Content
	34	+ <hr>
	35	+ </div>
	36	+ </div>
	37	+ </div>
	38	+ </div>
	39	+ </div>
	40	+ <!--/.Panel 1-->
	41	+
	42	+ <!--Panel 2-->
	43	+ <div class="tab-pane fade" id="panel2" role="tabpanel">
	44	+ <div class="panel panel-default">
	45	+ <div class="panel-body">
	46	+ <h3><b>Outgoing Server (SMTP)</b></h3>
	47	+ <div class="panel panel-default">
	48	+ <div class="panel-body">
	49	+ <h4><b>Settings</b></b></h4>
	50	+ <hr>
	51	+ <div class="form-group label-floating">
	52	+ <label class="control-label" for="focusedInput1">Description</label>
	53	+ <input class="form-control" id="focusedInput1" type="text">
	54	+ </div>
	55	+ <div class="form-group label-floating">
	56	+ <label class="control-label" for="focusedInput1">Server</label>
	57	+ <input class="form-control" id="focusedInput1" type="text">
	58	+ </div>
	59	+ <div class="form-group label-floating">
	60	+ <label for="number" class="col-md_10 control-label">Port</label>
	61	+ <div class="col-md-2">
	62	+ <input type="number" class="form-control" id="inputNumber">
	63	+ </div>
	64	+ <div>
	65	+ <label for="number">Deafault:</label> 25
	66	+ </div>
	67	+ </div>
	68	+ </div>
	69	+ </div>
	70	+ </div>
	71	+ <div class="panel-body">
	72	+ <div class="panel panel-default">
	73	+ <div class="panel-body">
	74	+ <h4><b>Security and Authentication</b></h4>
	75	+ <hr>
	76	+ <div class="form-group label-floating">
	77	+ <label class="control-label" for="focusedInput1">User Name</label>
	78	+ <input class="form-control" id="focusedInput1" type="text">
	79	+ </div>
	80	+ <div class="form-group label-floating">
	81	+ <label class="control-label" for="focusedInput1">Password</label>
	82	+ <input class="form-control" id="focusedInput1" type="password">
	83	+ </div>
	84	+ <div class="form-group">
	85	+ <p><b>Use safe contection</b></p>
	86	+ <div class="col-md-10">
	87	+ <div class="radio radio-primary">
	88	+ <label>
	89	+ <input type="radio" name="optionsRadios" id="optionsRadios1" value="option1">
	90	+ No
	91	+ </label>
	92	+ <label>
	93	+ <input type="radio" name="optionsRadios" id="optionsRadios2" value="option2">
	94	+ TSL, If available
	95	+ </label>
	96	+ <label>
	97	+ <input type="radio" name="optionsRadios" id="optionsRadios3" value="option3">
	98	+ TSL
	99	+ </label>
	100	+ <label>
	101	+ <input type="radio" name="optionsRadios" id="optionsRadios4" value="option4" checked="">
	102	+ SSL
	103	+ </label>
	104	+ </div>
	105	+ </div>
	106	+ </div>
	107	+ </div>
	108	+ </div>
	109	+ <button type="button" class="btn btn-success btn-raised">Save changes</button>
	110	+ </div>
	111	+ </div>
	112	+ </div>
	113	+
	114	+ <!--/.Panel 2-->
	115	+
	116	+ <!--Panel 3-->
	117	+ <div class="tab-pane fade" id="panel3" role="tabpanel">
	118	+ <div class="panel panel-default">
	119	+ <div class="panel-body">
	120	+ <div class="togglebutton">
	121	+ <label>
	122	+ <input type="checkbox" checked> <b>Allow users self-enroll.</b>
	123	+ </label>
	124	+ </div>
	125	+ <div class="togglebutton">
	126	+ <label>
	127	+ <input type="checkbox"> <b>Put the system in maintenance mode.</b>
	128	+ </label>
	129	+ </div>
	130	+ <button type="button" class="btn btn-primary">Save changes</button>
	131	+ </div>
	132	+ </div>
	133	+ </div>
	134	+ </div>
	135	+{% endblock content %}
0	136	\ No newline at end of file
...	...
...	...	@@ -3,55 +3,61 @@
3	3	{% load static i18n django_bootstrap_breadcrumbs permission_tags %}
4	4
5	5	{% block javascript %}
6		- {% if page_obj %}
7		- <script type="text/javascript">
8		- var pageNum = {{ page_obj.number }}; // The latest page loaded
9		- var numberPages = {{ paginator.num_pages }}; // Indicates the number of pages
10		- var baseUrl = '{% url "app:index" %}';
	6	+ {% if page_obj %}
	7	+ <script type="text/javascript">
	8	+ {% if page_obj and paginator %}
	9	+ var pageNum = {{ page_obj.number }}; // The latest page loaded
	10	+ var numberPages = {{ paginator.num_pages }}; // Indicates the number of pages
	11	+ {% else %}
	12	+ var pageNum = 0 ; // The latest page loaded
	13	+ var numberPages = 0 ; // Indicates the number of pages
	14	+ {% endif %}
	15	+
	16	+ var baseUrl = '{% url "app:index" %}';
11	17
12		- // loadOnScroll handler
13		- var loadOnScroll = function() {
14		- // If the current scroll position is past out cutoff point...
15		- if ($(window).scrollTop() >= $(document).height() - $(window).height() - 10) {
16		- // temporarily unhook the scroll event watcher so we don't call a bunch of times in a row
17		- $(window).unbind();
18		- // execute the load function below that will visit the view and return the content
19		- loadItems();
20		- }
21		- };
	18	+ // loadOnScroll handler
	19	+ var loadOnScroll = function() {
	20	+ // If the current scroll position is past out cutoff point...
	21	+ if ($(window).scrollTop() >= $(document).height() - $(window).height() - 10) {
	22	+ // temporarily unhook the scroll event watcher so we don't call a bunch of times in a row
	23	+ $(window).unbind();
	24	+ // execute the load function below that will visit the view and return the content
	25	+ loadItems();
	26	+ }
	27	+ };
22	28
23		- var loadItems = function() {
24		- // Check if page is equal to the number of pages
25		- if (pageNum == numberPages) {
26		- return false
27		- }
28		- // Update the page number
29		- pageNum = pageNum + 1;
	29	+ var loadItems = function() {
	30	+ // Check if page is equal to the number of pages
	31	+ if (pageNum == numberPages) {
	32	+ return false
	33	+ }
	34	+ // Update the page number
	35	+ pageNum = pageNum + 1;
30	36
31		- $("#loading").show();
32		- // Configure the url we're about to hit
33		- setTimeout(function (){
34		- $.ajax({
35		- url: baseUrl,
36		- data: {'page': pageNum},
37		- success: function(data) {
38		- $("#loading").hide();
	37	+ $("#loading").show();
	38	+ // Configure the url we're about to hit
	39	+ setTimeout(function (){
	40	+ $.ajax({
	41	+ url: baseUrl,
	42	+ data: {'page': pageNum},
	43	+ success: function(data) {
	44	+ $("#loading").hide();
39	45
40		- $("#timeline").append(data);
41		- },
42		- complete: function(data, textStatus){
43		- // Turn the scroll monitor back on
44		- $(window).bind('scroll', loadOnScroll);
45		- }
46		- });
47		- }, 1000)
48		- };
	46	+ $("#timeline").append(data);
	47	+ },
	48	+ complete: function(data, textStatus){
	49	+ // Turn the scroll monitor back on
	50	+ $(window).bind('scroll', loadOnScroll);
	51	+ }
	52	+ });
	53	+ }, 1000)
	54	+ };
49	55
50		- $(document).ready(function(){
51		- $(window).bind('scroll', loadOnScroll);
52		- });
53		- </script>
54		- {% endif %}
	56	+ $(document).ready(function(){
	57	+ $(window).bind('scroll', loadOnScroll);
	58	+ });
	59	+ </script>
	60	+ {% endif %}
55	61	{% endblock %}
56	62
57	63	{% block breadcrumbs %}
...	...	@@ -64,9 +70,9 @@
64	70	{% endblock %}
65	71
66	72	{% block sidebar %}
67		- <div class="panel panel-primary navigation">
	73	+ <div class="panel panel-primary">
68	74	<div class="panel-heading">
69		- <h4>Menu</h4>
	75	+ <h4>{% trans 'Menu' %}</h4>
70	76	</div>
71	77	<div class="panel-body">
72	78	<ul class="nav nav-pills nav-stacked">
...	...	@@ -74,10 +80,12 @@
74	80	<li><a href="{% url 'users:profile' %}">{% trans 'Profile' %}</a></li>
75	81	{% if user\|has_role:'student' or not user.is_staff %}
76	82	<li><a href="{% url 'course:manage' %}">{% trans 'My courses' %}</a></li>
	83	+ <li><a href="{% url 'course:all_courses' %}">{% trans 'All Courses' %}</a></li>
77	84	{% endif %}
78		- <li><a href="{% url 'core:guest' %}">{% trans 'All Courses' %}</a></li>
	85	+ <li><a href="{% url 'core:guest' %}">{% trans 'Courses' %}</a></li>
79	86	{% if user\|has_role:'system_admin' %}
80	87	<li> <a href="{% url 'users:manage' %}">{% trans 'Manage Users' %}</a></li>
	88	+ <li> <a href="{% url 'app:settings' %}">{% trans 'Settings' %}</a></li>
81	89	{% endif %}
82	90	{% if user\|has_role:'system_admin' or user\|has_role:'professor' %}
83	91	<li>
...	...	@@ -97,19 +105,19 @@
97	105	{% endblock %}
98	106
99	107	{% block content %}
100		- {% if user\|has_role:'system_admin' %}
	108	+ {% if user\|has_role:'system_admin' %}
101	109	<h3>{% trans 'Courses' %}</h3>
102	110	<div id="timeline">
103		- {% include page_template %}
	111	+ {% include page_template %}
104	112	</div>
105		- {% else %}
	113	+ {% else %}
106	114	<div id="timeline">
107	115	{% include page_template %}
108	116	</div>
109		- {% endif %}
110		- <div id="loading" class="alert alert-primary" role="alert" style="display: none">
111		- <center>
112		- <span class="fa fa-spin fa-circle-o-notch"></span>
113		- </center>
114		- </div>
	117	+ {% endif %}
	118	+ <div id="loading" class="alert alert-primary" role="alert" style="display: none">
	119	+ <center>
	120	+ <span class="fa fa-spin fa-circle-o-notch"></span>
	121	+ </center>
	122	+ </div>
115	123	{% endblock %}
...	...
...	...	@@ -15,7 +15,7 @@
15	15	{% endblock %}
16	16
17	17	{% block sidebar %}
18		- <div class="panel panel-primary navigation">
	18	+ <div class="panel panel-primary">
19	19	<div class="panel-heading">
20	20	<h5>{% trans 'Menu' %}</h5>
21	21	</div>
...	...	@@ -32,9 +32,9 @@
32	32	{% block content %}
33	33
34	34	<h3>{% trans 'Courses' %}</h3>
35		- {% if courses\|length > 0 %}
36		- {% for course in courses %}
37		- <a href="{% url 'course:view' course.slug %}">
	35	+ {% if courses\|length > 0 %}
	36	+ {% for course in courses %}
	37	+ <a href="{% url 'course:view' course.slug %}">
38	38	<div class="panel panel-default courseHome">
39	39	<div class="panel-body">
40	40	<p>{{ course }}</p>
...	...	@@ -48,9 +48,9 @@
48	48	</div>
49	49	</div>
50	50	</a>
51		- {% endfor %}
52		- {% else %}
53		- <p>{% trans "You didn't create any course yet." %}</p>
54		- {% endif %}
	51	+ {% endfor %}
	52	+ {% else %}
	53	+ <p>{% trans "You didn't create any course yet." %}</p>
	54	+ {% endif %}
55	55	{% endblock %}
56	56
...	...
...	...	@@ -16,23 +16,23 @@
16	16
17	17
18	18	{% block sidebar %}
19		- <div class="panel panel-primary navigation">
	19	+ <div class="panel panel-primary">
20	20	<div class="panel-heading">
21	21	<h4>{% trans 'Menu' %}</h4>
22	22	</div>
23	23	<div class="panel-body">
24		- <ul class="nav nav-pills nav-stacked">
25		- <li><a href="{% url 'users:profile' %}">{% trans 'Profile' %}</a></li>
26		- <li><a href="{% url 'course:manage' %}">{% trans 'My Courses' %}</a></li>
27		- <li><a href="{% url 'core:guest' %}">{% trans 'All Courses' %}</a></li>
28		- <li><a href="javascript:void(0)">{% trans 'Google accounts' %}</a></li>
	24	+ <ul class="nav nav-pills nav-stacked">
	25	+ <li><a href="{% url 'users:profile' %}">{% trans 'Profile' %}</a></li>
	26	+ <li><a href="{% url 'course:manage' %}">{% trans 'My Courses' %}</a></li>
	27	+ <li><a href="{% url 'course:all_courses' %}">{% trans 'All Courses' %}</a></li>
	28	+ <li><a href="javascript:void(0)">{% trans 'Google accounts' %}</a></li>
29	29	</ul>
30	30	</div>
31	31	</div>
32	32	{% endblock %}
33	33
34	34	{% block content %}
35		- <h3>{% trans 'Notifications' %}</h3>
	35	+ <h3>{% trans 'Notifications' %}</h3>
36	36	{% if messages %}
37	37	{% for message in messages %}
38	38	<div class="alert alert-success alert-dismissible" role="alert">
...	...	@@ -44,27 +44,27 @@
44	44	{% endfor %}
45	45	{% endif %}
46	46	<div class="panel panel-default">
47		- <div class="panel-body">
48		- His course has notified a new activity!
49		- </div>
50		- <div class="panel-footer">
51		- Go
52		- </div>
	47	+ <div class="panel-body">
	48	+ {% trans 'His course has notified a new activity!' %}
	49	+ </div>
	50	+ <div class="panel-footer">
	51	+ {% trans 'Go' %}
	52	+ </div>
53	53	</div>
54	54	<div class="panel panel-default">
55		- <div class="panel-body">
56		- His teacher has notified a new material!
57		- </div>
58		- <div class="panel-footer">
59		- Go
60		- </div>
	55	+ <div class="panel-body">
	56	+ {% trans 'His teacher has notified a new material!' %}
	57	+ </div>
	58	+ <div class="panel-footer">
	59	+ {% trans 'Go' %}
	60	+ </div>
61	61	</div>
62	62	<div class="panel panel-default">
63		- <div class="panel-body">
64		- You have a new guardian!
65		- </div>
66		- <div class="panel-footer">
67		- Go
68		- </div>
	63	+ <div class="panel-body">
	64	+ {% trans 'You have a new guardian!' %}
	65	+ </div>
	66	+ <div class="panel-footer">
	67	+ {% trans 'Go' %}
	68	+ </div>
69	69	</div>
70	70	{% endblock %}
...	...