diff --git a/editorsnotes/auth/templates/project_settings.html b/editorsnotes/auth/templates/project_settings.html new file mode 100644 index 00000000..a8f9fd19 --- /dev/null +++ b/editorsnotes/auth/templates/project_settings.html @@ -0,0 +1,16 @@ +{% extends "user_settings_base.html" %} + +{% block setting_content %} +

{{ project }}

+ +

Project settings

+ +

Project roster

+ +

Project roles

+ +

Download project archive

+ +

Delete project

+ +{% endblock %} diff --git a/editorsnotes/auth/templates/user_project_settings.html b/editorsnotes/auth/templates/user_project_settings.html index 07ffa705..41441861 100644 --- a/editorsnotes/auth/templates/user_project_settings.html +++ b/editorsnotes/auth/templates/user_project_settings.html @@ -8,7 +8,11 @@

Projects

Current projects

{% for project, role in user.get_affiliated_projects_with_roles %} -
{{ role }}: {{ project }}
+
+ + {{ project.name }} + ({{ role.role }}) +
{% empty %}

None

{% endfor %} diff --git a/editorsnotes/auth/urls.py b/editorsnotes/auth/urls.py index 6769ce77..95cd2915 100644 --- a/editorsnotes/auth/urls.py +++ b/editorsnotes/auth/urls.py @@ -31,7 +31,7 @@ url(r'^account/projects/$', views.user_project_settings, name='user_project_settings'), # Projects - url(r'^projects/(?P\w+)$', views.project_home, name='project_home'), + url(r'^account/projects/(?P\w+)$', views.project_settings, name='project_settings'), # Account creation things url(r'^account/create$', views.create_account, name='create_account'), diff --git a/editorsnotes/auth/views.py b/editorsnotes/auth/views.py index 35499415..61a26bde 100644 --- a/editorsnotes/auth/views.py +++ b/editorsnotes/auth/views.py @@ -2,12 +2,12 @@ from django.contrib.auth.decorators import login_required from django.contrib.auth.tokens import PasswordResetTokenGenerator from django.http import Http404 -from django.shortcuts import render_to_response, redirect +from django.shortcuts import render_to_response, redirect, get_object_or_404 from django.template import RequestContext from django.utils.http import urlsafe_base64_decode from .forms import ENUserCreationForm, UserProfileForm, ProjectForm -from .models import User +from .models import User, Project from .utils import send_activation_email @@ -111,8 +111,7 @@ def user_project_settings(request): # Add the user to the editor role project.roles.get().group.user_set.add(request.user) - - form = ProjectForm() + return redirect('auth:user_project_settings') else: form = ProjectForm() return render_to_response( @@ -125,7 +124,12 @@ def user_project_settings(request): @login_required -def project_home(request, project_slug): +def project_settings(request, project_slug): "View/change project name, slug, and roster." + project = get_object_or_404(Project, slug=project_slug) return render_to_response( - 'project_home.html', context_instance=RequestContext(request)) + 'project_settings.html', + { + 'project': project + }, + RequestContext(request))