Merge branch 'testing' into 0.9.x

22 files changed, 85 insertions, 18 deletions

diff --git a/README b/README
index e5cb2c933..927c77b9c 100644
--- 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. 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 e154a723c..56a7a66c3 100644
--- 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 f48bdf55e..a278126dc 100644
--- 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 41d053ac4..48b5cd6af 100644
--- 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 6df5e01ce..1784677d0 100644
--- 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 b35f332aa..a3f0d2277 100644
--- 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 73be5f0c1..80c73e2ea 100644
--- 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 f5efdb49c..c0ca64884 100644
--- 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 e735d8683..8b49cbb24 100644
--- 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 2f463bb44..46d14c202 100644
--- 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 caea5cf44..d93cd398f 100644
--- 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 a698676fb..e8f964ef4 100644
--- 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 9a1dabb51..a9d9910d4 100644
--- 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 228347166..6a95e0369 100644
--- 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 4c0e74218..a4dac0145 100644
--- 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 276659dce..edf071a65 100644
--- 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 2f463bb44..46d14c202 100644
--- 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 d7f150bcb..755775cf2 100644
--- 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 f69c13ae7..62b62748b 100644
--- 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 bc2e24dc5..c31ea6b67 100644
--- 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 3d6db00e1..91078806a 100644
--- 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 2f463bb44..46d14c202 100644
--- 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 {