Major site restructuring, also deleting of many unused or obsolete documents
The new structure is as follows:
<entity>/list - list all <entitie>s
<entity>/create - create a new <entity>
<entity>/show/<key fields> - public page for <entity>
<entity>/edit/<key fields> - edit a <entity>
<entity>/delete/key fields> - delete a specific entity
--- a/app/soc/logic/key_name.py Wed Nov 05 23:33:22 2008 +0000
+++ b/app/soc/logic/key_name.py Wed Nov 05 23:36:28 2008 +0000
@@ -58,28 +58,36 @@
return 'Document:%s' % path
-def nameSiteSettings(path):
+def nameSiteSettings(partial_path, link_name):
"""Returns a SiteSettings key name constructed from a supplied path.
Raises:
Error if path is "False" (None, empty string, etc.)
"""
- if not path:
- raise Error('"path" must be non-False: "%s"' % path)
+
+ if not partial_path:
+ raise Error('"partial_path" must be non-False: "%s"' % partial_path)
- return nameHomeSettings(path, entity_type='SiteSettings')
+ if not link_name:
+ raise Error('"link_name" must be non-False: "%s"' % link_name)
+
+ return 'SiteSettings:%s:%s' % (partial_path, link_name)
-def nameHomeSettings(path, entity_type='HomeSettings'):
+def nameHomeSettings(partial_path, link_name):
"""Returns a HomeSettings key name constructed from a supplied path.
Raises:
Error if path is "False" (None, empty string, etc.)
"""
- if not path:
- raise Error('"path" must be non-False: "%s"' % path)
+
+ if not partial_path:
+ raise Error('"partial_path" must be non-False: "%s"' % partial_path)
- return '%s:%s' % (entity_type, path)
+ if not link_name:
+ raise Error('"link_name" must be non-False: "%s"' % link_name)
+
+ return 'HomeSettings:%s:%s' % (partial_path, link_name)
def nameUser(email):
--- a/app/soc/logic/models/site_settings.py Wed Nov 05 23:33:22 2008 +0000
+++ b/app/soc/logic/models/site_settings.py Wed Nov 05 23:36:28 2008 +0000
@@ -33,7 +33,8 @@
"""Logic methods for the SiteSettings model
"""
- DEF_SITE_SETTINGS_PATH = 'site'
+ DEF_SITE_SETTINGS_PARTIAL_PATH = 'site'
+ DEF_SITE_SETTINGS_LINK_NAME = 'home'
DEF_SITE_HOME_DOC_LINK_NAME = 'home'
def __init__(self):
--- a/app/soc/logic/site/map.py Wed Nov 05 23:33:22 2008 +0000
+++ b/app/soc/logic/site/map.py Wed Nov 05 23:36:28 2008 +0000
@@ -39,9 +39,10 @@
r'^$',
'soc.views.home.public',
kwargs={
- 'path': models.site_settings.logic.DEF_SITE_SETTINGS_PATH,
+ 'partial_path': models.site_settings.logic.DEF_SITE_SETTINGS_PARTIAL_PATH,
+ 'link_name': models.site_settings.logic.DEF_SITE_SETTINGS_LINK_NAME,
'entity_type': 'SiteSettings',
- 'template': 'soc/site/home/public.html',
+ 'template': 'soc/home/public.html',
}),
'Google Open Source Programs',
# it should be obvious that every page comes from the home page
@@ -87,30 +88,24 @@
parent=user_signout_sub_menu)
# User Profile views
-user_create = page.Page(
+user_self = page.Page(
page.Url(
- r'^user/profile$',
+ r'^user/edit$',
'soc.views.user.profile.create'),
- 'User: Create a New Profile',
+ 'User: Edit own User Profile',
short_name='Site-wide User Profile',
parent=user_signout_sub_menu)
-user_edit = page.Page(
- page.Url(
- r'^user/profile/%s$' % path_link_name.LINKNAME_ARG_PATTERN,
- 'soc.views.user.profile.edit'),
- 'User: Modify Existing User Profile',
- parent=user_signout)
-
# Site Home Page views
site_home = page.Page(
page.Url(
r'^site/home$',
'soc.views.home.public',
kwargs={
- 'path': models.site_settings.logic.DEF_SITE_SETTINGS_PATH,
+ 'partial_path': models.site_settings.logic.DEF_SITE_SETTINGS_PARTIAL_PATH,
+ 'link_name': models.site_settings.logic.DEF_SITE_SETTINGS_LINK_NAME,
'entity_type': 'SiteSettings',
- 'template': 'soc/site/home/public.html',
+ 'template': 'soc/home/public.html',
}),
'Google Open Source Programs',
# it should be obvious that every page comes from the home page
@@ -129,10 +124,11 @@
# Site User Profile views
site_settings_edit = page.Page(
page.Url(
- r'^site/settings/edit$',
+ r'^settings/edit$',
'soc.views.site.settings.edit',
kwargs={
- 'path': models.site_settings.logic.DEF_SITE_SETTINGS_PATH,
+ 'partial_path': models.site_settings.logic.DEF_SITE_SETTINGS_PARTIAL_PATH,
+ 'link_name': models.site_settings.logic.DEF_SITE_SETTINGS_LINK_NAME,
'logic': models.site_settings.logic,
}),
'Site: Settings',
@@ -148,7 +144,7 @@
site_user_lookup = page.Page(
page.Url(
- r'^site/user/lookup$',
+ r'^user/lookup$',
'soc.views.site.user.profile.lookup'),
'Site: Look Up an Existing User',
short_name='Look Up Site User',
@@ -156,7 +152,7 @@
site_user_create = page.Page(
page.Url(
- r'^site/user/profile$',
+ r'^user/create$',
'soc.views.site.user.profile.create'),
'Site: Create New User Profile',
short_name='Create Site User',
@@ -164,7 +160,7 @@
site_user_edit = page.Page(
page.Url(
- r'^site/user/profile/%s$' % path_link_name.LINKNAME_ARG_PATTERN,
+ r'^user/edit/%s$' % path_link_name.LINKNAME_ARG_PATTERN,
'soc.views.site.user.profile.edit'),
'Site: Modify Existing User Profile',
short_name='Modify Site User',
@@ -172,7 +168,7 @@
site_user_list = page.Page(
page.Url(
- r'^site/user/list$',
+ r'^user/list$',
'soc.views.site.user.list.all'),
'Site: List of Users',
short_name='List Site Users',
@@ -228,7 +224,7 @@
# Sponsor Group public view
sponsor_profile = page.Page(
page.Url(
- r'^sponsor/profile/%s$' % path_link_name.LINKNAME_ARG_PATTERN,
+ r'^sponsor/show/%s$' % path_link_name.LINKNAME_ARG_PATTERN,
'soc.views.models.sponsor.public'),
'Sponsor Public Profile',
parent=home)
@@ -242,7 +238,7 @@
site_sponsor_create = page.Page(
page.Url(
- r'^site/sponsor/profile$',
+ r'^sponsor/create$',
'soc.views.models.sponsor.create'),
'Site: Create New Sponsor',
short_name='Create Site Sponsor',
@@ -250,7 +246,7 @@
site_sponsor_delete = page.Page(
page.Url(
- r'^site/sponsor/profile/delete/%s$' % path_link_name.LINKNAME_ARG_PATTERN,
+ r'^sponsor/delete/%s$' % path_link_name.LINKNAME_ARG_PATTERN,
'soc.views.models.sponsor.delete'),
'Site: Delete Existing Sponsor',
short_name='Delete Site Sponsor',
@@ -258,7 +254,7 @@
site_sponsor_edit = page.Page(
page.Url(
- r'^site/sponsor/profile/%s$' % path_link_name.LINKNAME_ARG_PATTERN,
+ r'^sponsor/edit/%s$' % path_link_name.LINKNAME_ARG_PATTERN,
'soc.views.models.sponsor.edit'),
'Site: Modify Existing Sponsor',
short_name='Modify Site Sponsor',
@@ -266,7 +262,7 @@
site_sponsor_list = page.Page(
page.Url(
- r'^site/sponsor/list$',
+ r'^sponsor/list$',
'soc.views.models.sponsor.list'),
'Site: List of Sponsors',
short_name='List Site Sponsors',
@@ -275,7 +271,7 @@
# Host public view
host_profile = page.Page(
page.Url(
- r'^host/profile/(?P<sponsor_ln>%(lnp)s)/(?P<user_ln>%(lnp)s)$' % {
+ r'^host/show/(?P<sponsor_ln>%(lnp)s)/(?P<user_ln>%(lnp)s)$' % {
'lnp': path_link_name.LINKNAME_PATTERN_CORE},
'soc.views.models.host.public'),
'Host Public Profile',
@@ -290,7 +286,7 @@
site_host_create = page.Page(
page.Url(
- r'^site/host/profile$',
+ r'^host/create$',
'soc.views.models.host.create'),
'Site: Create New Host',
short_name='Create Site Host',
@@ -298,7 +294,7 @@
site_host_delete = page.Page(
page.Url(
- r'^site/host/delete/(?P<sponsor_ln>%(lnp)s)/(?P<user_ln>%(lnp)s)$' % {
+ r'^host/delete/(?P<sponsor_ln>%(lnp)s)/(?P<user_ln>%(lnp)s)$' % {
'lnp': path_link_name.LINKNAME_PATTERN_CORE},
'soc.views.models.host.delete'),
'Site: Delete Existing Host',
@@ -307,7 +303,7 @@
site_host_edit = page.Page(
page.Url(
- r'^site/host/profile/(?P<sponsor_ln>%(lnp)s)/(?P<user_ln>%(lnp)s)$' % {
+ r'^host/edit/(?P<sponsor_ln>%(lnp)s)/(?P<user_ln>%(lnp)s)$' % {
'lnp': path_link_name.LINKNAME_PATTERN_CORE},
'soc.views.models.host.edit'),
'Site: Modify Existing Host',
@@ -316,7 +312,7 @@
site_host_list = page.Page(
page.Url(
- r'^site/host/list$',
+ r'^host/list$',
'soc.views.models.host.list'),
'Site: List of Hosts',
short_name='List Site Hosts',
--- a/app/soc/templates/soc/base.html Wed Nov 05 23:33:22 2008 +0000
+++ b/app/soc/templates/soc/base.html Wed Nov 05 23:36:28 2008 +0000
@@ -152,7 +152,7 @@
</div>
<div id="footer" dir="ltr">
{% if ga_tracking_num %}
- {% include 'soc/site/ga.html' %}
+ {% include 'soc/site_settings/ga.html' %}
{% endif %}
<div class="text">
{% block footer %}
--- a/app/soc/templates/soc/docs/edit.html Wed Nov 05 23:33:22 2008 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,59 +0,0 @@
-{% 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 %}
-
-{% block scripts %}
- <script type="text/javascript" src="/tiny_mce/tiny_mce_src.js"></script>
-{% endblock %}
-{% block header_title %}
-{{ page.short_name }}
- {% if entity %}
- <a href="/docs/show/{{ entity.partial_path }}/{{ entity.link_name }}">"{{ entity.title }}"</a>
- {% endif %}
-{% endblock %}
-
-{% block body %}
-<p>
-<p>
-{% block instructions %}
-Please use this form to edit the document.
-{% endblock %}
-</p>
-<form method="POST">
- <table>
- {{ form.as_table }}
- <tr>
- <td colspan="4"> </td>
- </tr>
- </table>
- <table>
- <tr>
- {% block submit_buttons %}
- <td>
- <input style="font-weight: bold" type="submit" value="Save Changes"/></span>
- </td>
- <td>
- <input type="button" onclick="location.href='/'" value="Cancel"/>
- </td>
- {% if entity %}
- <td>
- <input type="button" onclick="location.href='/docs/delete/{{ entity.partial_path }}/{{ entity.link_name }}'" value="Delete"/>
- </td>
- {% endif %}
- {% endblock %}
- </tr>
- </table>
-</form>
-</p>
-{% endblock %}
--- a/app/soc/templates/soc/docs/list/all.html Wed Nov 05 23:33:22 2008 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +0,0 @@
-{% 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 body %}
-<p>
-<p>
-{% block instructions %}
-{% endblock %}
-</p>
-{% include list_main %}
-</p>
-{% endblock %}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/app/soc/templates/soc/group/edit.html Wed Nov 05 23:36:28 2008 +0000
@@ -0,0 +1,62 @@
+{% 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 scripts %}
+ <script type="text/javascript" src="/tiny_mce/tiny_mce_src.js"></script>
+{% endblock %}
+
+{% block body %}
+<p>
+<p>
+{% block instructions %}
+Please use this form to alter {{ entity_type }} details.
+{% endblock %}
+</p>
+<form method="POST">
+ <table>
+ {% field_as_table_row form.name %}
+ {% field_as_table_row form.link_name %}
+ {% field_as_table_row form.short_name %}
+ {% if form.created_by %}
+ {% field_as_table_row form.created_by %}
+ {% endif %}
+ {% field_as_table_row form.home_page %}
+ {% field_as_table_row form.email %}
+ {% field_as_table_row form.description %}
+ {% field_as_table_row form.street %}
+ {% field_as_table_row form.city %}
+ {% field_as_table_row form.state %}
+ {% field_as_table_row form.country %}
+ {% field_as_table_row form.postalcode %}
+ {% field_as_table_row form.phone %}
+ <tr>
+ <td colspan="4"> </td>
+ </tr>
+ <table>
+ <table>
+ <tr>
+ {% block submit_buttons %}
+ <td>
+ <input style="font-weight: bold" type="submit" value="Save Changes"/></span>
+ </td>
+ <td>
+ <input type="button" onclick="location.href='/'" value="Cancel"/>
+ </td>
+ {% endblock %}
+ </tr>
+ </table>
+</form>
+</p>
+{% endblock %}
--- a/app/soc/templates/soc/group/list/all.html Wed Nov 05 23:33:22 2008 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,25 +0,0 @@
-{% 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 body %}
-<p>
-<p>
-{% block instructions %}
-List of {{ entity_type_plural }} in Google Open Source Programs.
-{% endblock %}
-</p>
-{% include list_main %}
-</p>
-{% endblock %}
--- a/app/soc/templates/soc/group/list/group_row.html Wed Nov 05 23:33:22 2008 +0000
+++ b/app/soc/templates/soc/group/list/group_row.html Wed Nov 05 23:36:28 2008 +0000
@@ -1,7 +1,7 @@
<tr class="off" onmouseover="this.className='on'" onmouseout="this.className='off'"
-onclick="document.location.href='/site/{{ entity_type|lower }}/profile/{{ data_element.link_name }}'" name="name">
+onclick="document.location.href='/{{ entity_type|lower }}/edit/{{ data_element.link_name }}'" name="name">
<td align="right"><div class="name"><a class="noul"
- href="/site/{{ entity_type|lower }}/profile/{{ data_element.link_name }}">{{ data_element.name }}</a>
+ href="/{{ entity_type|lower }}/edit/{{ data_element.link_name }}">{{ data_element.name }}</a>
</div>
</td>
<td><div class="link_name">{{ data_element.link_name }}</a></div></td>
--- a/app/soc/templates/soc/group/profile/edit.html Wed Nov 05 23:33:22 2008 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,62 +0,0 @@
-{% 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 scripts %}
- <script type="text/javascript" src="/tiny_mce/tiny_mce_src.js"></script>
-{% endblock %}
-
-{% block body %}
-<p>
-<p>
-{% block instructions %}
-Please use this form to alter {{ entity_type }} details.
-{% endblock %}
-</p>
-<form method="POST">
- <table>
- {% field_as_table_row form.name %}
- {% field_as_table_row form.link_name %}
- {% field_as_table_row form.short_name %}
- {% if form.created_by %}
- {% field_as_table_row form.created_by %}
- {% endif %}
- {% field_as_table_row form.home_page %}
- {% field_as_table_row form.email %}
- {% field_as_table_row form.description %}
- {% field_as_table_row form.street %}
- {% field_as_table_row form.city %}
- {% field_as_table_row form.state %}
- {% field_as_table_row form.country %}
- {% field_as_table_row form.postalcode %}
- {% field_as_table_row form.phone %}
- <tr>
- <td colspan="4"> </td>
- </tr>
- <table>
- <table>
- <tr>
- {% block submit_buttons %}
- <td>
- <input style="font-weight: bold" type="submit" value="Save Changes"/></span>
- </td>
- <td>
- <input type="button" onclick="location.href='/'" value="Cancel"/>
- </td>
- {% endblock %}
- </tr>
- </table>
-</form>
-</p>
-{% endblock %}
--- a/app/soc/templates/soc/group/profile/public.html Wed Nov 05 23:33:22 2008 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,35 +0,0 @@
-{% 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.short_name }} for {{ entity.name }}
-{% endblock %}
-
-{% block body %}
-<p>
- <table>
- {% readonly_field_as_table_row entity.fields.name.label entity.name %}
- {% readonly_field_as_table_row entity.fields.home_page.label entity.home_page %}
- {% readonly_field_as_table_row entity.fields.description.label entity.description %}
- {% readonly_field_as_table_row entity.fields.street.label entity.street %}
- {% readonly_field_as_table_row entity.fields.city.label entity.city %}
- {% readonly_field_as_table_row entity.fields.state.label entity.state %}
- {% readonly_field_as_table_row entity.fields.country.label entity.country %}
- {% readonly_field_as_table_row entity.fields.postalcode.label entity.postalcode %}
- {% readonly_field_as_table_row entity.fields.phone.label entity.phone %}
- </table>
-</p>
-{% endblock %}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/app/soc/templates/soc/group/public.html Wed Nov 05 23:36:28 2008 +0000
@@ -0,0 +1,35 @@
+{% 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.short_name }} for {{ entity.name }}
+{% endblock %}
+
+{% block body %}
+<p>
+ <table>
+ {% readonly_field_as_table_row entity.fields.name.label entity.name %}
+ {% readonly_field_as_table_row entity.fields.home_page.label entity.home_page %}
+ {% readonly_field_as_table_row entity.fields.description.label entity.description %}
+ {% readonly_field_as_table_row entity.fields.street.label entity.street %}
+ {% readonly_field_as_table_row entity.fields.city.label entity.city %}
+ {% readonly_field_as_table_row entity.fields.state.label entity.state %}
+ {% readonly_field_as_table_row entity.fields.country.label entity.country %}
+ {% readonly_field_as_table_row entity.fields.postalcode.label entity.postalcode %}
+ {% readonly_field_as_table_row entity.fields.phone.label entity.phone %}
+ </table>
+</p>
+{% endblock %}
--- a/app/soc/templates/soc/home/public.html Wed Nov 05 23:33:22 2008 +0000
+++ b/app/soc/templates/soc/home/public.html Wed Nov 05 23:36:28 2008 +0000
@@ -1,4 +1,4 @@
-{% extends "soc/base.html" %}
+{% extends "soc/home_settings/public.html" %}
{% comment %}
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -13,50 +13,15 @@
limitations under the License.
{% endcomment %}
-{% block scripts %}
-{% if home_settings.feed_url %}
- <script type="text/javascript" src="http://www.google.com/jsapi"></script>
- <script type="text/javascript" src="/soc/content/js/blog-080819.js"></script>
- <script type="text/javascript">
-
- google.load("feeds", "1");
-
- function initialize() {
- var blog = new BlogPreview(document.getElementById("blog"));
- blog.show("{{ home_settings.feed_url }}");
- }
- google.setOnLoadCallback(initialize);
-
- </script>
-{% endif %}
+{% block missing_doc %}
+The contents of this default Site home page can be changed by
+<a href="/docs/edit">creating a new Document</a> or
+<a href="/docs/list">editing an existing Document</a> and then selecting
+that Document in the
+<a href="/settings/edit">Site Settings</a> interface.
+Other elements of this page, such as a feed to be displayed below this
+content, can also be set using the
+<a href="/settings/edit">Site Settings</a> interface.
+You need to sign in as site Developer in order to change
+<a href="/settings/edit">Site Settings</a>.
{% endblock %}
-
-{% block page_title %}
-{% if home_document %}
-{{ home_document.title }}
-{% else %}
-{{ page.long_name }}
-{% endif %}
-{% endblock %}
-
-{% block header_title %}
-{% if home_document %}
-{{ home_document.short_name }}
-{% else %}
-{{ page.short_name }}
-{% endif %}
-{% endblock %}
-
-{% block body %}
- {% if home_document %}
- {{ home_document.content|safe }}
- <div id="lastmodified">Last updated on: {{ home_document.modified }}</div>
- {% else %}
-{% block missing_doc %}
-This is the default home page can be edited via Settings.
-{% endblock %}
- {% endif %}
- {% if home_settings.feed_url %}
- <div id="blog"></div>
- {% endif %}
-{% endblock %}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/app/soc/templates/soc/home_settings/public.html Wed Nov 05 23:36:28 2008 +0000
@@ -0,0 +1,62 @@
+{% 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 %}
+
+{% block scripts %}
+{% if home_settings.feed_url %}
+ <script type="text/javascript" src="http://www.google.com/jsapi"></script>
+ <script type="text/javascript" src="/soc/content/js/blog-080819.js"></script>
+ <script type="text/javascript">
+
+ google.load("feeds", "1");
+
+ function initialize() {
+ var blog = new BlogPreview(document.getElementById("blog"));
+ blog.show("{{ home_settings.feed_url }}");
+ }
+ google.setOnLoadCallback(initialize);
+
+ </script>
+{% endif %}
+{% endblock %}
+
+{% block page_title %}
+{% if home_document %}
+{{ home_document.title }}
+{% else %}
+{{ page.long_name }}
+{% endif %}
+{% endblock %}
+
+{% block header_title %}
+{% if home_document %}
+{{ home_document.short_name }}
+{% else %}
+{{ page.short_name }}
+{% endif %}
+{% endblock %}
+
+{% block body %}
+ {% if home_document %}
+ {{ home_document.content|safe }}
+ <div id="lastmodified">Last updated on: {{ home_document.modified }}</div>
+ {% else %}
+{% block missing_doc %}
+This is the default home page can be edited via Settings.
+{% endblock %}
+ {% endif %}
+ {% if home_settings.feed_url %}
+ <div id="blog"></div>
+ {% endif %}
+{% endblock %}
--- a/app/soc/templates/soc/host/list/host_row.html Wed Nov 05 23:33:22 2008 +0000
+++ b/app/soc/templates/soc/host/list/host_row.html Wed Nov 05 23:36:28 2008 +0000
@@ -1,7 +1,7 @@
<tr class="off" onmouseover="this.className='on'" onmouseout="this.className='off'"
-onclick="document.location.href='/site/{{ entity_type|lower }}/profile/{{ data_element.sponsor.link_name }}/{{ data_element.user.link_name }}'" name="name">
+onclick="document.location.href='/{{ entity_type|lower }}/edit/{{ data_element.sponsor.link_name }}/{{ data_element.user.link_name }}'" name="name">
<td align="right"><div class="user_link_name"><a class="noul"
- href="/site/{{ entity_type|lower }}/profile/{{ data_element.sponsor.link_name }}/{{ data_element.user.link_name }}">{{ data_element.user.link_name }}</a>
+ href="/{{ entity_type|lower }}/edit/{{ data_element.sponsor.link_name }}/{{ data_element.user.link_name }}">{{ data_element.user.link_name }}</a>
</div>
</td>
<td><div class="sponsor_name">{{ data_element.sponsor.name }}</div></td>
--- a/app/soc/templates/soc/list/all.html Wed Nov 05 23:33:22 2008 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,25 +0,0 @@
-{% 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 body %}
-<p>
-<p>
-{% block instructions %}
-List of {{ entity_type_plural }} in Google Open Source Programs.
-{% endblock %}
-</p>
-{% include list_main %}
-</p>
-{% endblock %}
--- a/app/soc/templates/soc/models/edit.html Wed Nov 05 23:33:22 2008 +0000
+++ b/app/soc/templates/soc/models/edit.html Wed Nov 05 23:36:28 2008 +0000
@@ -20,7 +20,7 @@
{{ page.short_name }}
{% if entity %}
<!-- TODO(srabbelier) use a generic entity name as link -->
- <a href="/{{ entity_type_short|lower }}/profile/{{ entity_suffix }}">"{{ entity_type }}"</a>
+ <a href="/{{ entity_type_short|lower }}/show/{{ entity_suffix }}">"{{ entity_type }}"</a>
{% endif %}
{% endblock %}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/app/soc/templates/soc/models/list.html Wed Nov 05 23:36:28 2008 +0000
@@ -0,0 +1,25 @@
+{% 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 body %}
+<p>
+<p>
+{% block instructions %}
+List of {{ entity_type_plural }} in Google Open Source Programs.
+{% endblock %}
+</p>
+{% include list_main %}
+</p>
+{% endblock %}
--- a/app/soc/templates/soc/models/public.html Wed Nov 05 23:33:22 2008 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,27 +0,0 @@
-{% 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 %}
-
-{% block page_title %}
-{{ entity.title }}
-{% endblock %}
-
-{% block header_title %}
-{{ entity.title }}
-{% endblock %}
-
-{% block body %}
-<!-- TODO(pawel.solyga) Make this generically working etc.-->
-{{ form.as_table }}
-{% endblock %}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/app/soc/templates/soc/person/edit.html Wed Nov 05 23:36:28 2008 +0000
@@ -0,0 +1,112 @@
+{% 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 %}
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<html lang="en">
+ <head>
+ <title>Profile</title>
+ {% block 'stylesheet' %}{% endblock %}
+ </head>
+ <body>
+ <p>
+ {% block 'logo' %}
+ <img src="/soc/content/images/dune.jpg" alt="Melange" />
+ {% endblock %}
+ <p>
+ {% block 'greeting' %}
+ Welcome, {{user.nickname}}.
+ {% endblock %}
+ </p>
+ <p>
+ {% block 'instructions' %}
+ Please update your profile:
+ {% endblock %}
+ </p>
+ <form method="POST">
+ <table>
+ <tr>
+ <td class="formfieldheading" colspan="4">
+ Name <i>(publicly displayed)</i>
+ </td>
+ </tr>
+ {% field_as_table_row form.given_name %}
+ {% field_as_table_row form.surname %}
+ {% field_as_table_row form.display_name %}
+ <tr><td colspan="4"> </td></tr>
+
+ <tr>
+ <td class="formfieldheading" colspan="4">
+ Online Profile <i>(publicly displayed)</i>
+ </td>
+ </tr>
+ {% field_as_table_row form.email %}
+ {% field_as_table_row form.im_network %}
+ {% field_as_table_row form.im_handle %}
+ {% field_as_table_row form.home_page %}
+ {% field_as_table_row form.blog %}
+ {% field_as_table_row form.photo_url %}
+ <tr><td colspan="4"> </td></tr>
+
+ <tr>
+ <td class="formfieldheading" colspan="4">
+ Location <i>(publicly displayed, these will be replaced with a
+ Google Maps control)</i>
+ </td>
+ </tr>
+ {% field_as_table_row form.latitude %}
+ {% field_as_table_row form.longitude %}
+ <tr><td colspan="4"> </td></tr>
+
+ <tr>
+ <td class="formfieldheading" colspan="4">
+ Residence Address <i>(kept private)</i>
+ </td>
+ </tr>
+ {% field_as_table_row form.res_street %}
+ {% field_as_table_row form.res_city %}
+ {% field_as_table_row form.res_state %}
+ {% field_as_table_row form.res_postalcode %}
+ {% field_as_table_row form.res_country %}
+ <tr><td colspan="4"> </td></tr>
+
+ <tr>
+ <td class="formfieldheading" colspan="4">
+ Shipping Address <i>(kept private; optional, if omitted, Residence
+ Address will be used)</i>
+ </td>
+ </tr>
+ {% field_as_table_row form.ship_street %}
+ {% field_as_table_row form.ship_city %}
+ {% field_as_table_row form.ship_state %}
+ {% field_as_table_row form.ship_postalcode %}
+ {% field_as_table_row form.ship_country %}
+
+ <tr><td colspan="4"> </td></tr>
+
+ <tr>
+ <td class="formfieldheading" colspan="4">
+ Personal Information <i>(kept private)</i>
+ </td>
+ </tr>
+ {% field_as_table_row form.phone %}
+ {% field_as_table_row form.birth_date %}
+ {% field_as_table_row form.tshirt_size %}
+ {% field_as_table_row form.tshirt_style %}
+ </table>
+ <input type="submit" />
+ </form>
+ </p>
+ </body>
+</html>
+
--- a/app/soc/templates/soc/person/profile/edit.html Wed Nov 05 23:33:22 2008 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,112 +0,0 @@
-{% 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 %}
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
-<html lang="en">
- <head>
- <title>Profile</title>
- {% block 'stylesheet' %}{% endblock %}
- </head>
- <body>
- <p>
- {% block 'logo' %}
- <img src="/soc/content/images/dune.jpg" alt="Melange" />
- {% endblock %}
- <p>
- {% block 'greeting' %}
- Welcome, {{user.nickname}}.
- {% endblock %}
- </p>
- <p>
- {% block 'instructions' %}
- Please update your profile:
- {% endblock %}
- </p>
- <form method="POST">
- <table>
- <tr>
- <td class="formfieldheading" colspan="4">
- Name <i>(publicly displayed)</i>
- </td>
- </tr>
- {% field_as_table_row form.given_name %}
- {% field_as_table_row form.surname %}
- {% field_as_table_row form.display_name %}
- <tr><td colspan="4"> </td></tr>
-
- <tr>
- <td class="formfieldheading" colspan="4">
- Online Profile <i>(publicly displayed)</i>
- </td>
- </tr>
- {% field_as_table_row form.email %}
- {% field_as_table_row form.im_network %}
- {% field_as_table_row form.im_handle %}
- {% field_as_table_row form.home_page %}
- {% field_as_table_row form.blog %}
- {% field_as_table_row form.photo_url %}
- <tr><td colspan="4"> </td></tr>
-
- <tr>
- <td class="formfieldheading" colspan="4">
- Location <i>(publicly displayed, these will be replaced with a
- Google Maps control)</i>
- </td>
- </tr>
- {% field_as_table_row form.latitude %}
- {% field_as_table_row form.longitude %}
- <tr><td colspan="4"> </td></tr>
-
- <tr>
- <td class="formfieldheading" colspan="4">
- Residence Address <i>(kept private)</i>
- </td>
- </tr>
- {% field_as_table_row form.res_street %}
- {% field_as_table_row form.res_city %}
- {% field_as_table_row form.res_state %}
- {% field_as_table_row form.res_postalcode %}
- {% field_as_table_row form.res_country %}
- <tr><td colspan="4"> </td></tr>
-
- <tr>
- <td class="formfieldheading" colspan="4">
- Shipping Address <i>(kept private; optional, if omitted, Residence
- Address will be used)</i>
- </td>
- </tr>
- {% field_as_table_row form.ship_street %}
- {% field_as_table_row form.ship_city %}
- {% field_as_table_row form.ship_state %}
- {% field_as_table_row form.ship_postalcode %}
- {% field_as_table_row form.ship_country %}
-
- <tr><td colspan="4"> </td></tr>
-
- <tr>
- <td class="formfieldheading" colspan="4">
- Personal Information <i>(kept private)</i>
- </td>
- </tr>
- {% field_as_table_row form.phone %}
- {% field_as_table_row form.birth_date %}
- {% field_as_table_row form.tshirt_size %}
- {% field_as_table_row form.tshirt_style %}
- </table>
- <input type="submit" />
- </form>
- </p>
- </body>
-</html>
-
--- a/app/soc/templates/soc/settings/edit.html Wed Nov 05 23:33:22 2008 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,111 +0,0 @@
-{% 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 %}
-
-{% block body %}
-<p>
-<p>
-{% block instructions %}
-Please use this form to set basic home page settings.
-{% endblock %}
-</p>
-<p>
-</p>
-<form method="POST">
- <table>
- {{ settings_form.as_table }}
-{% if home_doc %}
- <tr>
- <td colspan="4"> </td>
- </tr>
-{% comment %}
-TODO(tlarsen): OK, this is pretty lame as well. I think we need some sort
- of "Document preview" that can be appended to the end of the page. Also,
- There is way too much text on this page. Can a UI wizard please fix this
- UI?
-{% endcomment %}
- <tr>
- <td colspan="4">
-An existing Document is currently selected to provide the body contents of the home page:
- </td>
- </tr>
- <tr>
- <td> </td>
- <td colspan="3">
- {{ home_doc.title }}
- </td>
- </tr>
- <tr>
- <th>Path:</th>
- <td colspan="2">
- {{ home_doc.partial_path }}/{{ home_doc.link_name }}
- </td>
- </tr>
- <tr>
- <th>Created By:</th>
- <td colspan="2">
- {{ home_doc.author.link_name }}
- </td>
- </tr>
- <tr>
- <th>Created On:</th>
- <td colspan="2">
- {{ home_doc.created }}
- </td>
- </tr>
- <tr>
- <th>Modified:</th>
- <td colspan="2">
- {{ home_doc.modified }}
- </td>
- </tr>
-{% endif %}
- <tr>
- <td colspan="4">
- <p>
- Any existing Document (to which access is permitted) can be used as the body contents of the home page.
- <ul>
- <li>
-<a href="/docs/edit">Create a new Document to use for the home page content here.</a>
- </li>
- <li>
-<a href="/docs/list">Edit an existing Document to use for the home page content here.</a>
- </li>
- </ul>
-Then, specify the Document to use below:
-</p>
- </td>
- </tr>
- <tr>
- <td colspan="4"> </td>
- </tr>
- {{ doc_select_form.as_table }}
- <tr>
- <td colspan="4"> </td>
- </tr>
- <table>
- <tr>
- {% block submit_buttons %}
- <td>
- <input style="font-weight: bold" type="submit" value="Save Changes"/></span>
- </td>
- <td>
- <input type="button" onclick="location.href='/'" value="Cancel"/>
- </td>
- {% endblock %}
- </tr>
- </table>
-</form>
-</p>
-{% endblock %}
--- a/app/soc/templates/soc/site/ga.html Wed Nov 05 23:33:22 2008 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,21 +0,0 @@
-{% 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 %}
-<script type="text/javascript">
-var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
-document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
-</script>
-<script type="text/javascript">
-var pageTracker = _gat._getTracker("{{ ga_tracking_num }}");
-pageTracker._trackPageview();
-</script>
--- a/app/soc/templates/soc/site/home/public.html Wed Nov 05 23:33:22 2008 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,27 +0,0 @@
-{% extends "soc/home/public.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 %}
-
-{% block missing_doc %}
-The contents of this default Site home page can be changed by
-<a href="/docs/edit">creating a new Document</a> or
-<a href="/docs/list">editing an existing Document</a> and then selecting
-that Document in the
-<a href="/site/settings/edit">Site Settings</a> interface.
-Other elements of this page, such as a feed to be displayed below this
-content, can also be set using the
-<a href="/site/settings/edit">Site Settings</a> interface.
-You need to sign in as site Developer in order to change
-<a href="/site/settings/edit">Site Settings</a>.
-{% endblock %}
--- a/app/soc/templates/soc/site/sponsor/profile/edit.html Wed Nov 05 23:33:22 2008 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,28 +0,0 @@
-{% extends "soc/group/profile/edit.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 %}
-{% block submit_buttons %}
-{{ block.super }}
-{% if entity %}
-<td>
- <input type="button" onclick="location.href='/site/{{ entity_type_short|lower }}/profile/delete/{{ entity.link_name }}'" value="Delete"/>
-</td>
-{% endif %}
-{% endblock %}
-{% block body %}
-{{ block.super }}
-{% if entity %}
-<p><a href="/{{ entity_type_short|lower }}/profile/{{ entity.link_name }}">View Sponsor Public Profile</a></p>
-{% endif %}
-{% endblock %}
\ No newline at end of file
--- a/app/soc/templates/soc/site/user/list/all.html Wed Nov 05 23:33:22 2008 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,25 +0,0 @@
-{% 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 body %}
-<p>
-<p>
-{% block instructions %}
-List of Users in Google Open Source Programs.
-{% endblock %}
-</p>
-{% include list_main %}
-</p>
-{% endblock %}
\ No newline at end of file
--- a/app/soc/templates/soc/site/user/list/user_heading.html Wed Nov 05 23:33:22 2008 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,6 +0,0 @@
-<tr align="left">
- <th class="first" align="right">Id</th>
- <th>Email</th>
- <th>Nickname</th>
- <th>Linkname</th>
-</tr>
--- a/app/soc/templates/soc/site/user/list/user_row.html Wed Nov 05 23:33:22 2008 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,10 +0,0 @@
-<tr class="off" onmouseover="this.className='on'" onmouseout="this.className='off'"
-onclick="document.location.href='/site/user/profile/{{ data_element.link_name }}'" name="name">
- <td align="right"><div class="id"><a class="noul"
- href="/site/user/profile/{{ data_element.link_name }}">{{ data_element.id }}</a>
- </div>
- </td>
- <td><div class="email">{{ data_element.id.email }}</a></div></td>
- <td><div class="nick_name">{{ data_element.nick_name }}</div></td>
- <td><div class="link_name">{{ data_element.link_name }}</div></td>
-</tr>
--- a/app/soc/templates/soc/site/user/profile/edit.html Wed Nov 05 23:33:22 2008 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,82 +0,0 @@
-{% 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.short_name }}
- {% if existing_user %}
-for {{ existing_user.nick_name }}
-<a href="mailto:{{ existing_user.id.email }} "><{{ existing_user.id.email }}></a>
- {% endif %}
-{% endblock %}
-{% block body %}
-<p>
-<p>
-{% block instructions %}
-Please use this form to alter basic site-wide settings for a User in Google Open Source Programs.
-{% endblock %}
-</p>
-<form method="POST">
- {{ form.key_name }}
- <table>
- {% if existing_user %}
- {% readonly_field_as_table_row "Id" existing_user.id %}
- {% endif %}
- {% field_as_table_row form.id %}
-{% if lookup_error %}
-<tr>
- <td> </td>
- <td colspan="3" class="formfielderror">
- {{ lookup_error }}
- </td>
-</tr>
-{% endif %}
- {% field_as_table_row form.link_name %}
- {% field_as_table_row form.nick_name %}
- {% field_as_table_row form.is_developer %}
- {% if existing_user.former_ids %}
- <tr>
- <td class="formfieldlabel">Former ids</td>
- <td>
- {% for former_id in existing_user.former_ids %}
- {{ former_id }}<br />
- {% endfor %}
- </td>
- <td class="formfieldrequired"> </td>
- <td class="formfieldhelptext"> </td>
- </tr>
- {% endif %}
- <tr>
- <td colspan="4"> </td>
- </tr>
- <table>
- <tr>
- {% block submit_buttons %}
- <td>
- <input style="font-weight: bold" type="submit" value="Save Changes"/></span>
- </td>
- <td>
- <input type="button" onclick="location.href='/'" value="Cancel"/>
- </td>
- {% if submit_error %}
- <td class="formfielderror">
- {{ submit_error }}
- </td>
- {% endif %}
- {% endblock %}
- </tr>
- </table>
-</form>
-</p>
-{% endblock %}
--- a/app/soc/templates/soc/site/user/profile/lookup.html Wed Nov 05 23:33:22 2008 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,109 +0,0 @@
-{% 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 body %}
-<p>
-<p>
-{% block instructions %}
-Please use this form to look up an existing User in Google Open Source Programs.
-{% endblock %}
-</p>
-<form method="POST">
- <table>
-{% if found_user %}
-{% readonly_field_as_table_row "Id" found_user.id %}
-{% endif %}
-{% if email_error %}
-<tr>
- <td> </td>
- <td colspan="3" class="formfielderror">
- {{ email_error }}
- </td>
-</tr>
-{% endif %}
- {% field_as_table_row form.id %}
-{% if link_name_error %}
-<tr>
- <td> </td>
- <td colspan="3" class="formfielderror">
- {{ link_name_error }}
- </td>
-</tr>
-{% endif %}
- {% field_as_table_row form.link_name %}
-{% if found_user %}
- <tr>
- <td class="formfieldlabel">Nick name</td>
- <td>{{ found_user.nick_name }}</td>
- <td class="formfieldrequired"> </td>
- <td class="formfieldhelptext"> </td>
- </tr>
- <tr>
- <td class="formfieldlabel">Is Developer</td>
- <td>{{ found_user.is_developer }}</td>
- <td class="formfieldrequired"> </td>
- <td class="formfieldhelptext"> </td>
- </tr>
-
- {% if found_user.former_ids %}
- <tr>
- <td class="formfieldlabel">Former ids</td>
- <td>
- {% for former_id in found_user.former_ids %}
- {{ former_id }}<br />
- {% endfor %}
- </td>
- <td class="formfieldrequired"> </td>
- <td class="formfieldhelptext"> </td>
- </tr>
- {% endif %}
-{% endif %}
- <tr>
- <td colspan="4"> </td>
- </tr>
- <tr>
- <td>
- <input type="submit" style="font-weight: bold" name="lookup" value="Look up User"/></span>
- </td>
- <td colspan="2"> </td>
- <td>
- {% if lookup_message %}<b><i>{{ lookup_message }}</i></b>{% else %} {% endif %}
- </td>
- </tr>
-{% if edit_link %}
- <tr>
- <td colspan="4"> </td>
- </tr>
- <tr>
- <td colspan="4">
- <a href="{{ edit_link }}">Edit the User profile of {{ found_user.nick_name }}.</a>
- </td>
- </tr>
-{% endif %}
-{% if lookup_link %}
- <tr>
- <td colspan="4"> </td>
- </tr>
- <tr>
- <td colspan="4">
- <a href="{{ lookup_link }}">The specified User was not found, but similar
- Users are listed here.</a>
- </td>
- </tr>
-{% endif %}
- </table>
-</form>
-</p>
-{% endblock %}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/app/soc/templates/soc/site_settings/edit.html Wed Nov 05 23:36:28 2008 +0000
@@ -0,0 +1,111 @@
+{% 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 %}
+
+{% block body %}
+<p>
+<p>
+{% block instructions %}
+Please use this form to set basic home page settings.
+{% endblock %}
+</p>
+<p>
+</p>
+<form method="POST">
+ <table>
+ {{ settings_form.as_table }}
+{% if home_doc %}
+ <tr>
+ <td colspan="4"> </td>
+ </tr>
+{% comment %}
+TODO(tlarsen): OK, this is pretty lame as well. I think we need some sort
+ of "Document preview" that can be appended to the end of the page. Also,
+ There is way too much text on this page. Can a UI wizard please fix this
+ UI?
+{% endcomment %}
+ <tr>
+ <td colspan="4">
+An existing Document is currently selected to provide the body contents of the home page:
+ </td>
+ </tr>
+ <tr>
+ <td> </td>
+ <td colspan="3">
+ {{ home_doc.title }}
+ </td>
+ </tr>
+ <tr>
+ <th>Path:</th>
+ <td colspan="2">
+ {{ home_doc.partial_path }}/{{ home_doc.link_name }}
+ </td>
+ </tr>
+ <tr>
+ <th>Created By:</th>
+ <td colspan="2">
+ {{ home_doc.author.link_name }}
+ </td>
+ </tr>
+ <tr>
+ <th>Created On:</th>
+ <td colspan="2">
+ {{ home_doc.created }}
+ </td>
+ </tr>
+ <tr>
+ <th>Modified:</th>
+ <td colspan="2">
+ {{ home_doc.modified }}
+ </td>
+ </tr>
+{% endif %}
+ <tr>
+ <td colspan="4">
+ <p>
+ Any existing Document (to which access is permitted) can be used as the body contents of the home page.
+ <ul>
+ <li>
+<a href="/docs/edit">Create a new Document to use for the home page content here.</a>
+ </li>
+ <li>
+<a href="/docs/list">Edit an existing Document to use for the home page content here.</a>
+ </li>
+ </ul>
+Then, specify the Document to use below:
+</p>
+ </td>
+ </tr>
+ <tr>
+ <td colspan="4"> </td>
+ </tr>
+ {{ doc_select_form.as_table }}
+ <tr>
+ <td colspan="4"> </td>
+ </tr>
+ <table>
+ <tr>
+ {% block submit_buttons %}
+ <td>
+ <input style="font-weight: bold" type="submit" value="Save Changes"/></span>
+ </td>
+ <td>
+ <input type="button" onclick="location.href='/'" value="Cancel"/>
+ </td>
+ {% endblock %}
+ </tr>
+ </table>
+</form>
+</p>
+{% endblock %}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/app/soc/templates/soc/site_settings/ga.html Wed Nov 05 23:36:28 2008 +0000
@@ -0,0 +1,21 @@
+{% 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 %}
+<script type="text/javascript">
+var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
+document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
+</script>
+<script type="text/javascript">
+var pageTracker = _gat._getTracker("{{ ga_tracking_num }}");
+pageTracker._trackPageview();
+</script>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/app/soc/templates/soc/sponsor/edit.html Wed Nov 05 23:36:28 2008 +0000
@@ -0,0 +1,28 @@
+{% extends "soc/group/edit.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 %}
+{% block submit_buttons %}
+{{ block.super }}
+{% if entity %}
+<td>
+ <input type="button" onclick="location.href='/{{ entity_type_short|lower }}/delete/{{ entity.link_name }}'" value="Delete"/>
+</td>
+{% endif %}
+{% endblock %}
+{% block body %}
+{{ block.super }}
+{% if entity %}
+<p><a href="/{{ entity_type_short|lower }}/show/{{ entity.link_name }}">View Sponsor Public Profile</a></p>
+{% endif %}
+{% endblock %}
\ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/app/soc/templates/soc/user/list/user_heading.html Wed Nov 05 23:36:28 2008 +0000
@@ -0,0 +1,6 @@
+<tr align="left">
+ <th class="first" align="right">Id</th>
+ <th>Email</th>
+ <th>Nickname</th>
+ <th>Linkname</th>
+</tr>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/app/soc/templates/soc/user/list/user_row.html Wed Nov 05 23:36:28 2008 +0000
@@ -0,0 +1,10 @@
+<tr class="off" onmouseover="this.className='on'" onmouseout="this.className='off'"
+onclick="document.location.href='/user/edit/{{ data_element.link_name }}'" name="name">
+ <td align="right"><div class="id"><a class="noul"
+ href="/user/edit/{{ data_element.link_name }}">{{ data_element.id }}</a>
+ </div>
+ </td>
+ <td><div class="email">{{ data_element.id.email }}</a></div></td>
+ <td><div class="nick_name">{{ data_element.nick_name }}</div></td>
+ <td><div class="link_name">{{ data_element.link_name }}</div></td>
+</tr>
--- a/app/soc/templates/soc/user/profile/edit.html Wed Nov 05 23:33:22 2008 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,53 +0,0 @@
-{% 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 page_title %}User Profile{% endblock %}
-{% block header_title %}
-{% if user %}
-Modify Existing User Profile for {{ user.nick_name }} <a href="mailto:{{ id.email }} "><{{ id.email }}></a>
-{% else %}
-Create a New User Profile for <a href="mailto:{{ id.email }} "><{{ id.email }}></a>
-{% endif %}
-{% endblock %}
-{% block body %}
-<p>
-<p>
-{% block instructions %}
-Please use this form to set basic site-wide settings for your participation in Google Open Source Programs.
-{% endblock %}
-</p>
-<form method="POST">
- <table>
- {% field_as_table_row form.nick_name %}
- {% field_as_table_row form.link_name %}
- <tr>
- <td colspan="4"> </td>
- </tr>
- </table>
- <table>
- <tr>
- {% block submit_buttons %}
- <td>
- <input style="font-weight: bold" type="submit" value="Save Changes"/></span>
- </td>
- <td>
- <input type="button" onclick="location.href='/'" value="Cancel"/>
- </td>
- {% endblock %}
- </tr>
- </table>
-</form>
-</p>
-{% endblock %}
--- a/app/soc/templates/soc/user/profile/public.html Wed Nov 05 23:33:22 2008 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,27 +0,0 @@
-{% 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 page_title %}User Public Profile{% endblock %}
-{% block header_title %}
-User Public Profile for {{ link_name_user.nick_name }}
-{% endblock %}
-{% block body %}
-<p>
- <table>
- {% readonly_field_as_table_row link_name_user.fields.nick_name.label link_name_user.nick_name %}
- {% readonly_field_as_table_row link_name_user.fields.link_name.label link_name_user.link_name %}
- </table>
-</p>
-{% endblock %}
--- a/app/soc/templates/soc/user/roles/dashboard.html Wed Nov 05 23:33:22 2008 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,18 +0,0 @@
-{% 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 %}
-
-{% block body %}
- <div class="todo">TODO(tlarsen): this template is currently a placeholder for future work</div>
-{% endblock %}
--- a/app/soc/templates/soc/user/roles/public.html Wed Nov 05 23:33:22 2008 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,19 +0,0 @@
-{% 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 %}
-
-{% block body %}
- <div class="todo">TODO(tlarsen): this template is currently a placeholder for future work</div>
-{% endblock %}
-
--- a/app/soc/views/docs/edit.py Wed Nov 05 23:33:22 2008 +0000
+++ b/app/soc/views/docs/edit.py Wed Nov 05 23:36:28 2008 +0000
@@ -107,7 +107,7 @@
return link_name
-DEF_DOCS_CREATE_TMPL = 'soc/docs/edit.html'
+DEF_DOCS_CREATE_TMPL = 'soc/models/edit.html'
@decorators.view
def create(request, page=None, template=DEF_DOCS_CREATE_TMPL):
@@ -161,7 +161,7 @@
return helper.responses.respond(request, template, context)
-DEF_DOCS_EDIT_TMPL = 'soc/docs/edit.html'
+DEF_DOCS_EDIT_TMPL = 'soc/models/edit.html'
class EditForm(CreateForm):
"""Django form displayed a Document is edited.
--- a/app/soc/views/docs/list.py Wed Nov 05 23:33:22 2008 +0000
+++ b/app/soc/views/docs/list.py Wed Nov 05 23:36:28 2008 +0000
@@ -34,7 +34,7 @@
import soc.views.out_of_band
-DEF_DOCS_LIST_ALL_TMPL = 'soc/docs/list/all.html'
+DEF_DOCS_LIST_ALL_TMPL = 'soc/models/list.html'
@decorators.view
--- a/app/soc/views/helper/responses.py Wed Nov 05 23:33:22 2008 +0000
+++ b/app/soc/views/helper/responses.py Wed Nov 05 23:36:28 2008 +0000
@@ -110,7 +110,8 @@
sidebar.buildSidebar(**context)))
settings = site_settings.logic.getFromFields(
- path=site_settings.logic.DEF_SITE_SETTINGS_PATH)
+ partial_path=site_settings.logic.DEF_SITE_SETTINGS_PARTIAL_PATH,
+ link_name=site_settings.logic.DEF_SITE_SETTINGS_LINK_NAME)
if settings:
context['ga_tracking_num'] = settings.ga_tracking_num
--- a/app/soc/views/home.py Wed Nov 05 23:33:22 2008 +0000
+++ b/app/soc/views/home.py Wed Nov 05 23:36:28 2008 +0000
@@ -39,7 +39,8 @@
DEF_HOME_PUBLIC_TMPL = 'soc/home/public.html'
@decorators.view
-def public(request, page=None, path=None, entity_type='HomeSettings',
+def public(request, page=None, partial_path=None, link_name=None,
+ entity_type='HomeSettings',
template=DEF_HOME_PUBLIC_TMPL):
"""How the "general public" sees a "home" page.
@@ -57,8 +58,8 @@
# create default template context for use with any templates
context = helper.responses.getUniversalContext(request)
- settings = models.home_settings.logic.getFromFields(
- path=path, entity_type=entity_type)
+ settings = models.site_settings.logic.getFromFields(
+ partial_path=partial_path, link_name=link_name)
if settings:
context['home_settings'] = settings
--- a/app/soc/views/models/base.py Wed Nov 05 23:33:22 2008 +0000
+++ b/app/soc/views/models/base.py Wed Nov 05 23:36:28 2008 +0000
@@ -138,6 +138,7 @@
for field in fields:
kwargs[field] = None
+ # TODO(SRabbelier): make edit strip off 'create' if present and replace with 'edit'
return self.edit(request, page=page, **kwargs)
def edit(self, request, page=None, **kwargs):
--- a/app/soc/views/models/docs.py Wed Nov 05 23:33:22 2008 +0000
+++ b/app/soc/views/models/docs.py Wed Nov 05 23:36:28 2008 +0000
@@ -99,9 +99,9 @@
params['create_form'] = CreateForm
# TODO(tlarsen) Add support for Django style template lookup
- params['edit_template'] = 'soc/docs/edit.html'
+ params['edit_template'] = 'soc/models/edit.html'
params['public_template'] = 'soc/docs/public.html'
- params['list_template'] = 'soc/list/all.html'
+ params['list_template'] = 'soc/models/list.html'
params['lists_template'] = {
'list_main': 'soc/list/list_main.html',
@@ -111,7 +111,7 @@
}
params['delete_redirect'] = '/docs/list'
- params['create_redirect'] = 'soc/docs/edit.html'
+ params['create_redirect'] = 'soc/models/edit.html'
params['save_message'] = [ugettext_lazy('Profile saved.')]
--- a/app/soc/views/models/host.py Wed Nov 05 23:33:22 2008 +0000
+++ b/app/soc/views/models/host.py Wed Nov 05 23:36:28 2008 +0000
@@ -98,7 +98,7 @@
# TODO(tlarsen) Add support for Django style template lookup
params['edit_template'] = 'soc/models/edit.html'
params['public_template'] = 'soc/host/public.html'
- params['list_template'] = 'soc/list/all.html'
+ params['list_template'] = 'soc/models/list.html'
params['lists_template'] = {
'list_main': 'soc/list/list_main.html',
--- a/app/soc/views/models/sponsor.py Wed Nov 05 23:33:22 2008 +0000
+++ b/app/soc/views/models/sponsor.py Wed Nov 05 23:36:28 2008 +0000
@@ -104,9 +104,9 @@
params['create_form'] = CreateForm
# TODO(tlarsen) Add support for Django style template lookup
- params['edit_template'] = 'soc/site/sponsor/profile/edit.html'
- params['public_template'] = 'soc/group/profile/public.html'
- params['list_template'] = 'soc/group/list/all.html'
+ params['edit_template'] = 'soc/sponsor/edit.html'
+ params['public_template'] = 'soc/group/public.html'
+ params['list_template'] = 'soc/models/list.html'
params['lists_template'] = {
'list_main': 'soc/list/list_main.html',
--- a/app/soc/views/settings.py Wed Nov 05 23:33:22 2008 +0000
+++ b/app/soc/views/settings.py Wed Nov 05 23:36:28 2008 +0000
@@ -87,14 +87,14 @@
# TODO(tlarsen): partial_path will be a hard-coded read-only
# field for some (most?) User Roles
- partial_path = forms.CharField(required=False,
+ doc_partial_path = forms.CharField(required=False,
label=soc.models.work.Work.partial_path.verbose_name,
help_text=soc.models.work.Work.partial_path.help_text)
# TODO(tlarsen): actually, using these two text fields to specify
# the Document is pretty cheesy; this needs to be some much better
# Role-scoped Document selector that we don't have yet
- link_name = forms.CharField(required=False,
+ doc_link_name = forms.CharField(required=False,
label=soc.models.work.Work.link_name.verbose_name,
help_text=soc.models.work.Work.link_name.help_text)
@@ -102,10 +102,11 @@
model = None
-DEF_HOME_EDIT_TMPL = 'soc/settings/edit.html'
+DEF_HOME_EDIT_TMPL = 'soc/site_settings/edit.html'
@decorators.view
-def edit(request, page=None, path=None, logic=models.home_settings.logic,
+def edit(request, page=None, partial_path=None, link_name=None,
+ logic=models.home_settings.logic,
settings_form_class=SettingsForm,
template=DEF_HOME_EDIT_TMPL):
"""View for authorized User to edit contents of a home page.
@@ -150,11 +151,11 @@
value = settings_form.cleaned_data.get(field)
fields[field] = value
- partial_path = doc_select_form.cleaned_data.get('partial_path')
- link_name = doc_select_form.cleaned_data.get('link_name')
+ doc_partial_path = doc_select_form.cleaned_data.get('doc_partial_path')
+ doc_link_name = doc_select_form.cleaned_data.get('doc_link_name')
home_doc = document.logic.getFromFields(
- partial_path=partial_path, link_name=link_name)
+ partial_path=doc_partial_path, link_name=doc_link_name)
if home_doc:
fields['home'] = home_doc
@@ -171,7 +172,8 @@
home_doc = settings.home
else: # request.method == 'GET'
# try to fetch HomeSettings entity by unique key_name
- settings = logic.getFromFields(path=path)
+ settings = logic.getFromFields(partial_path=partial_path,
+ link_name=link_name)
if settings:
# populate form with the existing HomeSettings entity
@@ -185,8 +187,8 @@
if home_doc:
doc_select_form = DocSelectForm(initial={
- 'partial_path': home_doc.partial_path,
- 'link_name': home_doc.link_name})
+ 'doc_partial_path': home_doc.partial_path,
+ 'doc_link_name': home_doc.link_name})
else:
doc_select_form = DocSelectForm()
else:
--- a/app/soc/views/site/settings.py Wed Nov 05 23:33:22 2008 +0000
+++ b/app/soc/views/site/settings.py Wed Nov 05 23:36:28 2008 +0000
@@ -47,7 +47,8 @@
@decorators.view
-def edit(request, page=None, path=None, logic=models.site_settings.logic,
+def edit(request, page=None, partial_path=None, link_name=None,
+ logic=models.site_settings.logic,
settings_form_class=SiteSettingsForm,
template=settings_views.DEF_HOME_EDIT_TMPL):
"""View for authorized User to edit contents of a Site Settings page.
@@ -64,6 +65,8 @@
Returns:
A subclass of django.http.HttpResponse with generated template.
"""
- return settings_views.edit(request, page=page, path=path, logic=logic,
+ return settings_views.edit(request, page=page, partial_path=partial_path,
+ link_name=link_name, logic=logic,
settings_form_class=settings_form_class,
- template=template)
\ No newline at end of file
+ template=template)
+
\ No newline at end of file
--- a/app/soc/views/site/sponsor/list.py Wed Nov 05 23:33:22 2008 +0000
+++ b/app/soc/views/site/sponsor/list.py Wed Nov 05 23:36:28 2008 +0000
@@ -34,7 +34,7 @@
import soc.views.out_of_band
-DEF_SITE_SPONSOR_LIST_ALL_TMPL = 'soc/group/list/all.html'
+DEF_SITE_SPONSOR_LIST_ALL_TMPL = 'soc/models/list.html'
@decorators.view
def all(request, page=None, template=DEF_SITE_SPONSOR_LIST_ALL_TMPL):
--- a/app/soc/views/site/user/list.py Wed Nov 05 23:33:22 2008 +0000
+++ b/app/soc/views/site/user/list.py Wed Nov 05 23:36:28 2008 +0000
@@ -34,7 +34,7 @@
import soc.views.out_of_band
-DEF_SITE_USER_LIST_ALL_TMPL = 'soc/site/user/list/all.html'
+DEF_SITE_USER_LIST_ALL_TMPL = 'soc/models/list.html'
@decorators.view
def all(request, page=None, template=DEF_SITE_USER_LIST_ALL_TMPL):
@@ -69,11 +69,13 @@
context['pagination_form'] = helper.lists.makePaginationForm(request, limit)
- list_templates = {'list_main': 'soc/list/list_main.html',
- 'list_pagination': 'soc/list/list_pagination.html',
- 'list_row': 'soc/site/user/list/user_row.html',
- 'list_heading': 'soc/site/user/list/user_heading.html'}
-
+ list_templates = {
+ 'list_main': 'soc/list/list_main.html',
+ 'list_pagination': 'soc/list/list_pagination.html',
+ 'list_row': 'soc/user/list/user_row.html',
+ 'list_heading': 'soc/user/list/user_heading.html'
+ }
+
context = helper.lists.setList(
request, context, users,
offset=offset, limit=limit, list_templates=list_templates)
--- a/app/soc/views/site/user/profile.py Wed Nov 05 23:33:22 2008 +0000
+++ b/app/soc/views/site/user/profile.py Wed Nov 05 23:36:28 2008 +0000
@@ -93,7 +93,7 @@
raise forms.ValidationError('Account not found.')
-DEF_SITE_USER_PROFILE_LOOKUP_TMPL = 'soc/site/user/profile/lookup.html'
+DEF_SITE_USER_PROFILE_LOOKUP_TMPL = 'soc/user/lookup.html'
@decorators.view
def lookup(request, page=None, template=DEF_SITE_USER_PROFILE_LOOKUP_TMPL):
@@ -248,7 +248,7 @@
return form_id
-DEF_SITE_USER_PROFILE_EDIT_TMPL = 'soc/site/user/profile/edit.html'
+DEF_SITE_USER_PROFILE_EDIT_TMPL = 'soc/user/edit.html'
DEF_CREATE_NEW_USER_MSG = ' You can create a new user by visiting' \
' <a href="/site/user/profile">Create ' \
'a New User</a> page.'
@@ -403,7 +403,7 @@
return form_id
-DEF_SITE_CREATE_USER_PROFILE_TMPL = 'soc/site/user/profile/edit.html'
+DEF_SITE_CREATE_USER_PROFILE_TMPL = 'soc/user/edit.html'
@decorators.view
def create(request, page=None, template=DEF_SITE_CREATE_USER_PROFILE_TMPL):
@@ -454,7 +454,7 @@
# redirect to new /site/user/profile/new_link_name?s=0
# (causes 'Profile saved' message to be displayed)
return helper.responses.redirectToChangedSuffix(
- request, None, link_name,
+ request, 'create', 'edit/' + link_name,
params=profile.SUBMIT_PROFILE_SAVED_PARAMS)
else: # method == 'GET':
# no link name specified, so start with an empty form
--- a/app/soc/views/user/profile.py Wed Nov 05 23:33:22 2008 +0000
+++ b/app/soc/views/user/profile.py Wed Nov 05 23:36:28 2008 +0000
@@ -149,10 +149,10 @@
user = models.user.logic.updateOrCreateFromFields(properties,
key_fields)
- # redirect to new /user/profile/new_link_name?s=0
+ # redirect to /user/profile?s=0
# (causes 'Profile saved' message to be displayed)
return helper.responses.redirectToChangedSuffix(
- request, link_name, new_link_name, params=SUBMIT_PROFILE_SAVED_PARAMS)
+ request, None, params=SUBMIT_PROFILE_SAVED_PARAMS)
else: # request.method == 'GET'
# try to fetch User entity corresponding to Google Account if one exists
user = models.user.logic.getFromFields(email=id.email())