[cc-commits] [SCM] License chooser & etc (branch master) updated. 2216e87e08e17c898a45ffcaa1ee4f9d13336df0

git version control git at a7.creativecommons.org
Fri Jan 15 14:38:31 EST 2010


The branch, master has been updated
       via  2216e87e08e17c898a45ffcaa1ee4f9d13336df0 (commit)
       via  c97afbe206e737da7675c11c2098679f2279ba4c (commit)
       via  447483b8a99e88fe2bc55e44d1e924173615566b (commit)
      from  9313998a7ff4345613f1a44d87bd23035c11f426 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 2216e87e08e17c898a45ffcaa1ee4f9d13336df0
Author: Christopher Allan Webber <cwebber at dustycloud.org>
Date:   Fri Jan 15 13:39:38 2010 -0600

    Publicdomain chooser landing page renders

commit c97afbe206e737da7675c11c2098679f2279ba4c
Author: Christopher Allan Webber <cwebber at dustycloud.org>
Date:   Fri Jan 15 13:39:03 2010 -0600

    Adjusting the publicdomain landing template for the new view

commit 447483b8a99e88fe2bc55e44d1e924173615566b
Author: Christopher Allan Webber <cwebber at dustycloud.org>
Date:   Fri Jan 15 13:33:47 2010 -0600

    reindented the buffer a bit

-----------------------------------------------------------------------

Summary of changes (followed by patch):
 cc/engine/chooser/views.py                         |   17 +++-
 .../chooser_pages/publicdomain/publicdomain-2.pt   |  132 ++++++++++----------
 2 files changed, 82 insertions(+), 67 deletions(-)

diff --git a/cc/engine/chooser/views.py b/cc/engine/chooser/views.py
index 5165e5e..adbdbce 100644
--- a/cc/engine/chooser/views.py
+++ b/cc/engine/chooser/views.py
@@ -419,11 +419,26 @@ def lgpl_chooser(request):
 ### Public domain
 
 def publicdomain_landing(request):
-    pass
+    template = util.get_zpt_template(
+        'chooser_pages/publicdomain/publicdomain-2.pt')
+
+    engine_template = util.get_zpt_template(
+        'macros_templates/engine.pt')
+    support_template = util.get_zpt_template(
+        'macros_templates/support.pt')
+
+    context = _base_context(request)
+    context.update({
+            'support_template': support_template,
+            'engine_template': engine_template})
+
+    return Response(template.pt_render(context))
+
 
 def publicdomain_confirm(request):
     pass
 
+
 def publicdomain_result(request):
     pass
 
diff --git a/cc/engine/templates/chooser_pages/publicdomain/publicdomain-2.pt b/cc/engine/templates/chooser_pages/publicdomain/publicdomain-2.pt
index fc9b2d0..5d25b99 100644
--- a/cc/engine/templates/chooser_pages/publicdomain/publicdomain-2.pt
+++ b/cc/engine/templates/chooser_pages/publicdomain/publicdomain-2.pt
@@ -2,79 +2,79 @@
       xmlns:tal="http://xml.zope.org/namespaces/tal"
       xmlns:i18n="http://xml.zope.org/namespaces/i18n"
       xmlns:metal="http://xml.zope.org/namespaces/metal"
-      metal:use-macro="context/@@engine/page"
+      metal:use-macro="engine_template/macros/page"
       i18n:domain="cc_org">
-<head>
-  <title metal:fill-slot="title"
-	 i18n:translate="util.public_domain_certification">Public Domain Certification</title>
-</head>
+  <head>
+    <title metal:fill-slot="title"
+	   i18n:translate="util.public_domain_certification">
+      Public Domain Certification
+    </title>
+  </head>
 
-<body>
+  <body>
+    <metal:title metal:fill-slot="page-header-title"
+	         i18n:translate="license.pd.identify_a_pd_work">
+      Identify a Public Domain Work
+    </metal:title>
 
-  <metal:title metal:fill-slot="page-header-title"
-	       i18n:translate="license.pd.identify_a_pd_work">
-    Identify a Public Domain Work
-  </metal:title>
+    <metal:body fill-slot="body">
+      <p i18n:translate="license.pd.intro_1">
+        You have selected the Public Domain Certification.  The Public
+        Domain Certification should only be used to certify a work that is
+        already in the public domain.  Creative Commons does not recommend
+        you use the Public Domain Certification for dedicating a work
+        still protected by copyright to the public domain.  To dedicate a
+        work to the public domain, consider
+        using <a href="/choose/zero/">CC0</a>.  Please note that if you
+        use the Public Domain Certification to dedicate a work to the
+        public domain, it may not be valid outside of the United States.
+      </p>
 
-<metal:body fill-slot="body">
+      <p i18n:translate="license.pd.intro_3">
+        Once you're done filling this out, you will still have the
+        opportunity to confirm your choice before the certification
+        happens.
+      </p>
 
-  <p i18n:translate="license.pd.intro_1">
-    You have selected the Public Domain Certification.  The Public
-    Domain Certification should only be used to certify a work that is
-    already in the public domain.  Creative Commons does not recommend
-    you use the Public Domain Certification for dedicating a work
-    still protected by copyright to the public domain.  To dedicate a
-    work to the public domain, consider
-    using <a href="/choose/zero/">CC0</a>.  Please note that if you
-    use the Public Domain Certification to dedicate a work to the
-    public domain, it may not be valid outside of the United States.
-  </p>
+      <h3 i18n:translate="license.pd.about_the_work">
+        About the work you are certifying
+      </h3>
 
-  <p i18n:translate="license.pd.intro_3">
-    Once you're done filling this out, you will still have the
-    opportunity to confirm your choice before the certification
-    happens.
-  </p>
+      <form id="publicdomain"
+	    action="./publicdomain-3">
+        <input type="hidden" name="lang" value=""
+	       tal:attributes="value python:request.GET.get('lang','')" 
+	       tal:condition="python:request.GET.get('lang', False)" 
+	       />
+        <table border="0" cellspacing="3" cellpadding="3">
+          <tbody>
+	    <tr>
+	      <td align="right" i18n:translate="util.title_of_work">
+	        Title of work
+	      </td>
+	      <td><input type="text" name="title" value="" />
+	      </td>
+	    </tr>
+	    <tr>
+	      <td align="right" i18n:translate="util.author">
+	        Author
+	      </td>
+	      <td><input type="text" name="copyright_holder" value="" />
+	      </td>
+	    </tr>
+	    <tr>
+	      <td align="right">&nbsp;</td>
+	      <td>
+	        <input type="submit" value="proceed" 
+		       i18n:attributes="value util.proceed"/></td>
+	    </tr>
+          </tbody>
+        </table>
+      </form>
 
-  <h3 i18n:translate="license.pd.about_the_work">
-    About the work you are certifying
-  </h3>
+      <div metal:use-macro="support_template/macros/engine_languages"></div>
 
-  <form id="publicdomain"
-	action="./publicdomain-3">
-    <input type="hidden" name="lang" value=""
-	   tal:attributes="value python:request.form.get('lang','')" 
-	   tal:condition="python:request.form.get('lang', False)" 
-	   />
-    <table border="0" cellspacing="3" cellpadding="3">
-      <tbody>
-	<tr>
-	  <td align="right" i18n:translate="util.title_of_work">
-	    Title of work
-	  </td>
-	  <td><input type="text" name="title" value="" />
-	  </td>
-	</tr>
-	<tr>
-	  <td align="right" i18n:translate="util.author">
-	    Author
-	  </td>
-	  <td><input type="text" name="copyright_holder" value="" />
-	  </td>
-	</tr>
-	<tr>
-	  <td align="right">&nbsp;</td>
-	  <td>
-	    <input type="submit" value="proceed" 
-		   i18n:attributes="value util.proceed"/></td>
-	</tr>
-      </tbody>
-    </table>
-  </form>
+    </metal:body>
 
-    <div metal:use-macro="context/@@support/engine_languages"></div>
-
-</metal:body>
-
-</body>
+  </body>
 </html>


hooks/post-receive
-- 
License chooser & etc



More information about the cc-commits mailing list