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

Gitosis User git at gandi0.creativecommons.org
Thu Sep 15 11:32:34 EDT 2011


The branch, next has been updated
       via  0051781600d25fbc2d52b22a855b1e5aedbc5b2f (commit)
       via  d001442627ffa068e4a4f25c66ec75a8289eb7f0 (commit)
       via  b4630e0ceca33004183826ae787d47c3474575cb (commit)
       via  6fb8576d91669e2f2c82f682e3dc29fd7648e349 (commit)
       via  931c018aad06a528ab490c104e38e4f44d625148 (commit)
      from  f3b962f5dda97971021b42b1252775600fae6fd9 (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 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

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

Summary of changes (followed by patch):
 .../templates/catalog_pages/licenses-index.html    |    8 +-
 cc/engine/templates/chooser_pages/index.html       |  108 ++++--
 .../templates/chooser_pages/pdmark/details.html    |   24 +-
 .../templates/chooser_pages/pdmark/index.html      |   46 ++--
 cc/engine/templates/chooser_pages/zero/index.html  |   27 +-
 cc/engine/templates/chooser_pages/zero/waiver.html |   73 +++--
 cc/engine/templates/includes/more_metadata.html    |  121 +++++--
 cc/engine/templates/macros_templates/engine.html   |  397 ++++++++++++++------
 8 files changed, 560 insertions(+), 244 deletions(-)

diff --git a/cc/engine/templates/catalog_pages/licenses-index.html b/cc/engine/templates/catalog_pages/licenses-index.html
index 31cdead..5e43416 100644
--- a/cc/engine/templates/catalog_pages/licenses-index.html
+++ b/cc/engine/templates/catalog_pages/licenses-index.html
@@ -140,8 +140,8 @@
           </p>
         </div>
       </div>
-	</div>
-	<div class="row">
+        </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" />
@@ -196,8 +196,8 @@
           </p>
         </div>
       </div>
-	</div>
-	<div class="row">
+        </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" />
diff --git a/cc/engine/templates/chooser_pages/index.html b/cc/engine/templates/chooser_pages/index.html
index 9cc6d3a..7c4fd07 100644
--- a/cc/engine/templates/chooser_pages/index.html
+++ b/cc/engine/templates/chooser_pages/index.html
@@ -3,7 +3,8 @@
 {% block title %}Choose a License{% endblock title %}
 
 {% block headers %}
-<link rel="stylesheet" type="text/css" href="/wp-content/themes/creativecommons.org/engine.css" />
+  <link rel="stylesheet" type="text/css"
+        href="/wp-content/themes/creativecommons.org/engine.css" />
 {% endblock headers %}
 
 {% block body %}
@@ -45,9 +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>
+          <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>
@@ -58,9 +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>
+          <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,9 +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>
+          <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>
@@ -96,9 +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>
+            <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>
 
@@ -110,23 +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>
+          <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>
-<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>
+        <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">
diff --git a/cc/engine/templates/chooser_pages/pdmark/details.html b/cc/engine/templates/chooser_pages/pdmark/details.html
index 8ed1a42..af71965 100644
--- a/cc/engine/templates/chooser_pages/pdmark/details.html
+++ b/cc/engine/templates/chooser_pages/pdmark/details.html
@@ -3,7 +3,6 @@
 {% block title %}Public Domain Mark{% endblock title %}
 
 {% block headers %}
-
   <link rel="stylesheet" type="text/css"
         href="{{ request.staticdirect('includes/zero.css') }}" />
 
@@ -24,10 +23,21 @@
           <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 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">
           <div class="hd">{{ cctrans(locale, "Embedded Metadata")|safe }}</div>
@@ -107,14 +117,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 }}" /> 
+                     name="field1" value="{{ cctrans(locale, 'util.continue')|safe }}" />
             </div>
           </div>
 
diff --git a/cc/engine/templates/chooser_pages/pdmark/index.html b/cc/engine/templates/chooser_pages/pdmark/index.html
index ae24213..1e6109c 100644
--- a/cc/engine/templates/chooser_pages/pdmark/index.html
+++ b/cc/engine/templates/chooser_pages/pdmark/index.html
@@ -3,14 +3,12 @@
 {% block title %}Public Domain Mark{% 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 %}
@@ -18,33 +16,33 @@
 {% block page_header_title %}Public Domain Mark{% endblock %}
 
 {% block body %}
-    <div id="page-welcome">
-      <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>
-              <a class="btn" id="do-learn-more"
-                 href="/about/pdm">{{ cctrans(locale, "util.learn_more")|safe }}</a>
+      <p>
+        <a class="btn" id="do-learn-more"
+           href="/about/pdm">{{ cctrans(locale, "util.learn_more")|safe }}</a>
 
-              <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>
+        <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/zero/index.html b/cc/engine/templates/chooser_pages/zero/index.html
index ba5b81f..b67ceb9 100644
--- a/cc/engine/templates/chooser_pages/zero/index.html
+++ b/cc/engine/templates/chooser_pages/zero/index.html
@@ -38,23 +38,22 @@
         </p>
 
         <p>
-              <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 %}
+          <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/waiver.html b/cc/engine/templates/chooser_pages/zero/waiver.html
index e91ae5d..f61684e 100644
--- a/cc/engine/templates/chooser_pages/zero/waiver.html
+++ b/cc/engine/templates/chooser_pages/zero/waiver.html
@@ -25,16 +25,26 @@
   <div>
     <div id="waiver_ui">
       <div class="bd">
-        <p><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></p>
+        <p>
+          <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>
+        </p>
 
         <form id="form-details" class="form-stacked" action="confirm">
           <input type="hidden" name="license-class" value="zero" />
@@ -53,14 +63,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 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 class="form-row">
             <div class="form-question">
               {{ cctrans(locale, "util.title_of_work")|safe }}
@@ -82,16 +99,24 @@
 
               <a href="" id="country" 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.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>
+    	         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"
@@ -127,14 +152,14 @@
           </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 }}"> 
+    	             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 b2aa4b9..6227b5b 100644
--- a/cc/engine/templates/includes/more_metadata.html
+++ b/cc/engine/templates/includes/more_metadata.html
@@ -1,18 +1,28 @@
 <div class="more-metadata-container">
- <h4>{{ cctrans(locale, "license.additional_info")|safe }}</h4>
-<p>	<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>
-
+  <h4>{{ cctrans(locale, "license.additional_info")|safe }}</h4>
+  <p>
+    <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 class="label">
@@ -40,15 +50,23 @@
   <div class="more-metadata">
     <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 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">
@@ -56,14 +74,23 @@
       {{ 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 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>
 
 
@@ -77,10 +104,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, "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 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">
@@ -91,9 +126,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, "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 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">
@@ -104,10 +148,17 @@
       <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.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 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>
diff --git a/cc/engine/templates/macros_templates/engine.html b/cc/engine/templates/macros_templates/engine.html
index e0ca085..2672103 100644
--- a/cc/engine/templates/macros_templates/engine.html
+++ b/cc/engine/templates/macros_templates/engine.html
@@ -1,116 +1,293 @@
 <!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]-->
+<!--[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>
-	<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" />
-
-
-    <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" 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-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">W
 ho 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="http
 s://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 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://creativeco
 mmons.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></header>
-
-        <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>
+<!--[if gt IE 8]><!-->
+<html class="no-js" lang="en">
+<!--<![endif]-->
+
+<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" />
+
+  <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" 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-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 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> <!--! 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>
-
-	{% 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></div></div></footer></div> <!--! end of #container --><!-- 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 -->
-
-    <script type="text/javascript">
-
-  var _gaq = _gaq || [];
-  _gaq.push(['_setAccount', 'UA-2010376-1']);
-  _gaq.push(['_trackPageview']);
-
-  (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>
-  </body>
+    </header>
+
+    <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> <!--! 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>
+
+            {% 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>
+        </div>
+      </div>
+    </footer>
+  </div><!--! end of #container -->
+
+  <!-- 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 -->
+
+  <script type="text/javascript">
+    var _gaq = _gaq || [];
+    _gaq.push(['_setAccount', 'UA-2010376-1']);
+    _gaq.push(['_trackPageview']);
+
+    (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>
+</body>
 </html>


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


More information about the cc-commits mailing list