diff --git a/amadeus/staticfiles/nothing.d41d8cd98f00.txt.py b/amadeus/staticfiles/nothing.d41d8cd98f00.txt.py new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/amadeus/staticfiles/nothing.d41d8cd98f00.txt.py diff --git a/amadeus/staticfiles/nothing.txt.py b/amadeus/staticfiles/nothing.txt.py new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/amadeus/staticfiles/nothing.txt.py diff --git a/amadeus/staticfiles/sample.c7b009bae842.txt.py b/amadeus/staticfiles/sample.c7b009bae842.txt.py new file mode 100644 index 0000000..318705b --- /dev/null +++ b/amadeus/staticfiles/sample.c7b009bae842.txt.py @@ -0,0 +1 @@ +XXXX XXXX XXX XXXXXXX XX XXXX XXXXXXXX XX XXXXXXX \ No newline at end of file diff --git a/amadeus/staticfiles/sample.txt.py b/amadeus/staticfiles/sample.txt.py new file mode 100644 index 0000000..318705b --- /dev/null +++ b/amadeus/staticfiles/sample.txt.py @@ -0,0 +1 @@ +XXXX XXXX XXX XXXXXXX XX XXXX XXXXXXXX XX XXXXXXX \ No newline at end of file diff --git a/app/migrations/0001_initial.py b/app/migrations/0001_initial.py index 16d951c..52af05e 100644 --- a/app/migrations/0001_initial.py +++ b/app/migrations/0001_initial.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Generated by Django 1.10 on 2016-11-15 22:36 +# Generated by Django 1.10 on 2016-11-16 13:57 from __future__ import unicode_literals from django.db import migrations, models @@ -23,11 +23,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(blank=True, max_length=254, verbose_name='Default from email')), + ('default_from_email', models.EmailField(max_length=254, verbose_name='Default from email')), ], options={ - 'verbose_name': 'Amadeus SMTP setting', 'verbose_name_plural': 'Amadeus SMTP settings', + 'verbose_name': 'Amadeus SMTP setting', }, ), ] diff --git a/app/migrations/0002_auto_20161115_2054.py b/app/migrations/0002_auto_20161115_2054.py deleted file mode 100644 index 0a8a21f..0000000 --- a/app/migrations/0002_auto_20161115_2054.py +++ /dev/null @@ -1,20 +0,0 @@ -# -*- 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'), - ), - ] diff --git a/core/migrations/0001_initial.py b/core/migrations/0001_initial.py index f2fc78f..a649a33 100644 --- a/core/migrations/0001_initial.py +++ b/core/migrations/0001_initial.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Generated by Django 1.10 on 2016-11-15 22:36 +# Generated by Django 1.10 on 2016-11-16 13:57 from __future__ import unicode_literals import autoslug.fields @@ -25,8 +25,8 @@ class Migration(migrations.Migration): ('created_date', models.DateTimeField(auto_now_add=True, verbose_name='Created Date')), ], options={ - 'verbose_name': 'Action', 'verbose_name_plural': 'Actions', + 'verbose_name': 'Action', }, ), migrations.CreateModel( @@ -35,8 +35,8 @@ class Migration(migrations.Migration): ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), ], options={ - 'verbose_name': 'Action_Resource', 'verbose_name_plural': 'Action_Resources', + 'verbose_name': 'Action_Resource', }, ), migrations.CreateModel( @@ -48,8 +48,8 @@ class Migration(migrations.Migration): ('datetime', models.DateTimeField(auto_now_add=True, verbose_name='Date and Time of action')), ], options={ - 'verbose_name': 'Log', 'verbose_name_plural': 'Logs', + 'verbose_name': 'Log', }, ), migrations.CreateModel( @@ -60,8 +60,8 @@ class Migration(migrations.Migration): ('icon', models.CharField(max_length=50, unique=True, verbose_name='Icon')), ], options={ - 'verbose_name': 'Amadeus Mime Type', 'verbose_name_plural': 'Amadeus Mime Types', + 'verbose_name': 'Amadeus Mime Type', }, ), migrations.CreateModel( @@ -74,8 +74,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': 'Notification', 'verbose_name_plural': 'Notifications', + 'verbose_name': 'Notification', }, ), migrations.CreateModel( @@ -88,8 +88,8 @@ class Migration(migrations.Migration): ('url', models.CharField(default='', max_length=100, verbose_name='URL')), ], options={ - 'verbose_name': 'Resource', 'verbose_name_plural': 'Resources', + 'verbose_name': 'Resource', }, ), ] diff --git a/core/migrations/0002_auto_20161115_1936.py b/core/migrations/0002_auto_20161115_1936.py deleted file mode 100644 index 084112a..0000000 --- a/core/migrations/0002_auto_20161115_1936.py +++ /dev/null @@ -1,50 +0,0 @@ -# -*- 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'), - ), - ] diff --git a/core/migrations/0002_auto_20161116_1057.py b/core/migrations/0002_auto_20161116_1057.py new file mode 100644 index 0000000..fb95529 --- /dev/null +++ b/core/migrations/0002_auto_20161116_1057.py @@ -0,0 +1,50 @@ +# -*- 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'), + ), + ] diff --git a/courses/migrations/0001_initial.py b/courses/migrations/0001_initial.py index d1a8c9f..9f9535f 100644 --- a/courses/migrations/0001_initial.py +++ b/courses/migrations/0001_initial.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Generated by Django 1.10 on 2016-11-15 22:36 +# Generated by Django 1.10 on 2016-11-16 13:57 from __future__ import unicode_literals import autoslug.fields @@ -34,8 +34,8 @@ class Migration(migrations.Migration): ('name', models.CharField(max_length=100)), ], options={ - 'verbose_name': 'Activity File', 'verbose_name_plural': 'Activitys Files', + 'verbose_name': 'Activity File', }, ), migrations.CreateModel( @@ -47,8 +47,8 @@ class Migration(migrations.Migration): ('create_date', models.DateTimeField(auto_now_add=True, verbose_name='Creation Date')), ], options={ - 'verbose_name': 'Category', 'verbose_name_plural': 'Categories', + 'verbose_name': 'Category', }, ), migrations.CreateModel( @@ -68,9 +68,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 +82,8 @@ class Migration(migrations.Migration): ('create_date', models.DateTimeField(auto_now_add=True, verbose_name='Creation Date')), ], options={ - 'verbose_name': 'Category', 'verbose_name_plural': 'Categories', + 'verbose_name': 'Category', }, ), migrations.CreateModel( @@ -127,9 +127,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 +142,8 @@ class Migration(migrations.Migration): ('subjects', models.ManyToManyField(to='courses.Subject')), ], options={ - 'verbose_name': 'subject category', 'verbose_name_plural': 'subject categories', + 'verbose_name': 'subject category', }, ), migrations.CreateModel( @@ -159,9 +159,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', }, ), ] diff --git a/courses/migrations/0002_auto_20161115_1936.py b/courses/migrations/0002_auto_20161115_1936.py deleted file mode 100644 index f3dfad1..0000000 --- a/courses/migrations/0002_auto_20161115_1936.py +++ /dev/null @@ -1,85 +0,0 @@ -# -*- 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'), - ), - ] diff --git a/courses/migrations/0002_auto_20161116_1057.py b/courses/migrations/0002_auto_20161116_1057.py new file mode 100644 index 0000000..22e8263 --- /dev/null +++ b/courses/migrations/0002_auto_20161116_1057.py @@ -0,0 +1,85 @@ +# -*- 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'), + ), + ] diff --git a/exam/migrations/0001_initial.py b/exam/migrations/0001_initial.py index c6f9857..0416aa8 100644 --- a/exam/migrations/0001_initial.py +++ b/exam/migrations/0001_initial.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Generated by Django 1.10 on 2016-11-15 22:36 +# Generated by Django 1.10 on 2016-11-16 13:57 from __future__ import unicode_literals from django.db import migrations, models @@ -23,9 +23,9 @@ class Migration(migrations.Migration): ('order', models.PositiveSmallIntegerField(verbose_name='Order')), ], options={ - 'verbose_name': 'Answer', 'verbose_name_plural': 'Answers', 'ordering': ('order',), + 'verbose_name': 'Answer', }, ), migrations.CreateModel( @@ -37,8 +37,8 @@ class Migration(migrations.Migration): ('answer', models.ManyToManyField(related_name='student_answer', to='exam.Answer', verbose_name='Answers Students')), ], options={ - 'verbose_name': 'Answer Stundent', 'verbose_name_plural': 'Answers Student', + 'verbose_name': 'Answer Stundent', }, ), migrations.CreateModel( @@ -49,8 +49,8 @@ class Migration(migrations.Migration): ('exibe', models.BooleanField(default=False, verbose_name='Exibe?')), ], options={ - 'verbose_name': 'Exam', 'verbose_name_plural': 'Exams', + 'verbose_name': 'Exam', }, bases=('courses.activity',), ), diff --git a/exam/migrations/0002_auto_20161115_1936.py b/exam/migrations/0002_auto_20161115_1936.py deleted file mode 100644 index 893c18b..0000000 --- a/exam/migrations/0002_auto_20161115_1936.py +++ /dev/null @@ -1,30 +0,0 @@ -# -*- 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'), - ), - ] diff --git a/exam/migrations/0002_auto_20161116_1057.py b/exam/migrations/0002_auto_20161116_1057.py new file mode 100644 index 0000000..8469b01 --- /dev/null +++ b/exam/migrations/0002_auto_20161116_1057.py @@ -0,0 +1,30 @@ +# -*- 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'), + ), + ] diff --git a/exercise/migrations/0001_initial.py b/exercise/migrations/0001_initial.py index 592f56a..cdee935 100644 --- a/exercise/migrations/0001_initial.py +++ b/exercise/migrations/0001_initial.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Generated by Django 1.10 on 2016-11-15 22:36 +# Generated by Django 1.10 on 2016-11-16 13:57 from __future__ import unicode_literals from django.db import migrations, models diff --git a/exercise/templates/exercise/create_exercise.html.py b/exercise/templates/exercise/create_exercise.html.py new file mode 100644 index 0000000..93569fd --- /dev/null +++ b/exercise/templates/exercise/create_exercise.html.py @@ -0,0 +1,83 @@ +BBBB BBBBBBBBBBBBB BBBB BBBBBB +XXXXXXXXX XXXXXX XXXXXXXXXXX +XXXX XXXXXXXXXXXX XXXXX XXXXXXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXX XXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX + XXXX XXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXX + XXXX XXXXXXXXXXXXXXXXXXXXXX + XXXX XXXXXXXXXXXXXXXXXXXXX + XXXXXXX XXXXXXXXXXXXX XXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX + XXX XXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXX gettext(u'Create a New Exercise') XXXXX + XXXXXX + XXXX XXXXXXXXXXXXXXXXXXX + XXXX XXXX XXX + XXXXX XXXXXXXXXXXXX XXXXXXXXX XXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXX + BBBBBBBBBB + BB BBBBBBBB + BBB BBBBBBB BB BBBBBBBB + XXXX XXXXXXXXXXXX XXXXXX XXXXXXXXXXXXXXXXXX XXXXXXXXXXXXX + XXXXXXX XXXXXXXXXXXXX XXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXX + XXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX + XXXXXXXXX + XXXXXXX + XXXXXX + BBBBBB + BBBBB + BBB BBBBB BB BBBB + XXXX XXXXX XXXXXXXXXXXXXX + BB BBBBBBBBBBBBBBBBBBBB + XXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXX + BBBBB + BBBBBBBBBBBB BBBBB BBBBBBBBBBBBBBBBBBB BBBBBBBBB + BB BBBBBBBBBBBB + XXXX XXXXXXXXXXXX XXXXXXXXXXXX XXXXXXXXXXXXXXXXX XXXXXXXXX XXXXXXXXXXXXX + XXXXXXX XXXXXXXXXXXXX XXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXX + XXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX + XXXXXXXXX + XXXX + BBB BBBBB BB BBBBBBBBBBBB + XXXXXXXXX + BBBBBB + XXXXX + XXXXXX + BBBBB + XXXXXX + BBBBBB + XXXX XXXXXXXXXXXXXXXXXXX + XXXXXXX XXXXXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXXX X XXXXXXXXXXXXXXXXXXXXX gettext(u'Cancel') XXXXXXXXX + XXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXXXX XXXXXXXXXXXXXX gettext(u'Submit') XXXXXXXXX + XXXXXX + XXXX XXXX XXXX XXX + XXXXXX + XXXXXX + XXXXXX +XXXXXX +XXXX XXXXXXXX XXX +XXXXXXX XXXXXBBBBBB BBBBBBBBBBBBBBBBBXXXXXXXXXXX +XXXXXXX XXXXXXXXXXXXXXXXXXXXXXX + XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX X + XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX + XXX XXXX X XXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX + XXXXXXXX + XXXX XBBB BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB BBBBBBBBBBXX + XXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX + XXXXX XXXXX + XXXXXX XXXXXX + XXXXXXXXXXXX XXXXXX + XXXXXXXXXXXX XXXXXX + XXXXXXXX XXXXXXXXXXXXXX X + XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX + XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX + XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX + XXXXXXXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXX XXXXXXXXXX + XX + XXXXXX XXXXXXXXXXXXXXX + XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX + XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX + XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX + XXXXXXXXXXXXXXXXXXXXXXX XXXXXXXXX XXXXXX X XXXXX XXXXXXX + XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX + XXXXXXXXXXXXXXXXXXX XX X XXXXXXXXXXXXXXXXXXX XX XXXXXX + X + XXX + XXXXXXXXXXXXXXXXXXXXXXX + XXX +XXXXXXXXX diff --git a/exercise/templates/exercise/delete_exercise.html.py b/exercise/templates/exercise/delete_exercise.html.py new file mode 100644 index 0000000..c829ca1 --- /dev/null +++ b/exercise/templates/exercise/delete_exercise.html.py @@ -0,0 +1,66 @@ +BBBB BBBBBB BBBBBBBBBBBBB BBBB + +XXXX XXXXX XXXXXX XXXX XXX +XXXXXXXXX XXXXXXXXXXXXXXXX XXXXXXXXXXXXXXX XXXXXXBBBBBB BBBBBBBBBBBBBBBBBBXX + +XXXX XXXXXXXXXXXXXXXXXXXX + XXXX XXXXXXXXXXXX XXXXX XXXXXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXX XXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXX XXXX + XXXX XXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXX + XXXX XXXXXXXXXXXXXXXXXXXXXX + XXXX XXXXXXXXXXXXXXXXXXXXX + XXXXXXX XXXXXXXXXXXXX XXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX + XXX XXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXX gettext(u'Delete Exercise') XXXXX + XXXXXX + XXXX XXXXXXXXXXXXXXXXXXX + XXXX XXXX XXX + XXXXX XXXXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXX + BBBBBBBBBB + XXXXXXXXXX + XXXX XXXXXXXXXXXXXXXXXX + gettext(u'Are you sure to delete the exercise ') XXXXXXXXXXXXXXXXXXX XXXX XX X + XXXXXX + XXXX XXXXXXXXXXXXXXXXXXX + XXXX XXXXXXXXXXXXXXXXXX + XXXXXXX XXXXXXXXXXXXX XXXXXXXXXX XXXXXXXXXXX XXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXX gettext(u'Close') XXXXXXXXX + XXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXXXX XXXXXXXXXXXXXX gettext(u'Delete') XXXXXXXXX + XXXXXX + XXXXXX + XXXXXXXXXXX + XXXXXXX + XXXX XXXX XXXX XXX + XXXXXX + XXXXXX + XXXXXX + XXXXXX +XXXXXX + XXXXXXX XXXXXBBBBBB BBBBBBBBBBBBBBBBXXXXXXXXXXX + XXXXXXX XXXXXXXXXXXXXXXXXXXXXXX + XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX X + XXX XXXX X XXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX + XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX + XXXXXXXX + XXXX XBBB BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB BBBBBBBBBBBBBXX + XXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX + XXXXX XXXXX + XXXXXX XXXXXX + XXXXXXXXXXXX XXXXXX + XXXXXXXXXXXX XXXXXX + XXXXXXXX XXXXXXXXXXXXXX X + XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX + XXXXXXXXXXXXXXXXXXXXXXXXX + XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX + XXXXXXXXXXXXXXXXXXXXXXXXXXXXXX + XXXXXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXX XXXXXXXXXX + XX + XXXXXX XXXXXXXXXXXXXXX + XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX + XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX + XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX + XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX + XXXXXXXXXXXXXXXXXXXXX XXXX XXXXXX XX XXXXXXXXXX + X + XXX + XXXXXXXXXXXXXXXXXXXXXXX + XXX + XXXXXXXXX +XXXX XXXXXXXX XXX diff --git a/exercise/templates/exercise/exercise_edit.html.py b/exercise/templates/exercise/exercise_edit.html.py new file mode 100644 index 0000000..2c5937c --- /dev/null +++ b/exercise/templates/exercise/exercise_edit.html.py @@ -0,0 +1,7 @@ +BBBB BBBBBB BBBB BBBBBBBBBBBBBBBBB BBBBBBBBBBBBBBB +XXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX + BBB BBBBBBBB BB BBBBBBBBB + XXX XXXXXXXXXXXXXXXXXXXXXXXX XX X XXXXXXXXXXXXXXXXXXXXXX XX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXX XXXXXXXXX XXXXXXXXX XXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXX XX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXX XXXXXXXXX XXXXXXXX XXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX + XXX XX X XXXXXXXXXXXXXXXXXXX XXXXXXXXX XXXXXXXX XXXXXXXXXXXXXXXXXXXXXXX XX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX + BBBBBB +XXXXXX diff --git a/exercise/templates/exercise/exercise_list.html.py b/exercise/templates/exercise/exercise_list.html.py new file mode 100644 index 0000000..9fcd85a --- /dev/null +++ b/exercise/templates/exercise/exercise_list.html.py @@ -0,0 +1,6 @@ +BBBB BBBBBB BBBB BBBBBBBBBBBBBBBBB BBBBBBBBBBBBBBB +XXXX XXXXXXXXXXXXXXXXXXXXXXXXXX +BBB BBBBBBBB BB BBBBBBBBB + XXX XXXXXXXXXXXXXXXXX XXXXXXXXX XXXXXXXX XXXXXXXXXXXXXXXXXXXXXXX XX XXXXXXXXXXXXXXXXX +BBBBBB +XXXXXX diff --git a/files/migrations/0001_initial.py b/files/migrations/0001_initial.py index ec27f7a..37ae1bc 100644 --- a/files/migrations/0001_initial.py +++ b/files/migrations/0001_initial.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Generated by Django 1.10 on 2016-11-15 22:36 +# Generated by Django 1.10 on 2016-11-16 13:57 from __future__ import unicode_literals from django.db import migrations, models @@ -12,8 +12,8 @@ class Migration(migrations.Migration): initial = True dependencies = [ - ('courses', '0001_initial'), ('core', '0001_initial'), + ('courses', '0001_initial'), ] operations = [ @@ -26,9 +26,9 @@ 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',), ), diff --git a/files/migrations/0002_topicfile_professor.py b/files/migrations/0002_topicfile_professor.py index ffe048e..3b45d27 100644 --- a/files/migrations/0002_topicfile_professor.py +++ b/files/migrations/0002_topicfile_professor.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Generated by Django 1.10 on 2016-11-15 22:36 +# Generated by Django 1.10 on 2016-11-16 13:57 from __future__ import unicode_literals from django.conf import settings @@ -11,8 +11,8 @@ class Migration(migrations.Migration): initial = True dependencies = [ - migrations.swappable_dependency(settings.AUTH_USER_MODEL), ('files', '0001_initial'), + migrations.swappable_dependency(settings.AUTH_USER_MODEL), ] operations = [ diff --git a/forum/migrations/0001_initial.py b/forum/migrations/0001_initial.py index 4479156..7559900 100644 --- a/forum/migrations/0001_initial.py +++ b/forum/migrations/0001_initial.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Generated by Django 1.10 on 2016-11-15 22:36 +# Generated by Django 1.10 on 2016-11-16 13:57 from __future__ import unicode_literals from django.db import migrations, models @@ -24,8 +24,8 @@ class Migration(migrations.Migration): ('create_date', models.DateTimeField(auto_now_add=True, verbose_name='Create Date')), ], options={ - 'verbose_name': 'Forum', 'verbose_name_plural': 'Foruns', + 'verbose_name': 'Forum', }, bases=('courses.activity',), ), @@ -38,8 +38,8 @@ class Migration(migrations.Migration): ('post_date', models.DateTimeField(auto_now_add=True, verbose_name='Post Date')), ], options={ - 'verbose_name': 'Post', 'verbose_name_plural': 'Posts', + 'verbose_name': 'Post', }, ), migrations.CreateModel( @@ -52,8 +52,8 @@ class Migration(migrations.Migration): ('post', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='forum.Post', verbose_name='Post')), ], options={ - 'verbose_name': 'Post Answer', 'verbose_name_plural': 'Post Answers', + 'verbose_name': 'Post Answer', }, ), ] diff --git a/forum/migrations/0002_auto_20161115_1936.py b/forum/migrations/0002_auto_20161115_1936.py deleted file mode 100644 index 5b45aa1..0000000 --- a/forum/migrations/0002_auto_20161115_1936.py +++ /dev/null @@ -1,35 +0,0 @@ -# -*- 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'), - ), - ] diff --git a/forum/migrations/0002_auto_20161116_1057.py b/forum/migrations/0002_auto_20161116_1057.py new file mode 100644 index 0000000..7fe59fd --- /dev/null +++ b/forum/migrations/0002_auto_20161116_1057.py @@ -0,0 +1,35 @@ +# -*- 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'), + ), + ] diff --git a/links/migrations/0001_initial.py b/links/migrations/0001_initial.py index 01407af..27dea66 100644 --- a/links/migrations/0001_initial.py +++ b/links/migrations/0001_initial.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Generated by Django 1.10 on 2016-11-15 22:36 +# Generated by Django 1.10 on 2016-11-16 13:57 from __future__ import unicode_literals from django.db import migrations, models @@ -24,8 +24,8 @@ class Migration(migrations.Migration): ('image', models.ImageField(blank=True, upload_to='links/')), ], options={ - 'verbose_name': 'Link', 'verbose_name_plural': 'Links', + 'verbose_name': 'Link', }, bases=('courses.material',), ), diff --git a/links/migrations/0002_auto_20161116_1338.py b/links/migrations/0002_auto_20161116_1338.py new file mode 100644 index 0000000..2fc271e --- /dev/null +++ b/links/migrations/0002_auto_20161116_1338.py @@ -0,0 +1,25 @@ +# -*- 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'), + ), + ] diff --git a/links/migrations/0003_auto_20161116_1340.py b/links/migrations/0003_auto_20161116_1340.py new file mode 100644 index 0000000..fd010f9 --- /dev/null +++ b/links/migrations/0003_auto_20161116_1340.py @@ -0,0 +1,20 @@ +# -*- 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'), + ), + ] diff --git a/links/migrations/0004_auto_20161116_1341.py b/links/migrations/0004_auto_20161116_1341.py new file mode 100644 index 0000000..2c15054 --- /dev/null +++ b/links/migrations/0004_auto_20161116_1341.py @@ -0,0 +1,20 @@ +# -*- 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'), + ), + ] diff --git a/links/templates/links/create_link.html.py b/links/templates/links/create_link.html.py deleted file mode 100644 index 4c77678..0000000 --- a/links/templates/links/create_link.html.py +++ /dev/null @@ -1,68 +0,0 @@ -BBBB BBBBBBBBBBBBB BBBB - -XXXXXXXXX XXXXXX XXXXXXX -XXXX XXXXXXXXXXXX XXXXX XXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXX XXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXX - XXXX XXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXX - XXXX XXXXXXXXXXXXXXXXXXXXXX - XXXX XXXXXXXXXXXXXXXXXXXXX - XXXXXXX XXXXXXXXXXXXX XXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX - XXX XXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXX gettext(u'Create a New Link') XXXXX - XXXXXX - XXXX XXXXXXXXXXXXXXXXXXX - XXXX XXXX XXX - XXXXX XXXXXXXXXXXXX XXXXXXXXX XXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXX - BBBBBBBBBB - BB BBBBBBBB - BBB BBBBBBB BB BBBBBBBB - XXXX XXXXXXXXXXXX XXXXXX XXXXXXXXXXXXXXXXXX XXXXXXXXXXXXX - XXXXXXX XXXXXXXXXXXXX XXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXX - XXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX - XXXXXXXXX - XXXXXXX - XXXXXX - BBBBBB - BBBBB - BBB BBBBB BB BBBB - BB BBBBBBBBBBBBBBBBBBBB - XXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXX - BBBB - XXXXXX XXXXXXXXXXXXXXX - BBBBB - BBBBBBBBBBBB BBBBB BBBBBBBBBBBBBBBBBBBB - BBBBBB - XXXX XXXXXXXXXXXXXXXXXXX - XX XXXXXXXXXXXXXXXXXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXX gettext(u'Cancel') XXXX - XXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXXXX XXXXXXXXXXXXXXXX XXXXX XXXXXXXX XXXXXXXXXXX - XXXXXX - XXXX XXXX XXXX XXX - XXXXXX - XXXXXX - XXXXXX -XXXXXX -XXXX XXXXXXXX XXX - - -XXXXXXX XXXXXXXXXXXXXXXXXXXXXXX - XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX X - XXX XXXX X XXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX - XXXXXXXX - XXXX XBBB BBBBBBBBBBBBBBBBBBBBBBBBBB BBBBBBBBBBXX - XXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX - XXXXX XXXXX - XXXXXX XXXXXX - XXXXXXXXXXXX XXXXXX - XXXXXXXXXXXX XXXXXX - XXXXXXXX XXXXXXXXXXXXXX X - XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX - XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX - XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX - XX - XXXXXX XXXXXXXXXXXXXXX - XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX - XXXXXXXXXXXXXXXXXXXXXXXXXXXXXX - XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX - X - XXX - XXXXXXXXXXXXXXXXXXXXXXX - XXX -XXXXXXXXX diff --git a/links/templates/links/delete_link.html.py b/links/templates/links/delete_link.html.py deleted file mode 100644 index 98652fb..0000000 --- a/links/templates/links/delete_link.html.py +++ /dev/null @@ -1,22 +0,0 @@ -BBBB BBBBBBBBBBBBB BBBB -XXXX XXXXX XXXXXX XXXX XXX -XXXX XXXXXXXXXXXXX XXXXXXXXXXXXXXXX - XXXX XXXXXXXXXXXXXXXXXXXXX - XXXX XXXXXXXXXXXXXXXXXXXXXX - XXXX XXXXXXXXXXXXXXXXXXXXX - XXXXXXX XXXXXXXXXXXXX XXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXX - XXX XXXXXXXXXXXXXXXXXXXXXXXXX - XXXXXX - XXXX XXXXXXXXXXXXXXXXXXX - XXX gettext(u'Do you really want to delete this link?') XXXX - XXXXXX - XXXX XXXXXXXXXXXXXXXXXXXXX - XXXX XXX - XXXXXXX XXXXXXXXXXXXX XXXXXXXXXX XXXXXXXXXXX XXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXX gettext(u'Cancel') XXXXXXXXX - XX XXXXXXXXXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXX XXXXXXXXXX XXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXX gettext(u'Confirm') XXXXXXXXXXXXX - - XXXXXX - XXXXXX - XXXXXX -XXXXXX -XXXX XXX XXX diff --git a/links/templates/links/render_link.html.py b/links/templates/links/render_link.html.py deleted file mode 100644 index 6beff40..0000000 --- a/links/templates/links/render_link.html.py +++ /dev/null @@ -1 +0,0 @@ -XXXXXX XXXXXXXXX XXXXXXXX XXXXXXXXXXXXXXXXXXXXXXX XX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXBBB BBBBBBBBBBBBBBBBBBBBBBBB BBBBBBBBBXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX diff --git a/links/templates/links/update_link.html.py b/links/templates/links/update_link.html.py deleted file mode 100644 index d5d106a..0000000 --- a/links/templates/links/update_link.html.py +++ /dev/null @@ -1,33 +0,0 @@ -BBBB BBBBBBBBBBBBB BBBB -XXXX XXXXX XXXX XXXXXXX -XXXX XXXXXXXXXXXX XXXXX XXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXX XXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX - XXXX XXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXX - XXXX XXXXXXXXXXXXXXXXXXXXXX - XXXX XXXXXXXXXXXXXXXXXXXXX - XXXXXXX XXXXXXXXXXXXX XXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX - XXX XXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXX gettext(u'Links') XXXXX - XXXXXX - XXXX XXXXXXXXXXXXXXXXXXX - XXXX XXXX XXX - XXXX XXXXXXXXXXXXXXXXXXX - XXXXXX XXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXX gettext(u'Name') XXXXXXXX - XXXXXX XXXXXXXXXXXXXX XXXXXXXXXXX XXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXX - XXXXXX - XXXX XXXXXXXXXXXXXXXXXXX - XXXXXX XXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXX gettext(u'URL') XXXXXXXX - XXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXX XXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXX - XXXXXX - XXXX XXXXXXXXXXXXXXXXX XXXXXXXXXX - XXXXXX XXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXX gettext(u'Descrição') XXXXXXXX - XXXXXXXXX XXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXX - XXXXXX - XXXX XXXXXXXXXXXXXXXXXXX - XX XXXXXXXXXXXXXXXXXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXX gettext(u'Cancel') XXXX - XX XXXXXXXXXXXXXXXXXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXXXXX gettext(u'Submit') XXXX - XXXXXX - XXXX XXXX XXXX XXX - XXXXXX - XXXXXX - XXXXXX -XXXXXX -XXXX XXXXXXXX XXX diff --git a/links/templates/links/view_link.html.py b/links/templates/links/view_link.html.py deleted file mode 100644 index 72ff5a8..0000000 --- a/links/templates/links/view_link.html.py +++ /dev/null @@ -1,32 +0,0 @@ -BBBB BBBBBB BBBB BBBBBBBBBBBBBBBBB BBBBBBBBBBBBBBB -XXXXXXXXX XXXX XXXXXXX -XXXX XXXXXXXXXXXX XXXXX XXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXX XXXXXXXXXXXXX XXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX - XXXX XXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXX - XXXX XXXXXXXXXXXXXXXXXXXXXX - XXXX XXXXXXXXXXXXXXXXXXXXX - XXXXXXX XXXXXXXXXXXXX XXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX - XXX XXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXX gettext(u'Link') XXXXX - XXXXXX - XXXX XXXXXXXXXXXXXXXXXXX - XXXX XXXX XXX - XXXXXXXX XXXXXXXXXXX XXXXXXXX XXXXXXXXXXXX - XXXX XXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXX - XXXX XXXXXXXXXXXXXXXXXXX - XX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXX - XX XXXXXXXXXXXXXXXXXX XXXXXXXXXXX - XX XXXXXXX XXXXXXXXXX XXXXXXXXXXXXX gettext(u'Read more') XXXX - XXXXXX - XXXXXXXXXX - XXXX XXXX XXXX XXX - XXXXXX - XXXXXX - XXXXXX -XXXXXX - -XXXX XXXXX X XXXXX XX XXXXXXXXXXXXXXXX - -XXXXXX -XXXX XXXXXXXX XXX -XXXXXXX XXXXXXXXXXXXXXXXXXXXXXX -XXXXXXXXXXXXXXXXXXXXXXXXXXXXXX -XXXXXXXXX diff --git a/poll/migrations/0001_initial.py b/poll/migrations/0001_initial.py index fb1dcba..fe7d8cd 100644 --- a/poll/migrations/0001_initial.py +++ b/poll/migrations/0001_initial.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Generated by Django 1.10 on 2016-11-15 22:36 +# Generated by Django 1.10 on 2016-11-16 13:57 from __future__ import unicode_literals from django.db import migrations, models @@ -23,9 +23,9 @@ class Migration(migrations.Migration): ('order', models.PositiveSmallIntegerField(verbose_name='Order')), ], options={ - 'verbose_name': 'Answer', 'verbose_name_plural': 'Answers', 'ordering': ('order',), + 'verbose_name': 'Answer', }, ), migrations.CreateModel( @@ -37,8 +37,8 @@ class Migration(migrations.Migration): ('answer', models.ManyToManyField(related_name='answers_stundet', to='poll.Answer', verbose_name='Answers Students')), ], options={ - 'verbose_name': 'Answer Stundent', 'verbose_name_plural': 'Answers Student', + 'verbose_name': 'Answer Stundent', }, ), migrations.CreateModel( @@ -47,8 +47,8 @@ class Migration(migrations.Migration): ('activity_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='courses.Activity')), ], options={ - 'verbose_name': 'Poll', 'verbose_name_plural': 'Polls', + 'verbose_name': 'Poll', }, bases=('courses.activity',), ), diff --git a/poll/migrations/0002_auto_20161115_1936.py b/poll/migrations/0002_auto_20161115_1936.py deleted file mode 100644 index 9febe70..0000000 --- a/poll/migrations/0002_auto_20161115_1936.py +++ /dev/null @@ -1,30 +0,0 @@ -# -*- 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'), - ), - ] diff --git a/poll/migrations/0002_auto_20161116_1057.py b/poll/migrations/0002_auto_20161116_1057.py new file mode 100644 index 0000000..f75c537 --- /dev/null +++ b/poll/migrations/0002_auto_20161116_1057.py @@ -0,0 +1,30 @@ +# -*- 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'), + ), + ] diff --git a/users/migrations/0001_initial.py b/users/migrations/0001_initial.py index c1a29a5..e3183c6 100644 --- a/users/migrations/0001_initial.py +++ b/users/migrations/0001_initial.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Generated by Django 1.10 on 2016-11-15 22:36 +# Generated by Django 1.10 on 2016-11-16 13:57 from __future__ import unicode_literals import django.contrib.auth.models @@ -30,14 +30,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='Image')), - ('birth_date', models.DateField(verbose_name='Birth Date')), + ('image', models.ImageField(blank=True, null=True, upload_to='users/', verbose_name='Photo')), + ('birth_date', models.DateField(null=True, verbose_name='Birth Date')), ('phone', models.CharField(blank=True, max_length=30, verbose_name='Phone')), - ('cpf', models.CharField(max_length=15, verbose_name='Cpf')), + ('cpf', models.CharField(blank=True, max_length=15, null=True, 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 where he had titration')), + ('institution', models.CharField(blank=True, max_length=50, null=True, verbose_name='Institution')), ('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 +46,8 @@ class Migration(migrations.Migration): ('user_permissions', models.ManyToManyField(blank=True, help_text='Specific permissions for this user.', related_name='user_set', related_query_name='user', to='auth.Permission', verbose_name='user permissions')), ], options={ - 'verbose_name': 'User', 'verbose_name_plural': 'Users', + 'verbose_name': 'User', }, managers=[ ('objects', django.contrib.auth.models.UserManager()), diff --git a/users/migrations/0002_auto_20161115_1941.py b/users/migrations/0002_auto_20161115_1941.py deleted file mode 100644 index 808788e..0000000 --- a/users/migrations/0002_auto_20161115_1941.py +++ /dev/null @@ -1,20 +0,0 @@ -# -*- 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'), - ), - ] diff --git a/users/migrations/0003_auto_20161115_2054.py b/users/migrations/0003_auto_20161115_2054.py deleted file mode 100644 index a1f229c..0000000 --- a/users/migrations/0003_auto_20161115_2054.py +++ /dev/null @@ -1,30 +0,0 @@ -# -*- 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'), - ), - ] -- libgit2 0.21.2