diff options
| author | Evan Prodromou <evan@controlyourself.ca> | 2009-01-16 19:59:27 +0000 |
|---|---|---|
| committer | Evan Prodromou <evan@controlyourself.ca> | 2009-01-16 19:59:27 +0000 |
| commit | 69d6404f260fb30c41db9a7b7852beaae0dced95 (patch) | |
| tree | a380f378c6085e076a0d5658c60d75d82bb95e45 /lib | |
| parent | ed2fd6da6bbae0ccd433fead33c82f46e86a801e (diff) | |
| parent | 8abf9351860408db930ce9f423f94baa97ed5f56 (diff) | |
Merge branch 'uiredesign' of /var/www/trunk into uiredesign
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/action.php | 10 | ||||
| -rw-r--r-- | lib/common.php | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/lib/action.php b/lib/action.php index 1edfe157f..5ff536dab 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 2ef26cfc6..05fef045a 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), |