Merge branch 'testing' of gitorious.org:statusnet/mainline into testing

diff --git a/README b/README
index e5cb2c933d53f378b7ca4c07f8fd82c10139cba3..a12d168517e093ad7eab3f7b69f32bfe845c4b9c 100644 (file)
--- a/README
+++ b/README
@@ -72,6 +72,16 @@ License along with this program, in the file "COPYING".  If not, see
     of using the software, and if you do not wish to share your
     modifications, *YOU MAY NOT INSTALL STATUSNET*.
 
+CSS and images in the /theme/ directory are available under the
+Creative Commons Attribution 3.0 Unported license, with attribution to
+"StatusNet". See http://creativecommons.org/licenses/by/3.0/ for details.
+
+Our understanding and intention is that if you add your own theme that
+uses only CSS and images, those files are not subject to the copyleft
+requirements of the Affero General Public License 3.0. See
+http://wordpress.org/news/2009/07/themes-are-gpl-too/ . This is not
+legal advice; consult your lawyer.
+
 Additional library software has been made available in the 'extlib'
 directory. All of it is Free Software and can be distributed under
 liberal terms, but those terms may differ in detail from the AGPL's

diff --git a/theme/README b/theme/README
index e154a723c4a449e0f297f16b03db4086f7022b38..56a7a66c385e2b44cb227334cc27a11718617f21 100644 (file)
--- a/theme/README
+++ b/theme/README
@@ -3,7 +3,7 @@
  * @package   StatusNet
  * @author    Sarven Capadisli <csarven@status.net>
  * @copyright 2010 StatusNet, Inc.
- * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @license   http://creativecommons.org/licenses/by/3.0/ Creative Commons Attribution 3.0 unported
  * @link      http://status.net/
  */
 
@@ -23,25 +23,19 @@ default/default-avatar-stream.png   #48x48 default avatar for notice timelines
 default/default-avatar-profile.png  #96x96 default avatar for the profile page
 </nowiki></pre>
 
-
 == How to create your own theme ==
 
-
 You probably want to do one of the following:
 
-
 * If you just want to change the text, link, background, content, sidebar colours, background image:
 ** Do this from the Admin->Design settings (recommended!). You could also create a directory and a file structure like the default theme, search and replace with your own values. This is more work, but, you can do this if you plan to make additional *minimal* changes.
 
-
 * If you want to change the background images and colours:
 # Create a directory and a file structure like the default theme.
 # Have your stylesheet import base/css/display.css and add your own styles below. It is okay to add *minimal* changes here.
 
-
 * If you want to create a different layout, typography, background images and colours:
 ** Create your own theme directory (base or default) with stylesheets and images like.
 
-
 Finally, enable your theme by selecting it from the Admin->Design interface. You can set site's logo from here as well.
 

diff --git a/theme/base/css/display.css b/theme/base/css/display.css
index f48bdf55e7361d87b5cd64da05fa618366d76402..a278126dc29dd74e7e59835abc6d1eff59dfdd01 100644 (file)
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -3,7 +3,7 @@
  * @package   StatusNet
  * @author    Sarven Capadisli <csarven@status.net>
  * @copyright 2009-2010 StatusNet, Inc.
- * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @license   http://creativecommons.org/licenses/by/3.0/ Creative Commons Attribution 3.0 Unported
  * @link      http://status.net/
  */
 

diff --git a/theme/base/css/ie.css b/theme/base/css/ie.css
index 41d053ac469099a85848aed5b6089013baed8e74..48b5cd6af7409294ab2b3d6f59b68433631c12a7 100644 (file)
--- a/theme/base/css/ie.css
+++ b/theme/base/css/ie.css
@@ -1,3 +1,10 @@
+/**
+ * @package   StatusNet
+ * @author    Sarven Capadisli <csarven@status.net>
+ * @copyright 2009-2010 StatusNet, Inc.
+ * @license   http://creativecommons.org/licenses/by/3.0/ Creative Commons Attribution 3.0 Unported
+ * @link      http://status.net/
+ */
 /* IE specific styles */
 input.checkbox,
 input.radio {

diff --git a/theme/base/css/ie6.css b/theme/base/css/ie6.css
index 6df5e01cee7207e702e0596b701340c8297c4cff..1784677d08500e28396aedb136b68420c102bc44 100644 (file)
--- a/theme/base/css/ie6.css
+++ b/theme/base/css/ie6.css
@@ -1,3 +1,10 @@
+/**
+ * @package   StatusNet
+ * @author    Sarven Capadisli <csarven@status.net>
+ * @copyright 2009-2010 StatusNet, Inc.
+ * @license   http://creativecommons.org/licenses/by/3.0/ Creative Commons Attribution 3.0 Unported
+ * @link      http://status.net/
+ */
 /* IE6 specific styles */
 address {
 margin-left:7px;

diff --git a/theme/base/css/jquery.Jcrop.css b/theme/base/css/jquery.Jcrop.css
index b35f332aaeb2ca5bf6f1e057448abde639fdb618..a3f0d22776945c2cf68ec1c8ad586340a9169697 100644 (file)
--- a/theme/base/css/jquery.Jcrop.css
+++ b/theme/base/css/jquery.Jcrop.css
@@ -1,3 +1,10 @@
+/**
+ * @package   StatusNet
+ * @author    Sarven Capadisli <csarven@status.net>
+ * @copyright 2009-2010 StatusNet, Inc.
+ * @license   http://creativecommons.org/licenses/by/3.0/ Creative Commons Attribution 3.0 Unported
+ * @link      http://status.net/
+ */
 /* Fixes issue here http://code.google.com/p/jcrop/issues/detail?id=1 */
 .jcrop-holder { text-align: left; }
 

diff --git a/theme/base/css/uap.css b/theme/base/css/uap.css
index 73be5f0c144f4a8351a9a04232d17522472257e6..80c73e2ea581280d5e866f56a7edbc514c734429 100644 (file)
--- a/theme/base/css/uap.css
+++ b/theme/base/css/uap.css
@@ -7,7 +7,7 @@
  * @package   StatusNet
  * @author    Sarven Capadisli <csarven@status.net>
  * @copyright 2010 StatusNet, Inc.
- * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @license   http://creativecommons.org/licenses/by/3.0/ Creative Commons Attribution 3.0 Unported
  * @link      http://status.net/
  */
 

diff --git a/theme/biz/css/base.css b/theme/biz/css/base.css
index f5efdb49c465554203ac434311ea39b3f16b74dc..c0ca6488478fbdcb1c29888e0811cd5d73470c8c 100644 (file)
--- a/theme/biz/css/base.css
+++ b/theme/biz/css/base.css
@@ -3,7 +3,7 @@
  * @package   StatusNet
  * @author    Sarven Capadisli <csarven@status.net>
  * @copyright 2009 StatusNet, Inc.
- * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @license   http://creativecommons.org/licenses/by/3.0/ Creative Commons Attribution 3.0 Unported
  * @link      http://status.net/
  */
 

diff --git a/theme/biz/css/display.css b/theme/biz/css/display.css
index e735d8683fff24b3a949669ce653fec38a049544..8b49cbb247e9752693a6f1fb965fda9d80fad33a 100644 (file)
--- a/theme/biz/css/display.css
+++ b/theme/biz/css/display.css
@@ -3,7 +3,7 @@
  * @package   StatusNet
  * @author Sarven Capadisli <csarven@status.net>
  * @copyright 2009 StatusNet, Inc.
- * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @license   http://creativecommons.org/licenses/by/3.0/ Creative Commons Attribution 3.0 Unported
  * @link      http://status.net/
  */
 

diff --git a/theme/biz/css/ie.css b/theme/biz/css/ie.css
index 2f463bb44dfee9a14fd382a3b745bfe2a274429f..46d14c2021db43ee5b2ecd6809e5f27519615973 100644 (file)
--- a/theme/biz/css/ie.css
+++ b/theme/biz/css/ie.css
@@ -1,3 +1,10 @@
+/**
+ * @package   StatusNet
+ * @author    Sarven Capadisli <csarven@status.net>
+ * @copyright 2009-2010 StatusNet, Inc.
+ * @license   http://creativecommons.org/licenses/by/3.0/ Creative Commons Attribution 3.0 Unported
+ * @link      http://status.net/
+ */
 /* IE specific styles */
 
 .notice-options input.submit {

diff --git a/theme/cloudy/css/display.css b/theme/cloudy/css/display.css
index caea5cf4432c30c4ada8b10ea5d80e7c0c4a80b1..d93cd398fe684a6e97e38a726c9251e713abc103 100644 (file)
--- a/theme/cloudy/css/display.css
+++ b/theme/cloudy/css/display.css
@@ -3,7 +3,7 @@
  * @package   StatusNet
  * @author Sarven Capadisli <csarven@status.net>
  * @copyright 2009 StatusNet, Inc.
- * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @license   http://creativecommons.org/licenses/by/3.0/ Creative Commons Attribution 3.0 Unported
  * @link      http://status.net/
  */
 

diff --git a/theme/cloudy/css/ie.css b/theme/cloudy/css/ie.css
index a698676fbb0eb574e964fe1156fb122bfd8ea849..e8f964ef4352067f60b06808d38cad65c7309bc6 100644 (file)
--- a/theme/cloudy/css/ie.css
+++ b/theme/cloudy/css/ie.css
@@ -1,3 +1,10 @@
+/**
+ * @package   StatusNet
+ * @author    Sarven Capadisli <csarven@status.net>
+ * @copyright 2009-2010 StatusNet, Inc.
+ * @license   http://creativecommons.org/licenses/by/3.0/ Creative Commons Attribution 3.0 Unported
+ * @link      http://status.net/
+ */
 /* IE specific styles */
 
 .notice-options input.submit {

diff --git a/theme/default/css/display.css b/theme/default/css/display.css
index 9a1dabb51546c906ad87305c1aa67686e92be582..a9d9910d40edfb5ad2100810a107059394a6cdbf 100644 (file)
--- a/theme/default/css/display.css
+++ b/theme/default/css/display.css
@@ -3,7 +3,7 @@
  * @package   StatusNet
  * @author    Sarven Capadisli <csarven@status.net>
  * @copyright 2009-2010 StatusNet, Inc.
- * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @license   http://creativecommons.org/licenses/by/3.0/ Creative Commons Attribution 3.0 Unported
  * @link      http://status.net/
  */
 

diff --git a/theme/default/css/ie.css b/theme/default/css/ie.css
index 2283471661ddbb5fc98f6e86bb5570686bb655e6..6a95e0369ecab60855bc5903aaa8667049edd91e 100644 (file)
--- a/theme/default/css/ie.css
+++ b/theme/default/css/ie.css
@@ -1,3 +1,10 @@
+/**
+ * @package   StatusNet
+ * @author    Sarven Capadisli <csarven@status.net>
+ * @copyright 2009-2010 StatusNet, Inc.
+ * @license   http://creativecommons.org/licenses/by/3.0/ Creative Commons Attribution 3.0 Unported
+ * @link      http://status.net/
+ */
 /* IE specific styles */
 
 .notice-options input.submit {

diff --git a/theme/h4ck3r/css/base.css b/theme/h4ck3r/css/base.css
index 4c0e74218e27fd3bf4ac6f2bda029506a42ee0b5..a4dac0145a7bec25dc74170ac8d75e3feae07783 100644 (file)
--- a/theme/h4ck3r/css/base.css
+++ b/theme/h4ck3r/css/base.css
@@ -3,7 +3,7 @@
  * @package   StatusNet
  * @author Sarven Capadisli <csarven@status.net>
  * @copyright 2009 StatusNet, Inc.
- * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @license   http://creativecommons.org/licenses/by/3.0/ Creative Commons Attribution 3.0 Unported
  * @link      http://status.net/
  */
 

diff --git a/theme/h4ck3r/css/display.css b/theme/h4ck3r/css/display.css
index 276659dcede65159c844aab975c7b1cfbaa9169b..edf071a6596a63bea0988876ac45b29168052431 100644 (file)
--- a/theme/h4ck3r/css/display.css
+++ b/theme/h4ck3r/css/display.css
@@ -3,7 +3,7 @@
  * @package   StatusNet
  * @author Sarven Capadisli <csarven@status.net>
  * @copyright 2009 StatusNet, Inc.
- * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @license   http://creativecommons.org/licenses/by/3.0/ Creative Commons Attribution 3.0 Unported
  * @link      http://status.net/
  */
 

diff --git a/theme/h4ck3r/css/ie.css b/theme/h4ck3r/css/ie.css
index 2f463bb44dfee9a14fd382a3b745bfe2a274429f..46d14c2021db43ee5b2ecd6809e5f27519615973 100644 (file)
--- a/theme/h4ck3r/css/ie.css
+++ b/theme/h4ck3r/css/ie.css
@@ -1,3 +1,10 @@
+/**
+ * @package   StatusNet
+ * @author    Sarven Capadisli <csarven@status.net>
+ * @copyright 2009-2010 StatusNet, Inc.
+ * @license   http://creativecommons.org/licenses/by/3.0/ Creative Commons Attribution 3.0 Unported
+ * @link      http://status.net/
+ */
 /* IE specific styles */
 
 .notice-options input.submit {

diff --git a/theme/identica/css/display.css b/theme/identica/css/display.css
index d7f150bcb0ad9c17974966f904e830acc6a5de85..755775cf25a673c82a6ad693737f4245b79d1c5d 100644 (file)
--- a/theme/identica/css/display.css
+++ b/theme/identica/css/display.css
@@ -3,7 +3,7 @@
  * @package   StatusNet
  * @author    Sarven Capadisli <csarven@status.net>
  * @copyright 2009-2010 StatusNet, Inc.
- * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @license   http://creativecommons.org/licenses/by/3.0/ Creative Commons Attribution 3.0 Unported
  * @link      http://status.net/
  */
 

diff --git a/theme/identica/css/ie.css b/theme/identica/css/ie.css
index f69c13ae76f01ad4ff13d648575d0dc26914648c..62b62748b08c9f5e9d60fecc976edb5a39afc3f1 100644 (file)
--- a/theme/identica/css/ie.css
+++ b/theme/identica/css/ie.css
@@ -1,3 +1,10 @@
+/**
+ * @package   StatusNet
+ * @author    Sarven Capadisli <csarven@status.net>
+ * @copyright 2009-2010 StatusNet, Inc.
+ * @license   http://creativecommons.org/licenses/by/3.0/ Creative Commons Attribution 3.0 Unported
+ * @link      http://status.net/
+ */
 /* IE specific styles */
 
 .notice-options input.submit {

diff --git a/theme/pigeonthoughts/css/base.css b/theme/pigeonthoughts/css/base.css
index bc2e24dc509c3991468ee4356d485dbdc0e9d4ca..c31ea6b67881479ed4065c57cda88253e7de20ce 100644 (file)
--- a/theme/pigeonthoughts/css/base.css
+++ b/theme/pigeonthoughts/css/base.css
@@ -3,7 +3,7 @@
  * @package   StatusNet
  * @author Sarven Capadisli <csarven@status.net>
  * @copyright 2009 StatusNet, Inc.
- * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @license   http://creativecommons.org/licenses/by/3.0/ Creative Commons Attribution 3.0 Unported
  * @link      http://status.net/
  */
 

diff --git a/theme/pigeonthoughts/css/display.css b/theme/pigeonthoughts/css/display.css
index 3d6db00e142e1f84a5cab460891501ed01bb8de4..91078806a68e1a5a58753b50e9a47379c813759d 100644 (file)
--- a/theme/pigeonthoughts/css/display.css
+++ b/theme/pigeonthoughts/css/display.css
@@ -3,7 +3,7 @@
  * @package   StatusNet
  * @author Sarven Capadisli <csarven@status.net>
  * @copyright 2009 StatusNet, Inc.
- * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @license   http://creativecommons.org/licenses/by/3.0/ Creative Commons Attribution 3.0 Unported
  * @link      http://status.net/
  */
 

diff --git a/theme/pigeonthoughts/css/ie.css b/theme/pigeonthoughts/css/ie.css
index 2f463bb44dfee9a14fd382a3b745bfe2a274429f..46d14c2021db43ee5b2ecd6809e5f27519615973 100644 (file)
--- a/theme/pigeonthoughts/css/ie.css
+++ b/theme/pigeonthoughts/css/ie.css
@@ -1,3 +1,10 @@
+/**
+ * @package   StatusNet
+ * @author    Sarven Capadisli <csarven@status.net>
+ * @copyright 2009-2010 StatusNet, Inc.
+ * @license   http://creativecommons.org/licenses/by/3.0/ Creative Commons Attribution 3.0 Unported
+ * @link      http://status.net/
+ */
 /* IE specific styles */
 
 .notice-options input.submit {