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

Gustavo Bernardo
2 parents 2e247b77 9e15e5dc
Showing 52 changed files with 939 additions and 555 deletions Show diff stats
amadeus/urls.py
app/migrations/0001_initial.py
app/migrations/0002_auto_20161115_2054.py
core/migrations/0001_initial.py
core/migrations/0002_auto_20161115_1936.py
core/migrations/0002_auto_20161116_1057.py
core/migrations/0002_auto_20161117_0009.py
courses/migrations/0001_initial.py
courses/migrations/0002_auto_20161115_1936.py
courses/migrations/0002_auto_20161116_1057.py
courses/migrations/0002_auto_20161117_0009.py
courses/templates/subject/form_view_student.html
courses/templates/subject/form_view_teacher.html
courses/templates/subject/replicate.html
courses/templates/topic/index.html
courses/templates/topic/replicate.html
courses/templates/topic/replicate_topic.html
courses/templates/topic/topic_card.html
courses/templates/topic/topic_card_student.html
courses/urls.py
@@ -23,6 +23,7 @@ urlpatterns = [
     url(r'^home/', include('app.urls', namespace = 'app')),
     url(r'^courses/', include('courses.urls', namespace = 'course')),
     url(r'^users/', include('users.urls', namespace = 'users')),
+    url(r'^exercise/', include('exercise.urls', namespace = 'exercise')),
     url(r'^admin/', admin.site.urls),
     url(r'^', include('core.urls', namespace = 'core')),
     #API
 # -*- coding: utf-8 -*-
-# Generated by Django 1.10 on 2016-11-16 13:57
+
+# Generated by Django 1.10 on 2016-11-15 22:36
 from __future__ import unicode_literals
 from django.db import migrations, models
@@ -23,11 +24,11 @@ class Migration(migrations.Migration):
                 ('username', models.CharField(max_length=30, verbose_name='Email host username')),
                 ('password', models.CharField(blank=True, max_length=30, verbose_name='Email host password')),
                 ('safe_conection', models.IntegerField(choices=[(0, 'No'), (1, 'TLS, if available'), (2, 'TLS'), (3, 'SSL')], default=0, verbose_name='Use safe conection')),
-                ('default_from_email', models.EmailField(max_length=254, verbose_name='Default from email')),
+                ('default_from_email', models.EmailField(blank=True, max_length=254, verbose_name='Default from email')),
             ],
             options={
-                'verbose_name_plural': 'Amadeus SMTP settings',
                 'verbose_name': 'Amadeus SMTP setting',
+                'verbose_name_plural': 'Amadeus SMTP settings',
             },
         ),
     ]
@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.10 on 2016-11-15 23:54
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('app', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='emailbackend',
+            name='default_from_email',
+            field=models.EmailField(max_length=254, verbose_name='Default from email'),
+        ),
+    ]
 # -*- coding: utf-8 -*-
-# Generated by Django 1.10 on 2016-11-16 13:57
+
+# Generated by Django 1.10 on 2016-11-15 22:36
 from __future__ import unicode_literals
 import autoslug.fields
@@ -25,8 +26,8 @@ class Migration(migrations.Migration):
                 ('created_date', models.DateTimeField(auto_now_add=True, verbose_name='Created Date')),
             ],
             options={
-                'verbose_name_plural': 'Actions',
                 'verbose_name': 'Action',
+                'verbose_name_plural': 'Actions',
             },
         ),
         migrations.CreateModel(
@@ -35,8 +36,8 @@ class Migration(migrations.Migration):
                 ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
             ],
             options={
-                'verbose_name_plural': 'Action_Resources',
                 'verbose_name': 'Action_Resource',
+                'verbose_name_plural': 'Action_Resources',
             },
         ),
         migrations.CreateModel(
@@ -48,8 +49,8 @@ class Migration(migrations.Migration):
                 ('datetime', models.DateTimeField(auto_now_add=True, verbose_name='Date and Time of action')),
             ],
             options={
-                'verbose_name_plural': 'Logs',
                 'verbose_name': 'Log',
+                'verbose_name_plural': 'Logs',
             },
         ),
         migrations.CreateModel(
@@ -60,8 +61,8 @@ class Migration(migrations.Migration):
                 ('icon', models.CharField(max_length=50, unique=True, verbose_name='Icon')),
             ],
             options={
-                'verbose_name_plural': 'Amadeus Mime Types',
                 'verbose_name': 'Amadeus Mime Type',
+                'verbose_name_plural': 'Amadeus Mime Types',
             },
         ),
         migrations.CreateModel(
@@ -74,8 +75,8 @@ class Migration(migrations.Migration):
                 ('action_resource', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='core.Action_Resource', verbose_name='Action_Resource')),
             ],
             options={
-                'verbose_name_plural': 'Notifications',
                 'verbose_name': 'Notification',
+                'verbose_name_plural': 'Notifications',
             },
         ),
         migrations.CreateModel(
@@ -88,8 +89,8 @@ class Migration(migrations.Migration):
                 ('url', models.CharField(default='', max_length=100, verbose_name='URL')),
             ],
             options={
-                'verbose_name_plural': 'Resources',
                 'verbose_name': 'Resource',
+                'verbose_name_plural': 'Resources',
             },
         ),
     ]
@@ -0,0 +1,50 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.10 on 2016-11-15 22:36
+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='Performer'),
+        ),
+        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'),
+        ),
+    ]
@@ -1,50 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.10 on 2016-11-16 13:57
-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 = [
-        ('core', '0001_initial'),
-        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
-    ]
-
-    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='Performer'),
-        ),
-        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'),
-        ),
-    ]
@@ -0,0 +1,50 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.10 on 2016-11-17 03:09
+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='Performer'),
+        ),
+        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'),
+        ),
+    ]
 # -*- coding: utf-8 -*-
-# Generated by Django 1.10 on 2016-11-16 13:57
+
+# Generated by Django 1.10 on 2016-11-15 22:36
 from __future__ import unicode_literals
 import autoslug.fields
@@ -34,8 +35,8 @@ class Migration(migrations.Migration):
                 ('name', models.CharField(max_length=100)),
             ],
             options={
-                'verbose_name_plural': 'Activitys Files',
                 'verbose_name': 'Activity File',
+                'verbose_name_plural': 'Activitys Files',
             },
         ),
         migrations.CreateModel(
@@ -47,8 +48,8 @@ class Migration(migrations.Migration):
                 ('create_date', models.DateTimeField(auto_now_add=True, verbose_name='Creation Date')),
             ],
             options={
-                'verbose_name_plural': 'Categories',
                 'verbose_name': 'Category',
+                'verbose_name_plural': 'Categories',
             },
         ),
         migrations.CreateModel(
@@ -68,9 +69,9 @@ class Migration(migrations.Migration):
                 ('public', models.BooleanField(default=False, verbose_name='Public')),
             ],
             options={
+                'verbose_name': 'Course',
                 'verbose_name_plural': 'Courses',
                 'ordering': ('create_date', 'name'),
-                'verbose_name': 'Course',
             },
         ),
         migrations.CreateModel(
@@ -82,8 +83,8 @@ class Migration(migrations.Migration):
                 ('create_date', models.DateTimeField(auto_now_add=True, verbose_name='Creation Date')),
             ],
             options={
-                'verbose_name_plural': 'Categories',
                 'verbose_name': 'Category',
+                'verbose_name_plural': 'Categories',
             },
         ),
         migrations.CreateModel(
@@ -127,9 +128,9 @@ class Migration(migrations.Migration):
                 ('course', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='subjects', to='courses.Course', verbose_name='Course')),
             ],
             options={
+                'verbose_name': 'Subject',
                 'verbose_name_plural': 'Subjects',
                 'ordering': ('create_date', 'name'),
-                'verbose_name': 'Subject',
             },
         ),
         migrations.CreateModel(
@@ -142,8 +143,8 @@ class Migration(migrations.Migration):
                 ('subjects', models.ManyToManyField(to='courses.Subject')),
             ],
             options={
-                'verbose_name_plural': 'subject categories',
                 'verbose_name': 'subject category',
+                'verbose_name_plural': 'subject categories',
             },
         ),
         migrations.CreateModel(
@@ -159,9 +160,9 @@ class Migration(migrations.Migration):
                 ('subject', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='courses.Subject', verbose_name='Subject')),
             ],
             options={
+                'verbose_name': 'Topic',
                 'verbose_name_plural': 'Topics',
                 'ordering': ('create_date', 'name'),
-                'verbose_name': 'Topic',
             },
         ),
     ]
@@ -0,0 +1,85 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.10 on 2016-11-15 22:36
+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='subject',
+            name='professors',
+            field=models.ManyToManyField(related_name='professors_subjects', to=settings.AUTH_USER_MODEL, verbose_name='Professors'),
+        ),
+        migrations.AddField(
+            model_name='subject',
+            name='students',
+            field=models.ManyToManyField(blank=True, related_name='subject_student', to=settings.AUTH_USER_MODEL, verbose_name='Students'),
+        ),
+        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='linkmaterial',
+            name='material',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='material_link', to='courses.Material', verbose_name='Material'),
+        ),
+        migrations.AddField(
+            model_name='filematerial',
+            name='material',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='material_file', to='courses.Material', verbose_name='Material'),
+        ),
+        migrations.AddField(
+            model_name='course',
+            name='category',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='course_category', to='courses.CourseCategory', verbose_name='Category'),
+        ),
+        migrations.AddField(
+            model_name='course',
+            name='coordenator',
+            field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='course_coordenator', to=settings.AUTH_USER_MODEL, verbose_name='Coordenator'),
+        ),
+        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(blank=True, related_name='courses_student', to=settings.AUTH_USER_MODEL, verbose_name='Students'),
+        ),
+        migrations.AddField(
+            model_name='activityfile',
+            name='diet',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='files', to='courses.Activity'),
+        ),
+        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,85 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.10 on 2016-11-16 13:57
-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),
-        ('courses', '0001_initial'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='subject',
-            name='professors',
-            field=models.ManyToManyField(related_name='professors_subjects', to=settings.AUTH_USER_MODEL, verbose_name='Professors'),
-        ),
-        migrations.AddField(
-            model_name='subject',
-            name='students',
-            field=models.ManyToManyField(blank=True, related_name='subject_student', to=settings.AUTH_USER_MODEL, verbose_name='Students'),
-        ),
-        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='linkmaterial',
-            name='material',
-            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='material_link', to='courses.Material', verbose_name='Material'),
-        ),
-        migrations.AddField(
-            model_name='filematerial',
-            name='material',
-            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='material_file', to='courses.Material', verbose_name='Material'),
-        ),
-        migrations.AddField(
-            model_name='course',
-            name='category',
-            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='course_category', to='courses.CourseCategory', verbose_name='Category'),
-        ),
-        migrations.AddField(
-            model_name='course',
-            name='coordenator',
-            field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='course_coordenator', to=settings.AUTH_USER_MODEL, verbose_name='Coordenator'),
-        ),
-        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(blank=True, related_name='courses_student', to=settings.AUTH_USER_MODEL, verbose_name='Students'),
-        ),
-        migrations.AddField(
-            model_name='activityfile',
-            name='diet',
-            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='files', to='courses.Activity'),
-        ),
-        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'),
-        ),
-    ]
@@ -0,0 +1,75 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.10 on 2016-11-17 03:09
+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),
+        ('courses', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='subject',
+            name='professors',
+            field=models.ManyToManyField(related_name='professors_subjects', to=settings.AUTH_USER_MODEL, verbose_name='Professors'),
+        ),
+        migrations.AddField(
+            model_name='subject',
+            name='students',
+            field=models.ManyToManyField(blank=True, related_name='subject_student', to=settings.AUTH_USER_MODEL, verbose_name='Students'),
+        ),
+        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='linkmaterial',
+            name='material',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='material_link', to='courses.Material', verbose_name='Material'),
+        ),
+        migrations.AddField(
+            model_name='filematerial',
+            name='material',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='material_file', to='courses.Material', verbose_name='Material'),
+        ),
+        migrations.AddField(
+            model_name='course',
+            name='category',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='course_category', to='courses.CourseCategory', verbose_name='Category'),
+        ),
+        migrations.AddField(
+            model_name='course',
+            name='coordenator',
+            field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='course_coordenator', to=settings.AUTH_USER_MODEL, verbose_name='Coordenator'),
+        ),
+        migrations.AddField(
+            model_name='activityfile',
+            name='diet',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='files', to='courses.Activity'),
+        ),
+        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'),
+        ),
+    ]
@@ -63,33 +63,6 @@
             </ul>
           </div>
         </div>
-        <div class="col-xs-4 col-md-4">
-          <div class="resource_inline">
-            <h4>{% trans 'Exercises' %}</h4>
-          </div>
-          <div class="resource_inline">
-            {# dropdown de create exercício #}
-            <div class="dropdown">
-              <a href="#" type="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><i class="fa fa-plus-circle fa-lg" aria-hidden="true"></i></a>
-              <ul class="dropdown-menu" aria-labelledby="dLabel">
-                <li><a href="javascript:modal.get('{% url 'course:exercise:create_exercise' topic.slug %}', '#createExercisesModal','#requisicoes_ajax')">{% trans 'Create a Exercise' %}</a></li>
-              </ul>
-            </div>
-          </div>
-          <div class="presentation_{{exercise.slug}}">
-            {# exercício do tópico no modo de visualização #}
-            <ul>
-              {% list_topic_exercise request %}
-            </ul>
-          </div>
-          <div class="editation editation_{{exercise.slug}}">
-            {# exercício do tópico no modo de edição #}
-            <ul>
-              {% list_topic_exercise_edit request exercise %}
-            </ul>
-          </div>
-        </div>
-        {% include "exercise/create_exercise.html" %}
       </div>
     {% endif %}
@@ -7,7 +7,7 @@
         <button class="btn btn-default btn-sm caret-square"><i class="fa fa-caret-square-o-down fa-2x" aria-hidden="true"></i></button>
       </div>
       <div class="col-xs-9 col-md-9 titleTopic">
-        <a role="button">
+        <a href="{% url 'course:view_topic' topic.slug %}" role="button">
           <h4>{{topic}}</h4>
         </a>
       </div><!--column -->
@@ -21,7 +21,7 @@
           {% professor_subject topic.subject user as dropdown_topic %}
           {% if dropdown_topic %}
           <ul class="dropdown-menu pull-right" aria-labelledby="moreActions">
-            <li><a href="" data-toggle="modal" data-target="#myModal4"><i class="fa fa-files-o fa-fw" aria-hidden="true"></i>&nbsp; {% trans "Replicate" %}</a></li>
+            <li><a href="{% url 'course:replicate_topic' topic.slug %}"><i class="fa fa-files-o fa-fw" aria-hidden="true"></i>&nbsp; {% trans "Replicate" %}</a></li>
             <li><a href="javascript:show_editation('{{topic.slug}}')"><i class="fa fa-pencil fa-fw" aria-hidden="true"></i>&nbsp; {% trans "Edit" %}</a></li>
             <li><a href="javascript:void(0)" data-toggle="modal" data-target="#removeTopic"><i class="fa fa-trash fa-fw" aria-hidden="true"></i>&nbsp; {% trans "Remove" %}</a></li>
           </ul>
@@ -123,23 +123,6 @@
             </ul>
           </div>
         </div>
-        <div class="col-xs-4 col-md-4">
-          <div class="resource_inline">
-            <h4>{% trans 'Exercises' %}</h4>
-          </div>
-          <div class="presentation_{{exercise.slug}}">
-            {# exercício do tópico no modo de visualização #}
-            <ul>
-              {% list_topic_exercise request %}
-            </ul>
-          </div>
-          <div class="editation editation_{{exercise.slug}}">
-            {# exercício do tópico no modo de edição #}
-            <ul>
-              {% list_topic_exercise_edit request exercise %}
-            </ul>
-          </div>
-        </div>
       </div>
       {# opções de cancelar e editar no modo de edição #}
@@ -2,61 +2,51 @@
 {% load static i18n permission_tags widget_tweaks %}
-{% block breadcrumbs %}
-	<ol class="breadcrumb">
-	  	<li><a href="{% url 'app:index' %}">{% trans 'Home' %}</a></li>
-	  	<li class="active">{% trans 'Replicate Subject' %}</li>
-	</ol>
-{% endblock %}
-
 {% block content %}
-<div class="panel panel-default">
+
+  <div class="panel panel-default">
     <div class="panel-body">
       <form class="form-group " method="post" action="">
         {% csrf_token %}
         <div class="form-group {% if subject.name.errors %} has-error{% endif %}">
-          <label for="{{ id_name }}" class="control-label label-static"> {% trans 'Name' %}</label>
-          <input class="form-control" id="id_name" maxlength="100" name="name" type="text" required="True" value="{{subject.name}}">
-          <span class="help-block">{% trans 'Subject name' %}</span>
+          <label for="id_name" class="control-label label-static"> {% trans 'Name'%}</label>
+          <textarea class="form-control" id="id_name" maxlength="100" rows="1" name="name" placeholder="Name" type="text" required >{{subject.name}}</textarea>
+          <span class="help-block">{% trans 'Subject name'%}</span>
         </div>
-        <div class="form-group {% if subject.name.errors %} has-error{% endif %}">
-          <label for="{{ id_description }}" class="control-label label-static"> {% trans 'Description' %} </label>
-          <textarea class="form-control" id="id_description" name="description" type="text" required="">{{subject.description}}</textarea>
-          <span class="help-block">{% trans 'Subject Description' %}</span>
+        <div class="form-group">
+          <label for="id_description" class="control-label label-static"> {% trans 'Description'%}</label>
+          <textarea class="form-control" id="id_description" name="description" placeholder="Description" type="text" >{{subject.description}}</textarea>
+          <span class="help-block">{% trans 'Subject description'%}</span>
         </div>
-        <div class="form-group {% if subject.name.errors %} has-error{% endif %}">
-          <label for="{{ id_init_date }}" class="control-label label-static"> {% trans 'Init date' %}</label>
-          <input type="text" class="form-control date-picker" name="{{field.name}}" value="{{field.value|date:'SHORT_DA E_FORMAT'}}" min="{{now|date:'SHORT_DATE_FORMAT'}}">
-          <span class="help-block">{% trans 'Subject init date' %}</span>
+        <div class="form-group">
+          <label for="id_init_date" class="control-label label-static"> {% trans 'Init date'%}</label>
+          <input type="text" class="form-control date-picker" name="init_date" value="{{field.value|date:'SHORT_DATE_FORMAT'}}" min="{{now|date:'SHORT_DATE_FORMAT'}}">
+          <span class="help-block">{% trans 'Init date'%}</span>
         </div>
-        <div class="form-group {% if subject.name.errors %} has-error{% endif %}">
-          <label for="{{ id_end_date }}" class="control-label label-static"> {% trans 'End date' %}</label>
-          <input type="text" class="form-control date-picker" name="{{field.name}}" value="{{field.value|date:'SHORT_DA E_FORMAT'}}" min="{{now|date:'SHORT_DATE_FORMAT'}}">
-          <span class="help-block">{% trans 'Subject end date' %}</span>
-
-        </div>
-        <div class="form-group {% if subject.name.errors %} has-error{% endif %}">
-          <label for="{{ id_visible }}" class="control-label label-static"> {% trans 'Visible?' %} </label>
-          <input type="checkbox" class="form-control" id="id_visible" name="visible" required="true"/>
-          <span class="help-block">{% trans 'Is it visible?' %}</span>
+        <div class="form-group">
+          <label for="id_end_date" class="control-label label-static"> {% trans 'End date'%}</label>
+          <input type="text" class="form-control date-picker" name="end_date" value="{{field.value|date:'SHORT_DATE_FORMAT'}}" min="{{now|date:'SHORT_DATE_FORMAT'}}">
+          <span class="help-block">{% trans 'End date'%}</span>
         </div>
+        <div class="form-group">
+          <label for="id_visible" class="control-label label-static"> {% trans 'Visible'%}</label>
+          <input class="form-control" id="id_visible" name="visible" type="checkbox"/>
+          <span class="help-block">{% trans 'Is it visible?'%}</span>
         </div>
-        
         <div class="col-lg-offset-4 col-lg-4">
-          <button type="submit" class="btn btn-raised btn-primary btn-lg btn-block">{% trans 'Replicate' %}</button>
+          <button type="submite" class="btn btn-raised btn-primary btn-lg btn-block">{% trans 'Replicate' %}</button>
         </div>
       </form>
-
     </div>
   </div>
@@ -70,4 +60,4 @@
         $('#id_description').summernote({height: 300});
     });
   </script>
-{% endblock %}
 \ No newline at end of file
+{% endblock content %}
@@ -65,7 +65,7 @@
   </div>
   <div class="panel panel-default">
     <div class="panel-body">
-        {% include "topic/topic_card_student.html" %}
+        {% include "topic/topic_card.html" %}
         {% comment %}
@@ -116,13 +116,22 @@
     </fieldset>
   </form>-->
 {% endcomment %}
-
-
-
-
       </div>
-
-
     </div>
 </div>
+  <div class="col-md-6">
+      <h3>{% trans 'Students - Especific Exercises' %}</h3>  
+      <br/>  
+  </div>
+    {# mostra a lista de usuários caso seja um professor ou admin #}
+  {% if user|has_role:'professor' or user|has_role:'system_admin' %}
+    {% for user in users %}
+      {% include "exercise/card_list_user.html" %}
+    {% endfor %}
+  {# caso seja um estudante, mostra a lista de exercícios proposta a ele #}
+  {% elif user|has_role:'student'%}
+    {% for exercise in exercises %}
+      {% include "exercise/card_topic_exercises.html" %}
+    {% endfor %}
+  {% endif %}
 {% endblock %}
@@ -0,0 +1,38 @@
+{% extends 'subject/index.html' %}
+
+{% load static i18n permission_tags widget_tweaks %}
+
+{% block content %}
+
+  <div class="panel panel-default">
+    <div class="panel-body">
+      <form class="form-group " method="post" action="">
+        {% csrf_token %}
+        
+        <div class="form-group {% if topic.name.errors %} has-error{% endif %}">
+          <label for="id_name" class="control-label label-static"> {% trans 'Name'%}</label>
+          <textarea class="form-control" id="id_name" maxlength="100" rows="1" name="name" placeholder="Name" type="text" required >{{topic.name}}</textarea>
+
+          <span class="help-block">{% trans 'Topic name'%}</span>
+        </div>
+        <div class="form-group {% if topic.description.errors %} has-error{% endif %}">
+          <label for="id_description" class="control-label label-static"> {% trans 'Description'%}</label>
+          <textarea class="form-control" id="id_description" name="description" placeholder="Description" type="text"> {{topic.description}}</textarea>
+
+          <span class="help-block">{% trans 'Topic description'%}</span>
+        </div>
+
+        <div class="col-lg-offset-4 col-lg-4">
+          <button type="submit" class="btn btn-raised btn-primary btn-lg btn-block">{% trans 'Create' %}</button>
+
+        </div>
+      </form>
+    </div>
+  </div>
+  
+  <script type="text/javascript">
+      $(document).ready(function() {
+        $('#id_description').summernote({height: 300});
+    });
+  </script>
+{% endblock content %}
@@ -1,38 +0,0 @@
-{% extends 'subject/index.html' %}
-
-{% load static i18n permission_tags widget_tweaks %}
-
-{% block content %}
-
-  <div class="panel panel-default">
-    <div class="panel-body">
-      <form class="form-group " method="post" action="">
-        {% csrf_token %}
-        
-        <div class="form-group {% if topic.name.errors %} has-error{% endif %}">
-          <label for="id_name" class="control-label label-static"> {% trans 'Name'%}</label>
-          <input class="form-control" id="id_name" maxlength="100" name="name" placeholder="Name" type="text" value={{topic.name}} required />
-
-          <span class="help-block">{% trans 'Topic name'%}</span>
-        </div>
-        <div class="form-group {% if topic.description.errors %} has-error{% endif %}">
-          <label for="id_description" class="control-label label-static"> {% trans 'Description'%}</label>
-          <textarea class="form-control" id="id_description" name="description" placeholder="Description" type="text"> {{topic.description}}</textarea>
-
-          <span class="help-block">{% trans 'Topic description'%}</span>
-        </div>
-
-        <div class="col-lg-offset-4 col-lg-4">
-          <button type="submit" class="btn btn-raised btn-primary btn-lg btn-block">{% trans 'Create' %}</button>
-
-        </div>
-      </form>
-    </div>
-  </div>
-  
-  <script type="text/javascript">
-      $(document).ready(function() {
-        $('#id_description').summernote({height: 300});
-    });
-  </script>
-{% endblock content %}
@@ -0,0 +1,28 @@
+{% load static i18n list_topic_foruns permission_tags widget_tweaks professor_access%}
+
+
+<div class="row">
+  <div class="col-xs-6 col-md-6">
+    <div class="resource_inline">
+      <h4>{% trans "Materials" %}</h4>
+    </div>
+
+    <ul id="list-materials">
+        {% list_topic_file request topic %}
+        {% list_topic_link request topic%}
+
+    </ul>
+  </div>
+  <div class="col-xs-6 col-md-6">
+    <div class="resource_inline">
+      <h4>{% trans "Activities" %}</h4>
+    </div>
+    <ul>
+        <div class="foruns_list">
+            {# {% list_topic_exam request topic %} #}
+            {% list_topic_poll request topic %}
+            {% list_topic_foruns request topic %}
+        </div>
+    </ul>
+  </div>
+</div>
 \ No newline at end of file
@@ -1,29 +0,0 @@
-{% load static i18n list_topic_foruns permission_tags widget_tweaks professor_access%}
-
-
-<div class="row">
-  <div class="col-xs-6 col-md-6">
-    <div class="resource_inline">
-      <h4>{% trans "Materials" %}</h4>
-    </div>
-
-    <ul id="list-materials">
-        {% list_topic_file request topic %}
-        {% list_topic_link request topic%}
-
-    </ul>
-  </div>
-  <div class="col-xs-4 col-md-4">
-    <div class="resource_inline">
-      <h4>{% trans "Activities" %}</h4>
-    </div>
-    <ul>
-        <div class="foruns_list">
-            {% list_topic_exam request topic %}
-            {% list_topic_poll request topic %}
-            {% list_topic_foruns request topic %}
-        </div>
-    </ul>
-  </div>
-
-</div>
@@ -6,7 +6,6 @@ urlpatterns = [
     url(r'^all-courses/$', views.AllCoursesView.as_view(), name='all_courses'),
     url(r'^create/$', views.CreateCourseView.as_view(), name='create'),
     url(r'^replicate_course/(?P<slug>[\w_-]+)/$', views.ReplicateCourseView.as_view(), name='replicate_course'),
-    url(r'^replicate_subject/(?P<slug>[\w_-]+)/$', views.ReplicateSubjectView.as_view(), name='replicate_subject'),
     url(r'^edit/(?P<slug>[\w_-]+)/$', views.UpdateCourseView.as_view(), name='update'),
     url(r'^delete/(?P<slug>[\w_-]+)/$', views.DeleteCourseView.as_view(), name='delete'),
     url(r'^subscribe/(?P<slug>[\w_-]+)/$', views.subscribe_course, name='subscribe'),
@@ -19,10 +18,11 @@ urlpatterns = [
     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'^subjects/replicate/(?P<slug>[\w_-]+)/$', views.ReplicateSubjectView.as_view(), name='replicate_subject'),
     url(r'^subjects/subscribe/(?P<slug>[\w_-]+)/$', views.subscribe_subject, name='subscribe_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/update/(?P<slug>[\w_-]+)/$', views.DeleteTopic.as_view(), name='delete_topic'),
+    url(r'^topics/delete/(?P<slug>[\w_-]+)/$', views.DeleteTopic.as_view(), name='delete_topic'),
     url(r'^topics/replicate/(?P<slug>[\w_-]+)/$', views.ReplicateTopicView.as_view(), name='replicate_topic'),
     url(r'^topics/(?P<slug>[\w_-]+)/$', views.TopicsView.as_view(), name='view_topic'),
     url(r'^subjects/categories$',views.IndexSubjectCategoryView.as_view(), name='subject_category_index'),
@@ -562,39 +562,6 @@ class SubjectsView(LoginRequiredMixin, LogMixin, generic.ListView):
             context['files'] = TopicFile.objects.filter(students__name = self.request.user.name)
         return context
-class ReplicateSubjectView(LoginRequiredMixin, HasRoleMixin, LogMixin, NotificationMixin,generic.edit.CreateView):
-
-    allowed_roles = ['professor', 'system_admin']
-    login_url = reverse_lazy("core:home")
-    redirect_field_name = 'next'
-    template_name = 'subject/replicate.html'
-    form_class = SubjectForm
-    success_url = reverse_lazy('course:view')
-
-    def get_context_data(self, **kwargs):
-        context = super(ReplicateSubjectView, self).get_context_data(**kwargs)
-        subject = get_object_or_404(Subject, slug=self.kwargs.get('slug'))
-
-        if has_role(self.request.user,'system_admin'):
-            subjects = Subject.objects.all()
-            context['subjects'] = subjects
-        elif has_role(self.request.user,'professor'):
-            subject = self.request.user.professors_subjects.all()
-        categorys_subjects = CategorySubject.objects.all()
-
-        context['subject'] = subject
-        context['categorys_subjects'] = categorys_subjects
-        context['title'] = _("Replicate Subject")
-        context['now'] = date.today()
-        return context
-
-    def form_valid(self, form):
-        self.object = form.save()
-
-        return super(ReplicateSubjectView, self).form_valid(form)
-
-    def get_success_url(self):
-        return reverse_lazy('course:view', kwargs={'slug' : self.object.slug})
 class UploadMaterialView(LoginRequiredMixin, generic.edit.CreateView):
     login_url = reverse_lazy("core:home")
@@ -664,6 +631,12 @@ class TopicsView(LoginRequiredMixin, LogMixin, generic.ListView):
         activitys = Activity.objects.filter(topic__name = topic.name)
         students_activit = User.objects.filter(activities__in = Activity.objects.all())
         materials = Material.objects.filter(topic = topic)
+        if has_role(self.request.user, 'professor'):
+            users = User.objects.filter(subject_student__in = Subject.objects.all())
+            context['users'] = users
+        elif has_role(self.request.user, 'student'):
+            exercises = Exercise.objects.all().filter(students=self.request.user)
+            context['exercises'] = exercises
         context['topic'] = topic
         context['subject'] = topic.subject
@@ -1018,13 +991,13 @@ class TopicViewSet(viewsets.ModelViewSet):
 class ReplicateTopicView (LoginRequiredMixin, HasRoleMixin, LogMixin, NotificationMixin,generic.edit.CreateView):
     log_component = "course"
     log_resource = "topic"
-    log_action = "create"
+    log_action = "replicate"
     log_context = {}
     allowed_roles = ['professor', 'system_admin']
     login_url = reverse_lazy("core:home")
-    model = Topic
-    template_name = 'topic/replicate_topic.html'
+    redirect_field_name = 'next'
+    template_name = 'topic/replicate.html'
     form_class = TopicForm
     def get_success_url(self):
@@ -1033,21 +1006,23 @@ class ReplicateTopicView (LoginRequiredMixin, HasRoleMixin, LogMixin, Notificati
     def get_context_data(self, **kwargs):
         context = super(ReplicateTopicView, self).get_context_data(**kwargs)
         topic = get_object_or_404(Topic, slug = self.kwargs.get('slug'))
-        subject = topic.subject
+        subject = Subject.objects.get(pk = topic.subject_id)
         context['course'] = subject.course
         context['subject'] = subject
         context['subjects'] = subject.course.subjects.all()
         context['topic'] = topic
         return context
-
     def form_valid(self, form):
-        self.object.subject = self.object.subject.id
+        topic = get_object_or_404(Topic, slug = self.kwargs.get('slug'))
+        subject = Subject.objects.get(pk = topic.subject_id)
+
         self.object = form.save(commit = False)
+        self.object.topic = topic
+        self.object.subject = subject
         self.object.owner = self.request.user
         self.object.save()
-
-        action = super(ReplicateTopicView, self).createorRetrieveAction("replicate Topic")
+        action = super(ReplicateTopicView, self).createorRetrieveAction("create Topic")
         super(ReplicateTopicView, self).createNotification("Topic "+ self.object.name + " was created",
             resource_name=self.object.name, resource_link= reverse('course:view_topic',args=[self.object.slug]),
              actor=self.request.user, users = self.object.subject.course.students.all() )
@@ -1067,3 +1042,55 @@ class ReplicateTopicView (LoginRequiredMixin, HasRoleMixin, LogMixin, Notificati
         super(ReplicateTopicView, self).createLog(self.request.user, self.log_component, self.log_action, self.log_resource, self.log_context)
         return super(ReplicateTopicView, self).form_valid(form)
+
+class ReplicateSubjectView(LoginRequiredMixin, HasRoleMixin, LogMixin, NotificationMixin, generic.edit.CreateView):
+    log_component = "course"
+    log_resource = "subject"
+    log_action = "replicate"
+    log_context = {}
+
+    allowed_roles = ['professor', 'system_admin']
+    login_url = reverse_lazy("core:home")
+    redirect_field_name = 'next'
+    template_name = 'subject/replicate.html'
+    form_class = SubjectForm
+
+    def get_success_url(self):
+        return reverse_lazy('course:view_subject', kwargs={'slug' : self.object.slug})
+
+    def get_context_data(self, **kwargs):
+        context = super(ReplicateSubjectView, self).get_context_data(**kwargs)
+        subject = get_object_or_404(Subject, slug = self.kwargs.get('slug'))
+        course = Course.objects.get(pk=subject.course_id)
+        context['course'] = course
+        context['subjects'] = course.subjects.filter(Q(visible=True) | Q(professors__in=[self.request.user]))
+        context['subject'] = subject
+        if (has_role(self.request.user,'system_admin')):
+            context['subjects'] = course.subjects.all()
+        return context
+
+    def form_valid(self, form):
+        subject = get_object_or_404(Subject, slug = self.kwargs.get('slug'))
+        course = Course.objects.get(pk=subject.course_id)
+
+        self.object = form.save(commit = False)
+        self.object.course = course
+        self.object.save()
+        self.object.professors.add(self.request.user)
+        if self.object.visible:
+            super(ReplicateSubjectView, self).createNotification( " created subject " + self.object.name, resource_name=self.object.name,
+             resource_slug = self.object.slug, actor=self.request.user, users= self.object.course.students.all(),
+             resource_link = reverse('course:view_subject', args=[self.object.slug]))
+
+        self.log_context['subject_id'] = self.object.id
+        self.log_context['subject_name'] = self.object.name
+        self.log_context['subject_slug'] = self.object.slug
+        self.log_context['course_id'] = course.id
+        self.log_context['course_name'] = course.name
+        self.log_context['course_slug'] = course.slug
+        self.log_context['course_category_id'] = course.category.id
+        self.log_context['course_category_name'] = course.category.name
+
+        super(ReplicateSubjectView, self).createLog(self.request.user, self.log_component, self.log_action, self.log_resource, self.log_context)
+
+        return super(ReplicateSubjectView, self).form_valid(form)
 # -*- coding: utf-8 -*-
-# Generated by Django 1.10 on 2016-11-16 13:57
+
+# Generated by Django 1.10 on 2016-11-15 22:36
 from __future__ import unicode_literals
 from django.db import migrations, models
@@ -23,9 +24,10 @@ class Migration(migrations.Migration):
                 ('order', models.PositiveSmallIntegerField(verbose_name='Order')),
             ],
             options={
+                'verbose_name': 'Answer',
+                'ordering': ('order',),
                 'verbose_name_plural': 'Answers',
                 'ordering': ('order',),
-                'verbose_name': 'Answer',
             },
         ),
         migrations.CreateModel(
@@ -37,8 +39,8 @@ class Migration(migrations.Migration):
                 ('answer', models.ManyToManyField(related_name='student_answer', to='exam.Answer', verbose_name='Answers Students')),
             ],
             options={
-                'verbose_name_plural': 'Answers Student',
                 'verbose_name': 'Answer Stundent',
+                'verbose_name_plural': 'Answers Student',
             },
         ),
         migrations.CreateModel(
@@ -49,8 +51,8 @@ class Migration(migrations.Migration):
                 ('exibe', models.BooleanField(default=False, verbose_name='Exibe?')),
             ],
             options={
-                'verbose_name_plural': 'Exams',
                 'verbose_name': 'Exam',
+                'verbose_name_plural': 'Exams',
             },
             bases=('courses.activity',),
         ),
@@ -0,0 +1,30 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.10 on 2016-11-15 22:36
+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),
+        ('exam', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='answersstudent',
+            name='student',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='student', to=settings.AUTH_USER_MODEL, verbose_name='Student'),
+        ),
+        migrations.AddField(
+            model_name='answer',
+            name='exam',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='answers', to='exam.Exam', verbose_name='Answers'),
+        ),
+    ]
@@ -1,30 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.10 on 2016-11-16 13:57
-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 = [
-        ('exam', '0001_initial'),
-        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='answersstudent',
-            name='student',
-            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='student', to=settings.AUTH_USER_MODEL, verbose_name='Student'),
-        ),
-        migrations.AddField(
-            model_name='answer',
-            name='exam',
-            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='answers', to='exam.Exam', verbose_name='Answers'),
-        ),
-    ]
@@ -0,0 +1,30 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.10 on 2016-11-17 03:09
+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),
+        ('exam', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='answersstudent',
+            name='student',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='student', to=settings.AUTH_USER_MODEL, verbose_name='Student'),
+        ),
+        migrations.AddField(
+            model_name='answer',
+            name='exam',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='answers', to='exam.Exam', verbose_name='Answers'),
+        ),
+    ]
 from django.contrib import admin
-from .models import Exercise
+from .models import Exercise, File
 class ExerciseAdmin(admin.ModelAdmin):
     list_display = ['name']
     search_fields = ['name']
+class FileAdmin(admin.ModelAdmin):
+    list_display = ['name']
+    search_fields = ['name']
+
 admin.site.register(Exercise, ExerciseAdmin)
+admin.site.register(File, ExerciseAdmin)
@@ -9,11 +9,11 @@ class ExerciseForm(forms.ModelForm):
     class Meta:
         model = Exercise
-        fields = ['name', 'file']
+        fields = ['name']
 class UpdateExerciseForm(forms.ModelForm):
     class Meta:
         model = Exercise
-        fields = ['name', 'file']
+        fields = ['name']
 # -*- coding: utf-8 -*-
-# Generated by Django 1.10 on 2016-11-16 13:57
+
+# Generated by Django 1.10 on 2016-11-15 22:36
 from __future__ import unicode_literals
+from decimal import Decimal
 from django.db import migrations, models
 import django.db.models.deletion
@@ -11,7 +13,6 @@ class Migration(migrations.Migration):
     initial = True
     dependencies = [
-        ('courses', '0001_initial'),
     ]
     operations = [
@@ -19,9 +20,20 @@ class Migration(migrations.Migration):
             name='Exercise',
             fields=[
                 ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('file', models.FileField(upload_to='uploads/%Y/%m/%d')),
+                ('description', models.TextField(blank=True, verbose_name='Descrição')),
+                ('init_date', models.DateField(verbose_name='Begin of Subject Date')),
+                ('end_date', models.DateField(verbose_name='End of Subject Date')),
+                ('grade', models.DecimalField(decimal_places=2, default=Decimal('0.00'), max_digits=20, null=True)),
                 ('name', models.CharField(max_length=100)),
-                ('topic', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='exercises', to='courses.Topic', verbose_name='Topic')),
+            ],
+        ),
+        migrations.CreateModel(
+            name='File',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('name', models.CharField(max_length=100)),
+                ('file', models.FileField(upload_to='uploads/%Y/%m/%d')),
+                ('exercise', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='file', to='exercise.Exercise')),
             ],
         ),
     ]
@@ -0,0 +1,36 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.10 on 2016-11-17 03:09
+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),
+        ('exercise', '0001_initial'),
+        ('courses', '0002_auto_20161117_0009'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='exercise',
+            name='professors',
+            field=models.ManyToManyField(blank=True, related_name='professors_exercise', to=settings.AUTH_USER_MODEL, verbose_name='Professors'),
+        ),
+        migrations.AddField(
+            model_name='exercise',
+            name='students',
+            field=models.ManyToManyField(blank=True, related_name='subject_exercise', to=settings.AUTH_USER_MODEL, verbose_name='Students'),
+        ),
+        migrations.AddField(
+            model_name='exercise',
+            name='topic',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='exercises', to='courses.Topic', verbose_name='Topic'),
+        ),
+    ]
-from django.db import models
 from courses.models import Topic
+from decimal import Decimal
+from django.db import models
 from django.utils.translation import ugettext_lazy as _
+from users.models import User
 """
     Function to return the path where the file should be saved
@@ -15,8 +17,24 @@ def file_path(instance, filename):
 It represents the Exercises inside topic.
 """
-
 class Exercise(models.Model):
     topic = models.ForeignKey(Topic, verbose_name=_('Topic'), related_name='exercises')
-    file = models.FileField(upload_to='uploads/%Y/%m/%d')
+    professors = models.ManyToManyField(User, verbose_name=_('Professors'), related_name='professors_exercise', blank=True)
+    students = models.ManyToManyField(User, verbose_name=_('Students'), related_name='subject_exercise', blank = True)
+    description = models.TextField(_('Descrição'), blank=True)
+    init_date = models.DateField(_('Begin of Subject Date'))
+    end_date = models.DateField(_('End of Subject Date'))
+    grade = models.DecimalField(max_digits=20, decimal_places=2, default=Decimal('0.00'), null=True)
+    name = models.CharField(max_length=100)
+
+    def __str__(self):
+        return self.name
+
+
+class File(models.Model):
     name = models.CharField(max_length=100)
+    file = models.FileField(upload_to='uploads/%Y/%m/%d')
+    exercise = models.ForeignKey(Exercise, related_name='file')
+    
+    def __str__(self):
+        return self.name
 \ No newline at end of file
@@ -0,0 +1,33 @@
+{% load static i18n list_topic_foruns permission_tags widget_tweaks professor_access list_topic_exercises %}
+
+  <div class="col-md-12 col-sm-12 col-lg-12">
+    <div class="panel-group accordion ui-accordion ui-widget ui-helper-reset ui-sortable" role="tablist" aria-multiselectable="false">
+      <div class="group"><div class="panel panel-default">
+        <div class="panel-heading topic ui-sortable-handle" role="tab">
+          <div class="row">
+            <div class="col-md-1 moreAccordion" data-toggle="collapse" data-parent="#accordion-{{user.id}}" href=".collapseTopic-{{user.id}}" aria-expanded="false" aria-controls="collapseTopic-{{user.id}}">
+              <button class="btn btn-default btn-sm caret-square"><i class="fa fa-caret-square-o-down fa-2x" aria-hidden="true"></i></button>
+            </div>
+            <div class="col-xs-9 col-md-9 titleTopic">
+              <a href="" role="button">
+                <h4>{{user|capfirst}}</h4>
+              </a>
+            </div>
+          </div>
+        </div>
+        <div class="panel-collapse collapseTopic-{{user.id}} collapse in" role="tabpanel" aria-labelledby="heading_{{user.id}}" aria-expanded="true" aria-hidden="false">
+          <div class="panel-body">
+            <div class="presentation">
+              <p>
+                <i>
+
+                </i>
+              </p>
+
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+</div>
 \ No newline at end of file
@@ -0,0 +1,62 @@
+{% load static widget_tweaks i18n %}
+
+<div class="col-lg-4 col-xs-4 col-sm-4">
+  <div class="panel panel-default">
+    <div class="panel-body">
+      <form class="form-horizontal">
+        <fieldset>
+          <center><legend>{{exercise.name}}</legend></center>
+          <div class="container-fluid">
+            <div class="form-group">
+              <label class="col-md-2 col-xs-2 col-sm-2 control-label">Describe: </label><br>
+              {% if exercise.description%}
+                {{exercise.description}}
+              {% else %}
+                {% trans "Don't have description" %}
+              {% endif %}
+            </div>
+            <div class="form-group">
+              <label class="col-md-2 col-xs-2 col-sm-2 control-label">Opening: </label><br>{{exercise.init_date}}
+
+            </div>
+            <div class="form-group">
+              <label class="col-md-2 col-xs-2 col-sm-2 control-label">Ending: </label><br>{{exercise.end_date}}
+
+            </div>
+           <div class="form-group">
+              <label for="nota" class="col-md-2 control-label">NOTA: 
+                {% if exercise.grade %}
+                  <div class="col-md-4">
+                    <p id="nota" class="form-control">
+                      {{exercise.grade}}
+                    </p>
+                  </div>
+                {% else %}
+                    {% trans 'Not yet' %}
+                {% endif %}
+              </label>
+            </div>
+            {% if exercise.file %}
+              <div class="form-group">
+                <label for="DelExc" class="col-md-4 control-label"> <i class="fa fa-file-archive-o fa-3x" aria-hidden="true">
+                {% for file in exercise.file %}
+                    <a href="{{exercise.file.url}}">{% trans 'File' %}</a>
+                {% endfor %}
+                </i> 
+              </div>
+            {% else %}
+              <p>{% trans 'Exercise not yet' %}</p>
+            {% endif %}
+            {% if not exercise.grade %}
+              <div class="form-group">
+                <label class="col-md-6 control-label"><i class="fa fa-spinner fa-pulse fa-3x fa-fw"></i>{% trans 'Teacher waiting corretion' %}
+              </div>
+            {% endif %}
+          </div>
+
+        </fieldset>
+      </form>
+
+    </div>
+  </div>
+</div>
 \ No newline at end of file
 {% load static i18n list_topic_foruns permission_tags %}
-<div id="exercise-topic{{ exercise.id }}-exercises-edit">
+<div id="exercise-topic{{ topic.id }}-exercises-edit">
   {% for exercise in exercises %}
     <li class="icon_edit_remove" id = "exercise_edit_icon_{{ exercise.slug }}"> <a href="javascript:modal.get('', '#exercisesModalEdit', '#requisicoes_ajax')"><i class="fa fa-pencil fa-lg" aria-hidden="true"></i></a>  <a href="javascript:modal.get('', '#exerciseDeleteModal', '#requisicoes_ajax')"><i class="fa fa-trash fa-lg" aria-hidden="true"></i></a></li>
     <li id = "exercise_edit_{{ exercise.slug }}"><i class="fa fa-link" aria-hidden="true"></i>  <a href="javascript:modal.get('', '#viewExerciseModal','#requisicoes_ajax')">{{exercise.name}}</a></li>
@@ -5,21 +5,21 @@ register = template.Library()
 @register.inclusion_tag('exercise/exercise_list.html')
-def list_topic_exercise(request):
+def list_topic_exercise(request, topic):
     context = {
         'request': request,
     }
-    context['exercises'] = Exercise.objects.all()
+    context['exercises'] = Exercise.objects.filter(topic=topic)
     return context
 @register.inclusion_tag('exercise/exercise_edit.html')
-def list_topic_exercise_edit(request, exercise):
+def list_topic_exercise_edit(request, topic):
     context = {
         'request': request,
     }
-    context['exercises'] = Exercise.objects.all()
-    context['exercise'] = exercise
+    context['exercises'] = Exercise.objects.filter(topic = topic)
+    context['topic'] = topic
     return context
 from .forms import ExerciseForm, UpdateExerciseForm
 from .models import Exercise
-from files.utils import mime_type_to_material_icons
 from core.decorators import log_decorator
 from core.mixins import LogMixin, NotificationMixin
 from core.models import Log, MimeType
@@ -13,8 +12,10 @@ from django.core.urlresolvers import reverse_lazy
 from django.shortcuts import render, get_object_or_404, redirect
 from django.urls import reverse
 from django.views import generic
+from files.utils import mime_type_to_material_icons
 from rolepermissions.mixins import HasRoleMixin
 from rolepermissions.verifications import has_role
+from users.models import User
 class CreateExercise(LoginRequiredMixin, HasRoleMixin, LogMixin, NotificationMixin, generic.CreateView):
@@ -23,7 +24,7 @@ class CreateExercise(LoginRequiredMixin, HasRoleMixin, LogMixin, NotificationMix
     log_action = 'create'
     log_component = {}
-    allowed_roles = ['student']
+    allowed_roles = ['student', 'professor']
     login_url = reverse_lazy("core:home")
     redirect_field_name = 'next'
     model = Exercise
 # -*- coding: utf-8 -*-
-# Generated by Django 1.10 on 2016-11-16 13:57
+# Generated by Django 1.10 on 2016-11-15 22:36
 from __future__ import unicode_literals
 from django.db import migrations, models
@@ -12,8 +12,8 @@ class Migration(migrations.Migration):
     initial = True
     dependencies = [
-        ('core', '0001_initial'),
         ('courses', '0001_initial'),
+        ('core', '0001_initial'),
     ]
     operations = [
@@ -26,9 +26,10 @@ class Migration(migrations.Migration):
                 ('file_type', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='topic_files', to='core.MimeType', verbose_name='Type file')),
             ],
             options={
+                'verbose_name': 'File',
+
                 'verbose_name_plural': 'Files',
                 'ordering': ('-id',),
-                'verbose_name': 'File',
             },
             bases=('courses.material',),
         ),
 # -*- coding: utf-8 -*-
-# Generated by Django 1.10 on 2016-11-16 13:57
+
+# Generated by Django 1.10 on 2016-11-15 22:36
 from __future__ import unicode_literals
 from django.conf import settings
@@ -11,8 +12,8 @@ class Migration(migrations.Migration):
     initial = True
     dependencies = [
-        ('files', '0001_initial'),
         migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+        ('files', '0001_initial'),
     ]
     operations = [
 # -*- coding: utf-8 -*-
-# Generated by Django 1.10 on 2016-11-16 13:57
+
+# Generated by Django 1.10 on 2016-11-15 22:36
 from __future__ import unicode_literals
 from django.db import migrations, models
@@ -24,8 +25,8 @@ class Migration(migrations.Migration):
                 ('create_date', models.DateTimeField(auto_now_add=True, verbose_name='Create Date')),
             ],
             options={
-                'verbose_name_plural': 'Foruns',
                 'verbose_name': 'Forum',
+                'verbose_name_plural': 'Foruns',
             },
             bases=('courses.activity',),
         ),
@@ -38,8 +39,8 @@ class Migration(migrations.Migration):
                 ('post_date', models.DateTimeField(auto_now_add=True, verbose_name='Post Date')),
             ],
             options={
-                'verbose_name_plural': 'Posts',
                 'verbose_name': 'Post',
+                'verbose_name_plural': 'Posts',
             },
         ),
         migrations.CreateModel(
@@ -52,8 +53,8 @@ class Migration(migrations.Migration):
                 ('post', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='forum.Post', verbose_name='Post')),
             ],
             options={
-                'verbose_name_plural': 'Post Answers',
                 'verbose_name': 'Post Answer',
+                'verbose_name_plural': 'Post Answers',
             },
         ),
     ]
@@ -0,0 +1,35 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.10 on 2016-11-15 22:36
+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 = [
+        ('forum', '0001_initial'),
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+    ]
+
+    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'),
+        ),
+    ]
@@ -1,35 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.10 on 2016-11-16 13:57
-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 = [
-        ('forum', '0001_initial'),
-        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
-    ]
-
-    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'),
-        ),
-    ]
@@ -0,0 +1,35 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.10 on 2016-11-17 03:09
+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'),
+        ),
+    ]
 # -*- coding: utf-8 -*-
-# Generated by Django 1.10 on 2016-11-16 13:57
+# Generated by Django 1.10 on 2016-11-15 22:36
 from __future__ import unicode_literals
 from django.db import migrations, models
@@ -19,13 +19,13 @@ class Migration(migrations.Migration):
             name='Link',
             fields=[
                 ('material_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='courses.Material')),
-                ('link_url', models.URLField()),
-                ('link_description', models.CharField(max_length=200)),
+                ('link_url', models.URLField(verbose_name='Link_URL')),
+                ('link_description', models.CharField(max_length=200, verbose_name='Description')),
                 ('image', models.ImageField(blank=True, upload_to='links/')),
             ],
             options={
-                'verbose_name_plural': 'Links',
                 'verbose_name': 'Link',
+                'verbose_name_plural': 'Links',
             },
             bases=('courses.material',),
         ),
@@ -1,25 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.10 on 2016-11-16 16:38
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('links', '0001_initial'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='link',
-            name='link_description',
-            field=models.TextField(verbose_name='Description'),
-        ),
-        migrations.AlterField(
-            model_name='link',
-            name='link_url',
-            field=models.URLField(verbose_name='Link_URL'),
-        ),
-    ]
@@ -1,20 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.10 on 2016-11-16 16:40
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('links', '0002_auto_20161116_1338'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='link',
-            name='link_description',
-            field=models.TextField(max_length=200, verbose_name='Description'),
-        ),
-    ]
@@ -1,20 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.10 on 2016-11-16 16:41
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('links', '0003_auto_20161116_1340'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='link',
-            name='link_description',
-            field=models.CharField(max_length=200, verbose_name='Description'),
-        ),
-    ]
 # -*- coding: utf-8 -*-
-# Generated by Django 1.10 on 2016-11-16 13:57
+
+# Generated by Django 1.10 on 2016-11-15 22:36
 from __future__ import unicode_literals
 from django.db import migrations, models
@@ -23,9 +24,9 @@ class Migration(migrations.Migration):
                 ('order', models.PositiveSmallIntegerField(verbose_name='Order')),
             ],
             options={
-                'verbose_name_plural': 'Answers',
-                'ordering': ('order',),
                 'verbose_name': 'Answer',
+                'ordering': ('order',),
+                'verbose_name_plural': 'Answers',
             },
         ),
         migrations.CreateModel(
@@ -37,8 +38,8 @@ class Migration(migrations.Migration):
                 ('answer', models.ManyToManyField(related_name='answers_stundet', to='poll.Answer', verbose_name='Answers Students')),
             ],
             options={
-                'verbose_name_plural': 'Answers Student',
                 'verbose_name': 'Answer Stundent',
+                'verbose_name_plural': 'Answers Student',
             },
         ),
         migrations.CreateModel(
@@ -47,8 +48,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_plural': 'Polls',
                 'verbose_name': 'Poll',
+                'verbose_name_plural': 'Polls',
             },
             bases=('courses.activity',),
         ),
@@ -0,0 +1,30 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.10 on 2016-11-15 22:36
+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),
+        ('poll', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='answersstudent',
+            name='student',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='answers_stundent', to=settings.AUTH_USER_MODEL, verbose_name='Student'),
+        ),
+        migrations.AddField(
+            model_name='answer',
+            name='poll',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='answers', to='poll.Poll', verbose_name='Answers'),
+        ),
+    ]
@@ -1,30 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.10 on 2016-11-16 13:57
-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 = [
-        ('poll', '0001_initial'),
-        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='answersstudent',
-            name='student',
-            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='answers_stundent', to=settings.AUTH_USER_MODEL, verbose_name='Student'),
-        ),
-        migrations.AddField(
-            model_name='answer',
-            name='poll',
-            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='answers', to='poll.Poll', verbose_name='Answers'),
-        ),
-    ]
@@ -0,0 +1,30 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.10 on 2016-11-17 03:09
+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),
+        ('poll', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='answersstudent',
+            name='student',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='answers_stundent', to=settings.AUTH_USER_MODEL, verbose_name='Student'),
+        ),
+        migrations.AddField(
+            model_name='answer',
+            name='poll',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='answers', to='poll.Poll', verbose_name='Answers'),
+        ),
+    ]
 # -*- coding: utf-8 -*-
-# Generated by Django 1.10 on 2016-11-16 13:57
+
+# Generated by Django 1.10 on 2016-11-15 22:36
 from __future__ import unicode_literals
 import django.contrib.auth.models
@@ -30,14 +31,14 @@ class Migration(migrations.Migration):
                 ('city', models.CharField(blank=True, max_length=90, verbose_name='City')),
                 ('state', models.CharField(blank=True, max_length=30, verbose_name='State')),
                 ('gender', models.CharField(choices=[('M', 'Male'), ('F', 'Female')], max_length=1, verbose_name='Gender')),
-                ('image', models.ImageField(blank=True, null=True, upload_to='users/', verbose_name='Photo')),
-                ('birth_date', models.DateField(null=True, verbose_name='Birth Date')),
+                ('image', models.ImageField(blank=True, null=True, upload_to='users/', verbose_name='Image')),
+                ('birth_date', models.DateField(verbose_name='Birth Date')),
                 ('phone', models.CharField(blank=True, max_length=30, verbose_name='Phone')),
-                ('cpf', models.CharField(blank=True, max_length=15, null=True, verbose_name='CPF')),
+                ('cpf', models.CharField(max_length=15, verbose_name='Cpf')),
                 ('type_profile', models.IntegerField(blank=True, choices=[(1, 'Professor'), (2, 'Student')], default=2, null=True, verbose_name='Type')),
                 ('titration', models.CharField(blank=True, max_length=50, null=True, verbose_name='Titration')),
                 ('year_titration', models.CharField(blank=True, max_length=4, null=True, verbose_name='Year of titration')),
-                ('institution', models.CharField(blank=True, max_length=50, null=True, verbose_name='Institution')),
+                ('institution', models.CharField(blank=True, max_length=50, null=True, verbose_name='Institution where he had titration')),
                 ('curriculum', models.FileField(blank=True, null=True, upload_to='users/curriculum/', verbose_name='Curriculum')),
                 ('date_created', models.DateTimeField(auto_now_add=True, verbose_name='Create Date')),
                 ('is_staff', models.BooleanField(default=False, verbose_name='Administrador')),
@@ -46,8 +47,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_plural': 'Users',
                 'verbose_name': 'User',
+                'verbose_name_plural': 'Users',
             },
             managers=[
                 ('objects', django.contrib.auth.models.UserManager()),
@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.10 on 2016-11-15 22:41
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('users', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='user',
+            name='birth_date',
+            field=models.DateField(null=True, verbose_name='Birth Date'),
+        ),
+    ]
@@ -0,0 +1,30 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.10 on 2016-11-15 23:54
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('users', '0002_auto_20161115_1941'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='user',
+            name='cpf',
+            field=models.CharField(blank=True, max_length=15, null=True, verbose_name='CPF'),
+        ),
+        migrations.AlterField(
+            model_name='user',
+            name='image',
+            field=models.ImageField(blank=True, null=True, upload_to='users/', verbose_name='Photo'),
+        ),
+        migrations.AlterField(
+            model_name='user',
+            name='institution',
+            field=models.CharField(blank=True, max_length=50, null=True, verbose_name='Institution'),
+        ),
+    ]
@@ -0,0 +1,20 @@		@@ -0,0 +1,20 @@
	1	+# -- coding: utf-8 --
	2	+# Generated by Django 1.10 on 2016-11-15 23:54
	3	+from __future__ import unicode_literals
	4	+
	5	+from django.db import migrations, models
	6	+
	7	+
	8	+class Migration(migrations.Migration):
	9	+
	10	+ dependencies = [
	11	+ ('app', '0001_initial'),
	12	+ ]
	13	+
	14	+ operations = [
	15	+ migrations.AlterField(
	16	+ model_name='emailbackend',
	17	+ name='default_from_email',
	18	+ field=models.EmailField(max_length=254, verbose_name='Default from email'),
	19	+ ),
	20	+ ]
@@ -0,0 +1,50 @@		@@ -0,0 +1,50 @@
	1	+# -- coding: utf-8 --
	2	+# Generated by Django 1.10 on 2016-11-15 22:36
	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='Performer'),
	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,50 +0,0 @@	@@ -1,50 +0,0 @@
1	-# -- coding: utf-8 --
2	-# Generated by Django 1.10 on 2016-11-16 13:57
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	- ('core', '0001_initial'),
16	- migrations.swappable_dependency(settings.AUTH_USER_MODEL),
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='Performer'),
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	- ]
@@ -0,0 +1,85 @@		@@ -0,0 +1,85 @@
	1	+# -- coding: utf-8 --
	2	+# Generated by Django 1.10 on 2016-11-15 22:36
	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='subject',
	22	+ name='professors',
	23	+ field=models.ManyToManyField(related_name='professors_subjects', to=settings.AUTH_USER_MODEL, verbose_name='Professors'),
	24	+ ),
	25	+ migrations.AddField(
	26	+ model_name='subject',
	27	+ name='students',
	28	+ field=models.ManyToManyField(blank=True, related_name='subject_student', to=settings.AUTH_USER_MODEL, verbose_name='Students'),
	29	+ ),
	30	+ migrations.AddField(
	31	+ model_name='material',
	32	+ name='students',
	33	+ field=models.ManyToManyField(related_name='materials', to=settings.AUTH_USER_MODEL, verbose_name='Students'),
	34	+ ),
	35	+ migrations.AddField(
	36	+ model_name='material',
	37	+ name='topic',
	38	+ field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='materials', to='courses.Topic', verbose_name='Topic'),
	39	+ ),
	40	+ migrations.AddField(
	41	+ model_name='linkmaterial',
	42	+ name='material',
	43	+ field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='material_link', to='courses.Material', verbose_name='Material'),
	44	+ ),
	45	+ migrations.AddField(
	46	+ model_name='filematerial',
	47	+ name='material',
	48	+ field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='material_file', to='courses.Material', verbose_name='Material'),
	49	+ ),
	50	+ migrations.AddField(
	51	+ model_name='course',
	52	+ name='category',
	53	+ field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='course_category', to='courses.CourseCategory', verbose_name='Category'),
	54	+ ),
	55	+ migrations.AddField(
	56	+ model_name='course',
	57	+ name='coordenator',
	58	+ field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='course_coordenator', to=settings.AUTH_USER_MODEL, verbose_name='Coordenator'),
	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(blank=True, related_name='courses_student', to=settings.AUTH_USER_MODEL, verbose_name='Students'),
	69	+ ),
	70	+ migrations.AddField(
	71	+ model_name='activityfile',
	72	+ name='diet',
	73	+ field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='files', to='courses.Activity'),
	74	+ ),
	75	+ migrations.AddField(
	76	+ model_name='activity',
	77	+ name='students',
	78	+ field=models.ManyToManyField(related_name='activities', to=settings.AUTH_USER_MODEL, verbose_name='Students'),
	79	+ ),
	80	+ migrations.AddField(
	81	+ model_name='activity',
	82	+ name='topic',
	83	+ field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='activities', to='courses.Topic', verbose_name='Topic'),
	84	+ ),
	85	+ ]
	@@ -1,85 +0,0 @@	@@ -1,85 +0,0 @@
1	-# -- coding: utf-8 --
2	-# Generated by Django 1.10 on 2016-11-16 13:57
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	- ('courses', '0001_initial'),
17	- ]
18	-
19	- operations = [
20	- migrations.AddField(
21	- model_name='subject',
22	- name='professors',
23	- field=models.ManyToManyField(related_name='professors_subjects', to=settings.AUTH_USER_MODEL, verbose_name='Professors'),
24	- ),
25	- migrations.AddField(
26	- model_name='subject',
27	- name='students',
28	- field=models.ManyToManyField(blank=True, related_name='subject_student', to=settings.AUTH_USER_MODEL, verbose_name='Students'),
29	- ),
30	- migrations.AddField(
31	- model_name='material',
32	- name='students',
33	- field=models.ManyToManyField(related_name='materials', to=settings.AUTH_USER_MODEL, verbose_name='Students'),
34	- ),
35	- migrations.AddField(
36	- model_name='material',
37	- name='topic',
38	- field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='materials', to='courses.Topic', verbose_name='Topic'),
39	- ),
40	- migrations.AddField(
41	- model_name='linkmaterial',
42	- name='material',
43	- field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='material_link', to='courses.Material', verbose_name='Material'),
44	- ),
45	- migrations.AddField(
46	- model_name='filematerial',
47	- name='material',
48	- field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='material_file', to='courses.Material', verbose_name='Material'),
49	- ),
50	- migrations.AddField(
51	- model_name='course',
52	- name='category',
53	- field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='course_category', to='courses.CourseCategory', verbose_name='Category'),
54	- ),
55	- migrations.AddField(
56	- model_name='course',
57	- name='coordenator',
58	- field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='course_coordenator', to=settings.AUTH_USER_MODEL, verbose_name='Coordenator'),
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(blank=True, related_name='courses_student', to=settings.AUTH_USER_MODEL, verbose_name='Students'),
69	- ),
70	- migrations.AddField(
71	- model_name='activityfile',
72	- name='diet',
73	- field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='files', to='courses.Activity'),
74	- ),
75	- migrations.AddField(
76	- model_name='activity',
77	- name='students',
78	- field=models.ManyToManyField(related_name='activities', to=settings.AUTH_USER_MODEL, verbose_name='Students'),
79	- ),
80	- migrations.AddField(
81	- model_name='activity',
82	- name='topic',
83	- field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='activities', to='courses.Topic', verbose_name='Topic'),
84	- ),
85	- ]
@@ -0,0 +1,75 @@		@@ -0,0 +1,75 @@
	1	+# -- coding: utf-8 --
	2	+# Generated by Django 1.10 on 2016-11-17 03:09
	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	+ ('courses', '0001_initial'),
	17	+ ]
	18	+
	19	+ operations = [
	20	+ migrations.AddField(
	21	+ model_name='subject',
	22	+ name='professors',
	23	+ field=models.ManyToManyField(related_name='professors_subjects', to=settings.AUTH_USER_MODEL, verbose_name='Professors'),
	24	+ ),
	25	+ migrations.AddField(
	26	+ model_name='subject',
	27	+ name='students',
	28	+ field=models.ManyToManyField(blank=True, related_name='subject_student', to=settings.AUTH_USER_MODEL, verbose_name='Students'),
	29	+ ),
	30	+ migrations.AddField(
	31	+ model_name='material',
	32	+ name='students',
	33	+ field=models.ManyToManyField(related_name='materials', to=settings.AUTH_USER_MODEL, verbose_name='Students'),
	34	+ ),
	35	+ migrations.AddField(
	36	+ model_name='material',
	37	+ name='topic',
	38	+ field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='materials', to='courses.Topic', verbose_name='Topic'),
	39	+ ),
	40	+ migrations.AddField(
	41	+ model_name='linkmaterial',
	42	+ name='material',
	43	+ field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='material_link', to='courses.Material', verbose_name='Material'),
	44	+ ),
	45	+ migrations.AddField(
	46	+ model_name='filematerial',
	47	+ name='material',
	48	+ field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='material_file', to='courses.Material', verbose_name='Material'),
	49	+ ),
	50	+ migrations.AddField(
	51	+ model_name='course',
	52	+ name='category',
	53	+ field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='course_category', to='courses.CourseCategory', verbose_name='Category'),
	54	+ ),
	55	+ migrations.AddField(
	56	+ model_name='course',
	57	+ name='coordenator',
	58	+ field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='course_coordenator', to=settings.AUTH_USER_MODEL, verbose_name='Coordenator'),
	59	+ ),
	60	+ migrations.AddField(
	61	+ model_name='activityfile',
	62	+ name='diet',
	63	+ field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='files', to='courses.Activity'),
	64	+ ),
	65	+ migrations.AddField(
	66	+ model_name='activity',
	67	+ name='students',
	68	+ field=models.ManyToManyField(related_name='activities', to=settings.AUTH_USER_MODEL, verbose_name='Students'),
	69	+ ),
	70	+ migrations.AddField(
	71	+ model_name='activity',
	72	+ name='topic',
	73	+ field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='activities', to='courses.Topic', verbose_name='Topic'),
	74	+ ),
	75	+ ]
	@@ -63,33 +63,6 @@		@@ -63,33 +63,6 @@
63	</ul>	63	</ul>
64	</div>	64	</div>
65	</div>	65	</div>
66	- <div class="col-xs-4 col-md-4">
67	- <div class="resource_inline">
68	- <h4>{% trans 'Exercises' %}</h4>
69	- </div>
70	- <div class="resource_inline">
71	- {# dropdown de create exercício #}
72	- <div class="dropdown">
73	- <a href="#" type="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><i class="fa fa-plus-circle fa-lg" aria-hidden="true"></i></a>
74	- <ul class="dropdown-menu" aria-labelledby="dLabel">
75	- <li><a href="javascript:modal.get('{% url 'course:exercise:create_exercise' topic.slug %}', '#createExercisesModal','#requisicoes_ajax')">{% trans 'Create a Exercise' %}</a></li>
76	- </ul>
77	- </div>
78	- </div>
79	- <div class="presentation_{{exercise.slug}}">
80	- {# exercício do tópico no modo de visualização #}
81	- <ul>
82	- {% list_topic_exercise request %}
83	- </ul>
84	- </div>
85	- <div class="editation editation_{{exercise.slug}}">
86	- {# exercício do tópico no modo de edição #}
87	- <ul>
88	- {% list_topic_exercise_edit request exercise %}
89	- </ul>
90	- </div>
91	- </div>
92	- {% include "exercise/create_exercise.html" %}
93	</div>	66	</div>
94	{% endif %}	67	{% endif %}
95		68
@@ -0,0 +1,38 @@		@@ -0,0 +1,38 @@
	1	+{% extends 'subject/index.html' %}
	2	+
	3	+{% load static i18n permission_tags widget_tweaks %}
	4	+
	5	+{% block content %}
	6	+
	7	+ <div class="panel panel-default">
	8	+ <div class="panel-body">
	9	+ <form class="form-group " method="post" action="">
	10	+ {% csrf_token %}
	11	+
	12	+ <div class="form-group {% if topic.name.errors %} has-error{% endif %}">
	13	+ <label for="id_name" class="control-label label-static"> {% trans 'Name'%}</label>
	14	+ <textarea class="form-control" id="id_name" maxlength="100" rows="1" name="name" placeholder="Name" type="text" required >{{topic.name}}</textarea>
	15	+
	16	+ <span class="help-block">{% trans 'Topic name'%}</span>
	17	+ </div>
	18	+ <div class="form-group {% if topic.description.errors %} has-error{% endif %}">
	19	+ <label for="id_description" class="control-label label-static"> {% trans 'Description'%}</label>
	20	+ <textarea class="form-control" id="id_description" name="description" placeholder="Description" type="text"> {{topic.description}}</textarea>
	21	+
	22	+ <span class="help-block">{% trans 'Topic description'%}</span>
	23	+ </div>
	24	+
	25	+ <div class="col-lg-offset-4 col-lg-4">
	26	+ <button type="submit" class="btn btn-raised btn-primary btn-lg btn-block">{% trans 'Create' %}</button>
	27	+
	28	+ </div>
	29	+ </form>
	30	+ </div>
	31	+ </div>
	32	+
	33	+ <script type="text/javascript">
	34	+ $(document).ready(function() {
	35	+ $('#id_description').summernote({height: 300});
	36	+ });
	37	+ </script>
	38	+{% endblock content %}
	@@ -1,38 +0,0 @@	@@ -1,38 +0,0 @@
1	-{% extends 'subject/index.html' %}
2	-
3	-{% load static i18n permission_tags widget_tweaks %}
4	-
5	-{% block content %}
6	-
7	- <div class="panel panel-default">
8	- <div class="panel-body">
9	- <form class="form-group " method="post" action="">
10	- {% csrf_token %}
11	-
12	- <div class="form-group {% if topic.name.errors %} has-error{% endif %}">
13	- <label for="id_name" class="control-label label-static"> {% trans 'Name'%}</label>
14	- <input class="form-control" id="id_name" maxlength="100" name="name" placeholder="Name" type="text" value={{topic.name}} required />
15	-
16	- <span class="help-block">{% trans 'Topic name'%}</span>
17	- </div>
18	- <div class="form-group {% if topic.description.errors %} has-error{% endif %}">
19	- <label for="id_description" class="control-label label-static"> {% trans 'Description'%}</label>
20	- <textarea class="form-control" id="id_description" name="description" placeholder="Description" type="text"> {{topic.description}}</textarea>
21	-
22	- <span class="help-block">{% trans 'Topic description'%}</span>
23	- </div>
24	-
25	- <div class="col-lg-offset-4 col-lg-4">
26	- <button type="submit" class="btn btn-raised btn-primary btn-lg btn-block">{% trans 'Create' %}</button>
27	-
28	- </div>
29	- </form>
30	- </div>
31	- </div>
32	-
33	- <script type="text/javascript">
34	- $(document).ready(function() {
35	- $('#id_description').summernote({height: 300});
36	- });
37	- </script>
38	-{% endblock content %}
	@@ -0,0 +1,28 @@		@@ -0,0 +1,28 @@
		1	+{% load static i18n list_topic_foruns permission_tags widget_tweaks professor_access%}
		2	+
		3	+
		4	+<div class="row">
		5	+ <div class="col-xs-6 col-md-6">
		6	+ <div class="resource_inline">
		7	+ <h4>{% trans "Materials" %}</h4>
		8	+ </div>
		9	+
		10	+ <ul id="list-materials">
		11	+ {% list_topic_file request topic %}
		12	+ {% list_topic_link request topic%}
		13	+
		14	+ </ul>
		15	+ </div>
		16	+ <div class="col-xs-6 col-md-6">
		17	+ <div class="resource_inline">
		18	+ <h4>{% trans "Activities" %}</h4>
		19	+ </div>
		20	+ <ul>
		21	+ <div class="foruns_list">
		22	+ {# {% list_topic_exam request topic %} #}
		23	+ {% list_topic_poll request topic %}
		24	+ {% list_topic_foruns request topic %}
		25	+ </div>
		26	+ </ul>
		27	+ </div>
		28	+</div>
0	\ No newline at end of file	29	\ No newline at end of file