diff --git a/app/views.py b/app/views.py index 96c2795..d8b8bc4 100644 --- a/app/views.py +++ b/app/views.py @@ -35,7 +35,7 @@ class AppIndex(LoginRequiredMixin, ListView, NotificationMixin): else: context['page_template'] = "home_teacher_student_content.html" - context['title'] = _('Home | Amadeus') + context['title'] = _('Home') if self.request.is_ajax(): if self.request.user.is_staff: @@ -79,7 +79,7 @@ class AmadeusSettings(LoginRequiredMixin, HasRoleMixin, generic.CreateView): def get_context_data(self, **kwargs): context = super(AmadeusSettings, self).get_context_data(**kwargs) context['page'] = self.kwargs.get('page') - context['title'] = _('Settings | Amadeus') + context['title'] = _('Settings') if not self.request.method == 'POST': try: setting = EmailBackend.objects.latest('id') diff --git a/core/templates/base.html b/core/templates/base.html index b54cc56..41d5695 100644 --- a/core/templates/base.html +++ b/core/templates/base.html @@ -6,7 +6,7 @@ - {{ title }} + {{ title }} | Amadeus diff --git a/core/templates/guest.html b/core/templates/guest.html index cd3e203..f089698 100644 --- a/core/templates/guest.html +++ b/core/templates/guest.html @@ -5,7 +5,7 @@ - {{ title }} + {{ title }} | Amadeus diff --git a/core/views.py b/core/views.py index 3271b29..9b92332 100644 --- a/core/views.py +++ b/core/views.py @@ -58,6 +58,7 @@ def create_account(request): def login(request): context = {} + context['title'] = 'Log In' if request.POST: username = request.POST['username'] diff --git a/courses/views.py b/courses/views.py index e7c961c..a1f9c8f 100644 --- a/courses/views.py +++ b/courses/views.py @@ -101,7 +101,7 @@ class IndexView(LoginRequiredMixin, NotificationMixin, generic.ListView): translated = _('You searched for... ') context['categorys_courses'] = course_category(list_courses) - context['title'] = _('Courses | Amadeus') + context['title'] = _('Courses') if self.course_search: context['search'] = translated + self.course_search else: @@ -143,7 +143,7 @@ class AllCoursesView(LoginRequiredMixin, NotificationMixin, generic.ListView): list_courses = self.get_queryset() context['categorys_courses'] = course_category(list_courses) - context['title'] = _('All Courses | Amadeus') + context['title'] = _('All Courses') return context @@ -180,7 +180,7 @@ class CreateCourseView(LoginRequiredMixin, HasRoleMixin, LogMixin, NotificationM elif has_role(self.request.user,'professor'): courses = self.request.user.courses_student.all() context['courses'] = courses - context['title'] = _("Create Course | Amadeus") + context['title'] = _("Create Course") context['now'] = date.today() return context @@ -223,7 +223,7 @@ class ReplicateCourseView(LoginRequiredMixin, HasRoleMixin, LogMixin, Notificati context['courses'] = courses context['course'] = course context['categorys_courses'] = categorys_courses - context['title'] = _("Replicate Course | Amadeus") + context['title'] = _("Replicate Course") context['now'] = date.today() return context @@ -511,7 +511,7 @@ class IndexCatView(LoginRequiredMixin, generic.ListView): def get_context_data (self, **kwargs): context = super(IndexCatView, self).get_context_data(**kwargs) - context['title'] = _('Categories | Amadeus') + context['title'] = _('Categories') return context class CreateCatView(LoginRequiredMixin, HasRoleMixin, generic.edit.CreateView): @@ -530,7 +530,7 @@ class CreateCatView(LoginRequiredMixin, HasRoleMixin, generic.edit.CreateView): def get_context_data (self, **kwargs): context = super(CreateCatView, self).get_context_data(**kwargs) - context['title'] = _('Create Category | Amadeus') + context['title'] = _('Create Category') return context @@ -724,7 +724,7 @@ class CreateTopicView(LoginRequiredMixin, HasRoleMixin, LogMixin, NotificationMi context['course'] = subject.course context['subject'] = subject context['subjects'] = subject.course.subjects.all() - context['title'] = _('Create Topic | Amadeus') + context['title'] = _('Create Topic') return context def form_valid(self, form): @@ -824,7 +824,7 @@ class CreateSubjectView(LoginRequiredMixin, HasRoleMixin, LogMixin, Notification context['subjects'] = course.subjects.filter(Q(visible=True) | Q(professors__in=[self.request.user])) if (has_role(self.request.user,'system_admin')): context['subjects'] = course.subjects.all() - context['title'] = _('Create Subject | Amadeus') + context['title'] = _('Create Subject') return context def form_valid(self, form): diff --git a/users/views.py b/users/views.py index 27c8cec..ffb147a 100644 --- a/users/views.py +++ b/users/views.py @@ -47,7 +47,7 @@ class UsersListView(HasRoleMixin, LoginRequiredMixin, generic.ListView): def get_context_data (self, **kwargs): context = super(UsersListView, self).get_context_data(**kwargs) - context['title'] = 'Manage Users | Amadeus' + context['title'] = 'Manage Users' return context class Create(HasRoleMixin, LoginRequiredMixin, generic.edit.CreateView): @@ -77,7 +77,7 @@ class Create(HasRoleMixin, LoginRequiredMixin, generic.edit.CreateView): return super(Create, self).form_valid(form) def get_context_data (self, **kwargs): context = super(Create, self).get_context_data(**kwargs) - context['title'] = "Add User | Amadeus" + context['title'] = "Add User" return context class Update(HasRoleMixin, LoginRequiredMixin, generic.UpdateView): @@ -111,7 +111,7 @@ class Update(HasRoleMixin, LoginRequiredMixin, generic.UpdateView): def get_context_data (self, **kwargs): context = super(Update, self).get_context_data(**kwargs) - context['title'] = "Update User | Amadeus" + context['title'] = "Update User" return context class View(LoginRequiredMixin, generic.DetailView): @@ -126,7 +126,7 @@ class View(LoginRequiredMixin, generic.DetailView): def get_context_data (self, **kwargs): context = super(View, self).get_context_data(**kwargs) - context['title'] = "User | Amadeus" + context['title'] = "User" return context def delete_user(request,username): @@ -146,7 +146,7 @@ class Change_password(generic.TemplateView): def get_context_data (self, **kwargs): context = super(Change_password, self).get_context_data(**kwargs) - context['title'] = "Change Password | Amadeus" + context['title'] = "Change Password" return context class Remove_account(generic.TemplateView): @@ -154,7 +154,7 @@ class Remove_account(generic.TemplateView): def get_context_data (self, **kwargs): context = super(Remove_account, self).get_context_data(**kwargs) - context['title'] = "Remove Account | Amadeus" + context['title'] = "Remove Account" return context class UpdateProfile(LoginRequiredMixin, generic.edit.UpdateView): @@ -169,7 +169,7 @@ class UpdateProfile(LoginRequiredMixin, generic.edit.UpdateView): def get_context_data(self, **kwargs): context = super(UpdateProfile, self).get_context_data(**kwargs) - context['title'] = 'Update Profile | Amadeus' + context['title'] = 'Update Profile' if has_role(self.request.user, 'system_admin'): context['form'] = UpdateProfileFormAdmin(instance = self.object) else: @@ -207,7 +207,7 @@ class Profile(LoginRequiredMixin, generic.DetailView): def get_context_data (self, **kwargs): context = super(Profile, self).get_context_data(**kwargs) - context['title'] = "Profile | Amadeus" + context['title'] = "Profile" return context class SearchView(LoginRequiredMixin, generic.ListView): -- libgit2 0.21.2