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

Gitosis User git at gandi0.creativecommons.org
Fri Sep 16 09:31:18 EDT 2011


The branch, master has been updated
       via  589daf9fcf814f6fd981508c1dc221448f00ba9c (commit)
       via  19c976660cd34056e3501cbb504b8093beebe961 (commit)
       via  007b2f8532b3f4d57331742fa55c3a1c7717faf0 (commit)
       via  223a223ba00c3de25dce72553899339e29b7f3a9 (commit)
       via  6b035f978999663a6a3141064396f044556ff7a8 (commit)
       via  38dff5d08eae76852ac040a0d2ec54db7de067ad (commit)
       via  109dfc21d42746a9c1ebebb847a6d7a4ceb0da5d (commit)
       via  4d40224db9b59e1a37b65f202321ed1147cec9d6 (commit)
       via  b6b1da53a73664cc207536639b8bff8e3f7b51f6 (commit)
       via  d1fef85e531d792e509a5ccf5716e125f2fa8419 (commit)
       via  0051781600d25fbc2d52b22a855b1e5aedbc5b2f (commit)
       via  d001442627ffa068e4a4f25c66ec75a8289eb7f0 (commit)
       via  b4630e0ceca33004183826ae787d47c3474575cb (commit)
       via  6fb8576d91669e2f2c82f682e3dc29fd7648e349 (commit)
       via  931c018aad06a528ab490c104e38e4f44d625148 (commit)
       via  f3b962f5dda97971021b42b1252775600fae6fd9 (commit)
       via  6341108e264e9fa4e726b1b13d13d748a49a1460 (commit)
       via  85623e8deea755e9985a7a36f36ab91760d0ee3b (commit)
       via  ef644acc6e5a8e6e8d6d9d8817ee8e2a3504b5e4 (commit)
       via  9aa90488a6e107eb32fab2bc309c9607f47ab965 (commit)
       via  a99f358658d1343a0950a2d3a5d5beb2e2748fb0 (commit)
       via  e6313051833fdfc3df8d1fa194771ea776d8e086 (commit)
       via  6339af9f1a92acd716075a6c9701a3e8aae3c5c7 (commit)
       via  b1546b3090d35e923af709c9841048046fccabf3 (commit)
       via  de7d4282c3bc51595431bef825ca0890eabd1109 (commit)
       via  37802b761f413a6afcf08624dc9e5c509bda1a3a (commit)
      from  3b481f1cc09faf196e4da9dc992d4262f8007c23 (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 589daf9fcf814f6fd981508c1dc221448f00ba9c
Author: Christopher Allan Webber <cwebber at dustycloud.org>
Date:   Fri Sep 16 08:15:11 2011 -0500

    Removing YUI stuff

commit 19c976660cd34056e3501cbb504b8093beebe961
Author: Christopher Allan Webber <cwebber at dustycloud.org>
Date:   Fri Sep 16 08:01:39 2011 -0500

    Make textarea widths 100%

commit 007b2f8532b3f4d57331742fa55c3a1c7717faf0
Author: Christopher Allan Webber <cwebber at dustycloud.org>
Date:   Fri Sep 16 08:01:25 2011 -0500

    CC0 output should give a CC0 button, not a BY one

commit 223a223ba00c3de25dce72553899339e29b7f3a9
Author: Christopher Allan Webber <cwebber at dustycloud.org>
Date:   Fri Sep 16 05:40:31 2011 -0500

    Adding javascript for toggling the submit button

commit 6b035f978999663a6a3141064396f044556ff7a8
Author: Christopher Allan Webber <cwebber at dustycloud.org>
Date:   Fri Sep 16 05:40:09 2011 -0500

    Big refactoring: removing help.js, class="btn"'ifying buttons, removing YUI stuff

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

commit d1fef85e531d792e509a5ccf5716e125f2fa8419
Author: Christopher Allan Webber <cwebber at dustycloud.org>
Date:   Thu Sep 15 11:59:22 2011 -0500

    Add and .gitignore the new cc theme

commit 0051781600d25fbc2d52b22a855b1e5aedbc5b2f
Author: Christopher Allan Webber <cwebber at dustycloud.org>
Date:   Thu Sep 15 10:33:19 2011 -0500

    More template reindentation!

commit d001442627ffa068e4a4f25c66ec75a8289eb7f0
Author: Christopher Allan Webber <cwebber at dustycloud.org>
Date:   Thu Sep 15 09:47:12 2011 -0500

    reindented chooser_pages/index.html

commit b4630e0ceca33004183826ae787d47c3474575cb
Author: Christopher Allan Webber <cwebber at dustycloud.org>
Date:   Thu Sep 15 09:32:57 2011 -0500

    Oops, fixing {% if %} tags indentation in engine.html

commit 6fb8576d91669e2f2c82f682e3dc29fd7648e349
Author: Christopher Allan Webber <cwebber at dustycloud.org>
Date:   Thu Sep 15 09:28:43 2011 -0500

    Untabify'ing licenses-index.html

commit 931c018aad06a528ab490c104e38e4f44d625148
Author: Christopher Allan Webber <cwebber at dustycloud.org>
Date:   Thu Sep 15 09:27:42 2011 -0500

    Reindenting engine.html

commit f3b962f5dda97971021b42b1252775600fae6fd9
Merge: 3b481f1 6341108
Author: Nathan Kinkade <nkinkade at creativecommons.org>
Date:   Mon Sep 12 13:52:09 2011 -0400

    Merge remote-tracking branch 'origin/fabricatorz' into next

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

Summary of changes (followed by patch):
 .gitignore                                         |    1 +
 buildout.cfg                                       |    4 +-
 cc.engine.ini                                      |    6 +
 .../templates/catalog_pages/licenses-index.html    |   91 ++--
 cc/engine/templates/chooser_pages/index.html       |  162 ++++----
 .../templates/chooser_pages/pdmark/details.html    |   56 +--
 .../templates/chooser_pages/pdmark/index.html      |   84 +---
 .../templates/chooser_pages/pdmark/results.html    |   23 +-
 .../chooser_pages/publicdomain/publicdomain-2.html |    2 +-
 .../chooser_pages/publicdomain/publicdomain-3.html |   53 +--
 .../chooser_pages/publicdomain/publicdomain-4.html |    1 +
 .../templates/chooser_pages/zero/confirm.html      |   20 +-
 cc/engine/templates/chooser_pages/zero/index.html  |   59 +--
 .../templates/chooser_pages/zero/results.html      |   20 +-
 cc/engine/templates/chooser_pages/zero/waiver.html |  135 +++---
 cc/engine/templates/includes/more_metadata.html    |  172 ++++----
 cc/engine/templates/macros_templates/engine.html   |  451 ++++++++++++--------
 cc/engine/tests/view_tests.json                    |    2 +-
 18 files changed, 668 insertions(+), 674 deletions(-)

diff --git a/.gitignore b/.gitignore
index 9b6a3c9..f8d8632 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,6 +4,7 @@ cc/engine/resources/cc5
 cc/engine/resources/cc6
 cc/engine/resources/images
 cc/engine/resources/includes
+cc/engine/resources/cctheme
 dist/
 bin/
 develop-eggs/
diff --git a/buildout.cfg b/buildout.cfg
index 2fad6fb..bc36a00 100644
--- a/buildout.cfg
+++ b/buildout.cfg
@@ -19,9 +19,11 @@ eggs=
 recipe = infrae.subversion
 urls = 
     http://code.creativecommons.org/svnroot/ccwordpress/trunk/www/wp-content/themes/cc3 cc3
+    http://code.creativecommons.org/svnroot/ccwordpress/trunk/www/wp-content/themes/cc3 cc3
     http://code.creativecommons.org/svnroot/ccwordpress/trunk/www/wp-content/themes/cc4 cc4
     http://code.creativecommons.org/svnroot/ccwordpress/trunk/www/wp-content/themes/cc5 cc5
     http://code.creativecommons.org/svnroot/ccwordpress/trunk/www/wp-content/themes/cc6 cc6
+    http://code.creativecommons.org/svnroot/themes/creativecommons.org/trunk cctheme
     http://code.creativecommons.org/svnroot/ccwordpress/trunk/www/images images
     http://code.creativecommons.org/svnroot/ccwordpress/trunk/www/includes includes
-location = cc/engine/resources
\ No newline at end of file
+location = cc/engine/resources
diff --git a/cc.engine.ini b/cc.engine.ini
index 705ca06..800a1da 100644
--- a/cc.engine.ini
+++ b/cc.engine.ini
@@ -10,6 +10,7 @@ use = egg:Paste#urlmap
 /wp-content/themes/cc4 = cc4_serve
 /wp-content/themes/cc5 = cc5_serve
 /wp-content/themes/cc6 = cc6_serve
+/wp-content/themes/creativecommons.org = cctheme_serve
 
 [app:ccengine]
 use = egg:cc.engine#ccengine_app
@@ -20,6 +21,7 @@ direct_remote_paths =
    cc4 /wp-content/themes/cc4
    cc5 /wp-content/themes/cc5
    cc6 /wp-content/themes/cc6
+   cctheme /wp-content/themes/creativecommons.org
 
 [app:images_serve]
 use = egg:Paste#static
@@ -45,6 +47,10 @@ document_root = %(here)s/cc/engine/resources/cc5
 use = egg:Paste#static
 document_root = %(here)s/cc/engine/resources/cc6
 
+[app:cctheme_serve]
+use = egg:Paste#static
+document_root = %(here)s/cc/engine/resources/cctheme
+
 [server:main]
 use = egg:Paste#http
 host = 0.0.0.0
diff --git a/cc/engine/templates/catalog_pages/licenses-index.html b/cc/engine/templates/catalog_pages/licenses-index.html
index bfcc5a7..5e43416 100644
--- a/cc/engine/templates/catalog_pages/licenses-index.html
+++ b/cc/engine/templates/catalog_pages/licenses-index.html
@@ -5,9 +5,8 @@
 {% block page_header_title %}About The Licenses{% endblock page_header_title %}
 
 {% block body %}
-{# maybe include an extra div around all this? #}
-  <div class="container_16">
-    <div class="grid_12">
+  <div class="row">
+    <div class="ten columns alpha">
       <h2>
         {{ cctrans(locale, "license.index.what_licenses_do.title")|safe }}
       </h2>
@@ -16,20 +15,20 @@
       </div>
     </div>
 
-    <div class="grid_4">
+    <div class="six columns omega">
       <video width="230" height="210" controls>
         <source src="http://mirrors.creativecommons.org/movingimages/webm/WannaWorkTogether_360p.webm" type="video/webm" />
         <source src="http://blip.tv/file/get/Commonscreative-WannaWorkTogether958.mov" type="video/mp4" />
         <embed src="http://blip.tv/play/gpxSkdkzAg" type="application/x-shockwave-flash" width="230" height="210" allowscriptaccess="always" allowfullscreen="true"></embed>
       </video>
     </div>
-  </div>
+  </div> <!--! end "row" -->
 
-  <div class="container_16">
-    <h2 class="grid_16">
+  <div class="row">
+    <h2>
       {{ cctrans(locale, "license.index.design_rationale.title")|safe }}
     </h2>
-    <div class="grid_8">
+    <div class="eight columns alpha">
       <p>
         {{ cctrans(locale, "license.index.design_rationale.body1")|safe }}
       </p>
@@ -38,7 +37,7 @@
         {{ cctrans(locale, "license.index.design_rationale.body2")|safe }}
       </p>
     </div>
-    <div class="grid_8">
+    <div class="eight columns omega">
       <p>
         {{ cctrans(locale, "license.index.design_rationale.body3")|safe }}
       </p>
@@ -49,14 +48,15 @@
     </div>
   </div>
   <div class="alt" id="layers">
-    <div class="container_16">
-      <h2 class="grid_16">
+    <div class="row">
+      <h2>
         {{ cctrans(locale, "license.index.three_layers.title")|safe }}
       </h2>
-      <div class="grid_5">
+        <div class="six columns alpha">
         <img src="/images/license-layers.png" alt="Three Layers of Licenses"/>
       </div>
-      <div class="grid_11">
+
+      <div class="ten columns omega">
         <p>
           {{ cctrans(locale, "license.index.three_layers.body1")|safe }}
         </p>
@@ -80,16 +80,17 @@
     </div>
   </div>
 
-  <div class="container_16" id="licenses">
-    <h2 class="grid_16">
+  <div class="row" id="licenses">
+    <h2>
       {{ cctrans(locale, "license.index.the_licenses.title")|safe }}
     </h2>
-    <ul>
-      <li class="grid_8">
-        <div class="grid_2 alpha" style="text-align:right;">
+    <div class="row">
+      <div class="eight columns alpha">
+        <div class="two columns alpha">
+
           <img src="http://i.creativecommons.org/l/by/3.0/88x31.png" alt="" width="88" height="31" />
         </div>
-        <div class="grid_5 omega">
+        <div class="six columns omega">
           <p>
             <strong>
               {{ cctrans(locale, "licenses.pretty_by")|safe }}
@@ -109,14 +110,14 @@
             </span>
           </p>
         </div>
-      </li>
+      </div>
 
-      <li class="grid_8">
-        <div class="grid_2 alpha" style="text-align:right;">
+      <div class="eight columns omega">
+        <div class="two columns alpha">
           <img src="http://i.creativecommons.org/l/by-sa/3.0/88x31.png"
                alt="" width="88" height="31" />
         </div>
-        <div class="grid_5 omega">
+        <div class="six columns omega">
           <p>
             <strong>
               {{ cctrans(locale, "licenses.pretty_by-sa")|safe }}
@@ -138,12 +139,14 @@
             </span>
           </p>
         </div>
-      </li>
-      <li class="grid_8">
-        <div class="grid_2 alpha" style="text-align:right;">
+      </div>
+        </div>
+        <div class="row">
+      <div class="eight columns alpha">
+        <div class="two columns alpha">
           <img src="http://i.creativecommons.org/l/by-nd/3.0/88x31.png" alt="" width="88" height="31" />
         </div>
-        <div class="grid_5 omega">
+        <div class="six columns omega">
           <p>
             <strong>
               {{ cctrans(locale, "licenses.pretty_by-nd")|safe }}
@@ -165,12 +168,12 @@
             </span>
           </p>
         </div>
-      </li>
-      <li class="grid_8">
-        <div class="grid_2 alpha" style="text-align:right;">
+      </div>
+      <div class="eight columns omega">
+        <div class="two columns alpha">
           <img src="http://i.creativecommons.org/l/by-nc/3.0/88x31.png" alt="" width="88" height="31" />
         </div>
-        <div class="grid_5 omega">
+        <div class="six columns omega">
           <p>
             <strong>
               {{ cctrans(locale, "licenses.pretty_by-nc")|safe }}
@@ -192,12 +195,14 @@
             </span>
           </p>
         </div>
-      </li>
-      <li class="grid_8">
-        <div class="grid_2 alpha" style="text-align:right;">
+      </div>
+        </div>
+        <div class="row">
+      <div class="eight columns alpha">
+        <div class="two columns alpha">
           <img src="http://i.creativecommons.org/l/by-nc-sa/3.0/88x31.png" alt="" width="88" height="31" />
         </div>
-        <div class="grid_5 omega">
+        <div class="six columns omega">
           <p>
             <strong>
               {{ cctrans(locale, "licenses.pretty_by-nc-sa")|safe }}
@@ -219,12 +224,12 @@
             </span>
           </p>
         </div>
-      </li>
-      <li class="grid_8">
-        <div class="grid_2 alpha" style="text-align:right;">
+      </div>
+      <div class="eight columns omega">
+        <div class="two columns alpha">
           <img src="http://i.creativecommons.org/l/by-nc-nd/3.0/88x31.png" alt="" width="88" height="31" />
         </div>
-        <div class="grid_5 omega">
+        <div class="six columns omega">
           <p>
             <strong>
               {{ cctrans(locale, "licenses.pretty_by-nc-nd")|safe }}
@@ -246,16 +251,16 @@
             </span>
           </p>
         </div>
-      </li>
-    </ul>
-    <div class="grid_12">
+      </div>
+    </div>
+    <div class="row">
       <p>
         {{ cctrans(locale, "license.about_our_publicdomain_tools")|safe }}
       </p>
     </div>
   </div>
 
-  <div class="container_16">
+  <div class="row">
     {% include "includes/engine_languages.html" %}
   </div>
 {% endblock body %}
diff --git a/cc/engine/templates/chooser_pages/index.html b/cc/engine/templates/chooser_pages/index.html
index 78842e1..7c4fd07 100644
--- a/cc/engine/templates/chooser_pages/index.html
+++ b/cc/engine/templates/chooser_pages/index.html
@@ -3,13 +3,8 @@
 {% block title %}Choose a License{% endblock title %}
 
 {% block headers %}
-    <script type="text/javascript"
-            src="http://yui.yahooapis.com/2.6.0/build/container/container-min.js">
-    </script>
-
-    <script src="{{ request.staticdirect('/includes/help.js') }}"
-            type="text/javascript">
-    </script>
+  <link rel="stylesheet" type="text/css"
+        href="/wp-content/themes/creativecommons.org/engine.css" />
 {% endblock headers %}
 
 {% block body %}
@@ -30,7 +25,7 @@
   </div>
 
   <div class="licensebox">
-    <form action="./results-one" method="get" >
+    <form action="./results-one" method="get" class="form-stacked" >
       <div>
         <input type="hidden"  name="q_1" value="2" id="question_1-2"
                checked="checked" />
@@ -51,6 +46,18 @@
             <img src="{{ request.staticdirect('images/information.png') }}"
                  alt="{{ cctrans(locale, 'Information')|safe }}"/>
           </a>
+          <div class="help-popover">
+            <div class="popover below">
+              <div class="arrow"></div>
+              <div class="inner">
+                <h3 class="title">{{ cctrans(locale, "Commercial Use")|safe }}</h3>
+                <a href="#" class="close">&times;</a>
+                <div class="content">
+                  <p>{{ cctrans(locale, "license.help.commercial")|safe }}</p>
+                </div>
+              </div>
+            </div>
+          </div>
         </li>
 
         <li>
@@ -61,6 +68,18 @@
             <img src="{{ request.staticdirect('images/information.png') }}"
                  alt="{{ cctrans(locale, 'Information')|safe }}"/>
           </a>
+          <div class="help-popover">
+            <div class="popover below">
+              <div class="arrow"></div>
+              <div class="inner">
+                <h3 class="title">{{ cctrans(locale, "licenses.pretty_nc")|safe }}</h3>
+                <a href="#" class="close">&times;</a>
+                <div class="content">
+                  <p>{{ cctrans(locale, "license.help.noncommercial")|safe }}</p>
+                </div>
+              </div>
+            </div>
+          </div>
         </li>
       </ul>
 
@@ -80,6 +99,18 @@
             <img src="{{ request.staticdirect('images/information.png') }}"
                  alt="{{ cctrans(locale, 'Information')|safe }}"/>
           </a>
+          <div class="help-popover">
+            <div class="popover below">
+              <div class="arrow"></div>
+              <div class="inner">
+                <h3 class="title">{{ cctrans(locale, "Allow Derivative Works")|safe }}</h3>
+                <a href="#" class="close">&times;</a>
+                <div class="content">
+                  <p>{{ cctrans(locale, "license.help.derivatives")|safe }}</p>
+                </div>
+              </div>
+            </div>
+          </div>
         </li>
 
         <li>
@@ -93,6 +124,18 @@
               <img src="{{ request.staticdirect('images/information.png') }}"
                    alt="{{ cctrans(locale, 'Information')|safe }}"/>
             </a>
+            <div class="help-popover">
+              <div class="popover below">
+                <div class="arrow"></div>
+                <div class="inner">
+                  <h3 class="title">{{ cctrans(locale, "char.sa_title")|safe }}</h3>
+                  <a href="#" class="close">&times;</a>
+                  <div class="content">
+                    <p>{{ cctrans(locale, "char.sa_description")|safe }}</p>
+                  </div>
+                </div>
+              </div>
+            </div>
           </label>
         </li>
 
@@ -104,15 +147,42 @@
             <img src="{{ request.staticdirect('images/information.png') }}"
                  alt="{{ cctrans(locale, 'Information')|safe }}"/>
           </a>
+          <div class="help-popover">
+            <div class="popover below">
+              <div class="arrow"></div>
+              <div class="inner">
+                <h3 class="title">{{ cctrans(locale, "char.nd_title")|safe }}</h3>
+                <a href="#" class="close">&times;</a>
+                <div class="content">
+                  <p>{{ cctrans(locale, "char.nd_description")|safe }}</p>
+                </div>
+              </div>
+            </div>
+          </div>
         </li>
       </ul>
 
       <p>
-        {{ cctrans(locale, "license.jurisdiction_question")|safe }}
-        <a href="" class="helpLink" id="jurisdiction">
-          <img src="{{ request.staticdirect('images/information.png') }}"
-               alt="{{ cctrans(locale, 'Information')|safe }}"/>
-        </a>
+        <div>
+          {{ cctrans(locale, "license.jurisdiction_question")|safe }}
+          <a href="" class="helpLink" id="jurisdiction">
+            <img src="{{ request.staticdirect('images/information.png') }}"
+                 alt="{{ cctrans(locale, 'Information')|safe }}"/>
+          </a>
+          <div class="help-popover">
+            <div class="popover below">
+              <div class="arrow"></div>
+              <div class="inner">
+                <h3 class="title">{{ cctrans(locale, "util.Jurisdiction")|safe }}</h3>
+                <a href="#" class="close">&times;</a>
+                <div class="content">
+                  <p>{{ cctrans(locale, "license.jurisdiction_help")|safe }}</p>
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
+
         <br />
 
         <select name="field_jurisdiction">
@@ -149,7 +219,7 @@
 
       <div>
         <p>
-          <input type="submit" class="submit"
+          <input type="submit" class="primary btn submit"
                  value="{{ cctrans(locale, 'license.Select_a_License')|safe }}" />
         </p>
       </div>
@@ -159,69 +229,5 @@
 
   {% include "includes/engine_languages.html" %}
 
-  <div id="help_jurisdiction">
-    <div class="hd">
-      <span>{{ cctrans(locale, "util.Jurisdiction")|safe }}</span>
-    </div>
-    <div class="bd">
-      <p>
-        {{ cctrans(locale, "license.jurisdiction_help")|safe }}
-      </p>
-    </div>
-  </div>
-  <div id="help_commercial">
-    <div class="hd">
-      <span>{{ cctrans(locale, "Commercial Use")|safe }}</span>
-    </div>
-    <div class="bd">
-      <p>
-        {{ cctrans(locale, "license.help.commercial")|safe }}
-      </p>
-    </div>
-  </div>
-
-  <div id="help_noncommercial">
-    <div class="hd">
-      <span>{{ cctrans(locale, "licenses.pretty_nc")|safe }}</span>
-    </div>
-    <div class="bd">
-      <p>
-        {{ cctrans(locale, "license.help.noncommercial")|safe }}
-      </p>
-    </div>
-  </div>
-
-  <div id="help_derivatives">
-    <div class="hd">
-      <span>{{ cctrans(locale, "Allow Derivative Works")|safe }}</span>
-    </div>
-    <div class="bd">
-      <p>
-        {{ cctrans(locale, "license.help.derivatives")|safe }}
-      </p>
-    </div>
-  </div>
-
-  <div id="help_noderivatives">
-    <div class="hd">
-      <span>{{ cctrans(locale, "char.nd_title")|safe }}</span>
-    </div>
-    <div class="bd">
-      <p>
-        {{ cctrans(locale, "char.nd_description")|safe }}
-      </p>
-    </div>
-  </div>
-
-  <div id="help_sharealike">
-    <div class="hd">
-      <span>{{ cctrans(locale, "char.sa_title")|safe }}</span>
-    </div>
-    <div class="bd">
-      <p>
-        {{ cctrans(locale, "char.sa_description")|safe }}
-      </p>
-    </div>
-  </div>
 </div>
 {% endblock %}
diff --git a/cc/engine/templates/chooser_pages/pdmark/details.html b/cc/engine/templates/chooser_pages/pdmark/details.html
index c884b73..abe3803 100644
--- a/cc/engine/templates/chooser_pages/pdmark/details.html
+++ b/cc/engine/templates/chooser_pages/pdmark/details.html
@@ -4,39 +4,7 @@
 
 {% block headers %}
   <link rel="stylesheet" type="text/css"
-        href="http://yui.yahooapis.com/2.6.0/build/button/assets/skins/sam/button.css">
-
-  <script type="text/javascript"
-          src="http://yui.yahooapis.com/2.6.0/build/element/element-beta-min.js"></script>
-  <script type="text/javascript"
-          src="http://yui.yahooapis.com/2.6.0/build/button/button-min.js"></script>
-
-  <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.zero");
-
-    YAHOO.cc.zero.on_click = function(event) {
-
-    YAHOO.util.Dom.get("details-submit").disabled = !(
-    YAHOO.util.Dom.get("confirm_details").checked &&
-    YAHOO.util.Dom.get("confirm_understand").checked);
-
-    } // on_click
-
-    YAHOO.util.Event.onDOMReady(function() {
-
-    // connect event handlers for the check boxes
-    YAHOO.util.Event.addListener("confirm_details", "click", YAHOO.cc.zero.on_click);
-    YAHOO.util.Event.addListener("confirm_understand", "click", YAHOO.cc.zero.on_click);
-
-    });
-  </script>
 {% endblock %}
 
 {% block sidebar %}{% endblock %}
@@ -44,14 +12,27 @@
 {% block page_header_title %}Public Domain Mark{% endblock %}
 
 {% block body %}
-  <div class="yui-skin-sam">
     <div id="waiver_ui" class="yui-module">
       <div class="bd">
-        <p>
+        <p><div>
           {{ cctrans(locale, "license.mark.additional_metadata")|safe }}
           <a href="" id="embedded_metadata" class="helpLink">
             <img src="{{ request.staticdirect('/images/information.png') }}"
                  alt="{{ cctrans(locale, 'Information')|safe }}"/></a>
+          <div class="help-popover">
+            <div class="popover below">
+              <div class="arrow"></div>
+              <div class="inner">
+                <h3 class="title">Embedded Metadata</h3>
+                <a href="#" class="close">&times;</a>
+                <div class="content">
+                  <p>The information is embedded in a software readable format. This allows search engines to index additional information about the marked work.</p>
+                  <p><a href="http://wiki.creativecommons.org/Metadata">More information</a> on Creative Commons metadata is available if you want to find out more.</p>
+                </div>
+              </div>
+            </div>
+          </div>
+          </div>
         </p>
 
         <div id="help_embedded_metadata" class="help_panel">
@@ -132,14 +113,14 @@
           <div style="clear:both;"></div>
 
           <div>
-            <input type="hidden" name="lang" value="{{ target_lang }}" /> 
+            <input type="hidden" name="lang" value="{{ target_lang }}" />
           </div>
 
           <div class="form-row">
             <div class="form-question">&nbsp;</div>
             <div class="form-answer">
-              <input type="submit" id="submit"
-    	         name="field1" value="{{ cctrans(locale, 'util.continue')|safe }}" /> 
+              <input type="submit" id="submit" class="btn"
+                     name="field1" value="{{ cctrans(locale, 'util.continue')|safe }}" />
             </div>
           </div>
 
@@ -149,5 +130,4 @@
       </div>
     </div>
 
-  </div>
 {% endblock %}
diff --git a/cc/engine/templates/chooser_pages/pdmark/index.html b/cc/engine/templates/chooser_pages/pdmark/index.html
index 1e170e5..f37df98 100644
--- a/cc/engine/templates/chooser_pages/pdmark/index.html
+++ b/cc/engine/templates/chooser_pages/pdmark/index.html
@@ -4,39 +4,7 @@
 
 {% block headers %}
   <link rel="stylesheet" type="text/css"
-        href="http://yui.yahooapis.com/2.6.0/build/button/assets/skins/sam/button.css">
-
-  <script type="text/javascript"
-          src="http://yui.yahooapis.com/2.6.0/build/element/element-beta-min.js"></script>
-  <script type="text/javascript"
-          src="http://yui.yahooapis.com/2.6.0/build/button/button-min.js"></script>
-
-  <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.zero");
-
-    YAHOO.cc.zero.on_click = function(event) {
-
-    YAHOO.util.Dom.get("details-submit").disabled = !(
-    YAHOO.util.Dom.get("confirm_details").checked &&
-    YAHOO.util.Dom.get("confirm_understand").checked);
-
-    } // on_click
-
-    YAHOO.util.Event.onDOMReady(function() {
-
-    // connect event handlers for the check boxes
-    YAHOO.util.Event.addListener("confirm_details", "click", YAHOO.cc.zero.on_click);
-    YAHOO.util.Event.addListener("confirm_understand", "click", YAHOO.cc.zero.on_click);
-
-    });
-  </script>
 {% endblock headers %}
 
 {% block sidebar %}{% endblock %}
@@ -44,43 +12,33 @@
 {% block page_header_title %}Public Domain Mark{% endblock %}
 
 {% block body %}
-  <div class="yui-content">
-    <div id="page-welcome" class="yui-module">
-      <div class="bd">
-        <div class="pd-explain-differences">
-          {{ cctrans(locale, "license.mark.CC0-difference")|safe }}
-        </div>
+  <div id="page-welcome">
+    <div class="bd">
+      <div class="pd-explain-differences">
+        {{ cctrans(locale, "license.mark.CC0-difference")|safe }}
+      </div>
 
-        <p>
-          {{ cctrans(locale, "license.mark.intro_1")|safe }}
-        </p>
+      <p>
+        {{ cctrans(locale, "license.mark.intro_1")|safe }}
+      </p>
 
-        <p>
-          {{ cctrans(locale, "license.mark.intro_2")|safe }}
-        </p>
+      <p>
+        {{ cctrans(locale, "license.mark.intro_2")|safe }}
+      </p>
 
-        <p>
-          {{ cctrans(locale, "license.mark.intro_3")|safe }}
-        </p>
+      <p>
+        {{ cctrans(locale, "license.mark.intro_3")|safe }}
+      </p>
 
-        <p>
-          <span id="mycheckbox" class="yui-button">
-            <span class="first-child">
-              <a id="do-learn-more"
-                 href="/about/pdm">{{ cctrans(locale, "util.learn_more")|safe }}</a>
-            </span>
-          </span>
+      <p>
+        <a class="btn" id="do-learn-more"
+           href="/about/pdm">{{ cctrans(locale, "util.learn_more")|safe }}</a>
 
-          <span id="mycheckbox" class="yui-button">
-            <span class="first-child">
-              <a href="/choose/mark/details{% if target_lang %}?lang={{ target_lang }}{% endif %}"
-                 id="do-begin">{{ cctrans(locale, "util.begin")|safe }} &raquo;</a>
-            </span>
-          </span>
-        </p>
+        <a class="primary btn" href="/choose/mark/details{% if target_lang %}?lang={{ target_lang }}{% endif %}"
+           id="do-begin">{{ cctrans(locale, "util.begin")|safe }} &raquo;</a>
+      </p>
 
-        {% include "includes/engine_languages.html" %}
-      </div>
+      {% include "includes/engine_languages.html" %}
     </div>
   </div>
 {% endblock %}
diff --git a/cc/engine/templates/chooser_pages/pdmark/results.html b/cc/engine/templates/chooser_pages/pdmark/results.html
index a164b39..576efb1 100644
--- a/cc/engine/templates/chooser_pages/pdmark/results.html
+++ b/cc/engine/templates/chooser_pages/pdmark/results.html
@@ -3,23 +3,8 @@
 {% block title %}Public Domain Mark: Results{% endblock title %}
 
 {% block headers %}
-  <link rel="stylesheet" type="text/css" 
-        href="http://yui.yahooapis.com/2.6.0/build/button/assets/skins/sam/button.css">
-
-  <script type="text/javascript"
-          src="http://yui.yahooapis.com/2.6.0/build/element/element-beta-min.js"></script> 
-  <script type="text/javascript" 
-          src="http://yui.yahooapis.com/2.6.0/build/button/button-min.js"></script>
-
   <link rel="stylesheet" type="text/css"
         href="{{ request.staticdirect('includes/zero.css') }}" />
-
-  <script type="text/javascript">
-    YAHOO.util.Event.onDOMReady(function() {
-      // init the buttons
-      (new YAHOO.widget.Button("do-send-email")).render();
-    });
-  </script>
 {% endblock %}
 
 {% block sidebar %}{% endblock %}
@@ -27,8 +12,8 @@
 {% block page_header_title %}Public Domain Mark{% endblock %}
 
 {% block body %}
-  <div class="yui-skin-sam">
-    <div id="results" class="yui-module">
+  <div>
+    <div id="results">
       <div class="bd" id="waiver-results">
         <p>
           {{ cctrans(locale, "license.mark.choose_button")|safe }}
@@ -66,7 +51,7 @@
           {{ cctrans(locale, "license.mark.copy_text")|safe }}
         </p>
 
-        <textarea id="codetocopy" cols="70" rows="6"
+        <textarea id="codetocopy" cols="70" rows="6" style="width: 100%"
                   onfocus="select()">{{ rdfa }}</textarea>
 
         <div class="more-metadata-container">
@@ -102,7 +87,7 @@
                 <input type="textbox" name="email" />
               </div>
 
-              <input id="do-send-email" type="submit"
+              <input id="do-send-email" type="submit" class="btn"
                      value="{{ cctrans(locale, 'util.Send')|safe }}" />
             </form>
           {% endif %}
diff --git a/cc/engine/templates/chooser_pages/publicdomain/publicdomain-2.html b/cc/engine/templates/chooser_pages/publicdomain/publicdomain-2.html
index 24a2755..3e3db74 100644
--- a/cc/engine/templates/chooser_pages/publicdomain/publicdomain-2.html
+++ b/cc/engine/templates/chooser_pages/publicdomain/publicdomain-2.html
@@ -52,7 +52,7 @@
         <tr>
           <td align="right">&nbsp;</td>
           <td>
-            <input type="submit"
+            <input type="submit" class="btn"
                    value="{{ cctrans(locale, 'util.proceed')|safe }}" /></td>
         </tr>
       </tbody>
diff --git a/cc/engine/templates/chooser_pages/publicdomain/publicdomain-3.html b/cc/engine/templates/chooser_pages/publicdomain/publicdomain-3.html
index ab426c6..9f87c3b 100644
--- a/cc/engine/templates/chooser_pages/publicdomain/publicdomain-3.html
+++ b/cc/engine/templates/chooser_pages/publicdomain/publicdomain-3.html
@@ -6,51 +6,34 @@
 
 {% block headers %}
   <link rel="stylesheet" type="text/css"
-        href="http://yui.yahooapis.com/2.6.0/build/button/assets/skins/sam/button.css">
-
-  <script type="text/javascript"
-          src="http://yui.yahooapis.com/2.6.0/build/element/element-beta-min.js">
-  </script>
-  <script type="text/javascript"
-          src="http://yui.yahooapis.com/2.6.0/build/button/button-min.js">
-  </script>
-
-  <link rel="stylesheet" type="text/css"
         href="{{ request.staticdirect('/includes/zero.css') }}" />
+{% endblock headers %}
 
-  <script type="text/javascript"
-          src="{{ request.staticdirect('/includes/help.js') }}" >
-  </script>
-
+{% block scripts %}
   <script type="text/javascript">
-
-YAHOO.namespace("cc.pdc");
-
-YAHOO.cc.pdc.on_click = function(event) {
-
-    YAHOO.util.Dom.get("details-submit").disabled = !(
-        YAHOO.util.Dom.get("confirm_understand").checked);
-
-} // on_click
-
-YAHOO.util.Event.onDOMReady(function() {
-
-    // connect event handlers for the check box
-    YAHOO.util.Event.addListener("confirm_understand", "click", 
-                                 YAHOO.cc.pdc.on_click);
-
-});
+    function continue_toggler() {
+        submit_button = $('#details-submit');
+        if ($('#confirm_understand').is(':checked')) {
+            submit_button.removeAttr('disabled');
+            submit_button.removeClass('disabled');
+        } else {
+            submit_button.attr('disabled', 'disabled');
+            submit_button.addClass('disabled');
+        }
+    }
+
+    $('#confirm_understand').click(continue_toggler);
   </script>
-{% endblock headers %}
+{% endblock %}
 
 {% block page_header_title %}
   {{ cctrans(locale, "license.pd.confirm_title")|safe }}
 {% endblock %}
 
 {% block body %}
-  <div class="yui-module">
+  <div>
     <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 }}
@@ -80,7 +63,7 @@ YAHOO.util.Event.onDOMReady(function() {
         <div class="form-row">
           <div class="form-question">&nbsp;</div>
           <div class="form-answer">
-            <input type="submit" id="details-submit" disabled=""
+            <input type="submit" id="details-submit" disabled="" class="btn"
     	           name="field1" value="{{ cctrans(locale, 'util.continue')|safe }}" /> 
           </div>
         </div>
diff --git a/cc/engine/templates/chooser_pages/publicdomain/publicdomain-4.html b/cc/engine/templates/chooser_pages/publicdomain/publicdomain-4.html
index 5c0cfad..31270fb 100644
--- a/cc/engine/templates/chooser_pages/publicdomain/publicdomain-4.html
+++ b/cc/engine/templates/chooser_pages/publicdomain/publicdomain-4.html
@@ -25,6 +25,7 @@
           
           <p>
             <input type="button"
+                   class="btn"
                    onclick="form.html.focus();form.html.select()"
                    value="{{ cctrans(locale, 'util.Highlight_Text')|safe }}"
                    name="grab" /> 
diff --git a/cc/engine/templates/chooser_pages/zero/confirm.html b/cc/engine/templates/chooser_pages/zero/confirm.html
index e24d932..de5f86b 100644
--- a/cc/engine/templates/chooser_pages/zero/confirm.html
+++ b/cc/engine/templates/chooser_pages/zero/confirm.html
@@ -3,10 +3,6 @@
 {% block title %}CC0: Confirm Waiver{% endblock title %}
 
 {% block headers %}
-  <link rel="stylesheet" type="text/css" 
-        href="http://yui.yahooapis.com/2.6.0/build/button/assets/skins/sam/button.css">
-  <link rel="stylesheet" type="text/css"
-        href="http://yui.yahooapis.com/2.6.0/build/container/assets/container.css">
   <link rel="stylesheet" type="text/css"
         href="{{ request.staticdirect('/includes/zero.css') }}" />
 {% endblock headers %}
@@ -18,13 +14,13 @@
 {% endblock %}
 
 {% block body %}
-  <div class="yui-skin-sam">
+  <div>
     <form action="results">
       {% for key, value in request_form.iteritems() %}
         <input type="hidden" name="{{ key }}" value="{{ value }}" />
       {% endfor %}
 
-      <div id="confirm-waiver" class="yui-module">
+      <div id="confirm-waiver">
         <div class="bd">
           <p>
             {{ cctrans(locale, "license.zero.confirm_waiver_1")|safe }}
@@ -38,10 +34,10 @@
             {{ cctrans(locale, "license.zero.confirm_waiver_3")|safe }}
           </p>
 
-          <div class="form-row yui-buttongroup">
-            <span class="yui-button">
+          <div class="form-row">
+            <span>
               <span class="first-child">
-                <button type="submit" id="decline-submit"
+                <button type="submit" id="decline-submit" class="btn"
                         name="waiver-decline"
                         value="decline">
                   {{ cctrans(locale, "license.zero.confirm_waiver_no")|safe }}
@@ -49,10 +45,10 @@
               </span>
             </span>
 
-            <span class="yui-button">
+            <span>
               <span class="first-child">
-                <button type="submit" id="confirm-submit" 
-                        name="waiver-affirm" class="alert" 
+                <button type="submit" id="confirm-submit"
+                        name="waiver-affirm" class="btn danger"
                         value="affirm">
                   {{ cctrans(locale, "license.zero.confirm_waiver_yes")|safe }}
                 </button>
diff --git a/cc/engine/templates/chooser_pages/zero/index.html b/cc/engine/templates/chooser_pages/zero/index.html
index a796d17..f9b6963 100644
--- a/cc/engine/templates/chooser_pages/zero/index.html
+++ b/cc/engine/templates/chooser_pages/zero/index.html
@@ -3,28 +3,8 @@
 {% block title %}CC0{% endblock title %}
 
 {% block headers %}
-  <link rel="stylesheet" type="text/css" 
-        href="http://yui.yahooapis.com/2.6.0/build/button/assets/skins/sam/button.css">
-
-  <script type="text/javascript" 
-          src="http://yui.yahooapis.com/2.6.0/build/button/button-min.js"></script>
-
   <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.util.Event.onDOMReady(function() {
-
-    // init the buttons
-    new YAHOO.widget.Button("do-begin");
-    new YAHOO.widget.Button("do-learn-more");
-
-    });
-  </script>
 {% endblock headers %}
 
 {% block sidebar %}{% endblock %}
@@ -32,8 +12,8 @@
 {% block page_header_title %}CC0{% endblock %}
 
 {% block body %}
-  <div class="yui-content">
-    <div id="page-welcome" class="yui-module">
+  <div>
+    <div id="page-welcome">
       <div class="bd">
         <div class="pd-explain-differences">
           {{ cctrans(locale, "license.zero.PDM-difference")|safe }}
@@ -52,31 +32,22 @@
         </p>
 
         <p>
-          <span id="mycheckbox" class="yui-button">
-            <span class="first-child">
-              <a id="do-learn-more"
-                 href="/about/cc0">{{ cctrans(locale, "util.learn_more")|safe }}</a>
-            </span>
-          </span>
-
-          <span id="mycheckbox" class="yui-button">
-            <span class="first-child">
-              {% if request.GET.has_key('lang') %}
-                <a id="do-begin"
-                   href="{{ '/choose/zero/waiver?lang=' + target_lang }}">
-                  {{ cctrans(locale, "util.begin")|safe }} &raquo;
-                </a>
-              {% else %}
-                <a id="do-begin" href="/choose/zero/waiver">
-                  {{ cctrans(locale, "util.begin")|safe }} &raquo;
-                </a>
-              {% endif %}
-            </span>
-          </span>
+          <a id="do-learn-more" class="btn"
+             href="/about/cc0">{{ cctrans(locale, "util.learn_more")|safe }}</a>
+
+          {% if request.GET.has_key('lang') %}
+            <a id="do-begin" class="primary btn"
+               href="{{ '/choose/zero/waiver?lang=' + target_lang }}">
+              {{ cctrans(locale, "util.begin")|safe }} &raquo;
+            </a>
+          {% else %}
+            <a id="do-begin" class="primary btn" href="/choose/zero/waiver">
+              {{ cctrans(locale, "util.begin")|safe }} &raquo;
+            </a>
+          {% endif %}
         </p>
 
         {% include "includes/engine_languages.html" %}
-
       </div>
     </div>
   </div>
diff --git a/cc/engine/templates/chooser_pages/zero/results.html b/cc/engine/templates/chooser_pages/zero/results.html
index 01d63e8..e0e1f6b 100644
--- a/cc/engine/templates/chooser_pages/zero/results.html
+++ b/cc/engine/templates/chooser_pages/zero/results.html
@@ -3,16 +3,6 @@
 {% block title %}CC0: Results{% endblock title %}
 
 {% block headers %}
-  <link rel="stylesheet" type="text/css" 
-        href="http://yui.yahooapis.com/2.6.0/build/button/assets/skins/sam/button.css">
-  <link rel="stylesheet" type="text/css"
-        href="http://yui.yahooapis.com/2.6.0/build/container/assets/container.css">
-
-  <script type="text/javascript"
-          src="http://yui.yahooapis.com/2.6.0/build/element/element-beta-min.js"></script> 
-  <script type="text/javascript" 
-          src="http://yui.yahooapis.com/2.6.0/build/button/button-min.js"></script>
-
   <link rel="stylesheet" type="text/css"
         href="{{ request.staticdirect('/includes/zero.css') }}" />
 
@@ -31,10 +21,10 @@
 {% block page_header_title %}CC0{% endblock %}
 
 {% block body %}
-  <div class="yui-skin-sam">
+  <div>
 
     {% if not can_issue %}
-      <div id="error" class="yui-module">
+      <div id="error">
         <div class="bd">
           <p>
             {{ cctrans(locale, "license.zero.declined")|safe }}
@@ -51,7 +41,7 @@
         </div>
       </div>
     {% else %}
-      <div id="results" class="yui-module">
+      <div id="results">
         <div class="bd" id="waiver-results">
           <p>
             {{ cctrans(locale, "license.choose_button")|safe }}
@@ -88,7 +78,7 @@
             {{ cctrans(locale, "license.zero.copy_text")|safe }}
           </p>
   
-          <textarea id="codetocopy" cols="70" rows="6"
+          <textarea id="codetocopy" cols="70" rows="6" style="width: 100%"
                     onfocus="select()">{{ rdfa }}</textarea>
   
           <div class="more-metadata-container">
@@ -128,7 +118,7 @@
                   <input type="textbox" name="email" />
                 </div>
   
-                <input id="do-send-email" type="submit"
+                <input id="do-send-email" type="submit" class="btn"
                        value="{{ cctrans(locale, 'util.Send')|safe }}" />
               </form>
             {% endif %}
diff --git a/cc/engine/templates/chooser_pages/zero/waiver.html b/cc/engine/templates/chooser_pages/zero/waiver.html
index c934c78..519bc6e 100644
--- a/cc/engine/templates/chooser_pages/zero/waiver.html
+++ b/cc/engine/templates/chooser_pages/zero/waiver.html
@@ -4,66 +4,57 @@
 
 {% block headers %}
   <link rel="stylesheet" type="text/css"
-        href="http://yui.yahooapis.com/2.6.0/build/button/assets/skins/sam/button.css">
-
-  <script type="text/javascript"
-          src="http://yui.yahooapis.com/2.6.0/build/element/element-beta-min.js"></script>
-  <script type="text/javascript"
-          src="http://yui.yahooapis.com/2.6.0/build/button/button-min.js"></script>
-  <script type="text/javascript"
-          src="http://yui.yahooapis.com/2.6.0/build/container/container-min.js"></script>
-
-  <link rel="stylesheet" type="text/css"
         href="{{ request.staticdirect('/includes/zero.css') }}" />
+{% endblock headers %}
 
-  <script type="text/javascript"
-          src="{{ request.staticdirect('/includes/help.js') }}" >
-  </script>
-
+{% block scripts %}
   <script type="text/javascript">
-    YAHOO.namespace("cc.zero");
-
-    YAHOO.cc.zero.on_click = function(event) {
-
-    YAHOO.util.Dom.get("details-submit").disabled = !(
-    YAHOO.util.Dom.get("confirm_details").checked &&
-    YAHOO.util.Dom.get("confirm_understand").checked);
-
-    } // on_click
-
-    YAHOO.util.Event.onDOMReady(function() {
-
-    // connect event handlers for the check boxes
-    YAHOO.util.Event.addListener("confirm_details", "click", YAHOO.cc.zero.on_click);
-    YAHOO.util.Event.addListener("confirm_understand", "click", YAHOO.cc.zero.on_click);
-
-    });
+    function continue_toggler() {
+        submit_button = $('#details-submit');
+        if ($('#confirm_details').is(':checked') && $('#confirm_understand').is(':checked')) {
+            submit_button.removeAttr('disabled');
+            submit_button.removeClass('disabled');
+        } else {
+            submit_button.attr('disabled', 'disabled');
+            submit_button.addClass('disabled');
+        }
+    }
+
+    $('#confirm_details').click(continue_toggler);
+    $('#confirm_understand').click(continue_toggler);
   </script>
-{% endblock headers %}
+{% endblock %}
 
 {% block sidebar %}{% endblock %}
 
 {% block page_header_title %}CC0 Waiver{% endblock %}
 
 {% block body %}
-  <div class="yui-skin-sam">
-    <div id="waiver_ui" class="yui-module">
+  <div>
+    <div id="waiver_ui">
       <div class="bd">
         <p>
-          {{ cctrans(locale, "license.zero.additional_metadata")|safe }}
-          <a href="" id="embedded_metadata" class="helpLink">
-            <img src="{{ request.staticdirect('/images/information.png') }}"
-                 alt="{{ cctrans(locale, 'Information')|safe }}"/></a>
-        </p>
-
-        <div id="help_embedded_metadata" class="help_panel">
-          <div class="hd">{{ cctrans(locale, "Embedded Metadata")|safe }}</div>
-          <div class="bd">
-            {{ cctrans(locale, "license.zero.metadata_help")|safe }}
+          <div>
+            {{ cctrans(locale, "license.zero.additional_metadata")|safe }}
+            <a href="" id="embedded_metadata" class="helpLink">
+              <img src="{{ request.staticdirect('/images/information.png') }}"
+                   alt="{{ cctrans(locale, 'Information')|safe }}"/></a>
+              <div class="help-popover">
+                <div class="popover below">
+                  <div class="arrow"></div>
+                  <div class="inner">
+                    <h3 class="title">{{ cctrans(locale, "Embedded Metadata")|safe }}</h3>
+                    <a href="#" class="close">&times;</a>
+                    <div class="content">
+                      <p>{{ cctrans(locale, "license.zero.metadata_help")|safe }}</p>
+                    </div>
+                  </div>
+                </div>
+              </div>
           </div>
-        </div>
+        </p>
 
-        <form id="form-details" action="confirm">
+        <form id="form-details" class="form-stacked" action="confirm">
           <input type="hidden" name="license-class" value="zero" />
 
           <div class="form-row">
@@ -80,17 +71,21 @@
               <a href="" id="url" class="helpLink">
                 <img src="{{ request.staticdirect('/images/information.png') }}"
                      alt="{{ cctrans(locale, 'Information')|safe }}" /></a>
+              <div class="help-popover">
+                <div class="popover below">
+                  <div class="arrow"></div>
+                  <div class="inner">
+                    <h3 class="title">{{ cctrans(locale, "util.your_url")|safe }}</h3>
+                    <a href="#" class="close">&times;</a>
+                    <div class="content">
+                      <p>{{ cctrans(locale, "license.zero.your_url_help")|safe }}</p>
+                    </div>
+                  </div>
+                </div>
+              </div>
             </div>
           </div>
 
-          <div id="help_url" class="help_panel">
-            <div class="hd">{{ cctrans(locale, "util.your_url")|safe }}</div>
-            <div class="bd">
-              {{ cctrans(locale, "license.zero.your_url_help")|safe }}
-            </div>
-          </div>
-
-
           <div class="form-row">
             <div class="form-question">
               {{ cctrans(locale, "util.title_of_work")|safe }}
@@ -112,19 +107,24 @@
 
               <a href="" id="country" class="helpLink">
                 <img src="{{ request.staticdirect('/images/information.png') }}"
-    	         alt="{{ cctrans(locale, 'Information')|safe }}"
-    	         /></a>
-            </div>
-          </div>
-
-          <div id="help_country" class="help_panel">
-            <div class="hd">{{ cctrans(locale, "util.territory")|safe }}</div>
-            <div class="bd">
-              {{ cctrans(locale, "license.zero.country_help")|safe }}
+    	         alt="{{ cctrans(locale, 'Information')|safe }}" /></a>
+              <div class="help-popover">
+                <div class="popover below">
+                  <div class="arrow"></div>
+                  <div class="inner">
+                    <h3 class="title">{{ cctrans(locale, "util.territory")|safe }}</h3>
+                    <a href="#" class="close">&times;</a>
+                    <div class="content">
+                      <p>
+                        {{ cctrans(locale, "license.zero.country_help")|safe }}
+                      </p>
+                    </div>
+                  </div>
+                </div>
+              </div>
             </div>
           </div>
 
-
           <div class="form-row">
             <div class="form-question">
               <input name="confirm" type="checkbox"
@@ -160,14 +160,15 @@
           </div>
 
           <div>
-            <input type="hidden" name="lang" value="{{ target_lang }}" /> 
+            <input type="hidden" name="lang" value="{{ target_lang }}" />
           </div>
 
           <div class="form-row">
             <div class="form-question">&nbsp;</div>
             <div class="form-answer">
-              <input type="submit" id="details-submit" disabled=""
-    	             name="field1" value="{{ cctrans(locale, 'util.continue')|safe }}"> 
+              <input type="submit" id="details-submit" disabled="disabled"
+                     class="btn" name="field1"
+                     value="{{ cctrans(locale, 'util.continue')|safe }}">
             </div>
           </div>
 
diff --git a/cc/engine/templates/includes/more_metadata.html b/cc/engine/templates/includes/more_metadata.html
index 20e13b8..6227b5b 100644
--- a/cc/engine/templates/includes/more_metadata.html
+++ b/cc/engine/templates/includes/more_metadata.html
@@ -1,18 +1,31 @@
 <div class="more-metadata-container">
   <h4>{{ cctrans(locale, "license.additional_info")|safe }}</h4>
   <p>
-    <span>
-      {{ cctrans(locale, "license.additional_fields_optional")|safe }}
-    </span>
-    <a href="" id="embedded_metadata" class="helpLink">
-      <img src="{{ request.staticdirect('images/information.png') }}"
-           alt="{{ cctrans(locale, 'Information')|safe }}" />
-    </a>
+    <div>
+      <span>
+        {{ cctrans(locale, "license.additional_fields_optional")|safe }}
+      </span>
+      <a href="" id="embedded_metadata" class="helpLink">
+        <img src="{{ request.staticdirect('images/information.png') }}"
+             alt="{{ cctrans(locale, 'Information')|safe }}" />
+      </a>
+      <div class="help-popover">
+        <div class="popover below">
+          <div class="arrow"></div>
+          <div class="inner">
+            <h3 class="title">{{ cctrans(locale, "Embedded Metadata")|safe }}</h3>
+            <a href="#" class="close">&times;</a>
+            <div class="content">
+              <p>{{ cctrans(locale, "license.metadata_help")|safe }}</p>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
   </p>
 
-
   <div class="more-metadata">
-    <div>
+    <div class="label">
       {{ cctrans(locale, "license.tell_format")|safe }}
     </div>
 
@@ -35,30 +48,54 @@
   </div>
 
   <div class="more-metadata">
-    <div>{{ cctrans(locale, "util.title_of_work")|safe }}</div>
+    <div class="label">{{ cctrans(locale, "util.title_of_work")|safe }}</div>
 
-    <input type="text" name="field_worktitle" value="" /> 
+    <input type="text" name="field_worktitle" value="" />
     <a href="" id="worktitle" class="helpLink">
       <img src="{{ request.staticdirect('images/information.png') }}"
            alt="{{ cctrans(locale, 'Information')|safe }}" />
     </a>
+    <div class="help-popover">
+      <div class="popover below">
+        <div class="arrow"></div>
+        <div class="inner">
+          <h3 class="title">{{ cctrans(locale, "util.title_of_work")|safe }}</h3>
+          <a href="#" class="close">&times;</a>
+          <div class="content">
+            <p>{{ cctrans(locale, "The title of the work you are licensing.")|safe }}</p>
+          </div>
+        </div>
+      </div>
+    </div>
   </div>
 
   <div class="more-metadata">
-    <div>
+    <div class="label">
       {{ cctrans(locale, "util.attribute_to_name")|safe }}
     </div>
 
-    <input type="text" name="field_attribute_to_name" /> 
+    <input type="text" name="field_attribute_to_name" />
     <a href="" id="attribution_name" class="helpLink">
       <img src="{{ request.staticdirect('images/information.png') }}"
            alt="{{ cctrans(locale, 'Information')|safe }}" />
     </a>
+    <div class="help-popover">
+      <div class="popover below">
+        <div class="arrow"></div>
+        <div class="inner">
+          <h3 class="title">{{ cctrans(locale, "util.attribute_to_name")|safe }}</h3>
+          <a href="#" class="close">&times;</a>
+          <div class="content">
+            <p>{{ cctrans(locale, "The name users of the work should give attribution to. For example, the name of the work's author.")|safe }}</p>
+          </div>
+        </div>
+      </div>
+    </div>
   </div>
 
 
   <div class="more-metadata">
-    <div>
+    <div class="label">
       {{ cctrans(locale, "util.attribute_to_url")|safe }}
     </div>
 
@@ -67,94 +104,61 @@
       <img src="{{ request.staticdirect('images/information.png') }}"
            alt="{{ cctrans(locale, 'Information')|safe }}" />
     </a>
+    <div class="help-popover">
+      <div class="popover below">
+        <div class="arrow"></div>
+        <div class="inner">
+          <h3 class="title">{{ cctrans(locale, "util.attribute_to_url")|safe }}</h3>
+          <a href="#" class="close">&times;</a>
+          <div class="content">
+            <p>{{ cctrans(locale, "The URL users of the work should link to. For example, the work's page on the author's site.")|safe }}</p>
+          </div>
+        </div>
+      </div>
+    </div>
   </div>
 
   <div class="more-metadata">
-    <div>{{ cctrans(locale, "util.source_work")|safe }}</div>
+    <div class="label">{{ cctrans(locale, "util.source_work")|safe }}</div>
 
     <input type="text" name="field_sourceurl" value=""/>
     <a href="" id="source_work" class="helpLink">
       <img src="{{ request.staticdirect('images/information.png') }}"
            alt="{{ cctrans(locale, 'Information')|safe }}" />
     </a>
+    <div class="help-popover">
+      <div class="popover below">
+        <div class="arrow"></div>
+        <div class="inner">
+          <h3 class="title">{{ cctrans(locale, "util.source_work")|safe }}</h3>
+          <a href="#" class="close">&times;</a>
+          <div class="content">
+            <p>{{ cctrans(locale, "jargon.source_work_description")|safe }}</p>
+          </div>
+        </div>
+      </div>
+    </div>
   </div>
 
   <div class="more-metadata">
-    <div>{{ cctrans(locale, "util.more_permissions_url")|safe }}</div>
+    <div class="label">{{ cctrans(locale, "util.more_permissions_url")|safe }}</div>
 
     <input type="text" name="field_morepermissionsurl" value=""/>
     <a href="" id="more_permissions_url" class="helpLink">
       <img src="{{ request.staticdirect('images/information.png') }}"
            alt="{{ cctrans(locale, 'Information')|safe }}" />
     </a>
-  </div>
-
-  <div id="help_embedded_metadata">
-    <div class="hd">{{ cctrans(locale, "Embedded Metadata")|safe }}</div>
-    <div class="bd">
-      {{ cctrans(locale, "license.metadata_help")|safe }}
-    </div>
-  </div>
-
-  <div id="help_source_work">
-    <div class="hd">
-      <span>{{ cctrans(locale, "util.source_work")|safe }}</span>
-    </div>
-    <div class="bd">
-      <p>
-        {{ cctrans(locale, "jargon.source_work_description")|safe }}
-      </p>
-    </div>
-  </div>
-
-  <div id="help_worktitle">
-    <div class="hd">
-      <span>{{ cctrans(locale, "util.title_of_work")|safe }}</span>
-    </div>
-    <div class="bd">
-      <p>
-        {{ cctrans(locale, "The title of the work you are licensing.")|safe }}
-      </p>
-    </div>
-  </div>
-
-  <div id="help_attribution_name">
-    <div class="hd">
-      <span>
-        {{ cctrans(locale, "util.attribute_to_name")|safe }}
-      </span>
-    </div>
-    <div class="bd">
-      <p>
-        {{ cctrans(locale, "The name users of the work should give attribution to. For example, the name of the work's author.")|safe }}
-      </p>
-    </div>
-  </div>
-
-  <div id="help_attribution_url">
-    <div class="hd">
-      <span>
-        {{ cctrans(locale, "util.attribute_to_url")|safe }}
-      </span>
-    </div>
-    <div class="bd">
-      <p>
-        {{ cctrans(locale, "The URL users of the work should link to. For example, the work's page on the author's site.")|safe }}
-      </p>
+    <div class="help-popover">
+      <div class="popover below">
+        <div class="arrow"></div>
+        <div class="inner">
+          <h3 class="title">{{ cctrans(locale, "util.more_permissions_url")|safe }}</h3>
+          <a href="#" class="close">&times;</a>
+          <div class="content">
+            <p>{{ cctrans(locale, "A URL where a user can obtain information about clearing rights that are not pre-cleared by your CC license.")|safe }}</p>
+          </div>
+        </div>
+      </div>
     </div>
   </div>
-
-  <div id="help_more_permissions_url">
-    <div class="hd">
-      <span>
-        {{ cctrans(locale, "util.more_permissions_url")|safe }}
-      </span>
-    </div>
-    <div class="bd">
-      <p>
-        {{ cctrans(locale, "A URL where a user can obtain information about clearing rights that are not pre-cleared by your CC license.")|safe }}
-      </p>
-    </div>
-  </div>
-
 </div>
diff --git a/cc/engine/templates/macros_templates/engine.html b/cc/engine/templates/macros_templates/engine.html
index 73f2f7e..84e2e6c 100644
--- a/cc/engine/templates/macros_templates/engine.html
+++ b/cc/engine/templates/macros_templates/engine.html
@@ -1,190 +1,295 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
+<!doctype html>
+<!-- paulirish.com/2008/conditional-stylesheets-vs-css-hacks-answer-neither/ -->
+<!--[if lt IE 7]> <html class="no-js ie6 oldie" lang="en"> <![endif]-->
+<!--[if IE 7]>          <html class="no-js ie7 oldie" lang="en"> <![endif]-->
+<!--[if IE 8]>          <html class="no-js ie8 oldie" lang="en"> <![endif]-->
+<!-- Consider adding a manifest.appcache: h5bp.com/d/Offline -->
+<!--[if gt IE 8]><!-->
+<html class="no-js" lang="en">
+<!--<![endif]-->
 
-  <head>
-    <title>{% block title %}Page Title{% endblock %}</title>
+<head>
+  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+  <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0" />
 
-    <link rel="stylesheet" type="text/css"
-          href="http://yui.yahooapis.com/2.6.0/build/container/assets/skins/sam/container.css"
-          /> 
+  <title>{% block title %}Page Title{% endblock %}</title>
+
+  <link href="/wp-content/themes/creativecommons.org/favicon.ico" title="Icon" type="image/x-icon" rel="icon" />
 
-    <link rel="stylesheet" type="text/css" 
-          href="{{ request.staticdirect('cc6/style.css') }}" />
-    <link rel="stylesheet" type="text/css" media="print"
-          href="{{ request.staticdirect('cc6/print.css') }}" />
+  <link rel="stylesheet" href="/wp-content/themes/creativecommons.org/css/style.css" />
+  <link rel="stylesheet" href="/wp-content/themes/creativecommons.org/engine.css" />
+
+  {% if is_rtl %}
     <link rel="stylesheet" type="text/css"
-          href="{{ request.staticdirect('cc6/engine.css') }}" />
-
-    {% if is_rtl %}
-      <link rel="stylesheet" type="text/css"
-            href="{{ request.staticdirect('cc6/engine-rtl.css') }}" />
-    {% endif %}
-
-    <!--[if IE]>
-      <link rel="stylesheet" type="text/css"
-          media="screen" href="/wp-content/themes/cc6/style-ie.css" />
-    <![endif]-->
-
-    <script type="text/javascript" 
-            src="http://yui.yahooapis.com/2.6.0/build/yahoo-dom-event/yahoo-dom-event.js"></script>
-    <script type="text/javascript" src="http://yui.yahooapis.com/2.6.0/build/animation/animation-min.js"></script> 
-    <script type="text/javascript" src="http://yui.yahooapis.com/2.6.0/build/container/container-min.js"></script>
-    <script type="text/javascript"
-            src="{{ request.staticdirect('includes/license-results.js') }}" >
-    </script>
-    <script type="text/javascript"
-            src="{{ request.staticdirect('cc6/site.js') }}" ></script>
-
-    {% block headers %}{% endblock %}
-
-  </head>
-
-  <body class="yui-skin-sam">
-
-    <a id="top"></a>
-    <div id="header">
-      <div class="container_16">
-        <div class="grid_16">
-          <h1 id="logo"><a href="http://creativecommons.org"><span>Creative Commons</span></a></h1>
-          <ul class="nav">
-            <li><a href="/about">About</a></li>
-            <li><a href="/weblog">Blog</a></li>
-            <li><a href="https://creativecommons.net/donate">Donate</a></li>
-            <li><a href="http://wiki.creativecommons.org/FAQ">FAQ</a></li>
-            <li><a href="http://wiki.creativecommons.org/">Wiki</a></li>
-            <li><a href="/affiliates">International</a></li>
-          </ul>
+          href="{{ request.staticdirect('cc6/engine-rtl.css') }}" />
+  {% endif %}
+
+  <script src="/wp-content/themes/creativecommons.org/js/libs/modernizr-2.0.6.min.js"></script>
+
+  <script type="text/javascript"
+          src="{{ request.staticdirect('includes/license-results.js') }}" >
+  </script>   
+  {% block headers %}{% endblock %}
+</head>
+
+<body>
+  <div id="container">
+    <header>
+      <div class="topbar">
+        <div class="topbar-inner">
+          <div class="container">
+            <a id="skip-navigation" href="#start-content"
+               title="Skip Navigation">Skip Navigation</a>
+            <a href="" title="Home">
+              <span id="home-link">Home</span>
+              <span id="home-button"></span>
+            </a>
+            <div id="logo"><span>Creative Commons</span></div>
+            <ul id="short-menu" class="nav">
+              <li class="dropdown">
+                <a href="#about" class="dropdown-toggle">Menu</a>
+                <ul class="menu-dropdown">
+                  <li><a href="/about">About</a></li>
+                  <li><a href="/licenses/">Licenses</a></li>
+                  <li><a href="/publicdomain/">Public Domain</a></li>
+                  <li><a href="https://creativecommons.net/donate/">Support CC</a></li>
+                  <li><a href="/culture">Projects</a></li>
+                  <li><a href="/weblog">News</a></li>
+                </ul>
+              </li>
+            </ul>
+            <ul id="wide-menu" class="nav">
+              <li class="dropdown">
+                <a href="/about" class="dropdown-toggle">About</a>
+                <ul class="menu-dropdown">
+                  <li><a href="/about">Our Mission</a></li>
+                  <li><a href="/about/history">History</a></li>
+
+                  <li class="divider"></li>
+                  <li><a href="/who-uses-cc">Who Uses CC?</a></li>
+                  <li><a href="http://wiki.creativecommons.org/Case_Studies">Case Studies</a></li>
+                  <li><a href="/videos/">Videos about CC</a></li>
+
+                  <li class="divider"></li>
+                  <li><strong><span>The Team</span></strong></li>
+                  <li><a href="/board">Board of Directors</a></li>
+                  <li><a href="/staff">Staff</a></li>
+                  <li><a href="/fellows">Fellows</a></li>
+                  <li><a href="http://wiki.creativecommons.org/CC_Affiliate_Network">Affiliate Network</a>
+                  </li><li><a href="/opportunities">Job Opportunities</a></li>
+
+                  <li class="divider"></li>
+                  <li><a href="http://wiki.creativecommons.org/FAQ">Frequently Asked Questions</a></li>
+                  <li><a href="http://creativecommons.org/contact">Contact Us</a></li>
+                </ul>
+              </li>
+              <li class="dropdown">
+                <a href="/licenses/" class="dropdown-toggle">Licenses</a>
+                <ul class="menu-dropdown">
+                  <li><a href="/licenses/">About the Licenses</a></li>
+                  <li><a href="/choose/">Choose a License</a></li>
+                  <li><a href="http://labs.creativecommons.org/demos/search/?beta=1">Find licensed content</a></li>
+
+                  <li class="divider"></li>
+                  <li><span>Licensors</span></li>
+                  <li><a href="http://wiki.creativecommons.org/Before_Licensing">Things to know before licensing</a></li>
+                  <li><a href="http://wiki.creativecommons.org/FAQ#Do_I_need_to_sign_something_or_register_to_obtain_a_Creative_Commons_license.3F">Do I need to register my work?</a></li>
+                  <li><a href="http://wiki.creativecommons.org/Marking/">Marking my work</a></li>
+
+                  <li class="divider"></li>
+                  <li><span>Licensees</span></li>
+                  <li><a href="http://wiki.creativecommons.org/FAQ#How_do_I_properly_attribute_a_Creative_Commons_licensed_work.3F">Attributing a work properly</a></li>
+                  <li><a href="http://wiki.creativecommons.org/Marking/Users">Marking a CC-licensed work</a></li>
+                  <li><a href="http://wiki.creativecommons.org/FAQ#Will_Creative_Commons_give_me_permission_to_use_a_work.3F">Getting permission</a></li>
+                  <li class="divider"></li>
+                  <li><span>Developers</span></li>
+                  <li><a href="http://wiki.creativecommons.org/Integrate">App Integration</a></li>
+                  <li><a href="http://wiki.creativecommons.org/Developer_Challenges">Developer Challenges</a></li>
+                  <li><a href="http://wiki.creativecommons.org/Translate">Translation</a></li>
+                </ul>
+              </li>
+              <li class="dropdown">
+                <a href="/publicdomain/" class="dropdown-toggle">Public Domain</a>
+                <ul class="menu-dropdown">
+                  <li><a href="/publicdomain/">Our Public Domain Tools</a></li>
+
+                  <li class="divider"></li>
+                  <li><a href="/about/cc0">About CC0 Public Domain Dedication</a></li>
+                  <li><a href="/choose/zero/">Choose CC0 Public Domain Dedication </a></li>
+
+                  <li class="divider"></li>
+                  <li><a href="/about/pdm">About Public Domain Mark</a></li>
+                  <li><a href="/choose/mark/">Use Public Domain Mark</a></li>
+                </ul>
+              </li>
+              <li class="dropdown">
+                <a href="https://creativecommons.net/donate/" class="dropdown-toggle">Support CC</a>
+                <ul class="menu-dropdown">
+                  <li><a href="https://creativecommons.net/donate/">Donate to Creative Commons</a></li>
+
+                  <li class="divider"></li>
+                  <li><a href="https://creativecommons.net/store/">Buy CC Merchandise</a></li>
+                  <li><a href="https://creativecommons.net/supporters/">Our Supporters</a></li>
+                  <li><a href="https://creativecommons.net/corporate/">Corporate Giving</a></li>
+                  <li><a href="https://creativecommons.net/figures/">Facts &amp; Figures </a></li>
+                </ul>
+              </li>
+              <li class="dropdown">
+                <a href="/culture" class="dropdown-toggle">Projects</a>
+                <ul class="menu-dropdown">
+                  <li><a href="/culture">Culture</a></li>
+                  <li><a href="/education">Education</a></li>
+                  <li><a href="/science">Science</a></li>
+                  <li><a href="/government">Government</a></li>
+                  <li class="divider"></li>
+                  <li><a href="http://wiki.creativecommons.org/LRMI">Learning Resource Metadata Initiative (LRMI) </a></li>
+                  <li><a href="/taa-grant-program">Gates OPEN</a></li>
+                </ul>
+              </li>
+              <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>
+                  <li><a href="http://wiki.creativecommons.org/Events">Events</a></li>
+                  <li><a href="https://creativecommons.net/civicrm/mailing/subscribe?reset=1&gid=121">CC Newsletter</a></li>
+                  <li class="divider"></li>
+                  <li><a href="/about/press">Press Room</a></li>
+                </ul>
+              </li>
+            </ul>
+            <form action="" id="search_form">
+              <input type="hidden" name="stype" value="site" id="find_site" />
+              <input type="text" name="q" placeholder="Site Search" />
+              <input type="submit" id="glass" title="Search" value="Submit">
+            </form>
+          </div>
         </div>
       </div>
-    </div>
-
-    <div dir="{{ get_ltr_rtl }}" style="{{ is_rtl_align }}"
-         id="page">
-      <div id="title" class="container_16">
-        <h1 dir="{{ get_ltr_rtl }}" style="{{ is_rtl_align }}"
-            class="grid_16">
-          {% block page_header_title %}{% endblock %}
-        </h1>
-      </div>
+    </header>
 
-      <div dir="{{ get_ltr_rtl }}" style="{{ is_rtl_align }}"
-           id="content">
-        {% if page_style == "bare" %}
-          {# No wrapping needed :) #}
-        {% elif page_style == "2cols" %}
-          <div class="container_16">
-            <div class="grid_12">
-        {% else %}
-          {# if this is set we don't have a sidebar and are fully wide #}
-          <div class="container_16">
-            <div class="grid_11">
-        {% endif %}
-
-        {% block body %}{% endblock %}
-
-        {% if page_style == "bare" %}
-          {# Again... no wrapping needed :) #}
-        {% elif page_style == "2cols" %}
+    <div dir="{{ get_ltr_rtl }}" style="{{ is_rtl_align }}" 
+         id="main" role="main">
+      <div class="container">
+
+        <div class="sixteen columns">
+          <div class="first row">
+            <div id="title">
+              <h1 dir="{{ get_ltr_rtl }}" style="{{ is_rtl_align }}">
+                {%- block page_header_title %}{% endblock -%}
+              </h1>
             </div>
-          </div>
-        {% else %}
+          </div> <!--! end of "first row" -->
+          
+          <div class="row">
+
+            {% if page_style == "bare" %}
+              {# No wrapping needed :) #}
+            {% elif page_style == "2cols" %}
+              <div class="sixteen columns">
+            {% else %}
+              <div class="twelve columns alpha">
+            {% endif %}
+
+            <div dir="{{ get_ltr_rtl }}" style="{{ is_rtl_align }}"
+                 id="content">
+               {% block body %}{% endblock %}
             </div>
-            <div class="grid_4 prefix_1"
-                 dir="{{ get_ltr_rtl }}" style="{{ is_rtl_align }}">
-              {% block sidebar %}{% endblock %}
+
+            {% if page_style == "bare" %}
+              {# Again... no wrapping needed :) #}
+            {% elif page_style == "2cols" %}
+              </div> <!--! end of "sixteen columns" -->
+            {% else %}
+              </div> <!--! end of "twelve columns alpha" -->
+              <div class="four columns omega">
+                <div dir="{{ get_ltr_rtl }}" style="{{ is_rtl_align }}">
+                  {% block sidebar %}{% endblock %}
+                </div> <!--! end of sidebar -->
+              </div> <!--! end of "four columns omega" -->
+            {% endif %}
+          </div> <!-- end of "row" -->
+        </div> <!--! end of "sixteen columns" -->
+      </div><!--! end of .container -->
+    </div><!--! end of #main -->
+
+    <footer>
+      <div class="container">
+        <div id="globe"></div>
+        <div id="colophon">
+          <div class="sixteen columns">
+            <div class="first row">
+              <div class="five columns">
+                <div class="bucket">
+                  <a href="http://www.facebook.com/creativecommons"
+                     title="Creative Commons on Facebook"><img src="/wp-content/themes/creativecommons.org/img/facebook.png" alt="Creative Commons on Facebook"/></a>
+                  <a href="http://twitter.com/creativecommons"
+                     title="Creative Commons on Twitter"><img src="/wp-content/themes/creativecommons.org/img/twitter.png" alt="Creative Commons on Twitter"/></a>
+                  <a href="http://identi.ca/creativecommons"
+                     title="Creative Commons on Identi.ca"><img src="/wp-content/themes/creativecommons.org/img/identica.png" alt="Creative Commons on Identi.ca"/></a>
+                </div>
+              </div>
+              <div class="four offset-by-six columns">
+                <div class="bucket">
+                  <p>
+                    <a href="http://creativecommons.org/licenses/by/3.0/"
+                       title="Creative Commons Attribution 3.0 License"
+                       ><img src="http://i.creativecommons.org/l/by/3.0/88x31.png" alt="License"/></a>
+                  </p>
+                  <p>
+                    <small>
+                      Except where otherwise noted, content on this site is
+                      licensed under a
+                      <a href="http://creativecommons.org/licenses/by/3.0/"
+                         title="Creative Commons Attribution 3.0 License">Creative
+                        Commons Attribution 3.0 License</a>
+                    </small>
+                  </p>
+                </div>
+              </div>
+            </div>
+          </div>
+          <div class="sixteen columns">
+            <div class="first row">
+              <div class="five columns">
+                <div class="bucket">
+                  <a href="#container">Top</a>
+                </div>
+              </div>
+              <div class="four offset-by-six columns">
+                <p><a href="http://creativecommons.org/policies">Policies</a></p>
+                <p><a href="http://creativecommons.org/privacy">Privacy</a></p>
+                <p><a href="http://creativecommons.org/terms">Terms of Use</a></p>
+              </div>
             </div>
           </div>
-        {% endif %}
-      </div>    
-    </div>
-    <div id="footer">
-      <div class="container_16">
-        <div class="grid_2 alpha" id="top_link"><a href="#top">&#8682;</a></div>
-        <div class="clear"></div>
-        <div class="grid_6">
-          <h4>Creative Commons</h4>
-          <dl class="grid_2 alpha">
-            <dt><a href="/about">About</a></dt>
-            <dt><a href="/who-uses-cc">Who Uses CC?</a></dt>
-            <dt><a href="/culture">Culture</a></dt>
-            <dt><a href="/education">Education</a></dt>
-            <dt><a href="/science">Science</a></dt>
-          </dl>
-          <dl class="grid_2">
-            <dt><a href="/weblog">Blog</a></dt>
-            <dt><a href="http://wiki.creativecommons.org/Case_Studies">Case Studies</a></dt>
-            <dt><a href="/interviews">CC Talks With...</a></dt>
-            <dt><a href="/newsletter">Newsletters</a></dt>
-            <dt><a href="/about/downloads">Downloads</a></dt>
-          </dl>
-          <dl class="grid_2 omega">
-            <dt><a href="/affiliates">International</a></dt>
-            <dt><a href="http://wiki.creativecommons.org/Events">Events</a></dt>
-            <dt><a href="/about/people">People</a></dt>
-            <dt><a href="/about/press">Press Room</a></dt>
-            <dt><a href="/contact">Contact</a></dt>
-          </dl>
-        </div>
-        <div class="grid_2 prefix_1">
-          <h4>Licensing</h4>
-          <dl class="grid_2 alpha omega">
-            <dt><a href="/licenses">The Licenses</a></dt>
-            <dt><a href="/choose">Choose License</a></dt>
-            <dt><a href="http://wiki.creativecommons.org/FAQ">FAQ</a></dt>
-            <dt><a href="http://search.creativecommons.org/">Find Content</a></dt>
-            <dt><a href="http://wiki.creativecommons.org/Developers">Developers</a></dt>
-          </dl>
-        </div>
-        <div class="grid_2 prefix_1 suffix_1">
-          <h4>Supporting CC</h4>
-          <dl class="grid_2 alpha omega">
-            <dt><a href="https://creativecommons.net/donate">Donate</a></dt>
-            <dt><a href="https://creativecommons.net/store">Store</a></dt>
-            <dt><a href="https://creativecommons.net/supporters">Supporters</a></dt>
-            <dt><a href="https://creativecommons.net/corporate">Corporate Giving</a></dt>
-            <dt><a href="https://creativecommons.net/figures">Facts &amp; Figures</a></dt>
-          </dl>
-        </div>
-        <div class="grid_3 social alpha omega">
-          <dl class="social_links">
-            <dt><a href="https://creativecommons.net/civicrm/mailing/subscribe?reset=1&amp;gid=121">Subscribe to Newsletter</a></dt>
-            <dt class="fb"><iframe src="http://www.facebook.com/plugins/like.php?href=http%3A%2F%2Fcreativecommons.org&amp;layout=button_count&amp;show_faces=false&amp;width=150&amp;action=like&amp;colorscheme=light&amp;height=21" scrolling="no" frameborder="0" style="border:none; overflow:hidden; width:150px; height:21px;"></iframe></dt>
-            <dt><a href="http://twitter.com/creativecommons">Follow on Twitter</a></dt>
-            <dt><a href="http://identi.ca/creativecommons">Follow on Identi.ca</a></dt>
-          </dl>
         </div>
       </div>
-      <div class="container_16" id="footer_license">
-        <p class="grid_16">
-          <a href="http://creativecommons.org/policies">Policies</a>
-          &nbsp;&nbsp;&nbsp;<a href="http://creativecommons.org/privacy">Privacy</a>
-          &nbsp;&nbsp;&nbsp;<a href="http://creativecommons.org/terms">Terms of Use</a>
-        </p>
-        <p class="grid_16">
-          {% block license_override %}
-            <a rel="license" href="http://creativecommons.org/licenses/by/3.0/"><img src="http://i.creativecommons.org/l/by/3.0/80x15.png" alt="Creative Commons License" style="border: medium none ;" height="15" width="80" /></a>
-            Except where otherwise
-            <a class="subfoot" href="/policies#license">noted</a>,
-            content on this site is licensed under a
-            <a rel="license" href="http://creativecommons.org/licenses/by/3.0/"
-               class="subfoot">Creative Commons Attribution 3.0 License</a>
-          {% endblock %}
-        </p>
-      </div>
-    </div>
-
-    <script type="text/javascript">
+    </footer>
+  </div><!--! end of #container -->
 
-  var _gaq = _gaq || [];
-  _gaq.push(['_setAccount', 'UA-2010376-1']);
-  _gaq.push(['_trackPageview']);
+  <!-- JavaScript at the bottom for fast page loading -->
+  <!-- Grab Google CDN's jQuery, with a protocol relative URL; fall back to local if offline -->
+  <script src="//ajax.googleapis.com/ajax/libs/jquery/1.6.2/jquery.min.js"></script>
+  <script>window.jQuery || document.write('<script src="/wp-content/themes/creativecommons.org/js/libs/jquery-1.6.2.min.js"><\/script>')</script>
+  <!-- scripts concatenated and minified via build script -->
+  <script defer src="/wp-content/themes/creativecommons.org/js/plugins.js"></script>
+  <script defer src="/wp-content/themes/creativecommons.org/js/script.js"></script>
+  <!-- end scripts -->
 
-  (function() {
-    var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
-    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 type="text/javascript">
+    var _gaq = _gaq || [];
+    _gaq.push(['_setAccount', 'UA-2010376-1']);
+    _gaq.push(['_trackPageview']);
 
-    </script>
-  </body>
+    (function() {
+      var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+      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>
+  {% block scripts %}{% endblock %}
+</body>
 </html>
diff --git a/cc/engine/tests/view_tests.json b/cc/engine/tests/view_tests.json
index f269346..b075b08 100644
--- a/cc/engine/tests/view_tests.json
+++ b/cc/engine/tests/view_tests.json
@@ -221,7 +221,7 @@
       "CC0",
       "Choose which style of button you'd like on your webpage:",
       "Here's a preview of how your waiver will appear on your site:",
-      "src=\"http://i.creativecommons.org/l/by/3.0/80x15.png\""]},
+      "src=\"http://i.creativecommons.org/p/zero/1.0/80x15.png\""]},
  {"path": "/choose/zero/confirm?license-class=zero&name=foo&actor_href=bar&work_title=baz&work_jurisdiction=BA&confirm=confirm&understand=confirm&field1=continue",
   "string_tests": [
       "CC0: Confirm Waiver",


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


More information about the cc-commits mailing list