Merge branch 'testing' into 0.9.x

This commit is contained in:
Evan Prodromou 2010-09-02 23:30:24 -04:00
commit 7d878b7c35
22 changed files with 85 additions and 18 deletions

10
README
View File

@ -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 of using the software, and if you do not wish to share your
modifications, *YOU MAY NOT INSTALL STATUSNET*. 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' Additional library software has been made available in the 'extlib'
directory. All of it is Free Software and can be distributed under 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 liberal terms, but those terms may differ in detail from the AGPL's

View File

@ -3,7 +3,7 @@
* @package StatusNet * @package StatusNet
* @author Sarven Capadisli <csarven@status.net> * @author Sarven Capadisli <csarven@status.net>
* @copyright 2010 StatusNet, Inc. * @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/ * @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 default/default-avatar-profile.png #96x96 default avatar for the profile page
</nowiki></pre> </nowiki></pre>
== How to create your own theme == == How to create your own theme ==
You probably want to do one of the following: You probably want to do one of the following:
* If you just want to change the text, link, background, content, sidebar colours, background image: * 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. ** 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: * If you want to change the background images and colours:
# Create a directory and a file structure like the default theme. # 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. # 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: * 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. ** 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. Finally, enable your theme by selecting it from the Admin->Design interface. You can set site's logo from here as well.

View File

@ -3,7 +3,7 @@
* @package StatusNet * @package StatusNet
* @author Sarven Capadisli <csarven@status.net> * @author Sarven Capadisli <csarven@status.net>
* @copyright 2009-2010 StatusNet, Inc. * @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/ * @link http://status.net/
*/ */

View File

@ -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 */ /* IE specific styles */
input.checkbox, input.checkbox,
input.radio { input.radio {

View File

@ -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 */ /* IE6 specific styles */
address { address {
margin-left:7px; margin-left:7px;

View File

@ -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 */ /* Fixes issue here http://code.google.com/p/jcrop/issues/detail?id=1 */
.jcrop-holder { text-align: left; } .jcrop-holder { text-align: left; }

View File

@ -7,7 +7,7 @@
* @package StatusNet * @package StatusNet
* @author Sarven Capadisli <csarven@status.net> * @author Sarven Capadisli <csarven@status.net>
* @copyright 2010 StatusNet, Inc. * @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/ * @link http://status.net/
*/ */

View File

@ -3,7 +3,7 @@
* @package StatusNet * @package StatusNet
* @author Sarven Capadisli <csarven@status.net> * @author Sarven Capadisli <csarven@status.net>
* @copyright 2009 StatusNet, Inc. * @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/ * @link http://status.net/
*/ */

View File

@ -3,7 +3,7 @@
* @package StatusNet * @package StatusNet
* @author Sarven Capadisli <csarven@status.net> * @author Sarven Capadisli <csarven@status.net>
* @copyright 2009 StatusNet, Inc. * @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/ * @link http://status.net/
*/ */

View File

@ -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 */ /* IE specific styles */
.notice-options input.submit { .notice-options input.submit {

View File

@ -3,7 +3,7 @@
* @package StatusNet * @package StatusNet
* @author Sarven Capadisli <csarven@status.net> * @author Sarven Capadisli <csarven@status.net>
* @copyright 2009 StatusNet, Inc. * @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/ * @link http://status.net/
*/ */

View File

@ -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 */ /* IE specific styles */
.notice-options input.submit { .notice-options input.submit {

View File

@ -3,7 +3,7 @@
* @package StatusNet * @package StatusNet
* @author Sarven Capadisli <csarven@status.net> * @author Sarven Capadisli <csarven@status.net>
* @copyright 2009-2010 StatusNet, Inc. * @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/ * @link http://status.net/
*/ */

View File

@ -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 */ /* IE specific styles */
.notice-options input.submit { .notice-options input.submit {

View File

@ -3,7 +3,7 @@
* @package StatusNet * @package StatusNet
* @author Sarven Capadisli <csarven@status.net> * @author Sarven Capadisli <csarven@status.net>
* @copyright 2009 StatusNet, Inc. * @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/ * @link http://status.net/
*/ */

View File

@ -3,7 +3,7 @@
* @package StatusNet * @package StatusNet
* @author Sarven Capadisli <csarven@status.net> * @author Sarven Capadisli <csarven@status.net>
* @copyright 2009 StatusNet, Inc. * @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/ * @link http://status.net/
*/ */

View File

@ -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 */ /* IE specific styles */
.notice-options input.submit { .notice-options input.submit {

View File

@ -3,7 +3,7 @@
* @package StatusNet * @package StatusNet
* @author Sarven Capadisli <csarven@status.net> * @author Sarven Capadisli <csarven@status.net>
* @copyright 2009-2010 StatusNet, Inc. * @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/ * @link http://status.net/
*/ */

View File

@ -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 */ /* IE specific styles */
.notice-options input.submit { .notice-options input.submit {

View File

@ -3,7 +3,7 @@
* @package StatusNet * @package StatusNet
* @author Sarven Capadisli <csarven@status.net> * @author Sarven Capadisli <csarven@status.net>
* @copyright 2009 StatusNet, Inc. * @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/ * @link http://status.net/
*/ */

View File

@ -3,7 +3,7 @@
* @package StatusNet * @package StatusNet
* @author Sarven Capadisli <csarven@status.net> * @author Sarven Capadisli <csarven@status.net>
* @copyright 2009 StatusNet, Inc. * @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/ * @link http://status.net/
*/ */

View File

@ -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 */ /* IE specific styles */
.notice-options input.submit { .notice-options input.submit {