From 4549e577ac2c349881c7a411c0e25d5bdd0a0c51 Mon Sep 17 00:00:00 2001
From: sarven <csarven@plantard.controlezvous.ca>
Date: Fri, 16 Jan 2009 15:52:17 +0000
Subject: [PATCH] Updating Creative Commons text and image

---
 lib/action.php             | 10 +++++-----
 lib/common.php             |  2 +-
 theme/base/css/display.css | 11 +++++++----
 3 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/lib/action.php b/lib/action.php
index 792b9c0575..129a4b24b6 100644
--- a/lib/action.php
+++ b/lib/action.php
@@ -436,16 +436,16 @@ class Action extends HTMLOutputter // lawsuit
         $this->element('dt', array('id' => 'site_content_license'), _('Laconica software license'));
         $this->elementStart('dd', array('id' => 'site_content_license_cc'));
         $this->elementStart('p');
-        $this->text(_('Unless otherwise specified, contents of this site are copyright by the contributors and available under the '));
+        $this->element('img', array('id' => 'license_cc',
+                                    'src' => common_config('license', 'image'),
+                                    'alt' => common_config('license', 'title')));
+        $this->text(_('All criti.ca content and data are available under the '));
         $this->element('a', array('class' => 'license',
                                   'rel' => 'external license',
                                   'href' => common_config('license', 'url')),
                        common_config('license', 'title'));
-        $this->text(_('. Contributors should be attributed by full name or nickname.'));
+        $this->text(_('license.'));
         $this->elementEnd('p');
-        $this->element('img', array('id' => 'license_cc',
-                                    'src' => common_config('license', 'image'),
-                                    'alt' => common_config('license', 'title')));
         $this->elementEnd('dd');
     }
 
diff --git a/lib/common.php b/lib/common.php
index 2ef26cfc62..05fef045a1 100644
--- a/lib/common.php
+++ b/lib/common.php
@@ -79,7 +79,7 @@ $config =
         'license' =>
         array('url' => 'http://creativecommons.org/licenses/by/3.0/',
               'title' => 'Creative Commons Attribution 3.0',
-              'image' => 'http://i.creativecommons.org/l/by/3.0/88x31.png'),
+              'image' => 'http://i.creativecommons.org/l/by/3.0/80x15.png'),
         'mail' =>
         array('backend' => 'mail',
               'params' => null),
diff --git a/theme/base/css/display.css b/theme/base/css/display.css
index d56b416937..87a3a01e06 100644
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -253,6 +253,9 @@ margin-left:0;
 
 
 
+#licenses {
+font-size:0.9em;
+}
 
 #licenses dt {
 font-weight:bold;
@@ -260,17 +263,17 @@ display:none;
 }
 #licenses dd {
 margin-bottom:11px;
+line-height:1.5;
 }
 
 
 #site_content_license_cc p {
-float:left;
-margin-left:10%;
 width:90%;
 }
 #site_content_license_cc img {
-float:left;
-margin-left:-100%;
+display:inline;
+vertical-align:top;
+margin-right:4px;
 }