[cc-commits] [git]cc.license (branch master) updated. c56eda1746abc6d7d4eaef62a5b4cb3ae4a34238

git version control webmaster at creativecommons.org
Mon Mar 1 15:51:36 EST 2010


The branch, master has been updated
       via  c56eda1746abc6d7d4eaef62a5b4cb3ae4a34238 (commit)
      from  7471166621166a344467685bb1fff4cee5d931e5 (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 c56eda1746abc6d7d4eaef62a5b4cb3ae4a34238
Author: Christopher Allan Webber <cwebber at dustycloud.org>
Date:   Mon Mar 1 14:51:28 2010 -0600

    Roundup #419: CC0 publisher sans url should use <span> not <a>

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

Summary of changes (followed by patch):
 cc/license/formatters/templates/cc0.pt |    4 ++--
 cc/license/tests/test_formatters.py    |    6 ++----
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/cc/license/formatters/templates/cc0.pt b/cc/license/formatters/templates/cc0.pt
index 8d68739..796deba 100644
--- a/cc/license/formatters/templates/cc0.pt
+++ b/cc/license/formatters/templates/cc0.pt
@@ -34,8 +34,8 @@
   <a tal:condition="python: actor and actor_href" rel="dct:publisher"
      tal:attributes="href actor_href">
     <span property="dct:title" tal:content="actor"></span></a>
-  <a tal:condition="python: actor and not actor_href" href="[_:publisher]" rel="dct:publisher">
-    <span property="dct:title" tal:content="actor"></span></a>
+  <span property="dct:title"
+        tal:condition="python: actor and not actor_href" tal:content="actor"></span>
   <a tal:condition="python: not actor and actor_href" rel="dct:publisher"
      tal:attributes="href actor_href" tal:content="actor_href"></a>
 
diff --git a/cc/license/tests/test_formatters.py b/cc/license/tests/test_formatters.py
index 07d5676..9db52e3 100644
--- a/cc/license/tests/test_formatters.py
+++ b/cc/license/tests/test_formatters.py
@@ -92,8 +92,7 @@ EXPECTED_CC0_ACTOR = """<p xmlns:dct="http://purl.org/dc/terms/" xmlns:vcard="ht
   </a>
   <br />
   To the extent possible under law,
-  <a href="[_:publisher]" rel="dct:publisher">
-    <span property="dct:title">Expected Name</span></a>
+  <span property="dct:title">Expected Name</span>
   has waived all copyright and related or neighboring rights to
   this work.
 </p>"""
@@ -105,8 +104,7 @@ EXPECTED_CC0_ACTOR_TITLE = """<p xmlns:dct="http://purl.org/dc/terms/" xmlns:vca
   </a>
   <br />
   To the extent possible under law,
-  <a href="[_:publisher]" rel="dct:publisher">
-    <span property="dct:title">Expected Name</span></a>
+  <span property="dct:title">Expected Name</span>
   has waived all copyright and related or neighboring rights to
   <span property="dct:title">Expected Title</span>.
 </p>"""


hooks/post-receive
-- 
cc.license



More information about the cc-commits mailing list