# HG changeset patch # User Todd Larsen # Date 1211484973 0 # Node ID 670a4571f496c74a9b8bd2e1ceb75565a9577cca # Parent 8b43c541afa7afcb9786bf7d3274f77cd587ffe5 Move soc/profile.html into soc/person/profile.html, to avoid collisions between similarly-named templates. diff -r 8b43c541afa7 -r 670a4571f496 soc/templates/soc/person/profile.html --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/soc/templates/soc/person/profile.html Thu May 22 19:36:13 2008 +0000 @@ -0,0 +1,30 @@ +{% 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 %} + + + + Profile + {% block 'stylesheet' %}{% endblock %} + + +

+ {% block 'logo' %}{% endblock %} + Welcome, {{user.nickname}}. Please update your profile: +

+ {{form.as_table}}
+ +
+

+ + diff -r 8b43c541afa7 -r 670a4571f496 soc/templates/soc/profile.html --- a/soc/templates/soc/profile.html Wed May 21 16:27:35 2008 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,30 +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 %} - - - - Profile - {% block 'stylesheet' %}{% endblock %} - - -

- {% block 'logo' %}{% endblock %} - Welcome, {{user.nickname}}. Please update your profile: -

- {{form.as_table}}
- -
-

- - diff -r 8b43c541afa7 -r 670a4571f496 soc/views/person.py --- a/soc/views/person.py Wed May 21 16:27:35 2008 +0000 +++ b/soc/views/person.py Thu May 22 19:36:13 2008 +0000 @@ -42,7 +42,7 @@ exclude = ['user', ] -def profile(request, template='soc/profile.html'): +def profile(request, template='soc/person/profile.html'): """View for a Person to modify the properties of a PersonModel. Args: