Merge branch 'testing' into 0.9.x

2010-09-02 23:30:24 -04:00 · 2010-09-02 23:30:24 -04:00 · 7d878b7c35
commit 7d878b7c35
parent 6c14235d6c 3010429579
22 changed files with 85 additions and 18 deletions
--- a/10
+++ b/10
@ -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
--- 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.

--- 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/
 */

--- 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 {
--- 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;
--- 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; }

--- 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/
 */

--- 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/
 */

--- 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/
 */

--- 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 {
--- 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/
 */

--- 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 {
--- 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/
 */

--- 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 {
--- 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/
 */

--- 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/
 */

--- 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 {
--- 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/
 */

--- 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 {
--- 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/
 */

--- 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/
 */

--- 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 {