--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app/soc/logic/models/club_member.py	Sun Jan 25 12:28:26 2009 +0000
@@ -0,0 +1,45 @@
+#!/usr/bin/python2.5
+#
+# Copyright 2008 the Melange authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+"""Club Member (Model) query functions.
+"""
+
+__authors__ = [
+  '"Lennard de Rijk" <ljvderijk@gmail.com>',
+  ]
+
+
+from soc.logic.models import role
+from soc.logic.models import club as club_logic
+
+import soc.models.club_member
+import soc.models.role
+
+
+class Logic(role.Logic):
+  """Logic methods for the Club Member model.
+  """
+
+  def __init__(self, model=soc.models.club_member.ClubMember,
+               base_model=soc.models.role.Role, scope_logic=club_logic):
+    """Defines the name, key_name and model for this entity.
+    """
+
+    super(Logic, self).__init__(model=model, base_model=base_model,
+                                scope_logic=scope_logic)
+
+
+logic = Logic()

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app/soc/models/club_member.py	Sun Jan 25 12:28:26 2009 +0000
@@ -0,0 +1,31 @@
+#!/usr/bin/python2.5
+#
+# Copyright 2008 the Melange authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+"""This module contains the Club Member Model."""
+
+__authors__ = [
+  '"Lennard de Rijk" <ljvderijk@gmail.com>',
+]
+
+
+import soc.models.role
+
+
+class ClubMember(soc.models.role.Role):
+  """Member of a specific Club.
+  """
+
+  pass

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app/soc/templates/soc/club_member/list/heading.html	Sun Jan 25 12:28:26 2009 +0000
@@ -0,0 +1,4 @@
+<tr align="left">
+  <th class="first" align="right">Club ID</th>
+  <th>Member ID</th>
+</tr>

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app/soc/templates/soc/club_member/list/row.html	Sun Jan 25 12:28:26 2009 +0000
@@ -0,0 +1,8 @@
+<tr class="off" onmouseover="this.className='on'" onmouseout="this.className='off'" 
+onclick="document.location.href='{{ list.redirect }}'" name="name">
+  <td align="right"><div class="name"><a class="noul"
+         href="{{ list.redirect }}">{{ list.item.scope_path }}</a>
+     </div>
+  </td>
+  <td><div class="link_id">{{ list.item.link_id }}</a></div></td>
+</tr>

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app/soc/templates/soc/club_member/public.html	Sun Jan 25 12:28:26 2009 +0000
@@ -0,0 +1,30 @@
+{% extends "soc/base.html" %}
+{% comment %}
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+{% endcomment %}
+{% load forms_helpers %}
+
+{% block header_title %}
+{{ page_name }} {{ entity.link_id }} for {{ entity.scope_path }}
+{% endblock %}
+
+{% block body %}
+<p>
+ <table>
+  {% readonly_field_as_table_row entity.fields.link_id.label entity.link_id %}
+  {% readonly_field_as_table_row entity.fields.display_name.label entity.display_name %}
+  {% readonly_field_as_table_row entity.fields.im_handle.label entity.im_handle %}
+  {% readonly_field_as_table_row entity.fields.res_country.label entity.res_country %}
+ </table>
+</p>
+{% endblock %}

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app/soc/views/models/club_member.py	Sun Jan 25 12:28:26 2009 +0000
@@ -0,0 +1,129 @@
+#!/usr/bin/python2.5
+#
+# Copyright 2008 the Melange authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+"""Views for Club Members.
+"""
+
+__authors__ = [
+    '"Lennard de Rijk" <ljvderijk@gmail.com>'
+  ]
+
+
+from django import forms
+
+from soc.logic import cleaning
+from soc.logic import dicts
+from soc.logic.models import club as club_logic
+from soc.views.helper import access
+from soc.views.helper import dynaform
+from soc.views.helper import widgets
+from soc.views.models import club as club_view
+from soc.views.models import role
+
+import soc.logic.models.club_member
+
+
+class View(role.View):
+  """View methods for the Club Member model.
+  """
+
+  def __init__(self, params=None):
+    """Defines the fields and methods required for the base View class
+    to provide the user with list, public, create, edit and delete views.
+
+    Params:
+      params: a dict with params for this View
+    """
+
+    rights = {}
+    rights['create'] = [access.checkIsDeveloper]
+    rights['edit'] = [access.checkIsMyActiveRole(soc.logic.models.club_member)]
+    rights['delete'] = [access.checkIsDeveloper]
+    rights['invite'] = [access.checkIsClubAdminForClub]
+    rights['accept_invite'] = [access.checkCanCreateFromRequest('club_member')]
+    rights['request'] = [access.checkAgreesToSiteToS, 
+        access.checkCanMakeRequestToGroup(club_logic)]
+    rights['process_request'] = [access.checkIsClubAdminForClub,
+        access.checkCanProcessRequest('club_member')]
+
+    new_params = {}
+    new_params['logic'] = soc.logic.models.club_member.logic
+    new_params['group_logic'] = club_logic.logic
+    new_params['rights'] = rights
+
+    new_params['scope_view'] = club_view
+
+    new_params['name'] = "Club Member"
+
+    new_params['extra_dynaexclude'] = ['user', 'state']
+
+    new_params['create_extra_dynafields'] = {
+       'scope_path': forms.CharField(widget=forms.HiddenInput,
+                                  required=True),
+       'clean_link_id' : cleaning.clean_existing_user('link_id'),
+       'clean_home_page' : cleaning.clean_url('home_page'),
+       'clean_blog' : cleaning.clean_url('blog'),
+       'clean_photo_url' : cleaning.clean_url('photo_url')}
+
+    new_params['allow_requests_and_invites'] = True
+
+    params = dicts.merge(params, new_params)
+
+    super(View, self).__init__(params=params)
+
+    # create and store the special form for invited users
+    updated_fields = {
+        'link_id': forms.CharField(widget=widgets.ReadOnlyInput(),
+            required=False)}
+
+    invited_create_form = dynaform.extendDynaForm(
+        dynaform = self._params['create_form'],
+        dynafields = updated_fields)
+
+    params['invited_create_form'] = invited_create_form
+
+  def _editPost(self, request, entity, fields):
+    """See base.View._editPost().
+    """
+    
+    if not entity:
+      fields['user'] = fields['link_id']
+      fields['link_id'] = fields['user'].link_id
+
+    super(View, self)._editPost(request, entity, fields)
+
+  def _acceptInvitePost(self, fields, request, context, params, **kwargs):
+    """Fills in the fields that were missing in the invited_created_form.
+    
+    For params see base.View._acceptInvitePost()
+    """
+    # fill in the appropriate fields that were missing in the form
+    fields['user'] = fields['link_id']
+    fields['link_id'] = fields['user'].link_id
+
+
+view = View()
+
+accept_invite = view.acceptInvite
+create = view.create
+delete = view.delete
+edit = view.edit
+invite = view.invite
+list = view.list
+process_request = view.processRequest
+request = view.request
+public = view.public
+export = view.export

--- a/app/soc/views/sitemap/build.py	Sun Jan 25 12:22:53 2009 +0000
+++ b/app/soc/views/sitemap/build.py	Sun Jan 25 12:28:26 2009 +0000
@@ -27,6 +27,7 @@
 from soc.views.models import club
 from soc.views.models import club_app
 from soc.views.models import club_admin
+from soc.views.models import club_member
 from soc.views.models import document
 from soc.views.models import host
 from soc.views.models import notification
@@ -46,6 +47,7 @@
 sidebar.addMenu(user_self.view.getSidebarMenus)
 sidebar.addMenu(club.view.getSidebarMenus)
 sidebar.addMenu(club_admin.view.getSidebarMenus)
+sidebar.addMenu(club_member.view.getSidebarMenus)
 sidebar.addMenu(club_app.view.getSidebarMenus)
 sidebar.addMenu(site.view.getSidebarMenus)
 sidebar.addMenu(user.view.getSidebarMenus)
@@ -60,6 +62,7 @@
 sitemap.addPages(club.view.getDjangoURLPatterns())
 sitemap.addPages(club_admin.view.getDjangoURLPatterns())
 sitemap.addPages(club_app.view.getDjangoURLPatterns())
+sitemap.addPages(club_member.view.getDjangoURLPatterns())
 sitemap.addPages(document.view.getDjangoURLPatterns())
 sitemap.addPages(host.view.getDjangoURLPatterns())
 sitemap.addPages(notification.view.getDjangoURLPatterns())