diff --git a/app/locale/he_il/LC_MESSAGES/django.po b/app/locale/he_il/LC_MESSAGES/django.po new file mode 100644 index 0000000..cdb3a09 --- /dev/null +++ b/app/locale/he_il/LC_MESSAGES/django.po @@ -0,0 +1,178 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2016-09-16 02:41-0300\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME \n" +"Language-Team: LANGUAGE \n" +"Language: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#: app/templates/app/base.html:10 +msgid "The Project" +msgstr "" + +#: app/templates/app/base.html:11 +msgid "CCTE Group" +msgstr "" + +#: app/templates/app/base.html:14 +msgid "Hi" +msgstr "" + +#: app/templates/app/base.html:16 +msgid "See Profile" +msgstr "" + +#: app/templates/app/base.html:17 +msgid "Settings" +msgstr "" + +#: app/templates/app/base.html:18 +msgid "Logout" +msgstr "" + +#: app/templates/app/index.html:6 +msgid "You have:" +msgstr "" + +#: app/templates/app/index.html:10 app/templates/home.html:88 +msgid "Pending Tasks" +msgstr "" + +#: app/templates/app/index.html:14 +msgid "Users Online" +msgstr "" + +#: app/templates/app/index.html:20 +msgid "You can:" +msgstr "" + +#: app/templates/app/index.html:24 app/templates/home_professor.html:25 +msgid "Create Course" +msgstr "" + +#: app/templates/app/index.html:29 app/templates/home.html:93 +msgid "Manage Users" +msgstr "" + +#: app/templates/app/index.html:33 app/templates/home.html:96 +msgid "Manage Courses" +msgstr "" + +#: app/templates/app/index.html:37 +msgid "Gerenciar Categorias" +msgstr "" + +#: app/templates/app/index.html:45 +msgid "Your course(s):" +msgstr "" + +#: app/templates/app/index.html:46 +msgid "No courses subscribed yet" +msgstr "" + +#: app/templates/app/index.html:56 +msgid "Search course:" +msgstr "" + +#: app/templates/app/index.html:62 +msgid "Search" +msgstr "" + +#: app/templates/app/index.html:67 +msgid "Most popular keywords:" +msgstr "" + +#: app/templates/home.html:86 +msgid "Home" +msgstr "" + +#: app/templates/home.html:87 app/templates/home_student.html:25 +msgid "Profile" +msgstr "" + +#: app/templates/home.html:90 +msgid "My courses" +msgstr "" + +#: app/templates/home.html:105 app/templates/home_professor.html:33 +msgid "Courses" +msgstr "" + +#: app/templates/home.html:131 +msgid "No pending tasks at the moment." +msgstr "" + +#: app/templates/home_admin_content.html:10 +msgid "Students" +msgstr "" + +#: app/templates/home_admin_content.html:11 +msgid "Beginning" +msgstr "" + +#: app/templates/home_admin_content.html:12 +msgid "End" +msgstr "" + +#: app/templates/home_admin_content.html:15 +msgid "Edit" +msgstr "" + +#: app/templates/home_professor.html:20 app/templates/home_student.html:21 +msgid "Menu" +msgstr "" + +#: app/templates/home_professor.html:24 +msgid "Pending tasks" +msgstr "" + +#: app/templates/home_professor.html:26 +msgid "Manage Course" +msgstr "" + +#: app/templates/home_professor.html:43 +msgid "Students:" +msgstr "" + +#: app/templates/home_professor.html:44 +msgid "Beginning:" +msgstr "" + +#: app/templates/home_professor.html:45 +msgid "End:" +msgstr "" + +#: app/templates/home_professor.html:52 +msgid "You didn't create any course yet." +msgstr "" + +#: app/templates/home_professor.html:58 app/templates/home_student.html:73 +msgid "Goals" +msgstr "" + +#: app/templates/home_student.html:26 +msgid "My Courses" +msgstr "" + +#: app/templates/home_student.html:27 +msgid "Google accounts" +msgstr "" + +#: app/templates/home_student.html:34 +msgid "Notifications" +msgstr "" + +#: app/templates/home_student.html:76 +msgid "Favorites" +msgstr "" diff --git a/core/locale/he_il/LC_MESSAGES/django.po b/core/locale/he_il/LC_MESSAGES/django.po new file mode 100644 index 0000000..28f25a0 --- /dev/null +++ b/core/locale/he_il/LC_MESSAGES/django.po @@ -0,0 +1,66 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2016-09-16 02:41-0300\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME \n" +"Language-Team: LANGUAGE \n" +"Language: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#: core/templates/base.html:97 +msgid "Log out" +msgstr "" + +#: core/templates/index.html:38 +msgid "Username" +msgstr "" + +#: core/templates/index.html:44 +msgid "Password" +msgstr "" + +#: core/templates/index.html:52 +msgid "Remember Email" +msgstr "" + +#: core/templates/index.html:61 +msgid "Guest" +msgstr "" + +#: core/templates/index.html:64 core/templates/register_user.html:71 +msgid "Login" +msgstr "" + +#: core/templates/index.html:73 +msgid "Sign Up" +msgstr "" + +#: core/templates/register_user.html:29 +msgid "User Register" +msgstr "" + +#: core/templates/register_user.html:68 +msgid "Save" +msgstr "" + +#: core/templates/remember_password.html:27 +msgid "E-mail" +msgstr "" + +#: core/templates/remember_password.html:31 +msgid "Registration" +msgstr "" + +#: core/templates/remember_password.html:35 +msgid "Send" +msgstr "" diff --git a/core/migrations/0001_initial.py b/core/migrations/0001_initial.py index 70c28e4..56fc2b1 100644 --- a/core/migrations/0001_initial.py +++ b/core/migrations/0001_initial.py @@ -1,9 +1,8 @@ # -*- coding: utf-8 -*- -# Generated by Django 1.10 on 2016-09-20 13:57 +# Generated by Django 1.10 on 2016-09-21 02:52 from __future__ import unicode_literals import autoslug.fields -from django.conf import settings from django.db import migrations, models import django.db.models.deletion @@ -13,7 +12,6 @@ class Migration(migrations.Migration): initial = True dependencies = [ - migrations.swappable_dependency(settings.AUTH_USER_MODEL), ] operations = [ @@ -25,19 +23,18 @@ class Migration(migrations.Migration): ('created_date', models.DateField(auto_now_add=True, verbose_name='Created Date')), ], options={ - 'verbose_name_plural': 'Actions', 'verbose_name': 'Action', + 'verbose_name_plural': 'Actions', }, ), migrations.CreateModel( name='Action_Resource', fields=[ ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('action', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='core.Action', verbose_name='Action_Applied')), ], options={ - 'verbose_name_plural': 'Action_Resources', 'verbose_name': 'Action_Resource', + 'verbose_name_plural': 'Action_Resources', }, ), migrations.CreateModel( @@ -45,12 +42,10 @@ class Migration(migrations.Migration): fields=[ ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), ('datetime', models.DateTimeField(auto_now_add=True, verbose_name='Date and Time of action')), - ('action_resource', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='core.Action_Resource', verbose_name='Action_Resource')), - ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL, verbose_name='Actor')), ], options={ - 'verbose_name_plural': 'Logs', 'verbose_name': 'Log', + 'verbose_name_plural': 'Logs', }, ), migrations.CreateModel( @@ -61,12 +56,10 @@ class Migration(migrations.Migration): ('read', models.BooleanField(default=False, verbose_name='Read')), ('datetime', models.DateTimeField(auto_now_add=True, verbose_name='Date and Time of action')), ('action_resource', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='core.Action_Resource', verbose_name='Action_Resource')), - ('actor', models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='notification_Performer', to=settings.AUTH_USER_MODEL, verbose_name='Perfomer')), - ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='notification_Actor', to=settings.AUTH_USER_MODEL, verbose_name='User')), ], options={ - 'verbose_name_plural': 'Notifications', 'verbose_name': 'Notification', + 'verbose_name_plural': 'Notifications', }, ), migrations.CreateModel( @@ -79,13 +72,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', }, ), - 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_20160920_2352.py b/core/migrations/0002_auto_20160920_2352.py new file mode 100644 index 0000000..ffadf72 --- /dev/null +++ b/core/migrations/0002_auto_20160920_2352.py @@ -0,0 +1,50 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.10 on 2016-09-21 02:52 +from __future__ import unicode_literals + +from django.conf import settings +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + initial = True + + dependencies = [ + migrations.swappable_dependency(settings.AUTH_USER_MODEL), + ('core', '0001_initial'), + ] + + operations = [ + migrations.AddField( + model_name='notification', + name='actor', + field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='notification_Performer', to=settings.AUTH_USER_MODEL, verbose_name='Perfomer'), + ), + migrations.AddField( + model_name='notification', + name='user', + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='notification_Actor', to=settings.AUTH_USER_MODEL, verbose_name='User'), + ), + migrations.AddField( + model_name='log', + name='action_resource', + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='core.Action_Resource', verbose_name='Action_Resource'), + ), + migrations.AddField( + model_name='log', + name='user', + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL, verbose_name='Actor'), + ), + migrations.AddField( + model_name='action_resource', + name='action', + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='core.Action', verbose_name='Action_Applied'), + ), + migrations.AddField( + model_name='action_resource', + name='resource', + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='core.Resource', verbose_name='Resource'), + ), + ] diff --git a/courses/locale/he_il/LC_MESSAGES/django.po b/courses/locale/he_il/LC_MESSAGES/django.po new file mode 100644 index 0000000..88ac3c8 --- /dev/null +++ b/courses/locale/he_il/LC_MESSAGES/django.po @@ -0,0 +1,229 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2016-09-16 02:41-0300\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME \n" +"Language-Team: LANGUAGE \n" +"Language: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#: courses/templates/category/create.html:8 +#: courses/templates/category/delete.html:7 +#: courses/templates/category/index.html:7 +#: courses/templates/category/update.html:8 +#: courses/templates/category/view.html:7 +#: courses/templates/course/create.html:8 +#: courses/templates/course/delete.html:7 courses/templates/course/home.html:8 +#: courses/templates/course/update.html:8 +#: courses/templates/course/view.html:39 +#: courses/templates/subject/index.html:8 +msgid "Home" +msgstr "" + +#: courses/templates/category/create.html:9 +#: courses/templates/category/delete.html:18 +#: courses/templates/category/index.html:18 +#: courses/templates/category/view.html:18 +msgid "Create Category" +msgstr "" + +#: courses/templates/category/create.html:16 +#: courses/templates/category/delete.html:15 +#: courses/templates/category/index.html:15 +#: courses/templates/category/update.html:16 +#: courses/templates/category/view.html:15 +msgid "Categories" +msgstr "" + +#: courses/templates/category/create.html:26 +#: courses/templates/category/update.html:26 +#: courses/templates/course/create.html:26 +#: courses/templates/course/update.html:32 +msgid "All fields are required" +msgstr "" + +#: courses/templates/category/create.html:51 +#: courses/templates/category/update.html:51 +#: courses/templates/course/create.html:51 +#: courses/templates/course/update.html:57 +msgid "Save" +msgstr "" + +#: courses/templates/category/delete.html:8 +#: courses/templates/category/index.html:8 +msgid "Manage Categories" +msgstr "" + +#: courses/templates/category/delete.html:26 +#: courses/templates/subject/delete.html:11 +msgid "Are you sure you want to delete the category" +msgstr "" + +#: courses/templates/category/delete.html:27 +#: courses/templates/course/delete.html:28 +#: courses/templates/subject/delete.html:12 +msgid "Yes" +msgstr "" + +#: courses/templates/category/delete.html:28 +#: courses/templates/course/delete.html:29 +#: courses/templates/subject/delete.html:13 +msgid "No" +msgstr "" + +#: courses/templates/category/index.html:38 +msgid "Name" +msgstr "" + +#: courses/templates/category/index.html:39 +msgid "Slug" +msgstr "" + +#: courses/templates/category/index.html:40 +msgid "Actions" +msgstr "" + +#: courses/templates/category/index.html:59 +msgid "No categories found" +msgstr "" + +#: courses/templates/category/update.html:9 +#: courses/templates/category/view.html:21 +msgid "Edit Category" +msgstr "" + +#: courses/templates/category/view.html:24 +msgid "Remove Category" +msgstr "" + +#: courses/templates/category/view.html:32 +msgid "Name:" +msgstr "" + +#: courses/templates/category/view.html:33 +msgid "Slug:" +msgstr "" + +#: courses/templates/course/create.html:9 +#: courses/templates/course/delete.html:18 +#: courses/templates/course/filtered.html:11 +#: courses/templates/course/index.html:19 +msgid "Create Course" +msgstr "" + +#: courses/templates/course/create.html:16 +#: courses/templates/course/delete.html:15 +#: courses/templates/course/filtered.html:8 +#: courses/templates/course/home.html:16 +#: courses/templates/course/index.html:16 +#: courses/templates/course/update.html:16 +#: courses/templates/course/view.html:48 +msgid "Courses" +msgstr "" + +#: courses/templates/course/delete.html:27 +msgid "Are you sure you want to delete the couse" +msgstr "" + +#: courses/templates/course/filtered.html:19 +#: courses/templates/course/index.html:27 +msgid "Categories:" +msgstr "" + +#: courses/templates/course/home.html:9 +msgid "Home Course" +msgstr "" + +#: courses/templates/course/index.html:81 +msgid "students tops" +msgstr "" + +#: courses/templates/course/index.html:87 +msgid "Subscribe Period:" +msgstr "" + +#: courses/templates/course/index.html:89 +msgid "Period:" +msgstr "" + +#: courses/templates/course/index.html:105 +msgid "No courses found" +msgstr "" + +#: courses/templates/course/update.html:9 +msgid "Edit Course" +msgstr "" + +#: courses/templates/course/update.html:19 +msgid "Manage Modules" +msgstr "" + +#: courses/templates/course/update.html:22 +msgid "Participants" +msgstr "" + +#: courses/templates/course/view.html:40 +msgid "Profile" +msgstr "" + +#: courses/templates/course/view.html:62 +msgid "Subjects" +msgstr "" + +#: courses/templates/course/view.html:85 +msgid "Professor" +msgstr "" + +#: courses/templates/course/view.html:88 +msgid "Description" +msgstr "" + +#: courses/templates/course/view.html:110 +#: courses/templates/subject/index.html:78 +msgid "Pending Stuffs" +msgstr "" + +#: courses/templates/course/view.html:113 +msgid "No pending tasks at the moment." +msgstr "" + +#: courses/templates/subject/create.html:20 +#: courses/templates/topic/create.html:20 +msgid "Create" +msgstr "" + +#: courses/templates/subject/form_view_teacher.html:10 +#: courses/templates/subject/index.html:47 +msgid "edit" +msgstr "" + +#: courses/templates/subject/index.html:10 +msgid "Manage Subjects" +msgstr "" + +#: courses/templates/subject/index.html:34 +msgid "Create Subject" +msgstr "" + +#: courses/templates/subject/index.html:52 +msgid "delete" +msgstr "" + +#: courses/templates/subject/index.html:71 +msgid "Create Topic" +msgstr "" + +#: courses/templates/subject/update.html:20 +#: courses/templates/topic/update.html:20 +msgid "Update" +msgstr "" diff --git a/courses/migrations/0001_initial.py b/courses/migrations/0001_initial.py index 7641011..631fabd 100644 --- a/courses/migrations/0001_initial.py +++ b/courses/migrations/0001_initial.py @@ -1,9 +1,8 @@ # -*- coding: utf-8 -*- -# Generated by Django 1.10 on 2016-09-20 13:57 +# Generated by Django 1.10 on 2016-09-21 02:52 from __future__ import unicode_literals import autoslug.fields -from django.conf import settings from django.db import migrations, models import django.db.models.deletion @@ -14,7 +13,6 @@ class Migration(migrations.Migration): dependencies = [ ('core', '0001_initial'), - migrations.swappable_dependency(settings.AUTH_USER_MODEL), ] operations = [ @@ -24,7 +22,6 @@ class Migration(migrations.Migration): ('resource_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='core.Resource')), ('create_date', models.DateTimeField(auto_now_add=True, verbose_name='Creation Date')), ('limit_date', models.DateTimeField(verbose_name='Deliver Date')), - ('student', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL, verbose_name='student')), ], bases=('core.resource',), ), @@ -56,14 +53,11 @@ class Migration(migrations.Migration): ('init_date', models.DateField(verbose_name='Begin of Course Date')), ('end_date', models.DateField(verbose_name='End of Course Date')), ('image', models.ImageField(blank=True, upload_to='courses/', verbose_name='Image')), - ('category', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='courses.Category', verbose_name='Category')), - ('professors', models.ManyToManyField(related_name='courses', to=settings.AUTH_USER_MODEL, verbose_name='Professors')), - ('students', models.ManyToManyField(related_name='courses_student', to=settings.AUTH_USER_MODEL, verbose_name='Students')), ], options={ + 'ordering': ('create_date', 'name'), 'verbose_name': 'Course', 'verbose_name_plural': 'Courses', - 'ordering': ('create_date', 'name'), }, ), migrations.CreateModel( @@ -71,7 +65,6 @@ class Migration(migrations.Migration): fields=[ ('resource_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='core.Resource')), ('create_date', models.DateTimeField(auto_now_add=True, verbose_name='Creation Date')), - ('student', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL, verbose_name='student')), ], bases=('core.resource',), ), @@ -87,13 +80,11 @@ class Migration(migrations.Migration): ('end_date', models.DateField(verbose_name='End of Subject Date')), ('create_date', models.DateTimeField(auto_now_add=True, verbose_name='Creation Date')), ('update_date', models.DateTimeField(auto_now=True, verbose_name='Date of last update')), - ('course', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='subjects', to='courses.Course', verbose_name='Course')), - ('professors', models.ManyToManyField(related_name='subjects', to=settings.AUTH_USER_MODEL, verbose_name='Professors')), ], options={ + 'ordering': ('create_date', 'name'), 'verbose_name': 'Subject', 'verbose_name_plural': 'Subjects', - 'ordering': ('create_date', 'name'), }, ), migrations.CreateModel( @@ -106,23 +97,11 @@ class Migration(migrations.Migration): ('create_date', models.DateTimeField(auto_now_add=True, verbose_name='Creation Date')), ('update_date', models.DateTimeField(auto_now=True, verbose_name='Date of last update')), ('visible', models.BooleanField(default=False, verbose_name='Visible')), - ('owner', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL, verbose_name='Owner')), - ('subject', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='courses.Subject', verbose_name='Subject')), ], options={ + 'ordering': ('create_date', 'name'), 'verbose_name': 'Topic', 'verbose_name_plural': 'Topics', - 'ordering': ('create_date', 'name'), }, ), - migrations.AddField( - model_name='material', - name='topic', - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='courses.Topic', verbose_name='Topic'), - ), - migrations.AddField( - model_name='activity', - name='topic', - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='courses.Topic', verbose_name='Topic'), - ), ] diff --git a/courses/migrations/0002_auto_20160920_2352.py b/courses/migrations/0002_auto_20160920_2352.py new file mode 100644 index 0000000..0c5a242 --- /dev/null +++ b/courses/migrations/0002_auto_20160920_2352.py @@ -0,0 +1,75 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.10 on 2016-09-21 02:52 +from __future__ import unicode_literals + +from django.conf import settings +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + initial = True + + dependencies = [ + ('courses', '0001_initial'), + migrations.swappable_dependency(settings.AUTH_USER_MODEL), + ] + + operations = [ + migrations.AddField( + model_name='topic', + name='owner', + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL, verbose_name='Owner'), + ), + migrations.AddField( + model_name='topic', + name='subject', + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='courses.Subject', verbose_name='Subject'), + ), + migrations.AddField( + model_name='subject', + name='course', + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='subjects', to='courses.Course', verbose_name='Course'), + ), + migrations.AddField( + model_name='subject', + name='professors', + field=models.ManyToManyField(related_name='subjects', to=settings.AUTH_USER_MODEL, verbose_name='Professors'), + ), + migrations.AddField( + model_name='material', + name='student', + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL, verbose_name='student'), + ), + migrations.AddField( + model_name='material', + name='topic', + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='courses.Topic', verbose_name='Topic'), + ), + migrations.AddField( + model_name='course', + name='category', + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='courses.Category', verbose_name='Category'), + ), + migrations.AddField( + model_name='course', + name='professors', + field=models.ManyToManyField(related_name='courses', to=settings.AUTH_USER_MODEL, verbose_name='Professors'), + ), + migrations.AddField( + model_name='course', + name='students', + field=models.ManyToManyField(related_name='courses_student', to=settings.AUTH_USER_MODEL, verbose_name='Students'), + ), + migrations.AddField( + model_name='activity', + name='student', + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL, verbose_name='student'), + ), + migrations.AddField( + model_name='activity', + name='topic', + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='courses.Topic', verbose_name='Topic'), + ), + ] diff --git a/forum/migrations/__init__.py b/forum/migrations/__init__.py deleted file mode 100644 index e69de29..0000000 --- a/forum/migrations/__init__.py +++ /dev/null diff --git a/users/admin.py b/users/admin.py index d1f55a1..65300fd 100644 --- a/users/admin.py +++ b/users/admin.py @@ -5,6 +5,6 @@ from .forms import UserForm class UserAdmin(admin.ModelAdmin): list_display = ['username', 'name', 'email', 'is_staff', 'is_active'] search_fields = ['username', 'name', 'email'] - form = UserForm + # form = UserForm admin.site.register(User, UserAdmin) \ No newline at end of file diff --git a/users/migrations/0001_initial.py b/users/migrations/0001_initial.py index 7652e23..faa9ff3 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-09-20 13:57 +# Generated by Django 1.10 on 2016-09-21 02:52 from __future__ import unicode_literals import django.contrib.auth.models -- libgit2 0.21.2