Remove Changelog view in the about menu, add documentation link to the about template

This commit is contained in:
Roberto Rosario
2012-01-25 04:27:38 -04:00
parent 7276a11171
commit aa1ea252d8
6 changed files with 8 additions and 25 deletions

View File

@@ -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)

View File

@@ -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'

View File

@@ -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'),

View File

@@ -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

View File

@@ -8,6 +8,9 @@
<p class="tc">
<span class="famfam active famfam-world_go"></span><a href="http://www.mayan-edms.com">http://www.mayan-edms.com</a>
</p>
<p class="tc">
<span class="famfam active famfam-book_open"></span><a href="http://readthedocs.org/docs/mayan/en/latest/">http://mayan.readthedocs.org/</a>
</p>
<p class="tc">
<span class="famfam active famfam-wrench"></span><a href="http://www.github.com/rosarior/mayan/">http://www.github.com/rosarior/mayan/</a>
</p>

View File

@@ -1,6 +1,6 @@
========================
==============================
Mayan EDMS v0.12 release notes
========================
==============================
*February 2012*