[cc-commits] [SCM] cc.engine: License chooser, public domain chooser, deeds (branch next) updated. 99a650e0f61deaee4c86496c47862504d11daad2

Gitosis User git at gandi0.creativecommons.org
Tue Jan 10 13:33:41 EST 2012


The branch, next has been updated
       via  99a650e0f61deaee4c86496c47862504d11daad2 (commit)
       via  d34ca9e3d048c23af5b4d956f921c05ab6dee210 (commit)
      from  e54e0dccd6a0c5c8c7970d23a66f04f68eda8b05 (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 99a650e0f61deaee4c86496c47862504d11daad2
Merge: d34ca9e e54e0dc
Author: Jonathan Palecek <jonathan at creativecommons.org>
Date:   Tue Jan 10 12:35:33 2012 -0600

    Merge branch 'next' of code.creativecommons.org:cc.engine into next

commit d34ca9e3d048c23af5b4d956f921c05ab6dee210
Author: Jonathan Palecek <jonathan at creativecommons.org>
Date:   Tue Jan 10 12:34:51 2012 -0600

    Issue 1008: fixed malformed xhtml in license templates

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

Summary of changes (followed by patch):
 cc/engine/templates/licenses/standard_deed.html |    1 -
 cc/engine/templates/macros_templates/deed.html  |    8 ++++++--
 2 files changed, 6 insertions(+), 3 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..3577bf9 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>


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


More information about the cc-commits mailing list