fixing conflits

Matheus Lins
2 parents fe3b3af0 841817e1
Showing 37 changed files with 851 additions and 241 deletions Show diff stats
amadeus/settings.py
app/templates/app/base.html
app/templates/home.html
app/templates/home_student.html
app/templates/home_teacher_student_content.html
app/views.py
core/migrations/0009_auto_20160916_0126.py
core/models.py
core/static/css/base/amadeus.css
core/static/img/no_image.jpg
core/templates/base.html
courses/context_processors.py
courses/forms.py
courses/migrations/0013_auto_20160916_0001.py
courses/migrations/0013_auto_20160916_0126.py
courses/migrations/0014_merge_20160916_0255.py
courses/models.py
courses/permissions.py
courses/templates/course/create.html
courses/templates/course/delete.html
@@ -79,6 +79,7 @@ TEMPLATES = [
                 'django.contrib.messages.context_processors.messages',
                 'core.context_processors.notifications',
+                'courses.context_processors.courses',
             ],
         },
     },
@@ -5,7 +5,7 @@
 {% block menu_top %}
 	<ul class="nav navbar-nav">
 		<li class="active">
-			<a href="#">Home</a>
+			<a href="{% url 'home' %}">Home</a>
 		</li>
 		<li><a href="#contact">{% trans 'The Project' %}</a></li>
 		<li><a href="#contact">{% trans 'CCTE Group' %}</a></li>
@@ -64,7 +64,7 @@
 {% block sidebar %}
 	<div class="panel panel-primary">
         <div class="panel-heading">
-          	<img src="{{ user.image.url }}" id="img" class="img-rounded">
+          	<img src="{{ user.image_url }}" id="img" class="img-rounded">
           	<p></p>
           	<div class="row">
             	<div class="col-xs-3 col-md-3">
@@ -86,14 +86,24 @@
             	<li> <a href="{% url 'app:index' %}">{% trans 'Home' %}</a></li>
                 <li> <a href="{% url 'users:profile' %}">{% trans 'Profile' %}</a></li>
                 <li> <a href="#">{% trans 'Pending Tasks' %}</a></li>
-                {% if user|has_role:'student' %}
-                	<li> <a href="#">{% trans 'My courses' %}</a></li>
+                {% if user|has_role:'student' and not user.is_staff %}
+                	<li> <a href="{% url 'course:manage' %}">{% trans 'My courses' %}</a></li>
             	{% endif %}
             	{% if user|has_role:'system_admin' %}
             		<li> <a href="{% url 'users:manage' %}">{% trans 'Manage Users' %}</a></li>
             	{% endif %}
-            	{% if user|has_role:'system_admin, professor' %}
-            		<li> <a href="{% url 'course:manage' %}">{% trans 'Manage Courses' %}</a></li>
+            	{% if user|has_role:'system_admin' or user|has_role:'professor' %}
+            		<li> 
+            			<a href="#courses_list" class="accordion" data-toggle="collapse">{% trans 'Manage Courses' %}</a>
+
+						<div id="courses_list" class="collapse">
+							<ul class="nav nav-pill nav-stacked accordion_list">
+								{% for course in courses_list %}
+									<li><a href="{% url 'course:view' course.slug %}">{{ course }}</a></li>
+								{% endfor %}
+							</ul>
+						</div>
+					</li>
             	{% endif %}
           	</ul>
     	</div>
@@ -23,7 +23,7 @@
         <div class="panel-body">
         	<ul class="nav nav-pills nav-stacked">
               	<li><a href="{% url 'users:profile' %}">{% trans 'Profile' %}</a></li>
-              	<li><a href="javascript:void(0)">{% trans 'My Courses' %}</a></li>
+              	<li><a href="{% url 'course:manage' %}">{% trans 'My Courses' %}</a></li>
               	<li><a href="javascript:void(0)">{% trans 'Google accounts' %}</a></li>
             </ul>
         </div>
-{% load i18n %}
+{% load static i18n %}
 {% for notification in objects %}
     <li {% if not notification.read %}class="not_read"{% endif %}>
         <div class="avatar">
-            <img src="{{ notification.user.image.url }}">
+            <img src="{{ notification.user.image_url }}">
         </div>
         <div class="bubble-container">
             <div class="bubble">
@@ -43,8 +43,7 @@ class AppIndex(LoginRequiredMixin, LogMixin, ListView, NotificationMixin):
 			else:
 				self.template_name = "home_teacher_student_content.html"
-
-		super(AppIndex, self).createNotification("teste", not_resource="home", resource_link="/register")
+		
 		return self.response_class(request = self.request, template = self.template_name, context = context, using = self.template_engine, **response_kwargs)
@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.10 on 2016-09-16 04:26
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('core', '0008_resource_link'),
+    ]
+
+    operations = [
+        migrations.RenameField(
+            model_name='resource',
+            old_name='link',
+            new_name='url',
+        ),
+    ]
@@ -34,7 +34,7 @@ class Resource(models.Model):
     name = models.CharField(_('Name'), max_length =100, unique=True)
     created_date = models.DateField(_('Created Date'), auto_now_add=True)
-    link = models.CharField(_('URL'), max_length =100, default="")
+    url = models.CharField(_('URL'), max_length =100, default="")
     class Meta:
@@ -250,3 +250,15 @@ li.alert_li:hover{background-color:#eee}
 .turn_off_alert{float:right;margin-bottom :1px}
 a.alert_message{color : grey}
 a.alert_message:hover{color : grey}
+
+/*=================== Ailson - Please Don't touch*/
+.breadcrumb .divider{
+  display: none;
+}
+
+.accordion {
+    background: #c0c0c0;
+}
+.accordion_list {
+    background: #e0e0e0;
+}
@@ -48,7 +48,7 @@
 			                  			<span class="icon-bar"></span>
 			                  			<span class="icon-bar"></span>
 			                		</button>
-			                		<a class="navbar-brand" href="javascript:void(0)"><img class="logo" src="{% static 'img/topo-amadeus.png'  %}" alt="Logo"/></a>
+			                		<a class="navbar-brand" href="{% url 'app:index' %}"><img class="logo" src="{% static 'img/topo-amadeus.png'  %}" alt="Logo"/></a>
 			              		</div>
 			              		<div class="navbar-collapse collapse navbar-responsive-collapse">
 			                		<ul class="nav navbar-nav navbar-right notifications">
@@ -0,0 +1,14 @@
+from .models import Course
+
+def courses(request):
+	if request.user.is_authenticated:
+		context = {}
+
+		if request.user.is_staff:
+			context['courses_list'] = Course.objects.all()
+		else:
+			context['courses_list'] = Course.objects.filter(professors__in = [request.user])
+
+		return context
+	else:
+		return request
 \ No newline at end of file
+
 from django import forms
 from django.utils.translation import ugettext_lazy as _
 from .models import Category, Course, Subject, Topic
@@ -17,6 +18,29 @@ class CategoryForm(forms.ModelForm):
 class CourseForm(forms.ModelForm):
+	def clean_end_register_date(self):
+		init_register_date = self.data['init_register_date']
+		end_register_date = self.data['end_register_date']
+
+		if init_register_date and end_register_date and end_register_date < init_register_date:
+			raise forms.ValidationError(_('The end date may not be before the start date.'))
+		return end_register_date
+
+	def clean_init_date(self):
+		end_register_date = self.data['end_register_date']
+		init_date = self.data['init_date']
+
+		if end_register_date and init_date and init_date <= end_register_date:
+			raise forms.ValidationError(_('The course start date must be after the end of registration.'))
+		return init_date
+
+	def clean_end_date(self):
+		init_date = self.data['init_date']
+		end_date = self.data['end_date']
+
+		if init_date and end_date and end_date < init_date:
+			raise forms.ValidationError(_('The end date may not be before the start date.'))
+		return end_date
 	# init_register_date = forms.DateField(widget=forms.DateField)
 	# end_register_date = forms.DateField(widget=forms.DateField)
@@ -53,6 +77,53 @@ class CourseForm(forms.ModelForm):
 			'category': _('Category which the course belongs'),
 		}
+		widgets = {
+			'categoy': forms.Select(),
+			'objectivies': forms.Textarea(attrs={'cols': 80, 'rows': 5}),
+			'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:
@@ -0,0 +1,28 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.10 on 2016-09-16 03:01
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+import django.utils.timezone
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('courses', '0012_course_students'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='subject',
+            name='end_date',
+            field=models.DateField(default=django.utils.timezone.now, verbose_name='End of Subject Date'),
+            preserve_default=False,
+        ),
+        migrations.AddField(
+            model_name='subject',
+            name='init_date',
+            field=models.DateField(default=django.utils.timezone.now, verbose_name='Begin of Subject Date'),
+            preserve_default=False,
+        ),
+    ]
@@ -0,0 +1,48 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.10 on 2016-09-16 04:26
+from __future__ import unicode_literals
+
+from django.conf import settings
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+        ('core', '0009_auto_20160916_0126'),
+        ('courses', '0012_course_students'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='Activity',
+            fields=[
+                ('resource_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='core.Resource')),
+                ('create_date', models.DateTimeField(auto_now_add=True, verbose_name='Creation Date')),
+                ('limit_date', models.DateTimeField(verbose_name='Deliver Date')),
+                ('grade', models.IntegerField(verbose_name='grade')),
+                ('student', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='student', to=settings.AUTH_USER_MODEL, verbose_name='student')),
+            ],
+            bases=('core.resource',),
+        ),
+        migrations.CreateModel(
+            name='Link',
+            fields=[
+                ('resource_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='core.Resource')),
+                ('url_field', models.CharField(max_length=300, verbose_name='url')),
+            ],
+            bases=('core.resource',),
+        ),
+        migrations.AddField(
+            model_name='topic',
+            name='visible',
+            field=models.BooleanField(default=False, verbose_name='Visible'),
+        ),
+        migrations.AddField(
+            model_name='activity',
+            name='topic',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='topic', to='courses.Topic', verbose_name='Topic'),
+        ),
+    ]
@@ -0,0 +1,16 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.10 on 2016-09-16 05:55
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('courses', '0013_auto_20160916_0001'),
+        ('courses', '0013_auto_20160916_0126'),
+    ]
+
+    operations = [
+    ]
@@ -2,6 +2,7 @@ from django.utils.translation import ugettext_lazy as _
 from django.db import models
 from autoslug.fields import AutoSlugField
 from users.models import User
+from core.models import Resource
 class Category(models.Model):
@@ -47,6 +48,8 @@ class Subject(models.Model):
 	slug = AutoSlugField(_("Slug"),populate_from='name',unique=True)
 	description = models.TextField(_('Description'), blank = True)
 	visible = models.BooleanField(_('Visible'), default = False)
+	init_date = models.DateField(_('Begin of Subject Date'))
+	end_date = models.DateField(_('End of Subject Date'))
 	create_date = models.DateTimeField(_('Creation Date'), auto_now_add = True)
 	update_date = models.DateTimeField(_('Date of last update'), auto_now=True)
 	course = models.ForeignKey(Course, verbose_name = _('Course'), related_name="subjects")
@@ -70,6 +73,7 @@ class Topic(models.Model):
 	update_date = models.DateTimeField(_('Date of last update'), auto_now=True)
 	subject = models.ForeignKey(Subject, verbose_name = _('Subject'), related_name="topics")
 	owner = models.ForeignKey(User, verbose_name = _('Owner'), related_name="topics")
+	visible = models.BooleanField(_('Visible'), default=False)
 	class Meta:
 		ordering = ('create_date','name')
@@ -78,3 +82,21 @@ class Topic(models.Model):
 	def __str__(self):
 		return self.name
+
+"""
+It is one kind of possible resources available inside a Topic.
+Activity is something that has a deadline and has to be delivered by the student
+"""
+class Activity(Resource):
+	create_date = models.DateTimeField(_('Creation Date'), auto_now_add = True)
+	topic = models.ForeignKey(Topic, verbose_name = _('Topic'), related_name="topic")
+	create_date = models.DateTimeField(_('Creation Date'), auto_now_add = True)
+	limit_date = models.DateTimeField(_('Deliver Date'))
+	student = models.ForeignKey(User, verbose_name = _('student'), related_name="student")
+	grade = models.IntegerField(_('grade'))
+
+"""
+It is one kind of possible resources available inside a Topic.
+"""
+class Link(Resource):
+	url_field = models.CharField(_('url'), max_length= 300)
 \ No newline at end of file
@@ -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
-{% extends 'app/base.html' %}
+{% extends 'course/view.html' %}
 {% load static i18n %}
 {% load widget_tweaks %}
@@ -10,16 +10,9 @@
 	</ol>
 {% endblock %}
-{% block sidebar %}
-	<div class="list-group">
-	  	<a href="{% url 'course:manage' %}" class="list-group-item">
-	    	{% trans 'Courses' %}
-	  	</a>
-	</div>
-{% endblock %}
-
 {% block content %}
+<<<<<<< HEAD
 	<form method="post" action="" enctype="multipart/form-data">
 		{% csrf_token %}
 		{% for field in form %}
@@ -46,4 +39,56 @@
 		<input type="submit" value="{% trans 'Save' %}" class="btn btn-sm btn-success" />
 	</form>
 	<br clear="all" />
+=======
+</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>
+						{% endfor %}
+						<div class="row text-center">
+								<input type="submit" value="{% trans 'Create' %}" class="btn btn-primary" />
+						</div>
+          </form>
+    </div>
+</div>
+</br>
+</br>
+</br>
+>>>>>>> 841817e1db11c57551cb8e21bf361e5bf6c9d982
 {% endblock %}
-{% 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 %}
@@ -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">
-{% 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 %}
@@ -15,9 +15,24 @@
 {% endblock %}
 {% block sidebar %}
-<div class="panel panel-primary navigation">
+<div class="panel panel-primary">
   <div class="panel-heading">
-    <h5>{% trans "Menu" %}</h5>
+    <img src="{{ user.image.url }}" id="img" class="img-circle img-responsive">
+  </br>
+    <div class="row">
+      <div class="col-xs-3 col-md-3">
+        <i class="fa fa-facebook-official fa-2x" aria-hidden="true"></i>
+    </div>
+        <div class="col-xs-3 col-md-3">
+          <i class="fa fa-twitter fa-2x" aria-hidden="true"></i>
+      </div>
+        <div class="col-xs-3 col-md-3">
+          <i class="fa fa-linkedin-square fa-2x" aria-hidden="true"></i>
+      </div>
+        <div class="col-xs-3 col-md-3">
+          <i class="fa fa-google-plus-official fa-2x" aria-hidden="true"></i>
+      </div>
+    </div>
   </div>
   <div class="panel-body">
     <ul class="nav nav-pills nav-stacked">
@@ -28,7 +43,7 @@
   </div>
 </div>
 {% if courses.count > 0 %}
-<div class="panel panel-primary navigation">
+<div class="panel panel-primary">
   <div class="panel-heading">
     <h5>{% trans "Courses" %}</h5>
   </div>
@@ -49,22 +64,24 @@
   <div class="panel panel-info">
     <div class="panel-heading">
       <div class="row">
-<div class="col-md-10">
+        <a href="{% url 'course:view_subject' subject.slug %}">
+        <div class="col-md-10">
-    <h3 class="panel-title"><a href="{% url 'course:view_subject' subject.slug %}"></a>{{subject}}</h3>
+          <h3 class="panel-title">{{subject}}</h3>
-  </div>
-  <div class="col-md-2 text-right">
-    {% if user|has_role:'professor, system_admin' %}
-      <a href="{% url 'course:update_subject' subject.slug %}" style="padding: 3px; margin: 3px;" class="btn btn-sm btn-default">
-        <span class="glyphicon glyphicon-edit"></span>
-      </a>
-      <a href="{% url 'course:delete_subject' subject.slug %}" style="padding: 3px; margin: 3px;" class="btn btn-sm btn-danger">
-        <span class="glyphicon glyphicon-trash"></span>
-      </a>
-    {% endif %}
-  </div>
-</div>
+        </div>
+        </a>
+        <div class="col-md-2 text-right">
+          {% if user|has_role:'professor, system_admin' %}
+            <a href="{% url 'course:update_subject' subject.slug %}" style="padding: 3px; margin: 3px;" class="btn btn-sm btn-default">
+              <span class="glyphicon glyphicon-edit"></span>
+            </a>
+            <a href="{% url 'course:delete_subject' subject.slug %}" style="padding: 3px; margin: 3px;" class="btn btn-sm btn-danger">
+              <span class="glyphicon glyphicon-trash"></span>
+            </a>
+          {% endif %}
+        </div>
+    </div>
     </div>
     <div class="panel-body">
       <p><b>{% trans "Professor" %}: </b>{% for professor in subject.professors.all %}{% if not forloop.first %},{% endif %}
@@ -77,10 +94,10 @@
         </p>
         <div class="row">
           <div class="col-xs-6 col-md-6">
-            {# <p><b>{% trans "Begining" %}: </b>{{subject.init_date}}</p>#}
+            <p><b>{% trans "Begining" %}: </b>{{subject.init_date}}</p>
           </div>
           <div class="col-xs-6 col-md-6">
-            {# <p><b>End: </b>23/08/2019</p>#}
+            <p><b>{% trans "End" %}: </b>{{subject.end_date}}</p>
           </div>
         </div>
     </div>
@@ -90,5 +107,12 @@
 {% block rightbar %}
-
+<div class="panel panel-warning">
+      <div class="panel-heading">
+        <h3 class="panel-title">{% trans "Pending Stuffs" %}</h3>
+      </div>
+    <div class="panel-body">
+      <p>{% trans 'No pending tasks at the moment.' %}</p>
+      </div>
+  </div>
 {% endblock rightbar %}
@@ -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>
 {% load i18n %}
 <div class="panel panel-default">
+  <a href="{% url 'course:view_topic' topic.slug %}">
   <div class="panel-heading">
     <div class="row">
       <div class="col-md-9 col-sm-9">
         <h3>{{topic}}</h3>
       </div>
     </div>
+    </div>
+  </a>
   </div>
+  
   <div class="panel-body">
     <p>{{topic.description|linebreaks}}</p>
   </div>
 {% load i18n %}
 <div class="panel panel-default">
+  <a href="{% url 'course:view_topic' topic.slug %}">
   <div class="panel-heading">
     <div class="row">
       <div class="col-md-9 col-sm-9">
@@ -11,6 +12,7 @@
       </div>
     </div>
   </div>
+  </a>
   <div class="panel-body">
     <p>{{topic.description|linebreaks}}</p>
   </div>
@@ -7,7 +7,12 @@
 	<ol class="breadcrumb">
 	  	<li><a href="{% url 'app:index' %}">{% trans 'Home' %}</a></li>
 	  	<li><a href="{% url 'course:view' course.slug %}">{{ course }}</a></li>
-	  	<li class="active">{% trans 'Manage Subjects' %}</li>
+	  	{% if user|has_role:'professor' or user|has_role:'system_admin' %}
+	  		<li class="active">{% trans 'Manage Subjects' %}</li>
+	  	{% else %}
+	  		<li class="active">{{ subject.name }}</li>
+	  	{% endif %}
+	  	
 	</ol>
 {% endblock %}
@@ -67,8 +72,10 @@
 		{% include "subject/form_view_student.html" %}
 	{% endif %}
 {% endfor %}
+	{% if user|has_role:'system_admin' or topic.owner == user%}
+		<a name="create_topic" class="btn btn-primary btn-md btn-block" href="{% url 'course:create_topic' subject.slug %}">{% trans "Create Topic" %}</a>
+	{% endif %}	
-	<a name="create_topic" class="btn btn-primary btn-md btn-block" href="{% url 'course:create_topic' subject.slug %}">{% trans "Create Topic" %}</a>
 {% endblock %}
 {% block rightbar %}
@@ -0,0 +1,89 @@
+{% extends 'base.html' %}
+
+{% load static i18n permission_tags %}
+
+{% block breadcrumbs %}
+
+	<ol class="breadcrumb">
+	  	<li><a href="{% url 'app:index' %}">{% trans 'Home' %}</a></li>
+	  	<li><a href="{% url 'course:view_subject' subject.slug %}">{{ subject }}</a></li>
+	  	{% if user|has_role:'professor' or user|has_role:'system_admin' %}
+	  		<li class="active">{% trans 'Manage Topic' %}</li>
+	  	{% else %}
+	  		<li class="active">{{ topic.name }}</li>
+	  	{% endif %}
+	  	
+	</ol>
+{% endblock %}
+
+{% block sidebar %}
+
+    <div class="panel panel-primary">
+
+      <div class="panel-heading">
+        <h3 class="panel-title">{{course}}</h3>
+      </div>
+
+      <div class="panel-body">
+        <!--{% for subject in subjects %}
+				<div class="row">
+					<div class="col-md-12 col-sm-12">
+						{{subject}}
+					</div>
+				</div>
+        {% endfor %}-->
+      </div>
+    </div>
+
+		
+{% endblock %}
+
+{% block content %}
+  <div class="panel panel-info">
+    <div class="panel-heading">
+			<div class="row">
+	      <div class="col-md-7 col-sm-7">
+	        <h3>{{subject}}</h3>
+	      </div>
+	      <div class="col-md-2 col-sm-2">
+					{% if user|has_role:'system_admin' or user in subject.professors %}
+	        	<a href="{% url 'course:update_subject' subject.slug%}" class="btn">{% trans "edit" %}</a>
+					{% endif %}
+	      </div>
+				<div class="col-md-3 col-sm-3">
+					{% if user|has_role:'system_admin' or user in subject.professors %}
+	        	<a href="{% url 'course:delete_subject' subject.slug%}" class="btn">{% trans "delete" %}</a>
+					{% endif %}
+	      </div>
+	    </div>
+    </div>
+    <div class="panel-body">
+      <p>
+        {{subject.description|linebreaks}}
+      </p>
+    </div>
+  </div>
+<!--{% for topic in topics %}
+	{% if user|has_role:'system_admin' or topic.owner == user%}
+		{% include "subject/form_view_teacher.html" %}
+	{% else %}
+		{% include "subject/form_view_student.html" %}
+	{% endif %}
+{% endfor %}
+	{% if user|has_role:'system_admin' or topic.owner == user%}
+		<a name="create_topic" class="btn btn-primary btn-md btn-block" href="{% url 'course:create_topic' subject.slug %}">{% trans "Create Topic" %}</a>
+	{% endif %}	
+
+{% endblock %}-->
+
+{% block rightbar %}
+
+  <div class="panel panel-warning">
+    <div class="panel-heading">
+      <h3 class="panel-title">{% trans "Pending Stuffs" %}</h3>
+    </div>
+    <div class="panel-body">
+
+    </div>
+  </div>
+{% endblock rightbar %}
@@ -4,10 +4,10 @@ from . import views
 urlpatterns = [
 	url(r'^$', views.IndexView.as_view(), name='manage'),
-	url(r'^create/$', views.CreateView.as_view(), name='create'),
-	url(r'^edit/(?P<slug>[\w_-]+)/$', views.UpdateView.as_view(), name='update'),
+	url(r'^create/$', views.CreateCourseView.as_view(), name='create'),
+	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"),
@@ -15,9 +15,10 @@ urlpatterns = [
 	url(r'^categories/(?P<slug>[\w_-]+)/$', views.ViewCat.as_view(), name='view_cat'),
 	url(r'^categories/delete/(?P<slug>[\w_-]+)/$', views.DeleteCatView.as_view(), name='delete_cat'),
 	url(r'^subjects/(?P<slug>[\w_-]+)/$', views.SubjectsView.as_view(), name='view_subject'),
-	url(r'^topics/create/(?P<slug>[\w_-]+)/$', views.CreateTopicView.as_view(), name='create_topic'),
-	url(r'^topics/update/(?P<slug>[\w_-]+)/$', views.UpdateTopicView.as_view(), name='update_topic'),
 	url(r'^subjects/create/(?P<slug>[\w_-]+)/$', views.CreateSubjectView.as_view(), name='create_subject'),
 	url(r'^subjects/update/(?P<slug>[\w_-]+)/$', views.UpdateSubjectView.as_view(), name='update_subject'),
 	url(r'^subjects/delete/(?P<slug>[\w_-]+)/$', views.DeleteSubjectView.as_view(), name='delete_subject'),
+	url(r'^topics/create/(?P<slug>[\w_-]+)/$', views.CreateTopicView.as_view(), name='create_topic'),
+	url(r'^topics/update/(?P<slug>[\w_-]+)/$', views.UpdateTopicView.as_view(), name='update_topic'),
+	url(r'^topics/(?P<slug>[\w_-]+)/$', views.TopicsView.as_view(), name='view_topic')
 ]
@@ -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):
@@ -32,7 +33,7 @@ class IndexView(LoginRequiredMixin, NotificationMixin, generic.ListView):
 		return context
-class CreateView(LoginRequiredMixin, HasRoleMixin, NotificationMixin,generic.edit.CreateView):
+class CreateCourseView(LoginRequiredMixin, HasRoleMixin, NotificationMixin,generic.edit.CreateView):
 	allowed_roles = ['professor', 'system_admin']
 	login_url = reverse_lazy("core:home")
@@ -47,8 +48,6 @@ class CreateView(LoginRequiredMixin, HasRoleMixin, NotificationMixin,generic.edi
 		self.object.save()
 		messages.success(self.request, _('Course created successfully!'))
-		return super(CreateView, self).form_valid(form)
-
 	def form_invalid(self, form):
 	    print(form)
 	    return self.render_to_response(self.get_context_data(form=form))
@@ -56,27 +55,80 @@ class CreateView(LoginRequiredMixin, HasRoleMixin, NotificationMixin,generic.edi
 	def render_to_responssse(self, context, **response_kwargs):
 		return self.response_class(request=self.request, template=self.get_template_names(), context=context, using=self.template_engine)
-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):
@@ -90,7 +142,7 @@ class CourseView(LoginRequiredMixin, NotificationMixin, generic.DetailView):
 		context = super(CourseView, self).get_context_data(**kwargs)
 		course = get_object_or_404(Course, slug = self.kwargs.get('slug'))
 		if has_role(self.request.user,'system_admin'):
-			subjects = Subject.objects.all()
+			subjects = course.subjects.all()
 		elif has_role(self.request.user,'professor'):
 			subjects = course.subjects.filter(professors__in=[self.request.user])
 		elif has_role(self.request.user, 'student'):
@@ -239,6 +291,29 @@ class SubjectsView(LoginRequiredMixin, generic.ListView):
 		context['topics'] = subject.topics.all()
 		return context
+class TopicsView(LoginRequiredMixin, generic.ListView):
+
+	login_url = reverse_lazy("core:home")
+	redirect_field_name = 'next'
+	template_name = 'topic/index.html'
+	context_object_name = 'topics'
+	model = Topic
+
+	def get_queryset(self):
+		topic = get_object_or_404(Topic, slug = self.kwargs.get('slug'))
+		subject = topic.subject
+		context = subject.topics.filter(visible=True)
+		#if (self.request.user in subject.professors.all() or has_role(self.request.user,'system_admin')):
+			#context = subject.topics.all() <- Change it By Activities
+		return context
+
+	def get_context_data(self, **kwargs):
+		topic = get_object_or_404(Topic, slug = self.kwargs.get('slug'))
+		context = super(TopicsView, self).get_context_data(**kwargs)
+		context['topic'] = topic
+		context['subject'] = topic.subject
+		return context
+
 class CreateTopicView(LoginRequiredMixin, HasRoleMixin, NotificationMixin, generic.edit.CreateView):
 	allowed_roles = ['professor', 'system_admin']
@@ -386,4 +461,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})
 from django.contrib import admin
 from .models import User
-from .forms import ProfileForm
+from .forms import UserForm
 class UserAdmin(admin.ModelAdmin):
 	list_display = ['username', 'name', 'email', 'is_staff', 'is_active']
 	search_fields = ['username', 'name', 'email']
-	form = ProfileForm
+	form = UserForm
 admin.site.register(User, UserAdmin)
 \ No newline at end of file
 # coding=utf-8
-
+import os
+from django.conf import settings
 from django import forms
 from django.utils.translation import ugettext_lazy as _
+from rolepermissions.shortcuts import assign_role
 from .models import User
@@ -25,10 +27,32 @@ class ProfileForm(forms.ModelForm):
 		}	
 class UserForm(forms.ModelForm):
+	def save(self, commit=True):
+		super(UserForm, self).save(commit=False)
+
+		#if not self.instance.image:
+		#	self.instance.image = os.path.join(os.path.dirname(settings.BASE_DIR), 'uploads', 'no_image.jpg')
+
+		self.instance.set_password(self.cleaned_data['password'])
+		self.instance.save()
+
+		if self.instance.is_staff:
+			assign_role(self.instance, 'system_admin')
+		elif self.instance.type_profile == 2:
+			assign_role(self.instance, 'student')
+		elif self.instance.type_profile == 1:
+			assign_role(self.instance, 'professor')
+
+		self.instance.save()
+
+		return self.instance
 	class Meta:
 		model = User
-		fields = ['username', 'name', 'email', 'birth_date', 'city', 'state', 'gender', 'type_profile', 'cpf', 'phone', 'image', 'is_staff', 'is_active']
+		fields = ['username', 'name', 'email', 'password', 'birth_date', 'city', 'state', 'gender', 'type_profile', 'cpf', 'phone', 'image', 'is_staff', 'is_active']
+		widgets = {
+			'password':forms.PasswordInput
+		}
 class EditUserForm(forms.ModelForm):
@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.10 on 2016-09-16 02:34
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('users', '0012_auto_20160908_1625'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='user',
+            name='image',
+            field=models.ImageField(blank=True, upload_to='users/', verbose_name='Image'),
+        ),
+    ]
@@ -4,6 +4,7 @@ from django.db import models
 from django.core import validators
 from django.utils.translation import ugettext_lazy as _
 from django.contrib.auth.models import AbstractBaseUser, UserManager, PermissionsMixin
+from django.contrib.staticfiles.templatetags.staticfiles import static
 class User(AbstractBaseUser, PermissionsMixin):
@@ -19,7 +20,7 @@ class User(AbstractBaseUser, PermissionsMixin):
 	city = models.CharField(_('City'), max_length = 90, blank = True)
 	state = models.CharField(_('State'), max_length = 30, blank = True)
 	gender = models.CharField(_('Gender'), max_length = 1, choices = (('M', _('Male')), ('F', _('Female'))))
-	image = models.ImageField(verbose_name = _('Image'), blank = True, upload_to = 'users/', default = 'no_image.jpg')
+	image = models.ImageField(verbose_name = _('Image'), blank = True, upload_to = 'users/')
 	birth_date = models.DateField(_('Birth Date'), null = True, blank = True)
 	phone = models.CharField(_('Phone'), max_length = 30, blank = True)
 	cpf = models.CharField(_('Cpf'), max_length = 15, blank = True)
@@ -40,8 +41,15 @@ class User(AbstractBaseUser, PermissionsMixin):
 	def __str__(self):
 		return self.name or self.username
-	def det_full_name(self):
+	def get_full_name(self):
 		return str(self)
 	def get_short_name(self):
-		return str(self).split(" ")[0]
 \ No newline at end of file
+		return str(self).split(" ")[0]
+
+	@property
+	def image_url(self):
+		if self.image and hasattr(self.image, 'url'):
+			return self.image.url
+		else:
+			return static('img/no_image.jpg')
 \ No newline at end of file
-{% extends 'base.html' %}
+{% extends 'home.html' %}
-{% load i18n pagination %}
+{% load i18n pagination django_bootstrap_breadcrumbs %}
 {% block breadcrumbs %}
-    <div class="row">
-      	<div class="col-md-12">
-        	<ul class="breadcrumb" style="margin-bottom: 5px;">
-          		<li><a href="{% url 'app:index' %}">{% trans 'Home' %}</a></li>
-              	<li class="active">{% trans 'Manage Users' %}</li>
-            </ul>
-      	</div>
-    </div>
+
+  {{ block.super }}
+    {% breadcrumb 'Manage Users' 'users:manage' %}
+
 {% endblock %}
 {% block sidebar %}
@@ -52,7 +48,7 @@
                         <p>{% trans 'Email' %}: {{ acc.email }}</p>
                         <p>{% trans 'Contact' %}: {{ acc.phone }}</p>
                         <div align="right">
-                            <a href="javascript:void(0)" class="btn btn-raised btn-success">{% trans 'Edit' %}</a>
+                            <a href="{% url 'users:update' acc.username %}" class="btn btn-raised btn-success">{% trans 'Edit' %}</a>
                             <a href="javascript:void(0)" class="btn btn-raised btn-primary">{% trans 'Delete' %}</a>
                         </div>
                     </div>
@@ -68,3 +64,6 @@
         </div>
     {% endif %}
 {% endblock %}
+
+{% block rightbar %}
+{% endblock rightbar %}
-{% extends 'app/base.html' %}
+{% extends 'list_users.html' %}
 {% load static i18n %}
 {% load widget_tweaks %}
+{% load django_bootstrap_breadcrumbs %}
+
 {% block breadcrumbs %}
-	<ol class="breadcrumb">
-	  	<li><a href="{% url 'app:index' %}">{% trans 'Home' %}</a></li>
-	  	<li class="active">{% trans 'New User' %}</li>
-	</ol>
-{% endblock %}
-{% block sidebar %}
-	<div class="list-group">
-	  	<a href="{% url 'users:manage' %}" class="list-group-item">
-	    	{% trans 'System Users' %}
-	  	</a>
-	  	<a href="{% url 'users:create' %}" class="list-group-item active">
-	    	{% trans 'New Account' %}
-	  	</a>
-	  	<a href="#" class="list-group-item">
-	    	{% trans 'Send Mail' %}
-	  	</a>
-	</div>
+  {{ block.super }}
+    {% breadcrumb 'Add User' 'users:create' %}
+
 {% 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>
+	{% if messages %}
+		{% for message in messages %}
+			<div class="alert alert-success alert-dismissible" role="alert">
+				<button type="button" class="close" data-dismiss="alert" aria-label="Close">
+					<span aria-hidden="true">&times;</span>
+				</button>
+				<p>{{ message }}</p>
+			</div>
+		{% endfor %}
+	{% endif %}
-	<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>
+	<div class="card">
+		<div class="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_birth_date' %}
+								{% render_field field class='form-control input-sm' type='date' %}
+								<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="{% trans '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_is_staff' or field.auto_id == 'id_is_active' %}
+				            	<div class="checkbox">
+				            		<label>
+				            			{% render_field field type='checkbox' %}  	
+				            		</label>
+						        </div>
+							{% else %}
+								{% render_field field class='form-control input-sm' %}
+								<span id="helpBlock" class="help-block">{{ field.help_text }}</span>
+							{% endif %}
+							{% 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>
+								</div>
+							</div>
+							{% endif %}
+						</div>
+					{% endfor %}
+					<div class="col-md-offset-2 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 'users:manage' %}" class="btn btn-sm btn-success" >{% trans 'Cancel' %}</a>	
 					</div>
-				</div>
-				{% endif %}
+				</form>
 			</div>
-		{% endfor %}
-		<input type="submit" value="{% trans 'Save' %}" class="btn btn-sm btn-success" />
-	</form>
+		</div>
+	</div>
+	
 	<br clear="all" />
 {% endblock %}
-{% extends 'app/base.html' %}
+{% extends 'list_users.html' %}
 {% load static i18n %}
 {% load widget_tweaks %}
+{% load django_bootstrap_breadcrumbs %}
+
 {% block breadcrumbs %}
-	<ol class="breadcrumb">
-	  	<li><a href="{% url 'app:index' %}">{% trans 'Home' %}</a></li>
-	  	<li class="active">{% trans 'Edit user' %}</li>
-	</ol>
-{% endblock %}
-{% block sidebar %}
-	<div class="list-group">
-		<a href="{% url 'users:manage' %}" class="list-group-item">
-	    	{% trans 'System Users' %}
-	  	</a>
-	  	<a href="{% url 'users:create' %}" class="list-group-item">
-	    	{% trans 'New Account' %}
-	  	</a>
-	  	<a href="#" class="list-group-item">
-	    	{% trans 'Send Mail' %}
-	  	</a>
-	</div>
+  {{ block.super }}
+    {% breadcrumb 'Update User' 'users:update' %}
+
 {% 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>
+	{% if messages %}
+		{% for message in messages %}
+			<div class="alert alert-success alert-dismissible" role="alert">
+				<button type="button" class="close" data-dismiss="alert" aria-label="Close">
+					<span aria-hidden="true">&times;</span>
+				</button>
+				<p>{{ message }}</p>
+			</div>
+		{% endfor %}
+	{% endif %}
-	<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>
+	<div class="card">
+		<div class="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_birth_date' %}
+								{% render_field field class='form-control input-sm' type='date' %}
+								<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="{% trans '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_is_staff' or field.auto_id == 'id_is_active' %}
+				            	<div class="checkbox">
+				            		<label>
+				            			{% render_field field type='checkbox' %}  	
+				            		</label>
+						        </div>
+							{% else %}
+								{% render_field field class='form-control input-sm' %}
+								<span id="helpBlock" class="help-block">{{ field.help_text }}</span>
+							{% endif %}
+							{% 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>
+								</div>
+							</div>
+							{% endif %}
+						</div>
+					{% endfor %}
+					<div class="col-md-offset-2 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 'users:manage' %}" class="btn btn-sm btn-success" >{% trans 'Cancel' %}</a>	
 					</div>
-				</div>
-				{% endif %}
+				</form>
 			</div>
-		{% endfor %}
-		<input type="submit" value="{% trans 'Save' %}" class="btn btn-sm btn-success" />
-	</form>
+		</div>
+	</div>
 	<br clear="all" />
 {% endblock %}
	@@ -79,6 +79,7 @@ TEMPLATES = [		@@ -79,6 +79,7 @@ TEMPLATES = [
79	'django.contrib.messages.context_processors.messages',	79	'django.contrib.messages.context_processors.messages',
80		80
81	'core.context_processors.notifications',	81	'core.context_processors.notifications',
		82	+ 'courses.context_processors.courses',
82	],	83	],
83	},	84	},
84	},	85	},
	@@ -5,7 +5,7 @@		@@ -5,7 +5,7 @@
5	{% block menu_top %}	5	{% block menu_top %}
6	<ul class="nav navbar-nav">	6	<ul class="nav navbar-nav">
7	<li class="active">	7	<li class="active">
8	- <a href="#">Home</a>	8	+ <a href="{% url 'home' %}">Home</a>
9	</li>	9	</li>
10	<li><a href="#contact">{% trans 'The Project' %}</a></li>	10	<li><a href="#contact">{% trans 'The Project' %}</a></li>
11	<li><a href="#contact">{% trans 'CCTE Group' %}</a></li>	11	<li><a href="#contact">{% trans 'CCTE Group' %}</a></li>
	@@ -23,7 +23,7 @@		@@ -23,7 +23,7 @@
23	<div class="panel-body">	23	<div class="panel-body">
24	<ul class="nav nav-pills nav-stacked">	24	<ul class="nav nav-pills nav-stacked">
25	<li><a href="{% url 'users:profile' %}">{% trans 'Profile' %}</a></li>	25	<li><a href="{% url 'users:profile' %}">{% trans 'Profile' %}</a></li>
26	- <li><a href="javascript:void(0)">{% trans 'My Courses' %}</a></li>	26	+ <li><a href="{% url 'course:manage' %}">{% trans 'My Courses' %}</a></li>
27	<li><a href="javascript:void(0)">{% trans 'Google accounts' %}</a></li>	27	<li><a href="javascript:void(0)">{% trans 'Google accounts' %}</a></li>
28	</ul>	28	</ul>
29	</div>	29	</div>
1	-{% load i18n %}	1	+{% load static i18n %}
2		2
3	{% for notification in objects %}	3	{% for notification in objects %}
4	<li {% if not notification.read %}class="not_read"{% endif %}>	4	<li {% if not notification.read %}class="not_read"{% endif %}>
5	<div class="avatar">	5	<div class="avatar">
6	- <img src="{{ notification.user.image.url }}">	6	+ <img src="{{ notification.user.image_url }}">
7	</div>	7	</div>
8	<div class="bubble-container">	8	<div class="bubble-container">
9	<div class="bubble">	9	<div class="bubble">
	@@ -43,8 +43,7 @@ class AppIndex(LoginRequiredMixin, LogMixin, ListView, NotificationMixin):		@@ -43,8 +43,7 @@ class AppIndex(LoginRequiredMixin, LogMixin, ListView, NotificationMixin):
43	else:	43	else:
44	self.template_name = "home_teacher_student_content.html"	44	self.template_name = "home_teacher_student_content.html"
45		45
46	-
47	- super(AppIndex, self).createNotification("teste", not_resource="home", resource_link="/register")	46	+
48	return self.response_class(request = self.request, template = self.template_name, context = context, using = self.template_engine, **response_kwargs)	47	return self.response_class(request = self.request, template = self.template_name, context = context, using = self.template_engine, **response_kwargs)
49		48
50		49
@@ -0,0 +1,20 @@		@@ -0,0 +1,20 @@
	1	+# -- coding: utf-8 --
	2	+# Generated by Django 1.10 on 2016-09-16 04:26
	3	+from __future__ import unicode_literals
	4	+
	5	+from django.db import migrations
	6	+
	7	+
	8	+class Migration(migrations.Migration):
	9	+
	10	+ dependencies = [
	11	+ ('core', '0008_resource_link'),
	12	+ ]
	13	+
	14	+ operations = [
	15	+ migrations.RenameField(
	16	+ model_name='resource',
	17	+ old_name='link',
	18	+ new_name='url',
	19	+ ),
	20	+ ]
	@@ -34,7 +34,7 @@ class Resource(models.Model):		@@ -34,7 +34,7 @@ class Resource(models.Model):
34		34
35	name = models.CharField(_('Name'), max_length =100, unique=True)	35	name = models.CharField(_('Name'), max_length =100, unique=True)
36	created_date = models.DateField(_('Created Date'), auto_now_add=True)	36	created_date = models.DateField(_('Created Date'), auto_now_add=True)
37	- link = models.CharField(_('URL'), max_length =100, default="")	37	+ url = models.CharField(_('URL'), max_length =100, default="")
38		38
39		39
40	class Meta:	40	class Meta:
	@@ -250,3 +250,15 @@ li.alert_li:hover{background-color:#eee}		@@ -250,3 +250,15 @@ li.alert_li:hover{background-color:#eee}
250	.turn_off_alert{float:right;margin-bottom :1px}	250	.turn_off_alert{float:right;margin-bottom :1px}
251	a.alert_message{color : grey}	251	a.alert_message{color : grey}
252	a.alert_message:hover{color : grey}	252	a.alert_message:hover{color : grey}
		253	+
		254	+/=================== Ailson - Please Don't touch/
		255	+.breadcrumb .divider{
		256	+ display: none;
		257	+}
		258	+
		259	+.accordion {
		260	+ background: #c0c0c0;
		261	+}
		262	+.accordion_list {
		263	+ background: #e0e0e0;
		264	+}
	@@ -48,7 +48,7 @@		@@ -48,7 +48,7 @@
48	<span class="icon-bar"></span>	48	<span class="icon-bar"></span>
49	<span class="icon-bar"></span>	49	<span class="icon-bar"></span>
50	</button>	50	</button>
51	- <a class="navbar-brand" href="javascript:void(0)"><img class="logo" src="{% static 'img/topo-amadeus.png' %}" alt="Logo"/></a>	51	+ <a class="navbar-brand" href="{% url 'app:index' %}"><img class="logo" src="{% static 'img/topo-amadeus.png' %}" alt="Logo"/></a>
52	</div>	52	</div>
53	<div class="navbar-collapse collapse navbar-responsive-collapse">	53	<div class="navbar-collapse collapse navbar-responsive-collapse">
54	<ul class="nav navbar-nav navbar-right notifications">	54	<ul class="nav navbar-nav navbar-right notifications">
	@@ -0,0 +1,14 @@		@@ -0,0 +1,14 @@
		1	+from .models import Course
		2	+
		3	+def courses(request):
		4	+ if request.user.is_authenticated:
		5	+ context = {}
		6	+
		7	+ if request.user.is_staff:
		8	+ context['courses_list'] = Course.objects.all()
		9	+ else:
		10	+ context['courses_list'] = Course.objects.filter(professors__in = [request.user])
		11	+
		12	+ return context
		13	+ else:
		14	+ return request
0	\ No newline at end of file	15	\ No newline at end of file