diff --git a/courses/forms.py b/courses/forms.py
index ac4ce25..8c91ac8 100644
--- a/courses/forms.py
+++ b/courses/forms.py
@@ -1,7 +1,7 @@
+
 from django import forms
 from django.utils.translation import ugettext_lazy as _
 from .models import Category, Course, Subject, Topic
-import datetime
 
 class CategoryForm(forms.ModelForm):
 
@@ -26,9 +26,6 @@ class CourseForm(forms.ModelForm):
 		return end_register_date
 
 	def clean_init_date(self):
-		# print(dir(self))
-		print (self.data)
-		print (self.cleaned_data)
 		end_register_date = self.data['end_register_date']
 		init_date = self.data['init_date']
 
@@ -78,6 +75,47 @@ class CourseForm(forms.ModelForm):
 			'content': forms.Textarea(attrs={'cols': 80, 'rows': 5}),
 		}
 
+class UpdateCourseForm(CourseForm):
+	def __init__(self, *args, **kwargs):
+		super(UpdateCourseForm, self).__init__(*args, **kwargs)
+		self.fields["students"].required = False
+
+	class Meta:
+		model = Course
+		fields = ('name', 'objectivies', 'content', 'max_students', 'init_register_date', 'end_register_date',
+					'init_date', 'end_date', 'image', 'category','students',)
+		labels = {
+			'name': _('Name'),
+			'objectivies': _('Objectives'),
+			'content': _('Content'),
+			'max_students': _('Number of studets maximum'),
+			'init_register_date': _('Course registration start date'),
+			'end_register_date': _('Course registration end date'),
+			'init_date': _('Course start date'),
+			'end_date': _('Course end date'),
+			'image': _('Image'),
+			'category': _('Category'),
+			'students': _('Student'),
+		}
+		help_texts = {
+			'name': _('Course name'),
+			'objectivies': _('Course objective'),
+			'content': _('Course modules'),
+			'max_students': _('Max number of students that a class can have'),
+			'init_register_date': _('Date that starts the registration period of the course (dd/mm/yyyy)'),
+			'end_register_date': _('Date that ends the registration period of the course (dd/mm/yyyy)'),
+			'init_date': _('Date that the course starts (dd/mm/yyyy)'),
+			'end_date': _('Date that the course ends (dd/mm/yyyy)'),
+			'image': _('Representative image of the course'),
+			'category': _('Category which the course belongs'),
+			'students': _("Course's Students"),
+		}
+		widgets = {
+			'categoy': forms.Select(),
+			'objectivies': forms.Textarea(attrs={'cols': 80, 'rows': 5}),
+			'content': forms.Textarea(attrs={'cols': 80, 'rows': 5}),
+		}
+
 class SubjectForm(forms.ModelForm):
 
 	class Meta:
diff --git a/courses/permissions.py b/courses/permissions.py
index ae72da2..5028e25 100644
--- a/courses/permissions.py
+++ b/courses/permissions.py
@@ -30,3 +30,23 @@ def delete_subject(role, user, subject):
         return True
 
     return False
+
+@register_object_checker()
+def update_course(role, user, course):
+    if (role == SystemAdmin):
+        return True
+
+    if (user in course.professors.all()):
+        return True
+
+    return False
+
+@register_object_checker()
+def delete_course(role, user, course):
+    if (role == SystemAdmin):
+        return True
+
+    if (user in course.professors.all()):
+        return True
+
+    return False
diff --git a/courses/templates/course/create.html b/courses/templates/course/create.html
index f34d319..c59784a 100644
--- a/courses/templates/course/create.html
+++ b/courses/templates/course/create.html
@@ -21,7 +21,7 @@
 							<div class="form-group {% if form.has_error %} has-error {% endif %} is-fileinput">
 								<label for="{{ field.auto_id }}">{{ field.label }}</label>
 								{% if field.auto_id == 'id_init_register_date' or field.auto_id == 'id_end_register_date' or field.auto_id == 'id_init_date' or field.auto_id == 'id_end_date'%}
-									{% render_field field class='form-control' type='date' %}
+									<input type="date" class="form-control"name="{{field.name}}" value="{% if field.value.year %}{{field.value|date:'Y-m-d'}}{% else %}{{field.value}}{% endif %}" min="{{now|date:'Y-m-d'}}">
 								{% elif field.auto_id == 'id_image' %}
 									{% render_field field class='form-control' %}
 									<div class="input-group">
diff --git a/courses/templates/course/delete.html b/courses/templates/course/delete.html
index 7cadd53..5e2565e 100644
--- a/courses/templates/course/delete.html
+++ b/courses/templates/course/delete.html
@@ -1,4 +1,4 @@
-{% extends 'app/base.html' %}
+{% extends 'course/view.html' %}
 
 {% load static i18n %}
 
@@ -9,23 +9,15 @@
 	</ol>
 {% endblock %}
 
-{% block sidebar %}
-	<div class="list-group">
-	  	<a href="{% url 'course:manage' %}" class="list-group-item">
-	    	{% trans 'Courses' %}
-	  	</a>
-	  	<a href="{% url 'course:create' %}" class="list-group-item">
-	    	{% trans 'Create Course' %}
-	  	</a>
-	</div>
-
-{% endblock %}
-
 {% block content %}
-	<form action="" method="post">
-		{% csrf_token %}
-	    <p>{% trans 'Are you sure you want to delete the couse' %} "{{ object }}"?</p>
-	    <input type="submit" class="btn btn-success btn-sm" value="{% trans 'Yes' %}" />
-	    <a href="{% url 'course:manage' %}" class="btn btn-danger btn-sm">{% trans 'No' %}</a>
-	</form>
+<div class="panel panel-default">
+	<div class="panel-body">
+		<form action="" method="post">
+			{% csrf_token %}
+				<h2>{% trans 'Are you sure you want to delete the course' %} "{{course}}"?</h2>
+				<input type="submit" class="btn btn-raised btn-success btn-lg" value="{% trans 'Yes' %}" />
+				<a href="{% url 'course:view' course.slug%}" class="btn btn-raised btn-danger btn-lg">{% trans 'No' %}</a>
+		</form>
+	</div>
+</div>
 {% endblock %}
diff --git a/courses/templates/course/index.html b/courses/templates/course/index.html
index a160744..16ef05d 100644
--- a/courses/templates/course/index.html
+++ b/courses/templates/course/index.html
@@ -54,7 +54,11 @@
 		{% for course in courses %}
 			<div class="row well well-inverse">
 		  		<div class="col-md-2">
+            {% if course.image %}
 		  			<img src="{{ course.image.url }}" class="img-responsive" />
+            {% else %}
+            <img src="" class="img-responsive" />
+            {% endif %}
 	  			</div>
 		  		<div class="col-md-10">
 					<div class="row">
diff --git a/courses/templates/course/update.html b/courses/templates/course/update.html
index cfb202a..57919b5 100644
--- a/courses/templates/course/update.html
+++ b/courses/templates/course/update.html
@@ -1,60 +1,64 @@
-{% extends 'app/base.html' %}
+{% extends 'course/view.html' %}
 
 {% load static i18n %}
 {% load widget_tweaks %}
 
 {% block breadcrumbs %}
 	<ol class="breadcrumb">
-	  	<li><a href="{% url 'app:index' %}">{% trans 'Home' %}</a></li>
-	  	<li class="active">{% trans 'Edit Course' %}</li>
+  	<li><a href="{% url 'app:index' %}">{% trans 'Home' %}</a></li>
+  	<li class="active">{% trans 'Edit Course' %}</li>
 	</ol>
 {% endblock %}
-
-{% block sidebar %}
-	<div class="list-group">
-		<a href="{% url 'course:manage' %}" class="list-group-item">
-	    	{% trans 'Courses' %}
-	  	</a>
-	  	<a href="{% url 'course:manage_mods' course.slug %}" class="list-group-item">
-	    	{% trans 'Manage Modules' %}
-	  	</a>
-	  	<a href="#" class="list-group-item">
-	    	{% trans 'Participants' %}
-	  	</a>
-	</div>
-{% endblock %}
-
 {% block content %}
-	<div class="alert alert-info alert-dismissible" role="alert">
-		<button type="button" class="close" data-dismiss="alert" aria-label="Close">
-			<span aria-hidden="true">&times;</span>
-		</button>
-		<p>{% trans 'All fields are required' %}</p>
-	</div>
 
-	<form method="post" action="" enctype="multipart/form-data">
-		{% csrf_token %}
-		{% for field in form %}
-			<div class="form-group{% if form.has_error %} has-error {% endif %}">
-				<label for="{{ field.auto_id }}">{{ field.label }}</label>
-				{% render_field field class='form-control input-sm' %}
-				<span id="helpBlock" class="help-block">{{ field.help_text }}</span>
-				{% if field.errors.length > 0 %}
-					<div class="alert alert-danger alert-dismissible" 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>
+</br>
+<div class="card card-content">
+  <div class="card-body">
+		<form method="post" action="" enctype="multipart/form-data">
+			{% csrf_token %}
+			{% for field in form %}
+				<div class="form-group {% if form.has_error %} has-error {% endif %} is-fileinput">
+					<label for="{{ field.auto_id }}">{{ field.label }}</label>
+					{% if field.auto_id == 'id_init_register_date' or field.auto_id == 'id_end_register_date' or field.auto_id == 'id_init_date' or field.auto_id == 'id_end_date'%}
+						<input type="date" class="form-control"name="{{field.name}}" value="{% if field.value.year %}{{field.value|date:'Y-m-d'}}{% else %}{{field.value}}{% endif %}" min="{{now|date:'Y-m-d'}}">
+					{% elif field.auto_id == 'id_image' %}
+						{% render_field field class='form-control' %}
+						<div class="input-group">
+							<input type="text" readonly="" class="form-control" placeholder="Choose your photo..."/>
+							<span class="input-group-btn input-group-sm">
+									<button type="button" class="btn btn-fab btn-fab-mini">
+											<i class="material-icons">attach_file</i>
+									</button>
+							</span>
+						</div>
+					{% else %}
+						{% render_field field class='form-control' %}
+					{% endif %}
+					<span class="help-block">{{ field.help_text }}</span>
+					{% if field.errors %}
+					<div class="row">
+					</br>
+							<div class="alert alert-danger alert-dismissible" 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>
 					</div>
+					{% endif %}
 				</div>
-				{% endif %}
+			{% endfor %}
+			<div class="row text-center">
+					<input type="submit" value="{% trans 'Update' %}" class="btn btn-primary" />
 			</div>
-		{% endfor %}
-		<input type="submit" value="{% trans 'Save' %}" class="btn btn-sm btn-success" />
-	</form>
-	<br clear="all" />
+    </form>
+	</div>
+</div>
+</br>
+</br>
+</br>
 {% endblock %}
diff --git a/courses/templates/subject/delete.html b/courses/templates/subject/delete.html
index cdb45f6..043b06c 100644
--- a/courses/templates/subject/delete.html
+++ b/courses/templates/subject/delete.html
@@ -8,7 +8,7 @@
   <div class="panel-body">
     <form action="" method="post">
       {% csrf_token %}
-        <h2>{% trans 'Are you sure you want to delete the category' %} "{{subject}}"?</h2>
+        <h2>{% trans 'Are you sure you want to delete the subject' %} "{{subject}}"?</h2>
         <input type="submit" class="btn btn-raised btn-success btn-lg" value="{% trans 'Yes' %}" />
         <a href="{% url 'course:view_subject' subject.slug%}" class="btn btn-raised btn-danger btn-lg">{% trans 'No' %}</a>
     </form>
diff --git a/courses/urls.py b/courses/urls.py
index cbc4812..3399e57 100644
--- a/courses/urls.py
+++ b/courses/urls.py
@@ -5,9 +5,9 @@ from . import views
 urlpatterns = [
 	url(r'^$', views.IndexView.as_view(), name='manage'),
 	url(r'^create/$', views.CreateCourseView.as_view(), name='create'),
-	url(r'^edit/(?P<slug>[\w_-]+)/$', views.UpdateView.as_view(), name='update'),
+	url(r'^edit/(?P<slug>[\w_-]+)/$', views.UpdateCourseView.as_view(), name='update'),
 	url(r'^(?P<slug>[\w_-]+)/$', views.CourseView.as_view(), name='view'),
-	url(r'^delete/(?P<slug>[\w_-]+)/$', views.DeleteView.as_view(), name='delete'),
+	url(r'^delete/(?P<slug>[\w_-]+)/$', views.DeleteCourseView.as_view(), name='delete'),
 	url(r'^category/(?P<slug>[\w_-]+)/$', views.FilteredView.as_view(), name='filter'),
 	url(r'^categories/$', views.IndexCatView.as_view(), name='manage_cat'),
 	url(r'^categories/create/$', views.CreateCatView.as_view(), name="create_cat"),
diff --git a/courses/views.py b/courses/views.py
index 4438ac1..d995c92 100644
--- a/courses/views.py
+++ b/courses/views.py
@@ -12,10 +12,11 @@ from rolepermissions.verifications import has_role
 from django.db.models import Q
 from rolepermissions.verifications import has_object_permission
 
-from .forms import CourseForm, CategoryForm, SubjectForm,TopicForm
+from .forms import CourseForm, UpdateCourseForm, CategoryForm, SubjectForm,TopicForm
 from .models import Course, Subject, Category,Topic
 from core.mixins import NotificationMixin
 
+from datetime import date
 
 class IndexView(LoginRequiredMixin, NotificationMixin, generic.ListView):
 
@@ -40,32 +41,86 @@ class CreateCourseView(LoginRequiredMixin, HasRoleMixin, NotificationMixin,gener
 	template_name = 'course/create.html'
 	form_class = CourseForm
 	success_url = reverse_lazy('course:manage')
+
 	def form_valid(self, form):
 		self.object = form.save()
 		self.object.professors.add(self.request.user)
 		return super(CreateCourseView, self).form_valid(form)
 
-class UpdateView(LoginRequiredMixin, HasRoleMixin, generic.UpdateView):
+	def get_context_data(self, **kwargs):
+		context = super(CreateCourseView, self).get_context_data(**kwargs)
+
+		if has_role(self.request.user,'system_admin'):
+			courses = Course.objects.all()
+		elif has_role(self.request.user,'professor'):
+			courses = self.request.user.courses.all()
+		context['courses'] = courses
+		context['title'] = _("Create Course")
+		context['now'] = date.today()
+		return context
+
+class UpdateCourseView(LoginRequiredMixin, HasRoleMixin, generic.UpdateView):
 
 	allowed_roles = ['professor', 'system_admin']
 	login_url = reverse_lazy("core:home")
 	redirect_field_name = 'next'
 	template_name = 'course/update.html'
 	model = Course
-	form_class = CourseForm
+	form_class = UpdateCourseForm
+
+	def dispatch(self, *args, **kwargs):
+		course = get_object_or_404(Course, slug = self.kwargs.get('slug'))
+		if(not has_object_permission('update_course', self.request.user, course)):
+			return self.handle_no_permission()
+		return super(UpdateCourseView, self).dispatch(*args, **kwargs)
+
+	def get_context_data(self, **kwargs):
+		context = super(UpdateCourseView, self).get_context_data(**kwargs)
+		course = get_object_or_404(Course, slug = self.kwargs.get('slug'))
+
+		if has_role(self.request.user,'system_admin'):
+			courses = Course.objects.all()
+		elif has_role(self.request.user,'professor'):
+			courses = self.request.user.courses.all()
+		context['courses'] = courses
+		context['title'] = course.name
+		context['now'] = date.today()
+		return context
+
+	def get_success_url(self):
+		return reverse_lazy('course:view', kwargs={'slug' : self.object.slug})
+
+
+
+class DeleteCourseView(LoginRequiredMixin, HasRoleMixin, generic.DeleteView):
+
+	allowed_roles = ['professor', 'system_admin']
+	login_url = reverse_lazy("core:home")
+	redirect_field_name = 'next'
+	model = Course
+	template_name = 'course/delete.html'
 	success_url = reverse_lazy('course:manage')
 
-	def form_valid(self, form):
-		self.object = form.save(commit = False)
-		self.object.slug = slugify(self.object.name)
-		self.object.save()
+	def dispatch(self, *args, **kwargs):
+		course = get_object_or_404(Course, slug = self.kwargs.get('slug'))
+		if(not has_object_permission('delete_course', self.request.user, course)):
+			return self.handle_no_permission()
+		return super(DeleteCourseView, self).dispatch(*args, **kwargs)
 
-		return super(UpdateView, self).form_valid(form)
+	def get_context_data(self, **kwargs):
+		context = super(DeleteCourseView, self).get_context_data(**kwargs)
+		course = get_object_or_404(Course, slug = self.kwargs.get('slug'))
 
-	def render_to_response(self, context, **response_kwargs):
-		messages.success(self.request, _('Course edited successfully!'))
+		if has_role(self.request.user,'system_admin'):
+			courses = Course.objects.all()
+		elif has_role(self.request.user,'professor'):
+			courses = self.request.user.courses.all()
+		context['courses'] = courses
+		print (courses,"jdhksjbjs")
+		context['title'] = course.name
+
+		return context
 
-		return self.response_class(request=self.request, template=self.get_template_names(), context=context, using=self.template_engine)
 
 class CourseView(LoginRequiredMixin, NotificationMixin, generic.DetailView):
 
@@ -375,4 +430,4 @@ class DeleteSubjectView(LoginRequiredMixin, HasRoleMixin, generic.DeleteView):
 		return context
 
 	def get_success_url(self):
-		return reverse_lazy('course:view_subject', kwargs={'slug' : self.object.course.subjects.all()[0].slug})
+		return reverse_lazy('course:view', kwargs={'slug' : self.object.course.slug})
--
libgit2 0.21.2