conflit

Matheus Lins
2 parents 5309b7f9 a05687ab
Showing 45 changed files with 933 additions and 717 deletions Show diff stats
app/forms.py
app/models.py
app/templates/admin_settings.html
app/templates/home.html
app/urls.py
app/views.py
core/static/css/base/amadeus.css
core/static/js/base/amadeus.js
core/templates/base.html
core/templates/register_user.html
courses/locale/he_il/LC_MESSAGES/django.po
courses/static/js/topic_editation_presentation.js
courses/templates/subject/form_view_teacher.html
courses/templates/topic/link_topic_list.html
courses/templates/topic/link_topic_list_edit.html
exam/locale/pt_BR/LC_MESSAGES/django.po
files/locale/pt_BR/LC_MESSAGES/django.po
forum/locale/pt_BR/LC_MESSAGES/django.po
forum/static/js/forum.js
forum/tests/test_view_forum.py
@@ -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
 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
@@ -5,8 +5,14 @@
 {% 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
+            {% 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
@@ -79,6 +85,7 @@
                     <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>
@@ -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, )
+
+
  
@@ -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 */
@@ -404,6 +408,7 @@ ul, li {
 .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; }
@@ -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
 */
@@ -20,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>
  
@@ -140,7 +146,7 @@
 						        </ul>
 						    </div>
 						</div>
-							
+
 						{% endif %}
 	    		{% endblock %}
     		</div>
@@ -158,6 +164,10 @@
 	{% block script_file %}
  
 	{% endblock script_file %}
+
+	{% block script_link %}
+
+	{% endblock script_link %}
 </body>
  
 </html>
@@ -6,6 +6,10 @@
 {% block nav %}
 {% endblock %}
  
+{% block sidebar %}
+	
+{% endblock sidebar %}
+
  
 {% block content %}
 	{% if messages %}
@@ -19,85 +23,79 @@
         {% 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-6 col-md-offset-4 col-sm-6 col-sm-offset-4  col-xs-6 col-xs-offset-4 col-lg-6 col-lg-offset-4 col-xl-6 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>
-							<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-10 col-md-offset-2 col-lg-10 col-lg-offset-2 col-sm-10
-											col-sm-offset-2 col-xs-10 col-xs-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>
+							<legend>{% trans 'User Register' %}</legend>
+							{% for field in form %}
+							<div class="form-group is-empy{% if form.has_error %} has-error {% endif %} is-fileinput">
+								{% 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">
+									{% 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-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 %}
-										<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>
+							{% endfor %}
+							<div class="col-md-offset-4 col-md-2 col-sm-2 col-xs-2">
+								<input type="submit" value="{% trans 'Save' %}" class="btn btn-sm btn-success" />	
+							</div>
+							<div class="col-md-offset-3 col-md-2 col-sm-2 col-xs-2">
+								<a href="{% url 'core:home' %}" class="btn btn-sm btn-success" >{% trans 'Cancel' %}</a>	
+							</div>
+							
 						</form>
 					</div>
-				</div>
 			</div>
 		</div>
 	</div>
-
+	
 	<br clear="all" />
 {% endblock %}
@@ -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 ""
-$(".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
@@ -4,7 +4,7 @@
    <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>
+   <script type = "text/javascript" src="{% static 'js/links.js' %}"></script>
 {% endblock %}
 <div class="panel panel-default cards-detail">
   <div class="panel-heading topic">
@@ -16,7 +16,7 @@
         <a role="button">
           <h4>{{topic}}</h4>
         </a>
-      </div><!--column-->
+      </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">
@@ -31,7 +31,7 @@
           {% 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: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 %}
@@ -39,9 +39,9 @@
       </div><!--column-->
     </div><!--row-->
   </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-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">
+      <div class="presentation" id="presentation_{{topic.slug}}">
         <p>
           <i>
             {{topic.description|linebreaks}}
@@ -86,7 +86,7 @@
           </div>
         </div>
       </div><!--EndPresentation-->
-      <div class="editation">
+      <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}}">
@@ -135,16 +135,12 @@
         </div>
         <div class="form-group">
           <div class="col-md-10">
-            <button type="button" class="btn btn-raised btn-default edit_card_end">{% trans 'Cancel' %}</button>
-            <button type="submit" class="btn btn-raised btn-primary edit_card_end">{% trans 'Submit' %}</button>
+            <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><!--EndEditation-->
-      {% professor_subject topic.subject user as professor_links %}
-        {% if professor_links%}
-            {% include "links/create_link.html" %}
-            {% include "links/delete_link.html" %}
-        {% endif %}
+
     </div>
   </div>
 </div>
@@ -287,10 +283,7 @@
 <!--EndModal-->
  
 <!-- MODAL LINK EDIT-->
-{% professor_subject topic.subject user as links_update %}
-{% if links_update%}
-    {% include "links/update_link.html" %}
-{% endif %}
+
  
 <!-- EndModal -->
  
@@ -313,5 +306,3 @@
         </div>
     </div>
 </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>
@@ -24,119 +24,119 @@ msgstr &quot;&quot;
  
 #: exam/forms.py:33
 msgid "Start date to resolve the exam"
-msgstr ""
+msgstr "Data de início para resolver o exame"
  
 #: exam/forms.py:35
 msgid "Maximum date permited to resolve the exam"
-msgstr ""
+msgstr "Data máxima permitida para resolver o exame"
  
 #: exam/models.py:9
 msgid "Begin of Course Date"
-msgstr ""
+msgstr "Data de início do curso"
  
 #: exam/models.py:10
 msgid "Exibe?"
-msgstr ""
+msgstr "Exibir?"
  
 #: exam/models.py:13 exam/models.py:35
 msgid "Exam"
-msgstr ""
+msgstr "Exame"
  
 #: exam/models.py:14
 msgid "Exams"
-msgstr ""
+msgstr "Exames"
  
 #: exam/models.py:21 exam/models.py:27
 msgid "Answer"
-msgstr ""
+msgstr "Resposta"
  
 #: exam/models.py:22
 msgid "Order"
-msgstr ""
+msgstr "Ordem"
  
 #: exam/models.py:23 exam/models.py:28
 msgid "Answers"
-msgstr ""
+msgstr "Respostas"
  
 #: exam/models.py:34
 msgid "Answered"
-msgstr ""
+msgstr "Respondida"
  
 #: exam/models.py:36
 msgid "Answers Students"
-msgstr ""
+msgstr "Resposta dos estudantes"
  
 #: exam/models.py:37
 msgid "Student"
-msgstr ""
+msgstr "Estudante"
  
 #: exam/models.py:38
 msgid "Answered Date"
-msgstr ""
+msgstr "Data da resposta"
  
 #: exam/models.py:41
 msgid "Answer Stundent"
-msgstr ""
+msgstr "Resposta do estudante"
  
 #: exam/models.py:42
 msgid "Answers Student"
-msgstr ""
+msgstr "Respostas dos estudantes"
  
 #: exam/templates/exam/create.html:9
 msgid "New Exam"
-msgstr ""
+msgstr "Novo exame"
  
 #: exam/templates/exam/create.html:14 exam/templates/exam/create.html:16
 msgid "Exam Name"
-msgstr ""
+msgstr "Nome do exame"
  
 #: exam/templates/exam/create.html:20
 msgid "Exam's begin date"
-msgstr ""
+msgstr "Data de início do exame"
  
 #: exam/templates/exam/create.html:22
 msgid "Begin Date"
-msgstr ""
+msgstr "Data de início"
  
 #: exam/templates/exam/create.html:26
 msgid "Exam's end date"
-msgstr ""
+msgstr "Data final do exame"
  
 #: exam/templates/exam/create.html:28
 msgid "End Date"
-msgstr ""
+msgstr "Data final"
  
 #: exam/templates/exam/create.html:35
 msgid "Allow submissions after deadline?"
-msgstr ""
+msgstr "Permitir submissões após o prazo?"
  
 #: exam/templates/exam/create.html:44 exam/templates/exam/create.html:47
 msgid "Question Type"
-msgstr ""
+msgstr "Tipo de questão"
  
 #: exam/templates/exam/create.html:48
 msgid "Multiple Choice"
-msgstr ""
+msgstr "Múltipla escolha"
  
 #: exam/templates/exam/create.html:49
 msgid "True or False"
-msgstr ""
+msgstr "Verdadeiro ou falso"
  
 #: exam/templates/exam/create.html:50
 msgid "Gap Filling"
-msgstr ""
+msgstr "Preenchimento de lacunas"
  
 #: exam/templates/exam/create.html:51
 msgid "Discursive Question"
-msgstr ""
+msgstr "Questão discursiva"
  
 #: exam/templates/exam/create.html:57
 msgid "add question"
-msgstr ""
+msgstr "Adicionar questão"
  
 #: exam/templates/exam/create.html:62
 msgid "Create"
-msgstr ""
+msgstr "Criar"
  
 #: exam/templates/exam/discursive_question.html:2
 #: exam/templates/exam/discursive_question.html:4
@@ -144,24 +144,24 @@ msgstr &quot;&quot;
 #: exam/templates/exam/true_or_false_question.html:20
 #: exam/templates/exam/true_or_false_question.html:25
 msgid "Question"
-msgstr ""
+msgstr "Questão"
  
 #: exam/templates/exam/gap_filling_question.html:2
 msgid "Gap Filling Question"
-msgstr ""
+msgstr "Questão de preenchimento de lacunas"
  
 #: exam/templates/exam/multiple_choice_question.html:15
 msgid "Alternatives"
-msgstr ""
+msgstr "Alternativas"
  
 #: exam/templates/exam/true_or_false_answer.html:9
 msgid "Write your alternative"
-msgstr ""
+msgstr "Escreva sua alternativa"
  
 #: exam/templates/exam/true_or_false_question.html:37
 msgid "Alternatives: T/F"
-msgstr ""
+msgstr "Alternativas: V/F"
  
 #: exam/templates/exam/true_or_false_question.html:45
 msgid "New Alternative"
-msgstr ""
+msgstr "Nova alternativa"
@@ -20,69 +20,69 @@ msgstr &quot;&quot;
  
 #: files/forms.py:12 files/forms.py:29
 msgid "File too large (Max 10MB)"
-msgstr ""
+msgstr "Arquivo muito grande (máximo de 10MB)"
  
 #: files/models.py:20
 msgid "Professors"
-msgstr ""
+msgstr "Professores"
  
 #: files/models.py:21
 msgid "Description"
-msgstr ""
+msgstr "Descrição"
  
 #: files/models.py:22 files/models.py:27
 msgid "File"
-msgstr ""
+msgstr "Arquivo"
  
 #: files/models.py:23
 msgid "Type file"
-msgstr ""
+msgstr "Tipo de arquivo"
  
 #: files/models.py:28
 msgid "Files"
-msgstr ""
+msgstr "Arquivos"
  
 #: files/templates/files/create_file.html:10
 msgid "Add File"
-msgstr ""
+msgstr "Adicionar arquivo"
  
 #: files/templates/files/create_file.html:38
 #: files/templates/files/update_file.html:40
 msgid "Choose your file..."
-msgstr ""
+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 ""
+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 ""
+msgstr "Fechar"
  
 #: files/templates/files/create_file.html:75
 #: files/templates/files/update_file.html:80
 msgid "Submit"
-msgstr ""
+msgstr "Enviar"
  
 #: files/templates/files/delete_file.html:12
 msgid "Delete File"
-msgstr ""
+msgstr "Deletar arquivo"
  
 #: files/templates/files/delete_file.html:30
 msgid "Are you sure to delete "
-msgstr ""
+msgstr "Tem certeza que deseja deletar "
  
 #: files/templates/files/delete_file.html:35
 msgid "Delete"
-msgstr ""
+msgstr "Deletar"
  
 #: files/templates/files/update_file.html:12
 msgid "Edit File"
-msgstr ""
+msgstr "Editar arquivo"
  
 #: files/templates/files/update_file.html:48
 msgid "See current file"
-msgstr ""
+msgstr "Visualizar arquivo atual"
@@ -20,88 +20,88 @@ msgstr &quot;&quot;
  
 #: forum/forms.py:11
 msgid "Title"
-msgstr ""
+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 ""
+msgstr "Descrição"
  
 #: forum/forms.py:13
 msgid "Limit Date"
-msgstr ""
+msgstr "Data limite"
  
 #: forum/forms.py:16
 msgid "Forum title"
-msgstr ""
+msgstr "Título do fórum"
  
 #: forum/forms.py:17
 msgid "What is this forum about?"
-msgstr ""
+msgstr "Qual o assunto deste fórum?"
  
 #: forum/forms.py:18
 msgid "Limit date for students post on this forum"
-msgstr ""
+msgstr "Data limite para estudantes postarem neste fórum"
  
 #: forum/forms.py:33 forum/forms.py:46
 msgid "Message"
-msgstr ""
+msgstr "Mensagem"
  
 #: forum/models.py:15 forum/models.py:33 forum/models.py:61
 msgid "Modification Date"
-msgstr ""
+msgstr "Data de modificação"
  
 #: forum/models.py:16
 msgid "Create Date"
-msgstr ""
+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 ""
+msgstr "Fórum"
  
 #: forum/models.py:20
 msgid "Foruns"
-msgstr ""
+msgstr "Fóruns"
  
 #: forum/models.py:31 forum/models.py:58
 msgid "Autor"
-msgstr ""
+msgstr "Autor"
  
 #: forum/models.py:32
 msgid "Post message"
-msgstr ""
+msgstr "Postar mensagem"
  
 #: forum/models.py:34
 msgid "Post Date"
-msgstr ""
+msgstr "Data de postagem"
  
 #: forum/models.py:38 forum/models.py:59
 msgid "Post"
-msgstr ""
+msgstr "Postar"
  
 #: forum/models.py:39
 msgid "Posts"
-msgstr ""
+msgstr "Postagens"
  
 #: forum/models.py:60
 msgid "Answer message"
-msgstr ""
+msgstr "Resposta"
  
 #: forum/models.py:62
 msgid "Answer Date"
-msgstr ""
+msgstr "Data da resposta"
  
 #: forum/models.py:65
 msgid "Post Answer"
-msgstr ""
+msgstr "Postar resposta"
  
 #: forum/models.py:66
 msgid "Post Answers"
-msgstr ""
+msgstr "Postar respostas"
  
 #: forum/templates/forum/forum_list.html:16
 #: forum/templates/forum/forum_view.html:44
@@ -112,73 +112,73 @@ msgstr &quot;&quot;
 #: forum/templates/post_answers/post_answer_load_more_render.html:17
 #: forum/templates/post_answers/post_answer_render.html:15
 msgid "Edit"
-msgstr ""
+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 ""
+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 ""
+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 ""
+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 ""
+msgstr "Enviar"
  
 #: forum/templates/forum/forum_view.html:13
 msgid "Home"
-msgstr ""
+msgstr "Início"
  
 #: forum/templates/forum/forum_view.html:27
 msgid "Menu"
-msgstr ""
+msgstr "Menu"
  
 #: forum/templates/forum/forum_view.html:31
 msgid "Profile"
-msgstr ""
+msgstr "Perfil"
  
 #: forum/templates/forum/forum_view.html:32
 msgid "My Courses"
-msgstr ""
+msgstr "Meus cursos"
  
 #: forum/templates/forum/forum_view.html:40
 msgid "Actions"
-msgstr ""
+msgstr "Ações"
  
 #: forum/templates/forum/forum_view.html:44
 msgid "Forum edited successfully!"
-msgstr ""
+msgstr "Fórum editado com sucesso!"
  
 #: forum/templates/forum/forum_view.html:124
 msgid "Close"
-msgstr ""
+msgstr "Fechar"
  
 #: forum/templates/forum/forum_view.html:125
 msgid "Update"
-msgstr ""
+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 ""
+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 ""
+msgstr "Post editado com sucesso!"
  
 #: forum/templates/post/post_list.html:21
 #: forum/templates/post/post_load_more_render.html:21
@@ -187,7 +187,7 @@ msgstr &quot;&quot;
 #: forum/templates/post_answers/post_answer_load_more_render.html:18
 #: forum/templates/post_answers/post_answer_render.html:16
 msgid "Remove"
-msgstr ""
+msgstr "Remover"
  
 #: forum/templates/post/post_list.html:30
 #: forum/templates/post/post_load_more_render.html:30
@@ -196,7 +196,7 @@ msgstr &quot;&quot;
 #: forum/templates/post_answers/post_answer_load_more_render.html:26
 #: forum/templates/post_answers/post_answer_render.html:24
 msgid "ago"
-msgstr ""
+msgstr "atrás"
  
 #: forum/templates/post/post_list.html:32
 #: forum/templates/post/post_load_more_render.html:32
@@ -205,46 +205,46 @@ msgstr &quot;&quot;
 #: forum/templates/post_answers/post_answer_load_more_render.html:28
 #: forum/templates/post_answers/post_answer_render.html:26
 msgid "Edited"
-msgstr ""
+msgstr "Editado"
  
 #: forum/templates/post/post_list.html:54 forum/views.py:196
 msgid "Load more posts"
-msgstr ""
+msgstr "Carregar mais postagens"
  
 #: forum/templates/post/post_update_form.html:32
 #: forum/templates/post_answers/post_answer_form.html:32
 msgid "Cancel"
-msgstr ""
+msgstr "Cancelar"
  
 #: forum/templates/post/post_update_form.html:33
 #: forum/templates/post_answers/post_answer_form.html:33
 msgid "Save changes"
-msgstr ""
+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 ""
+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 ""
+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 ""
+msgstr "Carregar mais respostas"
  
 #: forum/views.py:130
 msgid "Forum deleted successfully."
-msgstr ""
+msgstr "Fórum deletado com sucesso."
  
 #: forum/views.py:253
 msgid "Post deleted successfully."
-msgstr ""
+msgstr "Postagem deletada com sucesso."
  
 #: forum/views.py:365
 msgid "Post answer deleted successfully."
-msgstr ""
+msgstr "Resposta deletada com sucesso."
@@ -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,
     });
@@ -72,13 +72,13 @@ function setForumCreateFormSubmit() {
             data: frm.serialize(),
             dataType: "json",
             success: function (data) {
-                $('.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>");
+                $(".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;
@@ -120,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 #########################
@@ -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']
@@ -1,53 +0,0 @@
-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):
-    try:
-        soup = make_soup(url)
-    except:
-        return("Use default image")
-    if soup == None or type(soup) == str:
-        return "Use default image"
-    images = [img for img in soup.findAll('img')]
-    image_links = [each.get('src') for each in images]
-    contador = 0
-    for each in image_links:
-        booleano = False
-        if each != "":
-            if each == None:
-                continue
-            if 'jpg' in each:
-                booleano = True
-                pos = each.index("jpg")
-                each = each[0:pos+3]
-            elif 'png' in each:
-                booleano = True
-                pos = each.index("png")
-                each = each[0:pos+3]
-            elif 'jpeg' in each:
-                booleano = True
-                pos = each.index('jpeg')
-                each = each[0:pos+4]
-            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
-            contador += 1
-            caminho = ""
-            filename=each.split('/')[-1]
-            try:
-                urllib.request.urlretrieve(each,"%s"%(caminho)+str(contador)+filename)
-            except Exception:
-                continue
@@ -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
@@ -8,7 +8,7 @@ msgid &quot;&quot;
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-10-26 14:47-0300\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"
@@ -18,64 +18,63 @@ msgstr &quot;&quot;
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
  
-#: links/forms.py:10
-msgid "Please enter a valid URL"
-msgstr ""
+#: .\forms.py:16 .\forms.py:22
+msgid "Invalid url!"
+msgstr "Url inválida!"
  
-#: links/templates/links/create_link.html:9
+#: .\templates\links\create_link.html:9
 msgid "Create a New Link"
-msgstr ""
+msgstr "Criar um novo link"
  
-#: links/templates/links/create_link.html:34
-#: links/templates/links/delete_link.html:15
-#: links/templates/links/update_link.html:25
+#: .\templates\links\create_link.html:46 .\templates\links\delete_link.html:15
+#: .\templates\links\update_link.html:25
 msgid "Cancel"
-msgstr ""
+msgstr "Cancelar"
  
-#: links/templates/links/delete_link.html:11
+#: .\templates\links\delete_link.html:11
 msgid "Do you really want to delete this link?"
-msgstr ""
+msgstr "Você realmente deseja apagar este link?"
  
-#: links/templates/links/delete_link.html:16
+#: .\templates\links\delete_link.html:16
 msgid "Confirm"
-msgstr ""
+msgstr "Confirmar"
  
-#: links/templates/links/update_link.html:8
+#: .\templates\links\update_link.html:8
 msgid "Links"
-msgstr ""
+msgstr "Links"
  
-#: links/templates/links/update_link.html:13
+#: .\templates\links\update_link.html:13
 msgid "Name"
-msgstr ""
+msgstr "Nome"
  
-#: links/templates/links/update_link.html:17
+#: .\templates\links\update_link.html:17
 msgid "URL"
-msgstr ""
+msgstr "URL"
  
-#: links/templates/links/update_link.html:21
-msgid "Descrição"
-msgstr ""
+#: .\templates\links\update_link.html:21
+msgid "Description"
+msgstr "Descrição"
  
-#: links/templates/links/update_link.html:26
+#: .\templates\links\update_link.html:26
 msgid "Submit"
-msgstr ""
+msgstr "Enviar"
  
-#: links/templates/links/view_link.html:8
+#: .\templates\links\view_link.html:8
 msgid "Link"
-msgstr ""
+msgstr "Link"
  
-#: links/templates/links/view_link.html:17
+#: .\templates\links\view_link.html:17
 msgid "Read more"
-msgstr ""
+msgstr "Ler mais"
  
-#: links/views.py:28
+#: .\views.py:28
 msgid "Link created successfully!"
-msgstr ""
+msgstr "Link criado com sucesso!"
  
-#: links/views.py:50
+#: .\views.py:50
 msgid "Link deleted Successfully!"
-msgstr ""
+msgstr "Link apagado com sucesso!"
  
-#: links/views.py:69
+#: .\views.py:69
 msgid "Link updated successfully!"
-msgstr ""
+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
@@ -0,0 +1,8 @@
+function get_modal_link(url, id,div_content){
+    $.get(url, function (data) {
+        $(div_content).empty();
+        $(div_content).append(data);
+        $(id).modal('show');
+    });
+
+}
@@ -12,27 +12,29 @@
         <!-- Card -->
         <form method="post" action="" id="form-link" enctype="multipart/form-data">
           {% csrf_token %}
-          {% if messages %}
-              {% for message in messages %}
-                  <div class="alert alert-{{ message.tags }} 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 %}
         {% for field in form %}
+            <div class ="form-group">
             {% if field.field.required %}
               <label for="{{ field.auto_id }}">{{ field.label }}<span>*</span></label>
-            {% else %}
-              <label for="{{ field.auto_id }}">{{ field.label }}</label>
             {% endif %}
-            {% render_field field class='form-control' %}
+            {% render_field field class='form-control input-sm' %}
+            {% if field.errors %}
+                <div class="alert alert-danger alert-dismissible clearfix" 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>
         {% endfor %}
         <div class="form-group">
-          <a href="javascript:void(0)" class="btn btn-raised btn-default" data-dismiss="modal">{% trans 'Cancel' %}</a>
-          <button class="btn btn-raised btn-primary" type="submit">{% trans 'Submit' %]</button>
+          <button type="button" class="btn btn-danger btn-raised" data-dismiss="modal">{% trans "Cancel" %}</button>
+          <button class="btn btn-raised btn-primary" type="submit">{% trans 'Submit' %}</button>
         </div>
         <!-- .end Card -->
       </div>
@@ -40,29 +42,32 @@
   </div>
 </div>
 <!-- EndModal -->
-
-{# // <script src="{% static '/links.js' %}"></script> #}
-<script type="text/javascript">
-  $("#form-link").submit(function(event) {
-        var data = new FormData($('#form-link').get(0));
-        $.ajax({
-            url: "{% url 'course:links:create_link' topic.slug %}",
-            type: $("#form-link").attr('method'),
-            data: data,
-            cache: false,
-            processData: false,
-            contentType: false,
-            success: function(data) {
-                $('#createLinksModal').modal('hide');
-                $('#list-topic{{ topic.id }}-links').append(data);
-                $('#list-topic{{ topic.id }}-links-edit').append(data);
-            },
-            error: function(data){
-                $('.erro').html(data.responseText);
-                $('.modal-backdrop').remove();
-                $('#createLinksModal').modal();
-            }
-        });
-        event.preventDefault();
-      });
-</script>
+{% block script_link %}
+    {# // <script src="{% static 'js/links.js' %}"></script> #}
+    <script type="text/javascript">
+      $("#form-link").submit(function(event) {
+            var data = new FormData($('#form-link').get(0));
+            $.ajax({
+                url: "{% url 'course:links:create_link' topic.slug %}",
+                type: $("#form-link").attr('method'),
+                data: data,
+                cache: false,
+                processData: false,
+                contentType: false,
+                success: function(data) {
+                    $('#createLinksModal').modal('hide');
+                    $('#list-topic{{ topic.id }}-links').append(data);
+                    $('#list-topic{{ topic.id }}-links-edit').append(data);
+                    alertify.alert('Link successfully created!')
+                },
+                error: function(data){
+                    $('.erro').html(data.responseText);
+                    $('.modal-backdrop').remove();
+                    $('#createLinksModal').modal();
+                    alertify.alert('Invalid link, insert a valid one!');
+                }
+            });
+            event.preventDefault();
+          });
+    </script>
+{% endblock script_link %}
-{% load widget_tweaks i18n %}
-<!-- MODAL REMOVE LINK -->
-<div class="modal" id="removeLink">
-  <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 'Do you really want to delete this link?' %}</p>
-      </div>
-      <div class="modal-footer">
-        <!--  -->
-        <button type="button" class="btn btn-primary btn-default" data-dismiss="modal">{% trans 'Cancel' %}</button>
-        <a href="http://www.google.com" target="_self"><button type="button" class="btn btn-primary" data-dismiss="modal" aria-hidden="true">{% trans 'Confirm' %}</button></a>
+{% load static widget_tweaks i18n %}
  
-      </div>
+<!-- MODAL DELETE LINK -->
+<link rel="stylesheet" type="text/css" href="{% static 'css/link.css' %}">
+
+<div class="erro-update">
+    <div class="modal fade" id="linkDeleteModal" tabindex="-1" role="dialog" aria-labelledby="deleteLinkLabel" style="z-index: 10">
+        <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="deleteLinkLabel">{% trans 'Delete Link' %}</h4>
+                </div>
+                <div class="modal-body">
+                <!-- Card -->
+                    <form class="form-horizontal" method="post" id="form-delete-link" enctype="multipart/form-data">
+                    {% csrf_token %}
+                        <fieldset>
+                            <div class="col-md-12">
+                                {% trans "Are you sure to delete the link " %} <strong>"{{ link.name }}"</strong> </a> of {{ link.topic.name }}?
+                            </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">{% trans 'Delete' %}</button>
+                                </div>
+                            </div>
+                        </fieldset>
+                    </form>
+                <!-- .end Card -->
+              </div>
+            </div>
+        </div>
     </div>
-  </div>
 </div>
-<!-- END -->
+
+{% block script_link %}
+
+    {# // <script src="{% static 'js/link.js' %}"></script> #}
+    <script type="text/javascript">
+      $("#form-delete-link").submit(function(event) {
+            var data = new FormData($('#form-delete-link').get(0));
+            $.ajax({
+                url: "{% url 'course:links:delete_link' link.slug %}",
+                type: $("#form-delete-link").attr('method'),
+                data: data,
+                cache: false,
+                processData: false,
+                contentType: false,
+                success: function(data) {
+                    $('#linkDeleteModal').modal('hide');
+                    $('#link_{{ link.slug }}').remove();
+                    $('#link_edit_icon_{{ link.slug }}').remove();
+                    $('#link_edit_{{ link.slug }}').remove();
+                    alertify.alert('Link successfully deleted!')
+                },
+                error: function(data){
+                    // $('.erro-update').html(data.responseText);
+                    $('.modal-backdrop').remove();
+                    $('#linkDeteleModal').modal();
+                    alertify.alert('Error when trying to delete.');
+                }
+            });
+            event.preventDefault();
+          });
+  </script>
+{% endblock script_link %}
+<!-- EndModal -->
-<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>
@@ -5,29 +5,73 @@
     <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 'Links' %}</h4>
+        <h4 class="modal-title" id="myModalLabel">{% trans 'Edit Link' %}</h4>
       </div>
       <div class="modal-body">
         <!-- Card -->
+        <form class="form-horizontal" method="post" id="form-update-link" enctype="multipart/form-data">
+        {% csrf_token %}
+        {% for field in form %}
+            <div class="form-group is-empty">
+                <div class="col-md-12">
+                    {% if field.field.required %}
+                        <label for="{{ field.auto_id }}" class="control-label">{{ field.label }}<span>*</span></label>
+                    {% else %}
+                        <label for="{{ field.auto_id }}" class=" control-label">{{ field.label }}</label>
+                    {% endif %}
+                    {% render_field field class='form-control input-sm' %}
+                  </div>
+            </div>
+            {% if field.errors %}
+                <div class="alert alert-danger alert-dismissible clearfix" 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 %}
+        {% endfor %}
         <div class="form-group">
-          <label class="control-label" for="inputDefault">{% trans 'Name' %}</label>
-          <input value="Python" type="text" class="form-control" id="inputDefault">
+          <button type="button" class="btn btn-danger btn-raised" data-dismiss="modal">{% trans "Cancel" %}</button>
+          <button class="btn btn-raised btn-primary" type="submit">{% trans 'Submit' %}</button>
         </div>
-        <div class="form-group">
-          <label class="control-label" for="inputDefault">{% trans 'URL' %}</label>
-          <input value="https://www.python.org/" type="text" class="form-control" id="inputDefault">
-        </div>
-        <div class="form-group is-empty">
-          <label class="control-label" for="inputDefault">{% trans 'Descrição' %}</label>
-          <textarea class="form-control" rows="3"></textarea>
-        </div>
-        <div class="form-group">
-          <a href="javascript:void(0)" class="btn btn-raised btn-default" data-dismiss="modal">{% trans 'Cancel' %}</a>
-          <a href="javascript:void(0)" class="btn btn-raised btn-primary">{% trans 'Submit' %}</a>
-      </div>
         <!-- .end Card -->
       </div>
     </div>
   </div>
 </div>
 <!-- EndModal -->
+{% block script_link %}
+
+    {# // <script src="{% static 'js/links.js' %}"></script> #}
+    <script type="text/javascript">
+      $("#form-update-link").submit(function(event) {
+            var data = new FormData($('#form-update-link').get(0));
+            $.ajax({
+                url: "{% url 'course:links:update_link' link.slug %}",
+                type: $("#form-update-link").attr('method'),
+                data: data,
+                cache: false,
+                processData: false,
+                contentType: false,
+                success: function(data) {
+                    $('#linksModalEdit').modal('hide');
+                    $('#link_edit_{{ link.slug }}').replaceWith(data);
+                    $('#link_{{ link.slug }}').replaceWith(data);
+                    alertify.alert("Sucessfully Updated!")
+                },
+                error: function(data){
+                    $('.erro-update').html(data.responseText);
+                    $('.modal-backdrop').remove();
+                    $('#linksModalEdit').modal();
+                    alertify.alert('Invalid link, insert a valid one!');
+                }
+            });
+            event.preventDefault();
+          });
+  </script>
+{% endblock script_link %}
@@ -10,7 +10,7 @@
       <div class="modal-body">
         <!-- Card -->
         <article class="card animated fadeInLeft">
-          <img class="card-img-top img-responsive" src="https://www.python.org/static/opengraph-icon-200x200.png" align="left">
+          <img class="card-img-top img-responsive" src="{{ link.image.url}}" width="200" height="200"  align="left">
            <div class="card-block">
               <b class="card-title">{{link.name}}</b><p></p>
               <p class="card-text"> </p><p>{{link.link_description}}</p>
@@ -154,7 +154,9 @@ class LinkTestCase(TestCase):
          url = reverse('course:links:update_link',kwargs={'slug': self.link.slug})
          print("slug",self.link.slug)
          data = {
+            "name" : 'testinglink',
             "link_description":'new description',
+            "link_url" : 'teste.com',
          }
          self.assertEqual(Link.objects.all()[0].link_description, "testdescription") # old description
          response = self.client.post(url, data)
@@ -3,8 +3,8 @@ from . import views
  
 urlpatterns = [
     url(r'^create_link/(?P<slug>[\w_-]+)/$', views.CreateLink.as_view(), name='create_link'),
-    url(r'^deletelink/(?P<linkname>[\w_-]+)/$', views.deleteLink,name = 'delete_link'),
-	url(r'^updatelink/(?P<slug>[\w_-]+)/$', views.UpdateLink.as_view(),name = 'update_link'),
-    url(r'^render-link/(?P<id>[0-9]+)/$', views.render_link, name='render_link'),
+    url(r'^delete_link/(?P<slug>[\w_-]+)/$', views.DeleteLink.as_view(),name = 'delete_link'),
+	url(r'^update_link/(?P<slug>[\w_-]+)/$', views.UpdateLink.as_view(),name = 'update_link'),
+    url(r'^render-link/(?P<slug>[\w_-]+)/$', views.render_link, name='render_link'),
     url(r'^view_link/(?P<slug>[\w_-]+)/$',views.ViewLink.as_view(),name = 'view_link')
 ]
@@ -6,12 +6,16 @@ from django.utils.translation import ugettext_lazy as _
 from django.shortcuts import get_object_or_404,redirect
 from django.contrib.auth.mixins import LoginRequiredMixin
 from rolepermissions.mixins import HasRoleMixin
+from core.mixins import NotificationMixin
+from django.urls import reverse
+from django.core.files.base import ContentFile
+from rolepermissions.verifications import has_role
  
+from .image_crawler import *
 from courses.models import Topic
 from .models import Link
 from .forms import *
-from core.mixins import NotificationMixin
-from django.urls import reverse
+
  
 # Create your views here.
 class CreateLink(LoginRequiredMixin, HasRoleMixin, NotificationMixin, generic.CreateView):
@@ -20,19 +24,36 @@ class CreateLink(LoginRequiredMixin, HasRoleMixin, NotificationMixin, generic.Cr
     form_class = CreateLinkForm
     success_url = reverse_lazy('course:manage')
     context_object_name = 'form'
+    def form_invalid(self,form):
+        context = super(CreateLink, self).form_invalid(form)
+        context.status_code = 400
+
+        return context
  
     def form_valid(self, form):
         self.object = form.save(commit = False)
         topic = get_object_or_404(Topic, slug = self.kwargs.get('slug'))
         self.object.topic = topic
-        messages.success(self.request, _('Link created successfully!'))
-       
         self.object.save()
+        self.link = Link.objects.get(slug = self.object.slug)
+        self.formato,self.baixado = get_images(self.link.link_url,self.link.slug)
+        self.caminho = 'links/static/images/%s'%(self.link.slug)+'%s'%(self.formato)
+
         super(CreateLink, self).createNotification(message="created a Link at "+ self.object.topic.name, actor=self.request.user,
-            resource_name=self.object.name, resource_link= reverse('course:view_topic', args=[self.object.topic.slug]), 
+            resource_name=self.object.name, resource_link= reverse('course:view_topic', args=[self.object.topic.slug]),
             users=self.object.topic.subject.students.all())
-
+        self.setImage()
         return self.get_success_url()
+    def setImage(self):
+        if self.baixado:
+            with open(self.caminho,'rb') as f:
+                data = f.read()
+            nome = '%s'%(self.link.slug)+"%s"%(self.formato)
+            self.link.image.save(nome,ContentFile(data))
+        else:
+            with open('links/static/images/default.jpg','rb') as f:
+                data = f.read()
+            self.link.image.save('default.jpg',ContentFile(data))
     def get_context_data(self,**kwargs):
         context = {}
         context['links'] = Link.objects.all()
@@ -41,20 +62,37 @@ class CreateLink(LoginRequiredMixin, HasRoleMixin, NotificationMixin, generic.Cr
         context["topic"] = topic
         return context
     def get_success_url(self):
-        self.success_url = redirect('course:links:render_link', id = self.object.id)
+        self.success_url = redirect('course:links:render_link', slug = self.object.slug)
         return self.success_url
-def deleteLink(request,linkname):
-    link = get_object_or_404(Link,name = linkname)
-    link.delete()
-    template_name = 'links/delete_link.html'
-    messages.success(request,_("Link deleted Successfully!"))
-   
-    return redirect('course:manage')
  
-def render_link(request, id):
+class DeleteLink(LoginRequiredMixin, HasRoleMixin, generic.DeleteView):
+	allowed_roles = ['professor', 'system_admin']
+	login_url = reverse_lazy("core:home")
+	redirect_field_name = 'next'
+	model = Link
+	template_name = 'links/delete_link.html'
+
+	def dispatch(self, *args, **kwargs):
+		link = get_object_or_404(Link, slug = self.kwargs.get('slug'))
+		if(not (link.topic.owner == self.request.user) and not(has_role(self.request.user, 'system_admin')) ):
+			return self.handle_no_permission()
+		return super(DeleteLink, self).dispatch(*args, **kwargs)
+
+	def get_context_data(self, **kwargs):
+		context = super(DeleteLink, self).get_context_data(**kwargs)
+		context['course'] = self.object.topic.subject.course
+		context['subject'] = self.object.topic.subject
+		context['link'] = self.object
+		context["topic"] = self.object.topic
+		return context
+
+	def get_success_url(self):
+		return reverse_lazy('course:view_topic', kwargs={'slug' : self.object.topic.slug})
+
+def render_link(request, slug):
 	template_name = 'links/render_link.html'
 	context = {
-		'link': get_object_or_404(Link, id = id)
+		'link': get_object_or_404(Link, slug = slug)
 	}
 	return render(request, template_name, context)
  
@@ -64,18 +102,41 @@ class UpdateLink(LoginRequiredMixin, HasRoleMixin, generic.UpdateView):
     template_name = 'links/update_link.html'
     form_class = UpdateLinkForm
     success_url = reverse_lazy('course:links:render_link')
-    def form_valid(self, form):
-        form.save()
-        messages.success(self.request, _('Link updated successfully!'))
  
-        return super(UpdateLink, self).form_valid(form)
+    def form_invalid(self,form):
+        context = super(UpdateLink, self).form_invalid(form)
+        context.status_code = 400
  
+        return context
+    def form_valid(self, form):
+        formulario = form
+        if formulario.has_changed():
+            if  'link_url' in formulario.changed_data:
+                self.object = form.save()
+                self.link = Link.objects.get(slug = self.object.slug)
+                self.formato,self.baixado = get_images(self.link.link_url,self.link.slug)
+                self.caminho = 'links/static/images/%s'%(self.link.slug)+'%s'%(self.formato)
+                self.setImage()
+            else:
+                form.save()
+        else:
+            form.save()
+        return super(UpdateLink, self).form_valid(form)
+    def setImage(self):
+        if self.baixado:
+            with open(self.caminho,'rb') as f:
+                data = f.read()
+            nome = '%s'%(self.link.slug)+"%s"%(self.formato)
+            self.object.image.save(nome,ContentFile(data))
+        else:
+            with open('links/static/images/default.jpg','rb') as f:
+                data = f.read()
+            self.object.image.save('default.jpg',ContentFile(data))
     def get_object(self, queryset=None):
         self.object = get_object_or_404(Link, slug = self.kwargs.get('slug'))
-        print(self.object.link_description)
         return self.object
     def get_success_url(self):
-        self.success_url = redirect('course:links:render_link', id = self.object.id)
+        self.success_url = reverse_lazy('course:links:render_link', args = (self.object.slug, ))
         return self.success_url
 class ViewLink(LoginRequiredMixin,HasRoleMixin,generic.DetailView):
     allowed_roles = ['professor', 'system_admin']
@@ -88,7 +149,7 @@ class ViewLink(LoginRequiredMixin,HasRoleMixin,generic.DetailView):
         context['link'] = link
         return context
     def get_success_url(self):
-        self.success_url = redirect('course:links:render_link', id = self.object.id)
+        self.success_url = redirect('course:links:render_link', slug = self.object.slug)
         return self.success_url
     def get_queryset(self):
         self.queryset = Link.objects.filter(slug = self.kwargs.get('slug'))
@@ -24,108 +24,108 @@ msgstr &quot;&quot;
  
 #: poll/models.py:11 poll/models.py:32
 msgid "Poll"
-msgstr ""
+msgstr "Enquete"
  
 #: poll/models.py:12
 msgid "Polls"
-msgstr ""
+msgstr "Enquetes"
  
 #: poll/models.py:18 poll/models.py:24 poll/templates/poll/answer.html:11
 #: poll/templates/poll/answer_student.html:27
 #: poll/templates/poll/create.html:68 poll/templates/poll/create.html:85
 #: poll/templates/poll/view.html:33
 msgid "Answer"
-msgstr ""
+msgstr "Reposta"
  
 #: poll/models.py:19
 msgid "Order"
-msgstr ""
+msgstr "Ordem"
  
 #: poll/models.py:20 poll/models.py:25
 msgid "Answers"
-msgstr ""
+msgstr "Repostas"
  
 #: poll/models.py:31
 msgid "Answered"
-msgstr ""
+msgstr "Respondido"
  
 #: poll/models.py:33
 msgid "Answers Students"
-msgstr ""
+msgstr "Respostas dos estudantes"
  
 #: poll/models.py:34
 msgid "Student"
-msgstr ""
+msgstr "Estudante"
  
 #: poll/models.py:35
 msgid "Answered Date"
-msgstr ""
+msgstr "Data de resposta"
  
 #: poll/models.py:38
 msgid "Answer Stundent"
-msgstr ""
+msgstr "Resposta do estudante"
  
 #: poll/models.py:39
 msgid "Answers Student"
-msgstr ""
+msgstr "Respostas dos estudantes"
  
 #: poll/templates/poll/answer.html:12 poll/templates/poll/create.html:69
 #: poll/templates/poll/create.html:86
 msgid "Possible answer for the question"
-msgstr ""
+msgstr "Possível resposta para a questão"
  
 #: poll/templates/poll/create.html:22
 msgid "Create a Poll"
-msgstr ""
+msgstr "Criar enquete"
  
 #: poll/templates/poll/create.html:38
 msgid "Question?"
-msgstr ""
+msgstr "Pergunta?"
  
 #: poll/templates/poll/create.html:39
 msgid "A Question to be answered"
-msgstr ""
+msgstr "A questão a ser respondida"
  
 #: poll/templates/poll/create.html:154
 msgid "Close"
-msgstr ""
+msgstr "Fechar"
  
 #: poll/templates/poll/create.html:157
 msgid "Create"
-msgstr ""
+msgstr "Criar"
  
 #: poll/templates/poll/remove.html:7
 msgid "Delete Poll"
-msgstr ""
+msgstr "Deletar enquete"
  
 #: poll/templates/poll/remove.html:15
 msgid "Are you sure you want to delete the subject"
-msgstr ""
+msgstr "Tem certeza que deseja deletar este assunto"
  
 #: poll/templates/poll/remove.html:19
 msgid "Delete"
-msgstr ""
+msgstr "Deletar"
  
 #: poll/templates/poll/update.html:7
 msgid "Update a Poll"
-msgstr ""
+msgstr "Atualizar enquete"
  
 #: poll/templates/poll/update.html:12
 msgid "Update"
-msgstr ""
+msgstr "Atualizar"
  
 #: poll/templates/poll/view.html:17
 msgid "Limit date:"
-msgstr ""
+msgstr "Data limite:"
  
 #: poll/templates/poll/view.html:20
 msgid "Status:"
-msgstr ""
+msgstr "Status:"
  
 #: poll/templates/poll/view.html:22
 msgid "Poll answered"
-msgstr ""
+msgstr "Enquete respondida"
  
 #: poll/templates/poll/view.html:24
 msgid "Poll don't yet answered"
-msgstr ""
+msgstr "A enquete não foi respondida ainda"
@@ -63,7 +63,6 @@ class UpdateUserForm(forms.ModelForm):
 	def clean_birth_date(self):
 		birth_date = self.cleaned_data['birth_date']
 		if birth_date >= date.today():
-			print('===============' + date.today() + '================')
 			raise forms.ValidationError(_('Please enter a valid date'))
 		return birth_date
  
@@ -73,10 +72,18 @@ class UpdateUserForm(forms.ModelForm):
 		'state', 'gender', 'type_profile', 'cpf', 'phone', 'image', 'titration', 
 		'year_titration', 'institution', 'curriculum', 'is_staff', 'is_active']
  
-class UpdateProfileForm(UpdateUserForm):
+class UpdateProfileFormAdmin(UpdateUserForm):
  
 	class Meta:
 		model = User
 		fields = ['username', 'name', 'email', 'birth_date', 'city', 
 		'state', 'gender', 'type_profile', 'cpf', 'phone', 'image', 'titration', 
 		'year_titration', 'institution', 'curriculum', 'is_staff', 'is_active']
+
+class UpdateProfileForm(UpdateUserForm):
+
+	class Meta:
+		model = User
+		fields = ['username', 'name', 'email', 'birth_date', 'city', 
+		'state', 'gender', 'cpf', 'phone', 'image', 'titration', 
+		'year_titration', 'institution', 'curriculum']
 {% extends 'home.html' %}
  
-{% load i18n pagination django_bootstrap_breadcrumbs static  %}
+{% load i18n pagination django_bootstrap_breadcrumbs permission_tags static  %}
  
 {% block breadcrumbs %}
  
@@ -9,20 +9,23 @@
  
 {% 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 'core:home' %}">{% trans "Home" %}</a></li>
-                <li><a href="{% url 'users:create' %}">{% trans 'Add user' %}</a></li>
-                <li><a href="javascript:void(0)">{% trans 'Send email' %}</a></li>
-            </ul>
+{% if user|has_role:'system_admin' %}
+    {% 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 'core:home' %}">{% trans "Home" %}</a></li>
+                    <li><a href="{% url 'users:create' %}">{% trans 'Add user' %}</a></li>
+                    <li><a href="javascript:void(0)">{% trans 'Send email' %}</a></li>
+                </ul>
+            </div>
         </div>
-    </div>
-{% endblock %}
+    {% endblock %}
+{% endif %}
+
  
 {% block content %}
     {% if messages %}
@@ -54,7 +57,7 @@
                 <div class="panel-body">
                     <div class="col-md-4">
                         {% if acc.image %}
-                            <div style="background-image: url('{{ acc.image.url }}'); background-size: 100%" alt="photoUser" class="img-circle img-responsive img-list-user"></div>
+                            <div style="background-image: url('{{ acc.image.url }}'); background-size: 100% 100%; background-repeat: no-repeat;" alt="photoUser" class="img-circle img-responsive img-list-user"></div>
                         {% else %}
                             {% if acc.gender == 'M' %}
                                 <img src="{% static 'img/male_avatar.png' %}" alt="Avatar" class="img-circle img-responsive img-list-user">
-{% extends 'list_users.html' %}
+{% extends 'users/profile.html' %}
  
 {% load static i18n permission_tags %}
 {% load widget_tweaks %}
@@ -6,9 +6,13 @@
 {% load django_bootstrap_breadcrumbs %}
  
 {% block breadcrumbs %}
-
-  {{ block.super }}
-    {% breadcrumb 'Update User' 'users:update' %}
+	{% if user|has_role:'system_admin' %}
+		{{ block.super }}
+    	{% breadcrumb 'Update User' 'users:update' %}	
+	{% else %}
+		{{ block.super }}
+		{% breadcrumb 'Update Profile' 'users:update' %}
+	{% endif %}  	
  
 {% endblock %}
  
@@ -25,7 +29,7 @@
 		{% endfor %}
 	{% endif %}
  
-	<div class="card">
+	<div class="card mg-b-5m">
 		<div class="card-content">
 			<div class="card-body">
 				<form method="post" action="" enctype="multipart/form-data">
@@ -53,6 +57,9 @@
  
                 			{% elif field.auto_id == 'id_phone' %}
                 				{% render_field field class='form-control' onkeypress='campoNumerico(this,event); formatarTelefone(this,event);' %}
+							
+							{% elif field.auto_id == 'id_year_titration' %}
+								{% render_field field class='form-control' onkeypress='campoNumerico(this,event);' %}
  
                 			{% elif field.auto_id == 'id_is_staff' or field.auto_id == 'id_is_active' %}
                 				{% if user|has_role:'system_admin' %}
@@ -44,7 +44,15 @@
 			<div class="well well-lg">
 				<div class="row">
 					<div class="col-md-4">
-						<img src="{{ user.image_url }}" class="img-responsive center-block img-circle" alt="foto perfil" style="max-height:174px">
+						{% if user.image %}
+                            <div style="background-image: url('{{ user.image.url }}'); background-size: 100% 100%; background-repeat: no-repeat; margin-left: 8em;" alt="photoUser" class="img-circle img-responsive img-list-user"></div>
+                        {% else %}
+                            {% if usser.gender == 'M' %}
+                                <img src="{% static 'img/male_avatar.png' %}" alt="Avatar" class="img-circle img-responsive img-list-user" style="margin-left: 8em;">
+                            {% else %}
+                                <img src="{% static 'img/female_avatar.png' %}" alt="Avatar" class="img-circle img-responsive img-list-user" style="margin-left: 8em;">    
+                            {% endif %}
+                        {% endif %}
 					</div>
 					<div class="col-md-8">
 						<table class="table table-hover table-edited">
@@ -123,22 +131,21 @@
 								</tr>
 								<tr>
 									<td>{% trans "Institution" %}:</td>
-								{% if user.institution %}
-									<td>{{user.institution}}</td>
-								{% else %}
-									<td>{% trans "Didn't inform institution" %}</td>
-								{% endif %}
-									
-									
+									{% if user.institution %}
+										<td>{{user.institution}}</td>
+									{% else %}
+										<td>{% trans "Didn't inform institution" %}</td>
+									{% endif %}
 								</tr>
 								<tr>
 									<td>{% trans "Curriculum" %}:</td>
 									{% if user.curriculum %}
-										<td>{{user.curriculum}}</td>
+										<td>
+											<a href="{{user.curriculum.url }}" target="_blank">link</a>
+										</td>
 									{% else %}
 										<td>{% trans "Didn't upload any curriculum" %}</td>
 									{% endif %}
-									
 								</tr>
 							</tbody>
 						</table>
@@ -6,10 +6,10 @@
 {% load django_bootstrap_breadcrumbs %}
  
 {% block breadcrumbs %}
-
-  {{ block.super }}
-    {% breadcrumb 'Update User' 'users:update' %}
-
+	
+	{{ block.super }}
+	{% breadcrumb 'Update User' 'users:update' %}
+    
 {% endblock %}
  
  
@@ -25,7 +25,7 @@
 		{% endfor %}
 	{% endif %}
  
-	<div class="card">
+	<div class="card mg-b-5m">
 		<div class="card-content">
 			<div class="card-body">
 				<form method="post" action="" enctype="multipart/form-data">
@@ -7,8 +7,9 @@ from django.contrib.auth.mixins import LoginRequiredMixin
 from django.core.urlresolvers import reverse_lazy
 from django.utils.translation import ugettext_lazy as _
 from rolepermissions.shortcuts import assign_role
+from rolepermissions.verifications import has_role
 from .models import User
-from .forms import UserForm, UpdateProfileForm, UpdateUserForm
+from .forms import UserForm, UpdateProfileForm, UpdateUserForm, UpdateProfileFormAdmin
  
 # ================ ADMIN =======================
 class UsersListView(HasRoleMixin, LoginRequiredMixin, generic.ListView):
@@ -110,8 +111,6 @@ class Remove_account(generic.TemplateView):
  
  
 class UpdateProfile(LoginRequiredMixin, generic.edit.UpdateView):
-
-	allowed_roles = ['student']
 	login_url = reverse_lazy("core:home")
 	template_name = 'users/edit_profile.html'
 	form_class = UpdateProfileForm
@@ -121,6 +120,14 @@ class UpdateProfile(LoginRequiredMixin, generic.edit.UpdateView):
 		user = get_object_or_404(User, username = self.request.user.username)
 		return user
  
+	def get_context_data(self, **kwargs):
+		context = super(UpdateProfile, self).get_context_data(**kwargs)
+		if has_role(self.request.user, 'system_admin'):
+			context['form'] = UpdateProfileFormAdmin(instance = self.object)
+		else:
+			context['form'] = UpdateProfileForm(instance = self.object)
+		return context
+
 	def form_valid(self, form):
 		form.save()
 		messages.success(self.request, _('Profile edited successfully!'))
...	...	@@ -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	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
...	...
...	...	@@ -5,8 +5,14 @@
5	5	{% block javascript %}
6	6	{% if page_obj %}
7	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
	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	+
10	16	var baseUrl = '{% url "app:index" %}';
11	17
12	18	// loadOnScroll handler
...	...	@@ -79,6 +85,7 @@
79	85	<li><a href="{% url 'core:guest' %}">{% trans 'Courses' %}</a></li>
80	86	{% if user\|has_role:'system_admin' %}
81	87	<li> <a href="{% url 'users:manage' %}">{% trans 'Manage Users' %}</a></li>
	88	+ <li> <a href="{% url 'app:settings' %}">{% trans 'Settings' %}</a></li>
82	89	{% endif %}
83	90	{% if user\|has_role:'system_admin' or user\|has_role:'professor' %}
84	91	<li>
...	...
...	...	@@ -4,4 +4,5 @@ from . import views
4	4
5	5	urlpatterns = [
6	6	url(r'^$', views.AppIndex.as_view(), name='index'),
	7	+ url(r'^settings$', views.AmadeusSettings.as_view(), name='settings'),
7	8	]
...	...
1	1	from django.shortcuts import render
2	2	from django.views.generic import ListView
	3	+from django.views import View
	4	+from rolepermissions.mixins import HasRoleMixin
3	5	from django.contrib.auth.mixins import LoginRequiredMixin
4	6	from django.core.urlresolvers import reverse_lazy
5	7	from core.mixins import LogMixin, NotificationMixin
6	8	from core.models import Notification, Action, Resource, Action_Resource
7	9	from users.models import User
	10	+from .models import EmailBackend
	11	+from .forms import EmailBackendForm
8	12	from courses.models import Course
9	13
10	14	class AppIndex(LoginRequiredMixin, LogMixin, ListView, NotificationMixin):
...	...	@@ -42,4 +46,17 @@ class AppIndex(LoginRequiredMixin, LogMixin, ListView, NotificationMixin):
42	46
43	47	return self.response_class(request = self.request, template = self.template_name, context = context, using = self.template_engine, **response_kwargs)
44	48
	49	+class AmadeusSettings(LoginRequiredMixin, HasRoleMixin, View):
	50	+ allowed_roles = ['system_admin']
	51	+ login_url = reverse_lazy("core:home")
	52	+ redirect_field_name = 'next'
	53	+ model = EmailBackend
	54	+ template_name = 'admin_settings.html'
	55	+ form_class = EmailBackendForm
	56	+ success_url = reverse_lazy('app:settings')
	57	+
	58	+ def get(self, request):
	59	+ return render(request, self.template_name, )
	60	+
	61	+
45	62
...	...
...	...	@@ -2,6 +2,10 @@
2	2	clear: both;
3	3	}
4	4
	5	+.mg-b-5m{
	6	+ margin-bottom: 5em;
	7	+}
	8	+
5	9	.navbar .logo {position: absolute; top: 6px; text-align: center; height: 48px; width: 48px;}
6	10
7	11	/* Modal */
...	...	@@ -404,6 +408,7 @@ ul, li {
404	408	.dropdown-menu .pull-right {
405	409	right: 0;
406	410	}
	411	+ .editation{display: none}
407	412	.moreAccordion{ padding-left: 0px; padding-right: 0px;}
408	413	.moreAccordion div button{ padding-left: 0px; padding-right: 0px;}
409	414	.cards-content{ padding-left: 0px; padding-right: 0px; }
...	...
...	...	@@ -14,6 +14,7 @@ function campoNumerico(campo, evento){
14	14	return true;
15	15	} else {
16	16	evento.returnValue = false;
	17	+ evento.preventDefault();
17	18	return false;
18	19	}
19	20	};
...	...	@@ -28,7 +29,7 @@ function formatarCpf(campo, evento){
28	29	}
29	30	else if( evento ) { // Firefox
30	31	codTecla = evento.which;
31		- }
	32	+ }
32	33	tamanho = campo.value.length;
33	34	if( (codTecla > 47 && codTecla < 58) \|\| codTecla== 8 \|\| codTecla == 0){
34	35	if(tamanho < 14 ){
...	...	@@ -41,8 +42,8 @@ function formatarCpf(campo, evento){
41	42	}
42	43	}else{
43	44	evento.returnValue = false;
	45	+ return false;
44	46	}
45		- return true;
46	47	} else {
47	48	return false;
48	49	}
...	...	@@ -61,30 +62,28 @@ function formatarTelefone(campo, evento){
61	62	}
62	63	tamanho = campo.value.length;
63	64
64		- if(((codTecla > 47 && codTecla < 58) \|\| (codTecla == 8)) && tamanho < 15){
	65	+ if(((codTecla > 47 && codTecla < 58) && tamanho < 15)){
65	66
66	67	if(tamanho == 0){
67	68	campo.value = "(" + campo.value;
68	69	}else if( tamanho == 3 ){
69	70	campo.value = campo.value + ") ";
70		- }else if(tamanho == 9){
	71	+ }else if(tamanho == 10){
71	72	campo.value = campo.value + "-";
72		- }else if(tamanho == 14){
73		- // alert('oi');
74		- campo.value = campo.value.slice(0, 4) + campo.value.slice(5, 14);
75		- campo.value = campo.value.slice(0, 8) + campo.value.slice(9, 10) + campo.value.slice(8, 9) + campo.value.slice(10, 14)
76	73	}
77	74	return true;
78	75
	76	+
79	77	} else if(codTecla == 0 \|\| codTecla == 8){
80	78	return true;
81	79	} else {
82	80	evento.returnValue = false;
	81	+ evento.preventDefault()
83	82	return false;
84	83	}
	84	+ evento.preventDefault()
85	85	return false;
86		-}
87		-
	86	+};
88	87	/*
89	88	This functions get the next 5 notifications from the user given a "step"(an amount) of previous notifications
90	89	*/
...	...
...	...	@@ -20,21 +20,27 @@
20	20
21	21	<!-- Bootstrap and themes (material) -->
22	22	<link rel="stylesheet" type="text/css" href="{% static 'bootstrap-3.3.7/css/bootstrap.css' %}">
23		- <link rel="stylesheet" type="text/css" href="{% static 'css/vendor/material.min.css' %}">
24		- <link rel="stylesheet" type="text/css" href="{% static 'css/vendor/ripples.min.css' %}">
	23	+ <link rel="stylesheet" type="text/css" href="{% static 'material/css/bootstrap-material-design.css' %}">
	24	+ <link rel="stylesheet" type="text/css" href="{% static 'material/css/bootstrap-material-design.min.css' %}">
	25	+ <link rel="stylesheet" type="text/css" href="{% static 'material/css/ripples.css' %}">
	26	+ <link rel="stylesheet" type="text/css" href="{% static 'material/css/ripples.min.css' %}">
	27	+
	28	+
25	29	<link rel="stylesheet" type="text/css" href="{% static 'css/vendor/bootstrap-datepicker.standalone.css' %}">
26	30	<link rel="stylesheet" type="text/css" href="{% static 'css/vendor/alertifyjs/alertify.min.css' %}">
27	31	<link rel="stylesheet" type="text/css" href="{% static 'css/vendor/alertifyjs/themes/bootstrap.css' %}">
28	32	<script type="text/javascript" src="{% static 'bootstrap-3.3.7/js/bootstrap.js' %}"></script>
29	33	<script type="text/javascript" src="{% static 'js/vendor/bootstrap-acessibility.min.js' %}"></script>
30		- <script type="text/javascript" src="{% static 'js/vendor/material.min.js' %}"></script>
31		- <script type="text/javascript" src="{% static 'js/vendor/ripples.min.js' %}"></script>
	34	+ <script type="text/javascript" src="{% static 'material/js/material.js' %}"></script>
	35	+ <script type="text/javascript" src="{% static 'material/js/material.min.js' %}"></script>
	36	+ <script type="text/javascript" src="{% static 'material/js/ripples.js' %}"></script>
	37	+ <script type="text/javascript" src="{% static 'material/js/ripples.min.js' %}"></script>
32	38	<script type="text/javascript" src="{% static 'js/vendor/bootstrap-datepicker.js' %}"></script>
33	39
34	40	{% with "js/vendor/locales/bootstrap-datepicker."\|add:LANGUAGE_CODE\|add:".js" as locale_datepicker %}
35	41	<script type="text/javascript" src="{% static locale_datepicker %}"></script>
36	42	{% endwith %}
37		-
	43	+
38	44	<script type="text/javascript" src="{% static 'js/vendor/alertify.min.js' %}"></script>
39	45	<script type="text/javascript" src="{% static 'js/vendor/jscookie.js' %}"></script>
40	46
...	...	@@ -140,7 +146,7 @@
140	146	</ul>
141	147	</div>
142	148	</div>
143		-
	149	+
144	150	{% endif %}
145	151	{% endblock %}
146	152	</div>
...	...	@@ -158,6 +164,10 @@
158	164	{% block script_file %}
159	165
160	166	{% endblock script_file %}
	167	+
	168	+ {% block script_link %}
	169	+
	170	+ {% endblock script_link %}
161	171	</body>
162	172
163	173	</html>
...	...
...	...	@@ -6,6 +6,10 @@
6	6	{% block nav %}
7	7	{% endblock %}
8	8
	9	+{% block sidebar %}
	10	+
	11	+{% endblock sidebar %}
	12	+
9	13
10	14	{% block content %}
11	15	{% if messages %}
...	...	@@ -19,85 +23,79 @@
19	23	{% endfor %}
20	24	{% endif %}
21	25	<div class="row">
22		- <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 ">
23		- <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">
24		- <img src="{% static 'img/amadeus.png' %}" class="img-responsive center-block logo-login " alt="logo amadeus">
25		- </div>
26		- </div>
	26	+ <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">
	27	+ <div class="col-lg-8 col-md-8 col-xs-8 col-sm-8">
	28	+ <img src="{% static 'img/amadeus.png' %}" class="img-responsive center-block " alt="logo amadeus" id="logo">
	29	+ </div>
	30	+ </div>
27	31	</div>
28	32
29	33	<div class="row">
30		- <div class="col-md-6 col-md-offset-4 col-sm-6 col-sm-offset-4 col-xs-6 col-xs-offset-4 col-lg-6 col-lg-offset-4 col-xl-6 col-xl-offset-3">
	34	+ <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">
31	35	<div class="card">
32		- <div class="card-content">
33	36	<div class="card-body">
34		- <form class="form-horizontal" name="registerForm" method="post" id="register-user" enctype="multipart/form-data">
	37	+ <form class="form-horizontal" name="registerForm" method="post" action="" enctype="multipart/form-data">
35	38	{% csrf_token %}
36		- <h2>{% trans 'User Register' %}</h2>
37		- <hr>
38		- <div class="row">
39		- <div class="col-xs-12 col-sm-12 col-md-12 col-lg-12">
40		- {% for field in form %}
41		- <div class="form-group {% if form.has_error %} has-error {% endif %} is-fileinput block-register-inline">
42		- {% if field.field.required %}
43		- <label for="{{ field.auto_id }}" class="col-md-4 control-label">{{ field.label }}<span>*</span></label>
44		- {% else %}
45		- <label for="{{ field.auto_id }}" class="col-md-4 control-label">{{ field.label }}</label>
46		- {% endif %}
47		- <div class="col-md-10 col-md-offset-2 col-lg-10 col-lg-offset-2 col-sm-10
48		- col-sm-offset-2 col-xs-10 col-xs-offset-2">
49		- {% if field.auto_id == 'id_birth_date' %}
50		- {% render_field field class='form-control input-sm date-picker' %}
51		- <span id="helpBlock" class="help-block">{{ field.help_text }}</span>
52		- {% elif field.auto_id == 'id_image' %}
53		- {% render_field field class='form-control input-sm' %}
54		- <div class="input-group">
55		- <input type="text" readonly="" class="form-control" placeholder="Choose your photo...">
56		- <span class="input-group-btn input-group-sm">
57		- <button type="button" class="btn btn-fab btn-fab-mini">
58		- <i class="material-icons">attach_file</i>
59		- </button>
60		- </span>
61		- </div>
62		- {% elif field.auto_id == 'id_cpf' %}
63		- {% render_field field class='form-control' onkeypress='campoNumerico(this,event); formatarCpf(this,event);' %}
64		-
65		- {% elif field.auto_id == 'id_phone' %}
66		- {% render_field field class='form-control' onkeypress='campoNumerico(this,event); formatarTelefone(this,event);' %}
67		- {% else %}
68		- {% render_field field class='form-control' %}
69		- <span id="helpBlock" class="help-block">{{ field.help_text }}</span>
70		- {% endif %}
71		- </div>
	39	+ <legend>{% trans 'User Register' %}</legend>
	40	+ {% for field in form %}
	41	+ <div class="form-group is-empy{% if form.has_error %} has-error {% endif %} is-fileinput">
	42	+ {% if field.field.required %}
	43	+ <label for="{{ field.auto_id }}" class="col-md-4 control-label">{{ field.label }}<span>*</span></label>
	44	+ {% else %}
	45	+ <label for="{{ field.auto_id }}" class="col-md-4 control-label">{{ field.label }}</label>
	46	+ {% endif %}
	47	+ <div class="col-md-8">
	48	+ {% if field.auto_id == 'id_birth_date' %}
	49	+ {% render_field field class='form-control input-sm date-picker' %}
	50	+
	51	+ <span id="helpBlock" class="help-block">{{ field.help_text }}</span>
	52	+ {% elif field.auto_id == 'id_image' %}
	53	+ {% render_field field class='form-control input-sm' %}
	54	+ <div class="input-group">
	55	+ <input type="text" readonly="" class="form-control" placeholder="Choose your photo...">
	56	+ <span class="input-group-btn input-group-sm">
	57	+ <button type="button" class="btn btn-fab btn-fab-mini">
	58	+ <i class="material-icons">attach_file</i>
	59	+ </button>
	60	+ </span>
	61	+ </div>
	62	+ {% elif field.auto_id == 'id_cpf' %}
	63	+ {% render_field field class='form-control' onkeypress='campoNumerico(this,event); formatarCpf(this,event);' %}
72	64
73		- {% if field.errors %}
74		- <div class="alert alert-danger alert-dismissible col-md-offset-4 col-md-8" role="alert">
75		- <button type="button" class="close" data-dismiss="alert" aria-label="Close">
76		- <span aria-hidden="true">×</span>
77		- </button>
78		- <ul>
79		- {% for error in field.errors %}
80		- <li>{{ error }}</li>
81		- {% endfor %}
82		- </ul>
83		- </div>
84		- {% endif %}
85		- </div>
	65	+ {% elif field.auto_id == 'id_phone' %}
	66	+ {% render_field field class='form-control' onkeypress='campoNumerico(this,event); formatarTelefone(this,event);' %}
	67	+ {% else %}
	68	+ {% render_field field class='form-control' %}
	69	+ <span id="helpBlock" class="help-block">{{ field.help_text }}</span>
	70	+ {% endif %}
	71	+ </div>
	72	+
	73	+ {% if field.errors %}
	74	+ <div class="alert alert-danger alert-dismissible col-md-offset-4 col-md-8" role="alert">
	75	+ <button type="button" class="close" data-dismiss="alert" aria-label="Close">
	76	+ <span aria-hidden="true">×</span>
	77	+ </button>
	78	+ <ul>
	79	+ {% for error in field.errors %}
	80	+ <li>{{ error }}</li>
86	81	{% endfor %}
87		- <div class="col-md-6 col-xs-6 col-sm-6 col-lg-5 col-lg-offset-1 text-center">
88		- <input type="submit" value="{% trans 'Save' %}" class="btn btn-success btn-raised" />
89		- </div>
90		- <div class="col-md-6 col-xs-6 col-sm-6 col-lg-5 text-center">
91		- <a href="{% url 'core:home' %}" class="btn btn-default btn-raised" >{% trans 'Cancel' %}</a>
92		- </div>
	82	+ </ul>
93	83	</div>
	84	+ {% endif %}
94	85	</div>
	86	+ {% endfor %}
	87	+ <div class="col-md-offset-4 col-md-2 col-sm-2 col-xs-2">
	88	+ <input type="submit" value="{% trans 'Save' %}" class="btn btn-sm btn-success" />
	89	+ </div>
	90	+ <div class="col-md-offset-3 col-md-2 col-sm-2 col-xs-2">
	91	+ <a href="{% url 'core:home' %}" class="btn btn-sm btn-success" >{% trans 'Cancel' %}</a>
	92	+ </div>
	93	+
95	94	</form>
96	95	</div>
97		- </div>
98	96	</div>
99	97	</div>
100	98	</div>
101		-
	99	+
102	100	<br clear="all" />
103	101	{% endblock %}
...	...