Mercurial Mercurial > py_tasks_melange / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Move soc/profile.html into soc/person/profile.html, to avoid collisions between
authorTodd Larsen <tlarsen@google.com>
Thu, 22 May 2008 19:36:13 +0000
changeset 32 670a4571f496
parent 31 8b43c541afa7
child 33 616855b101b5
Move soc/profile.html into soc/person/profile.html, to avoid collisions between similarly-named templates.
soc/templates/soc/person/profile.html file | annotate | diff | comparison | revisions
soc/templates/soc/profile.html file | annotate | diff | comparison | revisions
soc/views/person.py file | annotate | diff | comparison | revisions 
--- /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 %}
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<html lang="en">
+ <head>
+  <title>Profile</title>
+  {% block 'stylesheet' %}{% endblock %}
+ </head>
+ <body>
+  <p>
+   {% block 'logo' %}{% endblock %}
+   Welcome, {{user.nickname}}. Please update your profile:
+   <form method="POST">
+    <table>{{form.as_table}}</table>
+    <input type="submit" />
+   </form>
+  </p>
+ </body>
+</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 %}
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
-<html lang="en">
- <head>
-  <title>Profile</title>
-  {% block 'stylesheet' %}{% endblock %}
- </head>
- <body>
-  <p>
-   {% block 'logo' %}{% endblock %}
-   Welcome, {{user.nickname}}. Please update your profile:
-   <form method="POST">
-    <table>{{form.as_table}}</table>
-    <input type="submit" />
-   </form>
-  </p>
- </body>
-</html>
--- 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:
py_tasks_melange