[cc-commits] [SCM] cc.engine: License chooser, public domain chooser, deeds (branch master) updated. 9de8c826bf7eac8da78c7493483358fc97d15dbb
Gitosis User
git at gandi0.creativecommons.org
Tue Jan 10 18:35:43 EST 2012
The branch, master has been updated
via 9de8c826bf7eac8da78c7493483358fc97d15dbb (commit)
via 99b52d506c53384bc87e85d4b9c0b9b51809efb0 (commit)
from 3fd160008aec0ca260b4eb8f02bfb7ea2be2c96a (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 9de8c826bf7eac8da78c7493483358fc97d15dbb
Merge: 3fd1600 99b52d5
Author: Jonathan Palecek <jonathan at creativecommons.org>
Date: Tue Jan 10 17:28:39 2012 -0600
Merge branch 'next'
-----------------------------------------------------------------------
Summary of changes (followed by patch):
cc/engine/templates/licenses/zero_deed.html | 2 +-
cc/engine/templates/macros_templates/deed.html | 6 ++++--
.../templates/macros_templates/pdtool_deed.html | 4 +++-
3 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/cc/engine/templates/licenses/zero_deed.html b/cc/engine/templates/licenses/zero_deed.html
index 91c6299..ac0b1c6 100644
--- a/cc/engine/templates/licenses/zero_deed.html
+++ b/cc/engine/templates/licenses/zero_deed.html
@@ -23,7 +23,7 @@
<h3>{{ cctrans(locale, "deed.zero.no_copyright")|safe }}</h3>
<div id="librepd">
<a href="http://freedomdefined.org/">
- <img src="/images/deed/seal.png" border="0"
+ <img src="/images/deed/seal.png"
alt="{{ cctrans(locale, 'This license is acceptable for Free Cultural Works.')|safe }}" />
</a>
</div>
diff --git a/cc/engine/templates/macros_templates/deed.html b/cc/engine/templates/macros_templates/deed.html
index 9479b68..6347943 100644
--- a/cc/engine/templates/macros_templates/deed.html
+++ b/cc/engine/templates/macros_templates/deed.html
@@ -1,11 +1,13 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML+RDFa 1.0//EN" "http://www.w3.org/MarkUp/DTD/xhtml-rdfa-1.dtd">
<html xmlns="http://www.w3.org/1999/xhtml"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:dct="http://purl.org/dc/terms/"
xmlns:frbr="http://purl.org/vocab/frbr/core#"
- lang="{{ target_lang }}">
+ xml:lang="{{ target_lang }}">
<head about="{{ license.uri }}">
+ <meta http-equiv="Content-Type"
+ content="application/xhtml+xml; charset=utf-8" />
<title>
{%- block title -%}
Creative Commons — {{ license.title(target_lang) }}
diff --git a/cc/engine/templates/macros_templates/pdtool_deed.html b/cc/engine/templates/macros_templates/pdtool_deed.html
index 3712910..bc4c72c 100644
--- a/cc/engine/templates/macros_templates/pdtool_deed.html
+++ b/cc/engine/templates/macros_templates/pdtool_deed.html
@@ -4,8 +4,10 @@
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:dct="http://purl.org/dc/terms/"
xmlns:frbr="http://purl.org/vocab/frbr/core#"
- lang="{{ target_lang }}">
+ xml:lang="{{ target_lang }}">
<head about="{{ license.uri }}">
+ <meta http-equiv="Content-Type"
+ content="application/xhtml+xml; charset=utf-8" />
<title>
{%- block title -%}
Creative Commons — {{ license.title(target_lang) }}
hooks/post-receive
--
cc.engine: License chooser, public domain chooser, deeds
More information about the cc-commits
mailing list