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

Gitosis User git at gandi0.creativecommons.org
Fri Sep 16 06:18:28 EDT 2011


The branch, next has been updated
       via  38dff5d08eae76852ac040a0d2ec54db7de067ad (commit)
       via  109dfc21d42746a9c1ebebb847a6d7a4ceb0da5d (commit)
       via  4d40224db9b59e1a37b65f202321ed1147cec9d6 (commit)
       via  b6b1da53a73664cc207536639b8bff8e3f7b51f6 (commit)
      from  d1fef85e531d792e509a5ccf5716e125f2fa8419 (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 38dff5d08eae76852ac040a0d2ec54db7de067ad
Author: Christopher Allan Webber <cwebber at dustycloud.org>
Date:   Fri Sep 16 05:19:12 2011 -0500

    Removing help.js from index.html

commit 109dfc21d42746a9c1ebebb847a6d7a4ceb0da5d
Author: Christopher Allan Webber <cwebber at dustycloud.org>
Date:   Fri Sep 16 05:17:40 2011 -0500

    Adding the planet to the navigation

commit 4d40224db9b59e1a37b65f202321ed1147cec9d6
Author: Christopher Allan Webber <cwebber at dustycloud.org>
Date:   Fri Sep 16 05:16:45 2011 -0500

    Adding a scripts block for bottom-of-the-file scripts.

commit b6b1da53a73664cc207536639b8bff8e3f7b51f6
Author: Christopher Allan Webber <cwebber at dustycloud.org>
Date:   Fri Sep 16 04:38:00 2011 -0500

    Removing help.js from publicdomain-3 and fixing the form class for prettiness

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

Summary of changes (followed by patch):
 .../chooser_pages/publicdomain/publicdomain-3.html |    6 +-----
 cc/engine/templates/chooser_pages/zero/index.html  |    6 ------
 cc/engine/templates/macros_templates/engine.html   |    2 ++
 3 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/cc/engine/templates/chooser_pages/publicdomain/publicdomain-3.html b/cc/engine/templates/chooser_pages/publicdomain/publicdomain-3.html
index ab426c6..dc48554 100644
--- a/cc/engine/templates/chooser_pages/publicdomain/publicdomain-3.html
+++ b/cc/engine/templates/chooser_pages/publicdomain/publicdomain-3.html
@@ -18,10 +18,6 @@
   <link rel="stylesheet" type="text/css"
         href="{{ request.staticdirect('/includes/zero.css') }}" />
 
-  <script type="text/javascript"
-          src="{{ request.staticdirect('/includes/help.js') }}" >
-  </script>
-
   <script type="text/javascript">
 
 YAHOO.namespace("cc.pdc");
@@ -50,7 +46,7 @@ YAHOO.util.Event.onDOMReady(function() {
 {% block body %}
   <div class="yui-module">
     <div class="bd">
-      <form id="form-details" action="./publicdomain-4">
+      <form id="form-details" class="form-stacked" action="./publicdomain-4">
         <div class="licensebox" style="clear:both;">
           <h4>
             {{ cctrans(locale, "deed.pd.title_plain")|safe }}
diff --git a/cc/engine/templates/chooser_pages/zero/index.html b/cc/engine/templates/chooser_pages/zero/index.html
index b67ceb9..f9b6963 100644
--- a/cc/engine/templates/chooser_pages/zero/index.html
+++ b/cc/engine/templates/chooser_pages/zero/index.html
@@ -3,14 +3,8 @@
 {% block title %}CC0{% endblock title %}
 
 {% block headers %}
-
   <link rel="stylesheet" type="text/css"
         href="{{ request.staticdirect('includes/zero.css') }}" />
-
-  <script type="text/javascript"
-          src="{{ request.staticdirect('/includes/help.js') }}" >
-  </script>
-
 {% endblock headers %}
 
 {% block sidebar %}{% endblock %}
diff --git a/cc/engine/templates/macros_templates/engine.html b/cc/engine/templates/macros_templates/engine.html
index 2672103..84e2e6c 100644
--- a/cc/engine/templates/macros_templates/engine.html
+++ b/cc/engine/templates/macros_templates/engine.html
@@ -149,6 +149,7 @@
               <li class="dropdown"><a href="/weblog" class="dropdown-toggle">News</a>
                 <ul class="menu-dropdown">
                   <li><a href="/weblog">Blog</a></li>
+                  <li><a href="http://planet.creativecommons.org/">Affiliate News</a></li>
 
                   <li class="divider"></li>
                   <li><a href="/interviews">Interviews</a></li>
@@ -289,5 +290,6 @@
       var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
     })();
   </script>
+  {% block scripts %}{% endblock %}
 </body>
 </html>


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


More information about the cc-commits mailing list