ubuntu-packaging-guide-team team mailing list archive

[Andrew Starr-Bochicchio <a.starr.b@xxxxxxxxx>]

Andrew Starr-Bochicchio has proposed merging lp:~andrewsomething/ubuntu-packaging-guide/cc-by-sa-in-footer into lp:ubuntu-packaging-guide.

Requested reviews:
  Ubuntu Packaging Guide Team (ubuntu-packaging-guide-team)
Related bugs:
  Bug #1093447 in Ubuntu Packaging Guide: "Wrong/missing license information at http://developer.ubuntu.com/packaging/html/";
  https://bugs.launchpad.net/ubuntu-packaging-guide/+bug/1093447

For more details, see:
https://code.launchpad.net/~andrewsomething/ubuntu-packaging-guide/cc-by-sa-in-footer/+merge/141222

Adds licence info to page footer.
-- 
https://code.launchpad.net/~andrewsomething/ubuntu-packaging-guide/cc-by-sa-in-footer/+merge/141222
Your team Ubuntu Packaging Guide Team is requested to review the proposed merge of lp:~andrewsomething/ubuntu-packaging-guide/cc-by-sa-in-footer into lp:ubuntu-packaging-guide.

=== modified file 'debian/changelog'
--- debian/changelog	2012-12-14 15:09:23 +0000
+++ debian/changelog	2012-12-24 14:37:23 +0000
@@ -7,6 +7,9 @@
   * Document where to find a list of required autopkgtests and where 
     to get help.
 
+  [ Andrew Starr-Bochicchio ]
+  * Put license information into the page footer (LP: #1093447).
+
  -- Andrew Starr-Bochicchio <a.starr.b@xxxxxxxxx>  Sun, 09 Dec 2012 13:35:33 -0500
 
 ubuntu-packaging-guide (0.3.0) experimental; urgency=low

=== modified file 'themes/ubuntu/layout.html'
--- themes/ubuntu/layout.html	2012-11-26 11:01:16 +0000
+++ themes/ubuntu/layout.html	2012-12-24 14:37:23 +0000
@@ -185,13 +185,6 @@
     {%- if version %}
       {% trans version=version|e %}Version: {{ version }}.{% endtrans %}
     {%- endif %}
-    {%- if show_copyright %}
-      {%- if hasdoc('copyright') %}
-        {% trans path=pathto('copyright'), copyright=copyright|e %}&copy; <a href="{{ path }}">Copyright</a> {{ copyright }}.{% endtrans %}
-      {%- else %}
-        {% trans copyright=copyright|e %}&copy; Copyright {{ copyright }}.{% endtrans %}
-      {%- endif %}
-    {%- endif %}
     {%- if last_updated %}
       {% trans last_updated=last_updated|e %}Last updated on {{ last_updated }}.{% endtrans %}
     {%- endif %}
@@ -200,6 +193,19 @@
     {%- if show_sphinx %}
       {% trans sphinx_version=sphinx_version|e %}Created using <a href="http://sphinx-doc.org/";>Sphinx</a> {{ sphinx_version }}.{% endtrans %}
     {%- endif %}
+    {%- if show_copyright %}
+      <br />
+      {%- if hasdoc('copyright') %}
+        {% trans path=pathto('copyright'), copyright=copyright|e %}&copy; <a href="{{ path }}">Copyright</a> {{ copyright }}.{% endtrans %}
+      {%- else %}
+        {% trans copyright=copyright|e %}&copy; Copyright {{ copyright }}.{% endtrans %}
+        <a rel="license" href="http://creativecommons.org/licenses/by-sa/3.0/";>
+        Creative Commons Attribution-ShareAlike 3.0 Unported License</a>.
+        <a rel="license" href="http://creativecommons.org/licenses/by-sa/3.0/";>
+        <img alt="Creative Commons License" style="border-width:0" 
+        src="{{ pathto('_static/images/cc-by-sa.png', 1) }}" /></a>
+      {%- endif %}
+    {%- endif %}
 
   </div>
 </footer>