[cc-commits] [SCM] cc.engine: License chooser, public domain chooser, deeds (branch master) updated. 3fd160008aec0ca260b4eb8f02bfb7ea2be2c96a

Gitosis User git at gandi0.creativecommons.org
Tue Jan 10 17:25:25 EST 2012


The branch, master has been updated
       via  3fd160008aec0ca260b4eb8f02bfb7ea2be2c96a (commit)
       via  e483934d036534a6eb8045ba570f17ab9627bf6c (commit)
       via  99a650e0f61deaee4c86496c47862504d11daad2 (commit)
       via  d34ca9e3d048c23af5b4d956f921c05ab6dee210 (commit)
       via  e54e0dccd6a0c5c8c7970d23a66f04f68eda8b05 (commit)
       via  37e95e2ae084895194aa61fe91a71fee703d0830 (commit)
      from  a37583ee30145e01ccf70f4c58686612cff58c91 (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 3fd160008aec0ca260b4eb8f02bfb7ea2be2c96a
Merge: a37583e e483934
Author: Jonathan Palecek <jonathan at creativecommons.org>
Date:   Tue Jan 10 14:16:00 2012 -0600

    Merge branch 'next'

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

Summary of changes (followed by patch):
 cc/engine/templates/licenses/standard_deed.html    |    1 -
 cc/engine/templates/macros_templates/deed.html     |    8 ++++++--
 .../templates/macros_templates/pdtool_deed.html    |    6 ++++--
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/cc/engine/templates/licenses/standard_deed.html b/cc/engine/templates/licenses/standard_deed.html
index b51d1f0..029be77 100644
--- a/cc/engine/templates/licenses/standard_deed.html
+++ b/cc/engine/templates/licenses/standard_deed.html
@@ -164,7 +164,6 @@
               {{ cctrans(locale, "deed.moralrights-remix.us")|safe }}
             </li>
           {% endif %}
-          </span>
 
           <li>
             {{ cctrans(locale, "deed.publicity_rights")|safe }}
diff --git a/cc/engine/templates/macros_templates/deed.html b/cc/engine/templates/macros_templates/deed.html
index 69b6897..9479b68 100644
--- a/cc/engine/templates/macros_templates/deed.html
+++ b/cc/engine/templates/macros_templates/deed.html
@@ -140,7 +140,7 @@
       <p>
         {% if not license.deprecated %}
           {% block use_this_license %}
-            <a id="get_this" href="/choose/results-one?license_code={{ license_code_quoted }}&jurisdiction={{ license.jurisdiction.code }}&version={{ license.version }}&lang={{ target_lang }}"
+            <a id="get_this" href="/choose/results-one?license_code={{ license_code_quoted }}&amp;jurisdiction={{ license.jurisdiction.code }}&amp;version={{ license.version }}&amp;lang={{ target_lang }}"
                >{{ cctrans(locale, "deed.use_this_license")|safe }}</a>
           {% endblock %}
         {% endif %}
@@ -149,6 +149,7 @@
     </div>
 
     <script type="text/javascript">
+//<![CDATA[
       var _gaq = _gaq || [];
       _gaq.push(['_setAccount', 'UA-2010376-1']);
       _gaq.push(['_trackPageview']);
@@ -158,9 +159,12 @@
         ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
         var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
       })();
+//]]>
     </script>
     <script type="text/javascript">
-      document.write("<" + "script type='text/javascript' src='http://scraper.creativecommons.org/apps/deed?url=" + encodeURIComponent(document.referrer) + "&license_uri=" + encodeURIComponent(document.URL) + "&callback=YAHOO.cc.success'" + "><" + "/script>");
+//<![CDATA[
+      document.write("<" + "script type='text/javascript' src='http://scraper.creativecommons.org/apps/deed?url=" + encodeURIComponent(document.referrer) + "&amp;license_uri=" + encodeURIComponent(document.URL) + "&amp;callback=YAHOO.cc.success'" + "><" + "/script>");
+//]]>
     </script>
   </body>
 </html>
diff --git a/cc/engine/templates/macros_templates/pdtool_deed.html b/cc/engine/templates/macros_templates/pdtool_deed.html
index 5bcffd6..3712910 100644
--- a/cc/engine/templates/macros_templates/pdtool_deed.html
+++ b/cc/engine/templates/macros_templates/pdtool_deed.html
@@ -106,7 +106,7 @@
     </div>
 
     <script type="text/javascript">
-
+      //<![CDATA[
       var _gaq = _gaq || [];
       _gaq.push(['_setAccount', 'UA-2010376-1']);
       _gaq.push(['_trackPageview']);
@@ -116,10 +116,12 @@
         ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
         var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
       })();
-
+//]]>
     </script>
     <script type="text/javascript">
+      //<![CDATA[
       document.write("<" + "script type='text/javascript' src='http://scraper.creativecommons.org/apps/pddeed?url=" + encodeURIComponent(document.referrer) + "&license_uri=" + encodeURIComponent(document.URL) + "&callback=YAHOO.cc.success'" + "><" + "/script>");
+//]]>
     </script>
   </body>
 </html>


hooks/post-receive
-- 
cc.engine: License chooser, public domain chooser, deeds


More information about the cc-commits mailing list