Merge branch 'dev' of https://github.com/amadeusproject/amadeuslms into dev

fbormann
2 parents 4d665a98 8dbb9d76
Showing 45 changed files with 474 additions and 370 deletions Show diff stats
amadeus/settings.py
amadeus/urls.py
avaliacao/__init__.py
avaliacao/admin.py
avaliacao/apps.py
avaliacao/migrations/__init__.py
avaliacao/models.py
avaliacao/tests.py
avaliacao/urls.py
avaliacao/views.py
core/migrations/0001_initial.py
core/migrations/0002_auto_20161001_2117.py
core/templates/base.html
core/urls.py
courses/migrations/0001_initial.py
courses/migrations/0002_auto_20161001_2117.py
courses/migrations/0003_activityfile.py
courses/templates/course/index.html
courses/templates/course/view.html
courses/templates/subject/form_view_teacher.html
@@ -47,14 +47,16 @@ INSTALLED_APPS = [
     'rolepermissions',
     'rest_framework',
     'django_bootstrap_breadcrumbs',
+    's3direct',
+    'users',
     'core',
     'app',
     'courses',
-    'users',
     'forum',
     'poll',
-    's3direct',
+    'avaliacao',
+
 ]
 MIDDLEWARE_CLASSES = [
@@ -205,7 +207,6 @@ S3DIRECT_DESTINATIONS = {
 }
-
 try:
     from .local_settings import *
 except ImportError:
@@ -23,7 +23,6 @@ urlpatterns = [
     url(r'^home/', include('app.urls', namespace = 'app')),
     url(r'^course/', include('courses.urls', namespace = 'course')),
     url(r'^users/', include('users.urls', namespace = 'users')),
-    url(r'^forum/', include('forum.urls', namespace = 'forum')),
     url(r'^admin/', admin.site.urls),
     url(r'^', include('core.urls', namespace = 'core')),
@@ -0,0 +1,3 @@
+from django.contrib import admin
+
+# Register your models here.
@@ -0,0 +1,5 @@
+from django.apps import AppConfig
+
+
+class AvaliacaoConfig(AppConfig):
+    name = 'avaliacao'
@@ -0,0 +1,20 @@
+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
+from courses.models import Activity
+
+class Avaliacao(Activity):
+
+    name_avalicao = models.CharField(_('Name'), max_length = 100)
+    init_date = models.DateField(_('Begin of Avaliacao Date'))
+    end_date = models.DateField(_('End of Avaliacao Date'))
+
+    class Meta:
+        #ordering = ('create_date','name')
+        verbose_name = _('Avaliacao')
+        verbose_name_plural = _('Avaliacoes')
+
+def __str__(self):
+    return str(self.name) + str("/") + str(self.topic)
@@ -0,0 +1,3 @@
+from django.test import TestCase
+
+# Create your tests here.
@@ -0,0 +1,7 @@
+from django.conf.urls import url
+
+from . import views
+
+urlpatterns =[
+
+]
@@ -0,0 +1,3 @@
+from django.shortcuts import render
+
+# Create your views here.
 # -*- coding: utf-8 -*-
-# Generated by Django 1.10 on 2016-10-02 00:17
+# Generated by Django 1.10 on 2016-10-05 02:05
 from __future__ import unicode_literals
 import autoslug.fields
+from django.conf import settings
 from django.db import migrations, models
 import django.db.models.deletion
@@ -12,6 +13,7 @@ class Migration(migrations.Migration):
     initial = True
     dependencies = [
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
     ]
     operations = [
@@ -23,18 +25,19 @@ class Migration(migrations.Migration):
                 ('created_date', models.DateField(auto_now_add=True, verbose_name='Created Date')),
             ],
             options={
-                'verbose_name': 'Action',
                 'verbose_name_plural': 'Actions',
+                'verbose_name': 'Action',
             },
         ),
         migrations.CreateModel(
             name='Action_Resource',
             fields=[
                 ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('action', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='core.Action', verbose_name='Action_Applied')),
             ],
             options={
-                'verbose_name': 'Action_Resource',
                 'verbose_name_plural': 'Action_Resources',
+                'verbose_name': 'Action_Resource',
             },
         ),
         migrations.CreateModel(
@@ -42,10 +45,12 @@ class Migration(migrations.Migration):
             fields=[
                 ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
                 ('datetime', models.DateTimeField(auto_now_add=True, verbose_name='Date and Time of action')),
+                ('action_resource', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='core.Action_Resource', verbose_name='Action_Resource')),
+                ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL, verbose_name='Actor')),
             ],
             options={
-                'verbose_name': 'Log',
                 'verbose_name_plural': 'Logs',
+                'verbose_name': 'Log',
             },
         ),
         migrations.CreateModel(
@@ -56,10 +61,12 @@ class Migration(migrations.Migration):
                 ('read', models.BooleanField(default=False, verbose_name='Read')),
                 ('datetime', models.DateTimeField(auto_now_add=True, verbose_name='Date and Time of action')),
                 ('action_resource', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='core.Action_Resource', verbose_name='Action_Resource')),
+                ('actor', models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='notification_Performer', to=settings.AUTH_USER_MODEL, verbose_name='Perfomer')),
+                ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='notification_Actor', to=settings.AUTH_USER_MODEL, verbose_name='User')),
             ],
             options={
-                'verbose_name': 'Notification',
                 'verbose_name_plural': 'Notifications',
+                'verbose_name': 'Notification',
             },
         ),
         migrations.CreateModel(
@@ -72,8 +79,13 @@ class Migration(migrations.Migration):
                 ('url', models.CharField(default='', max_length=100, verbose_name='URL')),
             ],
             options={
-                'verbose_name': 'Resource',
                 'verbose_name_plural': 'Resources',
+                'verbose_name': 'Resource',
             },
         ),
+        migrations.AddField(
+            model_name='action_resource',
+            name='resource',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='core.Resource', verbose_name='Resource'),
+        ),
     ]
@@ -1,50 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.10 on 2016-10-02 00:17
-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):
-
-    initial = True
-
-    dependencies = [
-        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
-        ('core', '0001_initial'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='notification',
-            name='actor',
-            field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='notification_Performer', to=settings.AUTH_USER_MODEL, verbose_name='Perfomer'),
-        ),
-        migrations.AddField(
-            model_name='notification',
-            name='user',
-            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='notification_Actor', to=settings.AUTH_USER_MODEL, verbose_name='User'),
-        ),
-        migrations.AddField(
-            model_name='log',
-            name='action_resource',
-            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='core.Action_Resource', verbose_name='Action_Resource'),
-        ),
-        migrations.AddField(
-            model_name='log',
-            name='user',
-            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL, verbose_name='Actor'),
-        ),
-        migrations.AddField(
-            model_name='action_resource',
-            name='action',
-            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='core.Action', verbose_name='Action_Applied'),
-        ),
-        migrations.AddField(
-            model_name='action_resource',
-            name='resource',
-            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='core.Resource', verbose_name='Resource'),
-        ),
-    ]
@@ -45,6 +45,8 @@
 	<script src="{% static 'js/base/amadeus.js' %}"></script>
 	{% block style %}
 	{% endblock %}
+	{% block javascript %}
+	{% endblock %}
 </head>
 <body>
 	<div class="container-fluid">
 from django.conf.urls import url, include
 from django.contrib.auth import views as auth_views
 from django.contrib.auth.views import password_reset, password_reset_done,password_reset_confirm, password_reset_complete
-
 from . import views
@@ -12,10 +11,13 @@ urlpatterns = [
     url(r'^logout/$', auth_views.logout, {'next_page': 'core:home'}, name='logout'),
     url(r'^notification/([0-9]+)/$', views.processNotification, name='notification_read'),
     url(r'^getNotifications/$', views.getNotifications, name='getNotifications'),
+]
-	url(r'^reset/$', password_reset, {'template_name':'registration/passwor_reset_form.html','email_template_name':'registration/password_reset_email.html','post_reset_redirect':'done/'}, name="password_reset"),
-	url(r'^reset/done/$', password_reset_done, {'template_name':'registration/passwor_reset_done.html'}),
-	url(r'^reset/(?P<uidb36>[0-9A-Za-z]+)/(?P<token>[0-9A-Za-z]{1,13}-[0-9A-Za-z]{1,20})/$', password_reset_confirm, {'template_name':'registration/password_reset_confirm.html'}),
-	url(r'^done/$', password_reset_complete,{'template_name':'registration/passwor_reset_complete.html'}),
+#Reset Password
+urlpatterns += [
+	url(r'^password/reset/$', password_reset, {'post_reset_redirect' : 'password/reset/done/','template_name': 'registration/passwor_reset_form.html'}, name="password_reset"),
+	url(r'^password/reset/done/$', password_reset_done, {'template_name': 'registration/passwor_reset_done.html'}),
+	url(r'^password/reset/(?P<uidb36>[0-9A-Za-z]+)/(?P<token>[0-9A-Za-z]{1,13}-[0-9A-Za-z]{1,20})/$', password_reset_confirm, {'post_reset_redirect' : 'password/done/', 'template_name': 'registration/password_reset_confirm.html'}),
+	url(r'^password/done/$', password_reset_complete,{'template_name': 'registration/passwor_reset_complete.html'}),
 ]
 # -*- coding: utf-8 -*-
-# Generated by Django 1.10 on 2016-10-02 00:17
+# Generated by Django 1.10 on 2016-10-05 02:05
 from __future__ import unicode_literals
 import autoslug.fields
+from django.conf import settings
 from django.db import migrations, models
 import django.db.models.deletion
+import s3direct.fields
 class Migration(migrations.Migration):
@@ -13,6 +15,7 @@ class Migration(migrations.Migration):
     dependencies = [
         ('core', '0001_initial'),
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
     ]
     operations = [
@@ -22,10 +25,24 @@ class Migration(migrations.Migration):
                 ('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')),
                 ('limit_date', models.DateTimeField(verbose_name='Deliver Date')),
                 ('all_students', models.BooleanField(default=False, verbose_name='All Students')),
+                ('students', models.ManyToManyField(related_name='activities', to=settings.AUTH_USER_MODEL, verbose_name='Students')),
             ],
             bases=('core.resource',),
         ),
         migrations.CreateModel(
+            name='ActivityFile',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('pdf', s3direct.fields.S3DirectField()),
+                ('name', models.CharField(max_length=100)),
+                ('diet', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='files', to='courses.Activity')),
+            ],
+            options={
+                'verbose_name_plural': 'Activitys Files',
+                'verbose_name': 'Activity File',
+            },
+        ),
+        migrations.CreateModel(
             name='Category',
             fields=[
                 ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
@@ -34,8 +51,8 @@ class Migration(migrations.Migration):
                 ('create_date', models.DateField(auto_now_add=True, verbose_name='Creation Date')),
             ],
             options={
-                'verbose_name': 'Category',
                 'verbose_name_plural': 'Categories',
+                'verbose_name': 'Category',
             },
         ),
         migrations.CreateModel(
@@ -53,11 +70,14 @@ class Migration(migrations.Migration):
                 ('init_date', models.DateField(verbose_name='Begin of Course Date')),
                 ('end_date', models.DateField(verbose_name='End of Course Date')),
                 ('image', models.ImageField(blank=True, upload_to='courses/', verbose_name='Image')),
+                ('category', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='courses.Category', verbose_name='Category')),
+                ('professors', models.ManyToManyField(related_name='courses_professors', to=settings.AUTH_USER_MODEL, verbose_name='Professors')),
+                ('students', models.ManyToManyField(related_name='courses_student', to=settings.AUTH_USER_MODEL, verbose_name='Students')),
             ],
             options={
                 'ordering': ('create_date', 'name'),
-                'verbose_name': 'Course',
                 'verbose_name_plural': 'Courses',
+                'verbose_name': 'Course',
             },
         ),
         migrations.CreateModel(
@@ -65,6 +85,7 @@ class Migration(migrations.Migration):
             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')),
                 ('all_students', models.BooleanField(default=False, verbose_name='All Students')),
+                ('students', models.ManyToManyField(related_name='materials', to=settings.AUTH_USER_MODEL, verbose_name='Students')),
             ],
             bases=('core.resource',),
         ),
@@ -80,11 +101,13 @@ class Migration(migrations.Migration):
                 ('end_date', models.DateField(verbose_name='End of Subject Date')),
                 ('create_date', models.DateTimeField(auto_now_add=True, verbose_name='Creation Date')),
                 ('update_date', models.DateTimeField(auto_now=True, verbose_name='Date of last update')),
+                ('course', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='subjects', to='courses.Course', verbose_name='Course')),
+                ('professors', models.ManyToManyField(related_name='subjects', to=settings.AUTH_USER_MODEL, verbose_name='Professors')),
             ],
             options={
                 'ordering': ('create_date', 'name'),
-                'verbose_name': 'Subject',
                 'verbose_name_plural': 'Subjects',
+                'verbose_name': 'Subject',
             },
         ),
         migrations.CreateModel(
@@ -94,10 +117,11 @@ class Migration(migrations.Migration):
                 ('name', models.CharField(max_length=100, verbose_name='Name')),
                 ('slug', autoslug.fields.AutoSlugField(editable=False, populate_from='name', unique=True, verbose_name='Slug')),
                 ('description', models.TextField(blank=True, verbose_name='Description')),
+                ('subjects', models.ManyToManyField(to='courses.Subject')),
             ],
             options={
-                'verbose_name': 'subject category',
                 'verbose_name_plural': 'subject categories',
+                'verbose_name': 'subject category',
             },
         ),
         migrations.CreateModel(
@@ -110,11 +134,23 @@ class Migration(migrations.Migration):
                 ('create_date', models.DateTimeField(auto_now_add=True, verbose_name='Creation Date')),
                 ('update_date', models.DateTimeField(auto_now=True, verbose_name='Date of last update')),
                 ('visible', models.BooleanField(default=False, verbose_name='Visible')),
+                ('owner', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL, verbose_name='Owner')),
+                ('subject', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='courses.Subject', verbose_name='Subject')),
             ],
             options={
                 'ordering': ('create_date', 'name'),
-                'verbose_name': 'Topic',
                 'verbose_name_plural': 'Topics',
+                'verbose_name': 'Topic',
             },
         ),
+        migrations.AddField(
+            model_name='material',
+            name='topic',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='materials', to='courses.Topic', verbose_name='Topic'),
+        ),
+        migrations.AddField(
+            model_name='activity',
+            name='topic',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='activities', to='courses.Topic', verbose_name='Topic'),
+        ),
     ]
@@ -1,80 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.10 on 2016-10-02 00:17
-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):
-
-    initial = True
-
-    dependencies = [
-        ('courses', '0001_initial'),
-        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='topic',
-            name='owner',
-            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL, verbose_name='Owner'),
-        ),
-        migrations.AddField(
-            model_name='topic',
-            name='subject',
-            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='courses.Subject', verbose_name='Subject'),
-        ),
-        migrations.AddField(
-            model_name='subjectcategory',
-            name='subjects',
-            field=models.ManyToManyField(to='courses.Subject'),
-        ),
-        migrations.AddField(
-            model_name='subject',
-            name='course',
-            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='subjects', to='courses.Course', verbose_name='Course'),
-        ),
-        migrations.AddField(
-            model_name='subject',
-            name='professors',
-            field=models.ManyToManyField(related_name='subjects', to=settings.AUTH_USER_MODEL, verbose_name='Professors'),
-        ),
-        migrations.AddField(
-            model_name='material',
-            name='students',
-            field=models.ManyToManyField(related_name='materials', to=settings.AUTH_USER_MODEL, verbose_name='Students'),
-        ),
-        migrations.AddField(
-            model_name='material',
-            name='topic',
-            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='materials', to='courses.Topic', verbose_name='Topic'),
-        ),
-        migrations.AddField(
-            model_name='course',
-            name='category',
-            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='courses.Category', verbose_name='Category'),
-        ),
-        migrations.AddField(
-            model_name='course',
-            name='professors',
-            field=models.ManyToManyField(related_name='courses_professors', to=settings.AUTH_USER_MODEL, verbose_name='Professors'),
-        ),
-        migrations.AddField(
-            model_name='course',
-            name='students',
-            field=models.ManyToManyField(related_name='courses_student', to=settings.AUTH_USER_MODEL, verbose_name='Students'),
-        ),
-        migrations.AddField(
-            model_name='activity',
-            name='students',
-            field=models.ManyToManyField(related_name='activities', to=settings.AUTH_USER_MODEL, verbose_name='Students'),
-        ),
-        migrations.AddField(
-            model_name='activity',
-            name='topic',
-            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='activities', to='courses.Topic', verbose_name='Topic'),
-        ),
-    ]
@@ -1,30 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.10 on 2016-10-03 16:10
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-import django.db.models.deletion
-import s3direct.fields
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('courses', '0002_auto_20161001_2117'),
-    ]
-
-    operations = [
-        migrations.CreateModel(
-            name='ActivityFile',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('pdf', s3direct.fields.S3DirectField()),
-                ('name', models.CharField(max_length=100)),
-                ('diet', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='files', to='courses.Activity')),
-            ],
-            options={
-                'verbose_name_plural': 'Activitys Files',
-                'verbose_name': 'Activity File',
-            },
-        ),
-    ]
@@ -53,23 +53,33 @@
 		{% endfor %}
 	{% endif %}
+<div class="col-md-12">
+		<div class="input-group">
+		  <div class="form-group is-empty"><input type="search" class="form-control" placeholder="Search Courses"></div>
+		    <span class="input-group-btn input-group-sm">
+		      <button type="button" class="btn btn-fab btn-fab-mini">
+		        <i class="material-icons">search</i>
+		      </button>
+		    </span>
+		</div>
+	</div>
 {% if user|has_role:'professor, system_admin' %}
 	<div class="col-md-12">
-		{% if courses_teacher|length > 0 %}
+		{% if courses|length > 0 %}
 			{% for course in courses_teacher %}
 			  <!-- Put your content here! -->
 	          <div class="panel-group ui-accordion ui-widget ui-helper-reset ui-sortable" id="accordion" role="tablist" aria-multiselectable="false">
 	            <div class="group">
 					<div class="panel panel-info">
-					    <div class="panel-heading headingOne ui-sortable-handle" role="tab">
+					    <div class="panel-heading" role="tab">
 					      <div class="row">
-					        <div class="col-xs-9 col-md-10 titleTopic">
+					        <div class="col-xs-9 col-md-9 titleTopic">
 					          <a role="button" data-toggle="collapse" data-parent="#accordion" href=".collapseOne" aria-expanded="false" aria-controls="collapseOne" class="collapsed">
-					          <h4>{{course.name}}</h4>
+					          <h4 style="color:white">{{course.name}}</h4>
 					          </a>
 					        </div>
-					        <div class="col-xs-4 col-md-2" id="divMoreActions">
+					        <div class="col-xs-4 col-md-3" id="divMoreActions">
 					            <div class="btn-group">
 					              <button type="button" class="btn btn-default btn-sm eye" data-toggle="tooltip" data-placement="bottom" title="Visible">
 					                <i class="fa fa-eye fa-2x" aria-hidden="true"></i>
@@ -81,7 +91,6 @@
 					                <i class="fa fa-ellipsis-v fa-2x" aria-hidden="true"></i>
 					              </button>
 					              <ul class="dropdown-menu" aria-labelledby="moreActions">
-					                <li><a href="{% url 'course:view' course.slug %}"><i class="fa fa-angle-double-right fa-fw" aria-hidden="true"></i>&nbsp; Access</a></li>
 					                <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; Replicate</a></li>
 					                <li><a href="javascript:void(0)" data-toggle="modal" data-target="#removeCourse"><i class="fa fa-trash fa-fw" aria-hidden="true"></i>&nbsp; Remove</a></li>
 					              </ul>
@@ -100,7 +109,7 @@
 					            {{course.description}}
 					          </i>
 					        </p>
-
+							<a href="{% url 'course:view' course.slug %}" class="btn btn-raised btn-default center-block">{% trans 'View Course' %}<div class="ripple-container"></div></a>
 					      </div>
 					    </div>
 					</div>
@@ -131,21 +140,11 @@
 				</div>
 			</div>
 		</div>
+{% endif %}
-{% else %}
-
-	<div class="col-md-12">
-		<div class="input-group">
-		  <div class="form-group is-empty"><input type="search" class="form-control" placeholder="Search Courses"></div>
-		    <span class="input-group-btn input-group-sm">
-		      <button type="button" class="btn btn-fab btn-fab-mini">
-		        <i class="material-icons">search</i>
-		      </button>
-		    </span>
-		</div>
-	</div>
+{% if user|has_role:'students' %}
-	{% if subjects_student|length > 0 %}
+	{% if courses|length > 0 %}
 		{% for course in courses_student %}
 			<div class="col-md-12">
 			    <div class="panel panel-info">
@@ -155,9 +154,15 @@
 	            	<img src="" class="img-responsive" />
 	            {% endif %} -->
 				  <div class="panel-heading">
-				    	<h3 class="panel-title">Course</h3>
-				    	<span class="label label-info">{{ course.category }}</span>
-							<span class="label label-warning">{{ course.max_students }} {% trans 'students tops' %}</span>  
+					  <div class="row">
+					  	<div class="col-md-9">
+				  			<h3 class="panel-title">{{course.name}}</h3>
+				  		</div>
+				  		<div class="col-md-3">
+				  			<span class="label label-info">{{ course.category }}</span>
+							<span class="label label-warning">{{ course.max_students }} {% trans 'students tops' %}</span>
+				  		</div>
+					  </div>
 				  </div>     
 				  <div class="panel-body">
 				    <p><b>Course Name: </b>{{ course.name }}</p>
@@ -166,18 +171,22 @@
 				    <p>
 				      <b>Description:</b>
 				      <i>
-				        "Lorem ipsum dolor sit amet, consecctetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."
+				      {% if couse.description %}
+				        {{course.description|linebreaks}}
+				      {% else %}
+				      	{% trans 'No description' %}
+				      {% endif %}
 				      </i>
 				    </p>
-				    {% if user|has_role:'professor, system_admin' %}
+				    <!--{% if user|has_role:'professor, system_admin' %}
 						<a href="{% url 'course:update' course.slug %}" class="btn btn-sm btn-primary">
 							<span class="glyphicon glyphicon-edit"></span>
 						</a>
 						<a href="{% url 'course:delete' course.slug %}" class="btn btn-sm btn-danger">
 							<span class="glyphicon glyphicon-trash"></span>
 						</a>
-					{% endif %}
+					{% endif %}-->
 				    <a href="{% url 'course:view' course.slug %}" class="btn btn-raised btn-default center-block">View Course</a>
 				  </div>
@@ -186,7 +195,6 @@
     	{% endfor %}
-
     	<nav aria-label="Page navigation">
   			<ul class="pagination">
     			{% for page_number in paginator.page_range %}
@@ -200,4 +208,5 @@
 		{% trans 'No courses found' %}
 	{% endif %}
 {% endif %}
+
 {% endblock %}
@@ -52,10 +52,10 @@
     <div class="panel panel-info">
       <div class="panel-heading headingOne">
         <div class="row">
-          <div class="col-xs-8 col-md-10 titleTopic">
+          <div class="col-xs-8 col-md-9 titleTopic">
             <h4>{{course}}</h4>
           </div>
-          <div class="col-xs-4 col-md-2" id="divMoreActions">
+          <div class="col-xs-4 col-md-3" id="divMoreActions">
             <div class="btn-group">
               <button type="button" class="btn btn-default btn-sm eye" data-toggle="tooltip" data-placement="bottom" title="Visible">
                 <i class="fa fa-eye fa-2x" aria-hidden="true"></i>
@@ -99,7 +99,7 @@
       </div>
       <div class="modal-body">
         <div>
-          <form class="form-horizontal">
+          <!--<form class="form-horizontal">
             <div class="form-group is-empty">
               <label class="control-label col-md-2 col-md-offset-1 col-xs-2 col-xs-offset-1">Name</label>
               <div class="col-md-8 col-xs-8">
@@ -148,7 +148,7 @@
                 </div>
               </div>
             </div>
-          </form>
+          </form>-->
         </div>
         <div class="modal-footer">
           <button type="button" data-dismiss="modal" class="btn btn-default">Cancel</button>
@@ -190,12 +190,12 @@
 <div class="panel panel-info">
   <div class="panel-heading headingTwo ui-sortable-handle" role="tab">
     <div class="row">
-        <div class="col-xs-9 col-md-10 titleTopic">
+        <div class="col-xs-9 col-md-9 titleTopic">
           <a role="button" data-toggle="collapse" data-parent="#accordion" href=".collapseTwo" aria-expanded="true" aria-controls="collapseTwo">
-          <h4>{{subject.name}}</h4>
+          <h4 style="color:white">{{subject.name}}</h4>
           </a>
         </div>
-        <div class="col-xs-3 col-md-2" id="divMoreActions">
+        <div class="col-xs-3 col-md-3" id="divMoreActions">
           <div class="btn-group">
             <button type="button" class="btn btn-default btn-sm eye" data-toggle="tooltip" data-placement="bottom" title="Visible">
               <i class="fa fa-eye fa-2x" aria-hidden="true"></i>
@@ -206,7 +206,6 @@
               <i class="fa fa-ellipsis-v fa-2x" aria-hidden="true"></i>
             </button>
             <ul class="dropdown-menu" aria-labelledby="moreActions">
-              <li><a href="{% url 'course:view_subject' subject.slug %}"><i class="fa fa-files-o fa-fw" aria-hidden="true"></i>&nbsp; Access</a></li>
               <li><a href="javascript:void(0)" data-toggle="modal" data-target="#myModal3"><i class="fa fa-pencil fa-fw" aria-hidden="true"></i>&nbsp; Replicate</a></li>
               <li><a href="javascript:void(0)" data-toggle="modal" data-target="#removeSubject2"><i class="fa fa-trash fa-fw" aria-hidden="true"></i>&nbsp; Remove</a></li>
             </ul>
@@ -231,8 +230,13 @@
             <p><b>{% trans "End" %}: </b>{{subject.end_date}}</p>
           </div>
         </div>
+        <a href="{% url 'course:view_subject' subject.slug %}" class="btn btn-raised btn-default center-block">{% trans 'View Subject' %}<div class="ripple-container"></div></a>
     </div>
 </div>
+<div class="form-group">
+  <a href="{% url 'course:create_subject' subject.slug %}" data-toggle="modal" data-target="" class="btn btn-primary btn-lg btn-block btn-raised">{% trans 'Create Subject' %}<div class="ripple-container"></div></a>
+</div>
+
 {% endfor %}
@@ -19,32 +19,13 @@
     </a>
     <div class="panel-body">
         <p>{{ topic.description|linebreaks }}</p>
-        <button class="btn btn-primary btn-raised" onclick="createForum('{% url 'forum:create' %}', '{{ topic.id }}')">{% trans '+ Create Forum' %}</button>
+        <button class="btn btn-primary btn-raised" onclick="createForum('{% url 'course:forum:create' %}', '{{ topic.id }}')">{% trans '+ Create Forum' %}</button>
         <div class="foruns_list">
             {% list_topic_foruns request topic %}
         </div>
     </div>
 </div>
-<div class="modal fade" id="forumModal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel">
-    <div class="modal-dialog" role="document">
-        <div class="modal-content">
-            <div class="modal-header">
-                <h4 class="modal-title" id="myModalLabel">{% trans 'Forum' %}</h4>
-            </div>
-            <div class="modal-body">
-                <section>
-                    <div class="forum_topics"></div>
-                </section>
-            </div>
-            <div class="modal-footer">
-                <button type="button" class="btn btn-danger btn-raised" data-dismiss="modal">{% trans 'Close' %}</button>
-                <button type="button" class="btn btn-primary btn-raised">{% trans 'Save changes' %}</button>
-            </div>
-        </div>
-    </div>
-</div>
-
 <div class="modal fade" id="createForum" tabindex="-1" role="dialog" aria-labelledby="myModalLabel">
     <div class="modal-dialog" role="document">
         <div class="modal-content">
@@ -67,7 +67,9 @@
 	{% 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>
+		<div class="form-group">
+            <a href="{% url 'course:create_topic' subject.slug %}" data-toggle="modal" data-target="" class="btn btn-primary btn-lg btn-block btn-raised" name="create_topic">{% trans "Create Topic" %}<div class="ripple-container"></div></a>
+          </div>
 	{% endif %}	
 {% endblock %}
 {% for forum in foruns %}
-	<a id="forum_{{ forum.id }}" href="javascript:showForum('{% url 'forum:index' %}', '{{forum.id}}')">{{ forum }}<br /></a>
+	<a id="forum_{{ forum.id }}" href="{% url 'course:forum:view' forum.slug %}">{{ forum }}<br /></a>
 {% endfor %}
 \ No newline at end of file
@@ -24,6 +24,7 @@ urlpatterns = [
 	url(r'^subjects/categories$',views.IndexSubjectCategoryView.as_view(), name='subject_category_index'),
-	url(r'^poll/', include('poll.urls', namespace = 'poll'))
-
+	url(r'^forum/', include('forum.urls', namespace = 'forum')),
+	url(r'^poll/', include('poll.urls', namespace = 'poll')),
+	url(r'^avaliacao/', include('avaliacao.urls', namespace = 'avaliacao'))
 ]
@@ -24,13 +24,14 @@ class IndexView(LoginRequiredMixin, NotificationMixin, generic.ListView):
 	redirect_field_name = 'next'
 	queryset = Course.objects.all()
 	template_name = 'course/index.html'
-	context_object_name = 'courses_student'
+	context_object_name = 'courses'
 	paginate_by = 3
 	def get_context_data(self, **kwargs):
 		context = super(IndexView, self).get_context_data(**kwargs)
 		context['categories'] = Category.objects.all()
 		context['courses_teacher'] = Course.objects.filter(professors__name = self.request.user.name)
+		context['courses_student'] = Course.objects.filter(students__name = self.request.user.name)
 		return context
 # -*- coding: utf-8 -*-
-# Generated by Django 1.10 on 2016-10-02 00:17
+# Generated by Django 1.10 on 2016-10-05 02:05
 from __future__ import unicode_literals
+from django.conf import settings
 from django.db import migrations, models
 import django.db.models.deletion
@@ -12,6 +13,7 @@ class Migration(migrations.Migration):
     dependencies = [
         ('courses', '0001_initial'),
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
     ]
     operations = [
@@ -24,8 +26,8 @@ class Migration(migrations.Migration):
                 ('create_date', models.DateTimeField(auto_now_add=True, verbose_name='Create Date')),
             ],
             options={
-                'verbose_name': 'Forum',
                 'verbose_name_plural': 'Foruns',
+                'verbose_name': 'Forum',
             },
             bases=('courses.activity',),
         ),
@@ -36,10 +38,12 @@ class Migration(migrations.Migration):
                 ('message', models.TextField(verbose_name='Post message')),
                 ('modification_date', models.DateTimeField(auto_now=True, verbose_name='Modification Date')),
                 ('post_date', models.DateTimeField(auto_now_add=True, verbose_name='Post Date')),
+                ('forum', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='forum.Forum', verbose_name='Forum')),
+                ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL, verbose_name='Autor')),
             ],
             options={
-                'verbose_name': 'Post',
                 'verbose_name_plural': 'Posts',
+                'verbose_name': 'Post',
             },
         ),
         migrations.CreateModel(
@@ -50,10 +54,11 @@ class Migration(migrations.Migration):
                 ('modification_date', models.DateTimeField(auto_now=True, verbose_name='Modification Date')),
                 ('answer_date', models.DateTimeField(auto_now_add=True, verbose_name='Answer Date')),
                 ('post', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='forum.Post', verbose_name='Post')),
+                ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL, verbose_name='Autor')),
             ],
             options={
-                'verbose_name': 'Post Answer',
                 'verbose_name_plural': 'Post Answers',
+                'verbose_name': 'Post Answer',
             },
         ),
     ]
@@ -1,35 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.10 on 2016-10-02 00:17
-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):
-
-    initial = True
-
-    dependencies = [
-        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
-        ('forum', '0001_initial'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='postanswer',
-            name='user',
-            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL, verbose_name='Autor'),
-        ),
-        migrations.AddField(
-            model_name='post',
-            name='forum',
-            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='forum.Forum', verbose_name='Forum'),
-        ),
-        migrations.AddField(
-            model_name='post',
-            name='user',
-            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL, verbose_name='Autor'),
-        ),
-    ]
+/*
+*
+* Function to get a cookie stored on browser
+*
+*/
 function getCookie(name) {
     var cookieValue = null;
     if (document.cookie && document.cookie !== '') {
@@ -16,6 +21,31 @@ function getCookie(name) {
 /*
 *
+* Defining action of the form to make a post in forum
+*
+*/
+$(document).ready(function (){
+    var frm = $('#form_post');
+    frm.submit(function () {
+        $.ajax({
+            type: frm.attr('method'),
+            url: frm.attr('action'),
+            data: frm.serialize(),
+            success: function (data) {
+                $("#posts_list").append(data);
+                frm[0].reset();
+            },
+            error: function(data) {
+                console.log(frm.serialize());
+                console.log('Error');
+            }
+        });
+        return false;
+    });
+});
+
+/*
+*
 * Function to load create forum's form and set the submit function
 *
 */
@@ -39,7 +69,7 @@ function createForum(url, topic) {
                         console.log(data);
                         data = data.split('-');
-                        $('.foruns_list').append("<a id='forum_"+data[1]+"' href='javascript:showForum("+data[0]+","+data[1]+")'>"+data[2]+"<br /></a>");
+                        $('.foruns_list').append("<a id='forum_"+data[1]+"' href='"+data[0]+"'>"+data[2]+"<br /></a>");
                         $("#createForum").modal('hide');
@@ -59,29 +89,32 @@ function createForum(url, topic) {
 /*
 *
-* Function to load forum to modal
+* Function to load edit forum's form and set the submit function
 *
 */
-function showForum(url, forum_id) {
+function editForum(url, forum) {
     $.ajax({
         url: url, 
-        data: {'forum_id': forum_id},
+        data: {'pk': forum},
         success: function(data) {
-            $(".forum_topics").html(data);
+            $(".forum_form").html(data);
+            //$("#id_topic").val(topic);
+
+            $('.date-picker').datepicker();
-            var frm = $('#form_post');
+            var frm = $('#forum_create');
             frm.submit(function () {
                 $.ajax({
                     type: frm.attr('method'),
                     url: frm.attr('action'),
                     data: frm.serialize(),
                     success: function (data) {
-                        $("#posts_list").append(data);
-                        frm[0].reset();
+                        $('.forum_view').html(data);
+
+                        $("#editForum").modal('hide');
                     },
                     error: function(data) {
-                        console.log(frm.serialize());
-                        console.log('Error');
+                        $(".forum_form").html(data.responseText);
                     }
                 });
                 return false;
@@ -89,10 +122,15 @@ function showForum(url, forum_id) {
         }
     });
-    $('#forumModal').modal();
+    $("#editForum").modal();
 }
-function delete_forum(url, forum, message) {
+/*
+*
+* Function to delete a forum
+*
+*/
+function delete_forum(url, forum, message, return_url) {
     alertify.confirm(message, function(){
         var csrftoken = getCookie('csrftoken');
@@ -103,8 +141,9 @@ function delete_forum(url, forum, message) {
             },
             url: url, 
             success: function(data) {
-                $("#forum_"+forum).remove();
-                $('#forumModal').modal('hide');
+                alertify.alert('Amadeus', data, function(){
+                    window.location.href = return_url;
+                });
             }
         });
     });
 {% load static i18n %}
 {% load widget_tweaks %}
-<form id="forum_create" method="post" action="{% url 'forum:create' %}" enctype="multipart/form-data">
+<form id="forum_create" method="post" action="{% if forum %}{% url 'course:forum:update' forum.id %}{% else %}{% url 'course:forum:create' %}{% endif %}" enctype="multipart/form-data">
 	{% csrf_token %}
 	{% for field in form %}
 		<div class="form-group {% if form.has_error %} has-error {% endif %} is-fileinput">
@@ -29,7 +29,7 @@
     {% list_posts request forum %}
 </div>
-<form id="form_post" method="post" action="{% url 'forum:create_post' %}" enctype="multipart/form-data">
+<form id="form_post" method="post" action="{% url 'course:forum:create_post' %}" enctype="multipart/form-data">
     {% csrf_token %}
     {% for field in form %}
         {% if field.field.widget.input_type == 'hidden' %}
@@ -63,26 +63,4 @@
             </div>
         {% endif %}
     {% endfor %}
-</form>
-
-<!--{% if foruns|length > 0 %}
-    {% for forum in foruns %}
-        <a class="forum_collapse" role="button" href="javascript: showPosts('{% url 'forum:posts' %}', '{{ forum.slug }}')" aria-expanded="true">
-            <div class="page-header">
-                <h1 id="timeline">
-                    {{ forum }}
-                </h1>
-                <b>{% trans 'Description' %}: </b>{{ forum.description }}<p>
-                <b>{% trans 'Created in' %}: </b>{{ forum.create_date }}
-            </div>
-        </a>
-        <div class="collapse" id="collapse{{ forum.slug }}">
-            <div class="well">
-            </div>
-        </div>
-    {% endfor %}
-{% else %}
-    <div class="page-header">
-        <p>{% trans 'No forum created yet.' %}</p>
-    </div>
-{% endif %}-->
+</form>
 \ No newline at end of file
@@ -0,0 +1,136 @@
+{% extends 'base.html' %}
+
+{% load static i18n permission_tags list_post %}
+{% load widget_tweaks %}
+
+{% block javascript %}
+    <script type="text/javascript" src="{% static 'js/forum.js' %}"></script>
+{% endblock %}
+
+{% block breadcrumbs %}
+
+    <ol class="breadcrumb">
+        <li><a href="{% url 'app:index' %}">{% trans 'Home' %}</a></li>
+        <li><a href="{% url 'course:view' forum.topic.subject.course.slug %}">{{ forum.topic.subject.course }}</a></li>
+        {% if user|has_role:'professor' or user|has_role:'system_admin' %}
+            <li class="active">{% trans 'Forum' %}</li>
+        {% else %}
+            <li class="active">{{ forum.name }}</li>
+        {% endif %}
+        
+    </ol>
+{% endblock %}
+
+{% block sidebar %}
+    <div class="panel panel-primary navigation">
+        <div class="panel-heading">
+            <h5>{% trans 'Menu' %}</h5>
+        </div>
+        <div class="panel-body">
+            <ul class="nav nav-pills nav-stacked">
+                <li><a href="{% url 'users:profile' %}">{% trans 'Profile' %}</a></li>
+                <li><a href="{% url 'course:manage' %}">{% trans 'My Courses' %}</a></li>
+            </ul>
+        </div>
+    </div>
+    
+    {% if request.user|has_role:'system_admin' or request.user|has_role:'professor' and request.user == post.user %}
+        <div class="panel panel-primary navigation">
+            <div class="panel-heading">
+                <h3 class="panel-title">{% trans 'Actions' %}</h3>
+            </div>
+            <div class="panel-body">
+                <ul class="nav nav-pills nav-stacked">
+                    <li><a href="javascript:editForum('{% url 'course:forum:update' forum.id %}', '{{ forum.id }}')">{% trans 'Edit' %}</a></li>
+                    <li><a href="javascript:delete_forum('{% url 'course:forum:delete' forum.id %}', '{{ forum.id }}', '{% trans "Are you sure you want to delete this forum?" %}', '{% url 'course:view_subject' forum.topic.subject.slug %}')">{% trans 'Delete' %}</a></li>
+                </ul>
+            </div>
+        </div>
+    {% endif %}
+{% endblock %}
+
+{% block content %}
+    <div class="row panel panel-default">
+        <div class="panel-body">
+            <div class="comments-list">
+                <div class="section-heading forum_view">
+                    <h1>{{ forum }}</h1>
+                    <h4><b>{% trans 'Description' %}:</b> {{ forum.description }}</h4>
+                    <h4><b>{% trans 'Opened in' %}:</b> {{ forum.create_date }}</h4>
+                </div>
+            </div>
+            <div class="form_post_block">
+                <hr />
+                <form id="form_post" method="post" action="{% url 'course:forum:create_post' %}" enctype="multipart/form-data">
+                    {% csrf_token %}
+                    {% for field in form %}
+                        {% if field.field.widget.input_type == 'hidden' %}
+                            {% render_field field class='form-control' value=forum.id %}
+                        {% else %}
+                            <div class="form-group {% if form.has_error %} has-error {% endif %} is-fileinput">
+                                <div class="input-group">
+                                    {% render_field field class='form-control' placeholder="Post a message" %}
+                                    <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 %}
+                                    <span class="input-group-btn">
+                                        <button type="submit" class="btn btn-fab btn-fab-mini">
+                                            <i class="material-icons">send</i>
+                                        </button>
+                                    </span>
+                                </div>
+                            </div>
+                        {% endif %}
+                    {% endfor %}
+                </form>
+                <hr />
+            </div>
+            <div id="posts_list">
+                {% list_posts request forum %}
+            </div>
+        </div>
+    </div>
+    <!-- Modal to show Forum edit form -->
+    <div class="modal fade" id="editForum" tabindex="-1" role="dialog" aria-labelledby="myModalLabel">
+        <div class="modal-dialog" role="document">
+            <div class="modal-content">
+                <div class="modal-header">
+                    <h4 class="modal-title" id="myModalLabel">{% trans 'Forum' %}</h4>
+                </div>
+                <div class="modal-body">
+                    <section>
+                        <div class="forum_form"></div>
+                    </section>
+                </div>
+                <div class="modal-footer">
+                    <button type="button" class="btn btn-danger btn-raised" data-dismiss="modal">{% trans 'Close' %}</button>
+                    <button type="button" onclick="$('#forum_create').submit();" class="btn btn-primary btn-raised">{% trans 'Update' %}</button>
+                </div>
+            </div>
+        </div>
+    </div>
+{% 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 %}
@@ -0,0 +1,5 @@
+{% load i18n %}
+
+<h1>{{ forum }}</h1>
+<h4><b>{% trans 'Description' %}:</b> {{ forum.description }}</h4>
+<h4><b>{% trans 'Opened in' %}:</b> {{ forum.create_date }}</h4>
 \ No newline at end of file
@@ -7,7 +7,7 @@
                 <h3 class="user-name">
                     {{ post.user }}
                     <div class="pull-right">
-                        <a href="javascript:answer('{{ post.id }}', '{% url 'forum:reply_post' %}');">
+                        <a href="javascript:answer('{{ post.id }}', '{% url 'course:forum:reply_post' %}');">
                             <i class="material-icons">reply</i>
                         </a>
                         {% if request.user|has_role:'system_admin' or request.user == post.user %}
@@ -17,8 +17,8 @@
                                     <i class="material-icons">more_horiz</i>
                                 </a>
                                 <ul class="dropdown-menu" aria-labelledby="dropdownMenu1">
-                                    <li><a href="javascript:edit_post('{% url 'forum:update_post' post.id %}', '{{ post.id }}')"><i class="material-icons">create</i> {% trans 'Edit' %}</a></li>
-                                    <li><a href="javascript:javascript:delete_post('{% url 'forum:delete_post' post.id %}', '{{ post.id }}')"><i class="material-icons">delete_sweep</i> {% trans 'Remove' %}</a></li>
+                                    <li><a href="javascript:edit_post('{% url 'course:forum:update_post' post.id %}', '{{ post.id }}')"><i class="material-icons">create</i> {% trans 'Edit' %}</a></li>
+                                    <li><a href="javascript:javascript:delete_post('{% url 'course:forum:delete_post' post.id %}', '{{ post.id }}')"><i class="material-icons">delete_sweep</i> {% trans 'Remove' %}</a></li>
                                 </ul>
                             </div>
                         {% endif %}
@@ -40,34 +40,4 @@
         </div>
         {% list_post_answer request post %}
     {% endfor %}
-{% endif %}
-            <!--<li>
-                <a class="post_collapse" role="button" href="javascript: showPostsAnswers('{% url 'forum:post_answers' %}', '{{ post.id }}')" aria-expanded="false">
-                    <div class="timeline-panel">
-                        <div class="row">
-                            <div class="col-xs-2 col-sm-2 col-md-2">
-                                <img class="img-responsive img-rounded" src="{{ post.user.image_url }}" />
-                            </div>
-                            <div class="col-xs-10 col-sm-10 col-md-10">
-                                <div class="timeline-heading">
-                                    <h3> {{ post.user }}</h3>
-                                </div>
-                                <div class="timeline-body">
-                                    <p><em>{{ post.message|linebreaks }}</em></p>
-                                </div>
-                                <hr>
-                                <small class="text-muted">
-                                    <span class="pull-right">
-                                        <i class="glyphicon glyphicon-time"></i> {{ post.post_date|timesince }} 
-                                        {% trans ' ago' %}
-                                    </span>
-                                </small>
-                            </div>
-                        </div>
-                    </div>
-                </a>
-                <div class="collapse" id="collapse{{ post.id }}" style="margin-top:10px;">
-                    <div class="well">
-                    </div>
-                </div>
-            </li>-->
 \ No newline at end of file
+{% endif %}
 \ No newline at end of file
@@ -5,7 +5,7 @@
         <h3 class="user-name">
             {{ post.user }}
             <div class="pull-right">
-                <a href="javascript:answer('{{ post.id }}', '{% url 'forum:reply_post' %}');">
+                <a href="javascript:answer('{{ post.id }}', '{% url 'course:forum:reply_post' %}');">
                     <i class="material-icons">reply</i>
                 </a>
                 {% if request.user|has_role:'system_admin' or request.user|has_role:'professor' and request.user == post.user %}
@@ -15,8 +15,8 @@
                             <i class="material-icons">more_horiz</i>
                         </a>
                         <ul class="dropdown-menu" aria-labelledby="dropdownMenu1">
-                            <li><a href="javascript:edit_post('{% url 'forum:update_post' post.id %}', '{{ post.id }}')"></li>
-                            <li><a href="javascript:delete_post('{% url 'forum:delete_post' post.id %}', '{{ post.id }}')"><i class="material-icons">delete_sweep</i> {% trans 'Remove' %}</a></li>
+                            <li><a href="javascript:edit_post('{% url 'course:forum:update_post' post.id %}', '{{ post.id }}')"></li>
+                            <li><a href="javascript:delete_post('{% url 'course:forum:delete_post' post.id %}', '{{ post.id }}')"><i class="material-icons">delete_sweep</i> {% trans 'Remove' %}</a></li>
                         </ul>
                     </div>
                 {% endif %}
-from django.conf.urls import url, include
+from django.conf.urls import url
 from . import views
@@ -6,8 +6,10 @@ from . import views
 urlpatterns = [
 	url(r'^$', views.ForumIndex.as_view(), name='index'),
 	url(r'^create/$', views.CreateForumView.as_view(), name='create'),
+	url(r'^update/(?P<pk>[\w_-]+)/$', views.UpdateForumView.as_view(), name='update'),
 	url(r'^delete/(?P<pk>[\w_-]+)/$', views.ForumDeleteView.as_view(), name='delete'),
 	url(r'^render_forum/([\w_-]+)/$', views.render_forum, name='render_forum'),
+	url(r'^render_edit_forum/([\w_-]+)/$', views.render_edit_forum, name='render_edit_forum'),
 	url(r'^forum_deleted/$', views.forum_deleted, name='deleted_forum'),
 	url(r'^create_post/$', views.CreatePostView.as_view(), name='create_post'),
 	url(r'^update_post/(?P<pk>[\w_-]+)/$', views.PostUpdateView.as_view(), name='update_post'),
@@ -16,4 +18,5 @@ urlpatterns = [
 	url(r'^post_deleted/$', views.post_deleted, name='deleted_post'),
 	url(r'^post_answers/$', views.PostAnswerIndex.as_view(), name='post_answers'),
 	url(r'^reply_post/$', views.CreatePostAnswerView.as_view(), name='reply_post'),
+	url(r'^(?P<slug>[\w_-]+)/$', views.ForumDetailView.as_view(), name='view'),
 ]
@@ -41,15 +41,38 @@ class CreateForumView(LoginRequiredMixin, generic.edit.CreateView):
 		return self.render_to_response(self.get_context_data(form = form), status = 400)
 	def get_success_url(self):
-		print("Pass")
-		self.success_url = reverse('forum:render_forum', args = (self.object.id, ))
+		self.success_url = reverse('course:forum:render_forum', args = (self.object.id, ))
 		return self.success_url
 def render_forum(request, forum):
 	last_forum = get_object_or_404(Forum, id = forum)
-	return HttpResponse(str(reverse_lazy('forum:index')) + '-' + str(forum) + '-' + str(last_forum.name))
+	return HttpResponse(str(reverse_lazy('course:forum:view', args = (), kwargs = {'slug': last_forum.slug})) + '-' + str(forum) + '-' + str(last_forum.name))
+
+class UpdateForumView(LoginRequiredMixin, generic.UpdateView):
+	login_url = reverse_lazy("core:home")	
+	redirect_field_name = 'next'
+
+	template_name = 'forum/forum_form.html'
+	form_class = ForumForm
+	model = Forum
+	
+	def form_invalid(self, form):
+		return self.render_to_response(self.get_context_data(form = form), status = 400)
+
+	def get_success_url(self):
+		self.success_url = reverse('course:forum:render_edit_forum', args = (self.object.id, ))
+		
+		return self.success_url
+
+def render_edit_forum(request, forum):
+	last_forum = get_object_or_404(Forum, id = forum)
+	context = {
+		'forum': last_forum
+	}
+
+	return render(request, 'forum/render_forum.html', context)
 class ForumDeleteView(LoginRequiredMixin, generic.DeleteView):
 	login_url = reverse_lazy("core:home")
@@ -57,11 +80,29 @@ class ForumDeleteView(LoginRequiredMixin, generic.DeleteView):
 	model = Forum
 	pk_url_kwarg = 'pk'	
-	success_url = reverse_lazy('forum:deleted_forum')
+	success_url = reverse_lazy('course:forum:deleted_forum')
 def forum_deleted(request):
 	return HttpResponse(_("Forum deleted successfully."))
+class ForumDetailView(LoginRequiredMixin, generic.DetailView):
+	login_url = reverse_lazy("core:home")
+	redirect_field_name = 'next'
+
+	model = Forum
+	template_name = 'forum/forum_view.html'
+	context_object_name = 'forum'
+
+	def get_context_data(self, **kwargs):
+		context = super(ForumDetailView, self).get_context_data(**kwargs)
+		forum = get_object_or_404(Forum, slug = self.kwargs.get('slug'))
+
+		context['form'] = PostForm()
+		context['forum'] = forum
+		context['title'] = forum.name
+
+		return context
+
 class CreatePostView(LoginRequiredMixin, generic.edit.CreateView):
 	login_url = reverse_lazy("core:home")	
 	redirect_field_name = 'next'
@@ -77,7 +118,7 @@ class CreatePostView(LoginRequiredMixin, generic.edit.CreateView):
 		return super(CreatePostView, self).form_valid(form)
 	def get_success_url(self):
-		self.success_url = reverse('forum:render_post', args = (self.object.id, ))
+		self.success_url = reverse('course:forum:render_post', args = (self.object.id, ))
 		return self.success_url
@@ -98,7 +139,7 @@ class PostUpdateView(LoginRequiredMixin, generic.UpdateView):
 	template_name = "post/post_update_form.html"
 	def get_success_url(self):
-		self.success_url = reverse('forum:render_post', args = (self.object.id, ))
+		self.success_url = reverse('course:forum:render_post', args = (self.object.id, ))
 		return self.success_url
@@ -108,7 +149,7 @@ class PostDeleteView(LoginRequiredMixin, generic.DeleteView):
 	model = Post
 	pk_url_kwarg = 'pk'	
-	success_url = reverse_lazy('forum:deleted_post')
+	success_url = reverse_lazy('course:forum:deleted_post')
 def post_deleted(request):
 	return HttpResponse(_("Post deleted successfully."))
@@ -128,7 +169,9 @@ class PostAnswerIndex(LoginRequiredMixin, generic.ListView):
 		return context
 class CreatePostAnswerView(LoginRequiredMixin, generic.edit.CreateView):
+	login_url = reverse_lazy("core:home")	
+	redirect_field_name = 'next'
 	template_name = 'post_answers/post_answer_form.html'
 	form_class = PostAnswerForm
-	success_url = reverse_lazy('forum:index')
 \ No newline at end of file
+	success_url = reverse_lazy('course:forum:index')
 \ No newline at end of file
@@ -0,0 +1,3 @@
+from django.contrib import admin
+
+# Register your models here.
@@ -0,0 +1,5 @@
+from django.apps import AppConfig
+
+
+class LinksConfig(AppConfig):
+    name = 'links'
@@ -0,0 +1,15 @@
+from django.db import models
+from courses.models import Material
+# Create your models here.
+class Link(Material,models.Model):
+	name = models.CharField(max_lenght = 100)
+	link = models.UrlField()
+	description = models.CharField(max_lenght = 200)
+	class Meta:
+		verbose_name = 'Link'
+		verbose_name_plural = "Links"
+	def __str__(self):
+		return str(self.name)
+	
+
+
@@ -0,0 +1,3 @@
+from django.test import TestCase
+
+# Create your tests here.
@@ -0,0 +1,3 @@
+from django.shortcuts import render
+
+# Create your views here.
 # -*- coding: utf-8 -*-
-# Generated by Django 1.10 on 2016-10-02 00:17
+# Generated by Django 1.10 on 2016-10-05 02:05
 from __future__ import unicode_literals
 from django.db import migrations, models
@@ -24,8 +24,8 @@ class Migration(migrations.Migration):
             ],
             options={
                 'ordering': ('order',),
-                'verbose_name': 'Answer',
                 'verbose_name_plural': 'Answers',
+                'verbose_name': 'Answer',
             },
         ),
         migrations.CreateModel(
@@ -34,8 +34,8 @@ class Migration(migrations.Migration):
                 ('activity_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='courses.Activity')),
             ],
             options={
-                'verbose_name': 'Poll',
                 'verbose_name_plural': 'Polls',
+                'verbose_name': 'Poll',
             },
             bases=('courses.activity',),
         ),
 # -*- coding: utf-8 -*-
-# Generated by Django 1.10 on 2016-10-02 00:17
+# Generated by Django 1.10 on 2016-10-03 19:10
 from __future__ import unicode_literals
 import django.contrib.auth.models
@@ -42,8 +42,8 @@ class Migration(migrations.Migration):
                 ('user_permissions', models.ManyToManyField(blank=True, help_text='Specific permissions for this user.', related_name='user_set', related_query_name='user', to='auth.Permission', verbose_name='user permissions')),
             ],
             options={
-                'verbose_name': 'User',
                 'verbose_name_plural': 'Users',
+                'verbose_name': 'User',
             },
             managers=[
                 ('objects', django.contrib.auth.models.UserManager()),
	@@ -23,7 +23,6 @@ urlpatterns = [		@@ -23,7 +23,6 @@ urlpatterns = [
23	url(r'^home/', include('app.urls', namespace = 'app')),	23	url(r'^home/', include('app.urls', namespace = 'app')),
24	url(r'^course/', include('courses.urls', namespace = 'course')),	24	url(r'^course/', include('courses.urls', namespace = 'course')),
25	url(r'^users/', include('users.urls', namespace = 'users')),	25	url(r'^users/', include('users.urls', namespace = 'users')),
26	- url(r'^forum/', include('forum.urls', namespace = 'forum')),
27	url(r'^admin/', admin.site.urls),	26	url(r'^admin/', admin.site.urls),
28	url(r'^', include('core.urls', namespace = 'core')),	27	url(r'^', include('core.urls', namespace = 'core')),
29		28
@@ -0,0 +1,3 @@		@@ -0,0 +1,3 @@
	1	+from django.contrib import admin
	2	+
	3	+# Register your models here.
@@ -0,0 +1,5 @@		@@ -0,0 +1,5 @@
	1	+from django.apps import AppConfig
	2	+
	3	+
	4	+class AvaliacaoConfig(AppConfig):
	5	+ name = 'avaliacao'
@@ -0,0 +1,20 @@		@@ -0,0 +1,20 @@
	1	+from django.utils.translation import ugettext_lazy as _
	2	+from django.db import models
	3	+from autoslug.fields import AutoSlugField
	4	+from users.models import User
	5	+from core.models import Resource
	6	+from courses.models import Activity
	7	+
	8	+class Avaliacao(Activity):
	9	+
	10	+ name_avalicao = models.CharField(_('Name'), max_length = 100)
	11	+ init_date = models.DateField(_('Begin of Avaliacao Date'))
	12	+ end_date = models.DateField(_('End of Avaliacao Date'))
	13	+
	14	+ class Meta:
	15	+ #ordering = ('create_date','name')
	16	+ verbose_name = _('Avaliacao')
	17	+ verbose_name_plural = _('Avaliacoes')
	18	+
	19	+def __str__(self):
	20	+ return str(self.name) + str("/") + str(self.topic)
@@ -0,0 +1,3 @@		@@ -0,0 +1,3 @@
	1	+from django.test import TestCase
	2	+
	3	+# Create your tests here.
@@ -0,0 +1,7 @@		@@ -0,0 +1,7 @@
	1	+from django.conf.urls import url
	2	+
	3	+from . import views
	4	+
	5	+urlpatterns =[
	6	+
	7	+]
@@ -0,0 +1,3 @@		@@ -0,0 +1,3 @@
	1	+from django.shortcuts import render
	2	+
	3	+# Create your views here.
	@@ -1,50 +0,0 @@	@@ -1,50 +0,0 @@
1	-# -- coding: utf-8 --
2	-# Generated by Django 1.10 on 2016-10-02 00:17
3	-from __future__ import unicode_literals
4	-
5	-from django.conf import settings
6	-from django.db import migrations, models
7	-import django.db.models.deletion
8	-
9	-
10	-class Migration(migrations.Migration):
11	-
12	- initial = True
13	-
14	- dependencies = [
15	- migrations.swappable_dependency(settings.AUTH_USER_MODEL),
16	- ('core', '0001_initial'),
17	- ]
18	-
19	- operations = [
20	- migrations.AddField(
21	- model_name='notification',
22	- name='actor',
23	- field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='notification_Performer', to=settings.AUTH_USER_MODEL, verbose_name='Perfomer'),
24	- ),
25	- migrations.AddField(
26	- model_name='notification',
27	- name='user',
28	- field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='notification_Actor', to=settings.AUTH_USER_MODEL, verbose_name='User'),
29	- ),
30	- migrations.AddField(
31	- model_name='log',
32	- name='action_resource',
33	- field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='core.Action_Resource', verbose_name='Action_Resource'),
34	- ),
35	- migrations.AddField(
36	- model_name='log',
37	- name='user',
38	- field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL, verbose_name='Actor'),
39	- ),
40	- migrations.AddField(
41	- model_name='action_resource',
42	- name='action',
43	- field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='core.Action', verbose_name='Action_Applied'),
44	- ),
45	- migrations.AddField(
46	- model_name='action_resource',
47	- name='resource',
48	- field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='core.Resource', verbose_name='Resource'),
49	- ),
50	- ]
	@@ -1,80 +0,0 @@	@@ -1,80 +0,0 @@
1	-# -- coding: utf-8 --
2	-# Generated by Django 1.10 on 2016-10-02 00:17
3	-from __future__ import unicode_literals
4	-
5	-from django.conf import settings
6	-from django.db import migrations, models
7	-import django.db.models.deletion
8	-
9	-
10	-class Migration(migrations.Migration):
11	-
12	- initial = True
13	-
14	- dependencies = [
15	- ('courses', '0001_initial'),
16	- migrations.swappable_dependency(settings.AUTH_USER_MODEL),
17	- ]
18	-
19	- operations = [
20	- migrations.AddField(
21	- model_name='topic',
22	- name='owner',
23	- field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL, verbose_name='Owner'),
24	- ),
25	- migrations.AddField(
26	- model_name='topic',
27	- name='subject',
28	- field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='courses.Subject', verbose_name='Subject'),
29	- ),
30	- migrations.AddField(
31	- model_name='subjectcategory',
32	- name='subjects',
33	- field=models.ManyToManyField(to='courses.Subject'),
34	- ),
35	- migrations.AddField(
36	- model_name='subject',
37	- name='course',
38	- field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='subjects', to='courses.Course', verbose_name='Course'),
39	- ),
40	- migrations.AddField(
41	- model_name='subject',
42	- name='professors',
43	- field=models.ManyToManyField(related_name='subjects', to=settings.AUTH_USER_MODEL, verbose_name='Professors'),
44	- ),
45	- migrations.AddField(
46	- model_name='material',
47	- name='students',
48	- field=models.ManyToManyField(related_name='materials', to=settings.AUTH_USER_MODEL, verbose_name='Students'),
49	- ),
50	- migrations.AddField(
51	- model_name='material',
52	- name='topic',
53	- field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='materials', to='courses.Topic', verbose_name='Topic'),
54	- ),
55	- migrations.AddField(
56	- model_name='course',
57	- name='category',
58	- field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='courses.Category', verbose_name='Category'),
59	- ),
60	- migrations.AddField(
61	- model_name='course',
62	- name='professors',
63	- field=models.ManyToManyField(related_name='courses_professors', to=settings.AUTH_USER_MODEL, verbose_name='Professors'),
64	- ),
65	- migrations.AddField(
66	- model_name='course',
67	- name='students',
68	- field=models.ManyToManyField(related_name='courses_student', to=settings.AUTH_USER_MODEL, verbose_name='Students'),
69	- ),
70	- migrations.AddField(
71	- model_name='activity',
72	- name='students',
73	- field=models.ManyToManyField(related_name='activities', to=settings.AUTH_USER_MODEL, verbose_name='Students'),
74	- ),
75	- migrations.AddField(
76	- model_name='activity',
77	- name='topic',
78	- field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='activities', to='courses.Topic', verbose_name='Topic'),
79	- ),
80	- ]
	@@ -1,30 +0,0 @@	@@ -1,30 +0,0 @@
1	-# -- coding: utf-8 --
2	-# Generated by Django 1.10 on 2016-10-03 16:10
3	-from __future__ import unicode_literals
4	-
5	-from django.db import migrations, models
6	-import django.db.models.deletion
7	-import s3direct.fields
8	-
9	-
10	-class Migration(migrations.Migration):
11	-
12	- dependencies = [
13	- ('courses', '0002_auto_20161001_2117'),
14	- ]
15	-
16	- operations = [
17	- migrations.CreateModel(
18	- name='ActivityFile',
19	- fields=[
20	- ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
21	- ('pdf', s3direct.fields.S3DirectField()),
22	- ('name', models.CharField(max_length=100)),
23	- ('diet', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='files', to='courses.Activity')),
24	- ],
25	- options={
26	- 'verbose_name_plural': 'Activitys Files',
27	- 'verbose_name': 'Activity File',
28	- },
29	- ),
30	- ]