diff --git a/apps/common/__init__.py b/apps/common/__init__.py index 928a5d36b7..bc663d91d9 100644 --- a/apps/common/__init__.py +++ b/apps/common/__init__.py @@ -24,10 +24,9 @@ current_user_edit = {'text': _(u'edit details'), 'view': 'current_user_edit', 'f register_links(['current_user_details', 'current_user_edit', 'password_change_view'], [current_user_details, current_user_edit, password_change_view], menu_name='secondary_menu') about_view = {'text': _('about'), 'view': 'about_view', 'famfam': 'information'} -changelog_view = {'text': _('changelog'), 'view': 'changelog_view', 'famfam': 'book_open'} license_view = {'text': _('license'), 'view': 'license_view', 'famfam': 'script'} -register_links(['about_view', 'changelog_view', 'license_view'], [about_view, changelog_view, license_view], menu_name='secondary_menu') +register_links(['about_view', 'license_view'], [about_view, license_view], menu_name='secondary_menu') register_top_menu('about', link={'text': _(u'about'), 'view': 'about_view', 'famfam': 'information'}, position=-1) diff --git a/apps/common/forms.py b/apps/common/forms.py index 11d91d0c2c..1f6644cc1c 100644 --- a/apps/common/forms.py +++ b/apps/common/forms.py @@ -167,11 +167,6 @@ class FileDisplayForm(forms.Form): fd.close() -class ChangelogForm(FileDisplayForm): - FILENAME = u'changelog.rst' - DIRECTORY = u'docs' - - class LicenseForm(FileDisplayForm): FILENAME = u'LICENSE' DIRECTORY = u'docs' diff --git a/apps/common/urls.py b/apps/common/urls.py index 8ac491fbd5..844b490a50 100644 --- a/apps/common/urls.py +++ b/apps/common/urls.py @@ -4,7 +4,6 @@ from django.conf import settings urlpatterns = patterns('common.views', url(r'^about/$', direct_to_template, {'template': 'about.html'}, 'about_view'), - url(r'^changelog/$', 'changelog_view', (), 'changelog_view'), url(r'^license/$', 'license_view', (), 'license_view'), url(r'^password/change/done/$', 'password_change_done', (), name='password_change_done'), url(r'^object/multiple/action/$', 'multi_object_action_view', (), name='multi_object_action_view'), diff --git a/apps/common/views.py b/apps/common/views.py index 46aa782bad..fd5a81f1c8 100644 --- a/apps/common/views.py +++ b/apps/common/views.py @@ -12,8 +12,8 @@ from django.utils.http import urlencode from django.contrib.auth.views import login from django.utils.simplejson import dumps, loads -from .forms import (ChoiceForm, UserForm, UserForm_view, ChangelogForm, - LicenseForm, EmailAuthenticationForm) +from .forms import (ChoiceForm, UserForm, UserForm_view, LicenseForm, + EmailAuthenticationForm) from .conf.settings import LOGIN_METHOD @@ -216,19 +216,6 @@ def login_view(request): return login(request, extra_context=context, **kwargs) -def changelog_view(request): - """ - Display the included Changelog.txt file from the about menu - """ - form = ChangelogForm() - return render_to_response( - 'generic_detail.html', { - 'form': form, - 'title': _(u'Changelog'), - }, - context_instance=RequestContext(request)) - - def license_view(request): """ Display the included LICENSE file from the about menu diff --git a/apps/main/templates/project_description.html b/apps/main/templates/project_description.html index 8eb85f32d3..16a53de480 100644 --- a/apps/main/templates/project_description.html +++ b/apps/main/templates/project_description.html @@ -8,6 +8,9 @@
+ diff --git a/docs/releases/0.12.rst b/docs/releases/0.12.rst index e00b715aa4..0dda074160 100644 --- a/docs/releases/0.12.rst +++ b/docs/releases/0.12.rst @@ -1,6 +1,6 @@ -======================== +============================== Mayan EDMS v0.12 release notes -======================== +============================== *February 2012*