From cc256aaa67a2fe009f818874a79901d921085905 Mon Sep 17 00:00:00 2001 From: Sarven Capadisli Date: Tue, 2 Feb 2010 13:12:03 +0100 Subject: Updated StatusNet logos --- theme/base/logo.png | Bin 4988 -> 10107 bytes theme/default/css/display.css | 2 +- theme/default/logo.png | Bin 6389 -> 10107 bytes theme/default/mobilelogo.png | Bin 2238 -> 4017 bytes theme/identica/mobilelogo.png | Bin 2238 -> 4017 bytes 5 files changed, 1 insertion(+), 1 deletion(-) diff --git a/theme/base/logo.png b/theme/base/logo.png index 7c68b34f6..cf1839194 100644 Binary files a/theme/base/logo.png and b/theme/base/logo.png differ diff --git a/theme/default/css/display.css b/theme/default/css/display.css index 06711850f..c31d13d00 100644 --- a/theme/default/css/display.css +++ b/theme/default/css/display.css @@ -1,7 +1,7 @@ /** theme: default * * @package StatusNet - * @author Sarven Capadisli + * @author Sarven Capadisli * @copyright 2009 StatusNet, Inc. * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 * @link http://status.net/ diff --git a/theme/default/logo.png b/theme/default/logo.png index 550d373fe..cf1839194 100644 Binary files a/theme/default/logo.png and b/theme/default/logo.png differ diff --git a/theme/default/mobilelogo.png b/theme/default/mobilelogo.png index b72f7aff5..66bb5f678 100644 Binary files a/theme/default/mobilelogo.png and b/theme/default/mobilelogo.png differ diff --git a/theme/identica/mobilelogo.png b/theme/identica/mobilelogo.png index b72f7aff5..66bb5f678 100644 Binary files a/theme/identica/mobilelogo.png and b/theme/identica/mobilelogo.png differ -- cgit v1.2.3-54-g00ecf From 7b690dab8f277d864c4588667838ad9ce6959baf Mon Sep 17 00:00:00 2001 From: Sarven Capadisli Date: Tue, 2 Feb 2010 13:16:30 +0100 Subject: Minor alignment notice form alignment for default theme --- theme/default/css/display.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/theme/default/css/display.css b/theme/default/css/display.css index c31d13d00..07aa5325f 100644 --- a/theme/default/css/display.css +++ b/theme/default/css/display.css @@ -18,7 +18,7 @@ font-family: "Lucida Sans Unicode", "Lucida Grande", sans-serif; font-size:1em; } address { -margin-right:5.7%; +margin-right:5.3%; } input, textarea, select { border-width:2px; -- cgit v1.2.3-54-g00ecf From 5f14301c55477e9989039bc04747608fdc7c932c Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Tue, 2 Feb 2010 06:15:01 -0800 Subject: setconfig.php: list all current settings if no parameters given --- scripts/setconfig.php | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) mode change 100644 => 100755 scripts/setconfig.php diff --git a/scripts/setconfig.php b/scripts/setconfig.php old mode 100644 new mode 100755 index b102f99b1..fe0e46d65 --- a/scripts/setconfig.php +++ b/scripts/setconfig.php @@ -28,6 +28,7 @@ setconfig.php [options] [section] [setting] With three args, set the setting to the value. With two args, just show the setting. With -d, delete the setting. +With no args, lists all currently set values. [section] section to use (required) [setting] setting to use (required) @@ -39,6 +40,21 @@ END_OF_SETCONFIG_HELP; require_once INSTALLDIR.'/scripts/commandline.inc'; +if (empty($args)) { + $count = 0; + $config = new Config(); + $config->find(); + while ($config->fetch()) { + $count++; + printf("%-20s %-20s %s\n", $config->section, $config->setting, + var_export($config->value, true)); + } + if ($count == 0) { + print "No configuration set in database for this site.\n"; + } + exit(0); +} + if (count($args) < 2 || count($args) > 3) { show_help(); exit(1); -- cgit v1.2.3-54-g00ecf From 65c5d7813b6e4add186e7e8bf7e476c262c2c4cd Mon Sep 17 00:00:00 2001 From: Sarven Capadisli Date: Tue, 2 Feb 2010 16:06:22 +0100 Subject: Added icon to Clear label for UserFlag plugin --- plugins/UserFlag/clearflagform.php | 2 +- theme/base/images/icons/icons-01.gif | Bin 3650 -> 3696 bytes theme/default/css/display.css | 6 +++++- theme/identica/css/display.css | 8 ++++++-- 4 files changed, 12 insertions(+), 4 deletions(-) diff --git a/plugins/UserFlag/clearflagform.php b/plugins/UserFlag/clearflagform.php index 5ad6055d3..eefd15c36 100644 --- a/plugins/UserFlag/clearflagform.php +++ b/plugins/UserFlag/clearflagform.php @@ -54,7 +54,7 @@ class ClearFlagForm extends ProfileActionForm function formClass() { - return 'form_entity_clearflag'; + return 'form_user_clearflag'; } /** diff --git a/theme/base/images/icons/icons-01.gif b/theme/base/images/icons/icons-01.gif index f93d33d79..980fa0c0d 100644 Binary files a/theme/base/images/icons/icons-01.gif and b/theme/base/images/icons/icons-01.gif differ diff --git a/theme/default/css/display.css b/theme/default/css/display.css index 07aa5325f..3c05420ef 100644 --- a/theme/default/css/display.css +++ b/theme/default/css/display.css @@ -189,7 +189,8 @@ button.close, .notice-options .repeated, .form_notice label[for=notice_data-geo], button.minimize, -.form_reset_key input.submit { +.form_reset_key input.submit, +.entity_clear input.submit { background-image:url(../../base/images/icons/icons-01.gif); background-repeat:no-repeat; background-color:transparent; @@ -338,6 +339,9 @@ background-position: 5px -1511px; .form_reset_key input.submit { background-position: 5px -1973px; } +.entity_clear input.submit { +background-position: 5px -2039px; +} /* NOTICES */ .notice .attachment { diff --git a/theme/identica/css/display.css b/theme/identica/css/display.css index 1ac96ab5b..e19555378 100644 --- a/theme/identica/css/display.css +++ b/theme/identica/css/display.css @@ -1,7 +1,7 @@ /** theme: identica * * @package StatusNet - * @author Sarven Capadisli + * @author Sarven Capadisli * @copyright 2009 StatusNet, Inc. * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 * @link http://status.net/ @@ -189,7 +189,8 @@ button.close, .notice-options .repeated, .form_notice label[for=notice_data-geo], button.minimize, -.form_reset_key input.submit { +.form_reset_key input.submit, +.entity_clear input.submit { background-image:url(../../base/images/icons/icons-01.gif); background-repeat:no-repeat; background-color:transparent; @@ -337,6 +338,9 @@ background-position: 5px -1511px; .form_reset_key input.submit { background-position: 5px -1973px; } +.entity_clear input.submit { +background-position: 5px -2039px; +} /* NOTICES */ .notice .attachment { -- cgit v1.2.3-54-g00ecf From 7cecd7f722b152f34ff8e82fb5a93bb596a9a3dc Mon Sep 17 00:00:00 2001 From: Sarven Capadisli Date: Tue, 2 Feb 2010 16:09:39 +0100 Subject: Added single icon for Clear --- theme/base/images/icons/twotone/green/clear.gif | Bin 0 -> 82 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 theme/base/images/icons/twotone/green/clear.gif diff --git a/theme/base/images/icons/twotone/green/clear.gif b/theme/base/images/icons/twotone/green/clear.gif new file mode 100644 index 000000000..2666430ef Binary files /dev/null and b/theme/base/images/icons/twotone/green/clear.gif differ -- cgit v1.2.3-54-g00ecf From a1f55c3f80f9a08ca7b2ed24faf4e148b09d4bb2 Mon Sep 17 00:00:00 2001 From: Sarven Capadisli Date: Tue, 2 Feb 2010 16:14:37 +0100 Subject: Added flag icon to core --- theme/base/images/icons/icons-01.gif | Bin 3696 -> 3758 bytes theme/base/images/icons/twotone/green/flag.gif | Bin 0 -> 80 bytes 2 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 theme/base/images/icons/twotone/green/flag.gif diff --git a/theme/base/images/icons/icons-01.gif b/theme/base/images/icons/icons-01.gif index 980fa0c0d..01a729c10 100644 Binary files a/theme/base/images/icons/icons-01.gif and b/theme/base/images/icons/icons-01.gif differ diff --git a/theme/base/images/icons/twotone/green/flag.gif b/theme/base/images/icons/twotone/green/flag.gif new file mode 100644 index 000000000..68c8aee25 Binary files /dev/null and b/theme/base/images/icons/twotone/green/flag.gif differ -- cgit v1.2.3-54-g00ecf From 245610d2e18e2df26b8b2095ab3092855a272096 Mon Sep 17 00:00:00 2001 From: Sarven Capadisli Date: Tue, 2 Feb 2010 16:27:58 +0100 Subject: Removed entity flag stylesheet and icons from plugin to core. --- plugins/UserFlag/UserFlagPlugin.php | 15 --------------- plugins/UserFlag/icon_flag.gif | Bin 80 -> 0 bytes plugins/UserFlag/userflag.css | 4 ---- theme/default/css/display.css | 8 +++++++- theme/identica/css/display.css | 8 +++++++- 5 files changed, 14 insertions(+), 21 deletions(-) delete mode 100644 plugins/UserFlag/icon_flag.gif delete mode 100644 plugins/UserFlag/userflag.css diff --git a/plugins/UserFlag/UserFlagPlugin.php b/plugins/UserFlag/UserFlagPlugin.php index 8728e5703..ae3dfe036 100644 --- a/plugins/UserFlag/UserFlagPlugin.php +++ b/plugins/UserFlag/UserFlagPlugin.php @@ -182,21 +182,6 @@ class UserFlagPlugin extends Plugin return true; } - /** - * Add our plugin's CSS to page output - * - * @param Action $action action being shown - * - * @return boolean hook result - */ - - function onEndShowStatusNetStyles($action) - { - $action->cssLink(common_path('plugins/UserFlag/userflag.css'), - null, 'screen, projection, tv'); - return true; - } - /** * Initialize any flagging buttons on the page * diff --git a/plugins/UserFlag/icon_flag.gif b/plugins/UserFlag/icon_flag.gif deleted file mode 100644 index 68c8aee25..000000000 Binary files a/plugins/UserFlag/icon_flag.gif and /dev/null differ diff --git a/plugins/UserFlag/userflag.css b/plugins/UserFlag/userflag.css deleted file mode 100644 index 98da24cc9..000000000 --- a/plugins/UserFlag/userflag.css +++ /dev/null @@ -1,4 +0,0 @@ -.entity_flag input.submit, -.entity_flag p { -background:url(icon_flag.gif) 5px 5px no-repeat; -} diff --git a/theme/default/css/display.css b/theme/default/css/display.css index 3c05420ef..6954de7ba 100644 --- a/theme/default/css/display.css +++ b/theme/default/css/display.css @@ -190,7 +190,9 @@ button.close, .form_notice label[for=notice_data-geo], button.minimize, .form_reset_key input.submit, -.entity_clear input.submit { +.entity_clear input.submit, +.entity_flag input.submit, +.entity_flag p { background-image:url(../../base/images/icons/icons-01.gif); background-repeat:no-repeat; background-color:transparent; @@ -342,6 +344,10 @@ background-position: 5px -1973px; .entity_clear input.submit { background-position: 5px -2039px; } +.entity_flag input.submit, +.entity_flag p { +background-position: 5px -2105px; +} /* NOTICES */ .notice .attachment { diff --git a/theme/identica/css/display.css b/theme/identica/css/display.css index e19555378..9ac2730bd 100644 --- a/theme/identica/css/display.css +++ b/theme/identica/css/display.css @@ -190,7 +190,9 @@ button.close, .form_notice label[for=notice_data-geo], button.minimize, .form_reset_key input.submit, -.entity_clear input.submit { +.entity_clear input.submit, +.entity_flag input.submit, +.entity_flag p { background-image:url(../../base/images/icons/icons-01.gif); background-repeat:no-repeat; background-color:transparent; @@ -341,6 +343,10 @@ background-position: 5px -1973px; .entity_clear input.submit { background-position: 5px -2039px; } +.entity_flag input.submit, +.entity_flag p { +background-position: 5px -2105px; +} /* NOTICES */ .notice .attachment { -- cgit v1.2.3-54-g00ecf From 027c7e61fd6ecbb866a4f18111662902942d046e Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Tue, 2 Feb 2010 09:30:15 -0800 Subject: Fix regression breaking file attachments. This is what I get for rushing fixes and not properly testing them. :P --- classes/File.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/classes/File.php b/classes/File.php index 6dd9e0c06..ee418a802 100644 --- a/classes/File.php +++ b/classes/File.php @@ -181,7 +181,7 @@ class File extends Memcached_DataObject */ static function validFilename($filename) { - return preg_match('^/[A-Za-z0-9._-]+$/', $filename); + return preg_match('/^[A-Za-z0-9._-]+$/', $filename); } /** -- cgit v1.2.3-54-g00ecf