From c6f8b94fa91e3e5559a9b79766e7320b096b839e Mon Sep 17 00:00:00 2001 From: Sarven Capadisli Date: Thu, 28 Jan 2010 16:02:39 +0100 Subject: Showing processing indicator for form_repeat on submit instead of form --- theme/identica/css/display.css | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'theme/identica') diff --git a/theme/identica/css/display.css b/theme/identica/css/display.css index 2818196c2..1ac96ab5b 100644 --- a/theme/identica/css/display.css +++ b/theme/identica/css/display.css @@ -196,11 +196,12 @@ background-color:transparent; } #wrap form.processing input.submit, -.entity_actions a.processing { +.entity_actions a.processing, +.dialogbox.processing .submit_dialogbox { background:#FFFFFF url(../../base/images/icons/icon_processing.gif) no-repeat 47% 47%; -cursor:wait; -text-indent:-9999px; -outline:none; +} +.notice-options .form_repeat.processing { +background-image:none; } #content { -- cgit v1.2.3-54-g00ecf 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(-) (limited to 'theme/identica') 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 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(-) (limited to 'theme/identica') 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 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 (limited to 'theme/identica') 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 9e940445f1ab1ec53f3bad14a1a94dc2064d0ee6 Mon Sep 17 00:00:00 2001 From: Sarven Capadisli Date: Thu, 4 Feb 2010 16:51:51 +0000 Subject: Added accept and reject icons to remote subscription authorization --- theme/base/images/icons/icons-01.gif | Bin 3758 -> 3870 bytes theme/base/images/icons/twotone/green/against.gif | Bin 0 -> 85 bytes theme/base/images/icons/twotone/green/checkmark.gif | Bin 0 -> 76 bytes theme/default/css/display.css | 9 ++++++++- theme/identica/css/display.css | 9 ++++++++- 5 files changed, 16 insertions(+), 2 deletions(-) create mode 100644 theme/base/images/icons/twotone/green/against.gif create mode 100644 theme/base/images/icons/twotone/green/checkmark.gif (limited to 'theme/identica') diff --git a/theme/base/images/icons/icons-01.gif b/theme/base/images/icons/icons-01.gif index 01a729c10..6f284f023 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/against.gif b/theme/base/images/icons/twotone/green/against.gif new file mode 100644 index 000000000..ca796c8a3 Binary files /dev/null and b/theme/base/images/icons/twotone/green/against.gif differ diff --git a/theme/base/images/icons/twotone/green/checkmark.gif b/theme/base/images/icons/twotone/green/checkmark.gif new file mode 100644 index 000000000..892429d48 Binary files /dev/null and b/theme/base/images/icons/twotone/green/checkmark.gif differ diff --git a/theme/default/css/display.css b/theme/default/css/display.css index 6954de7ba..82eb13531 100644 --- a/theme/default/css/display.css +++ b/theme/default/css/display.css @@ -192,7 +192,8 @@ button.minimize, .form_reset_key input.submit, .entity_clear input.submit, .entity_flag input.submit, -.entity_flag p { +.entity_flag p, +.entity_subscribe input.submit { background-image:url(../../base/images/icons/icons-01.gif); background-repeat:no-repeat; background-color:transparent; @@ -348,6 +349,12 @@ background-position: 5px -2039px; .entity_flag p { background-position: 5px -2105px; } +.entity_subscribe input.accept { +background-position: 5px -2171px; +} +.entity_subscribe input.reject { +background-position: 5px -2237px; +} /* NOTICES */ .notice .attachment { diff --git a/theme/identica/css/display.css b/theme/identica/css/display.css index 9ac2730bd..44ae4953b 100644 --- a/theme/identica/css/display.css +++ b/theme/identica/css/display.css @@ -192,7 +192,8 @@ button.minimize, .form_reset_key input.submit, .entity_clear input.submit, .entity_flag input.submit, -.entity_flag p { +.entity_flag p, +.entity_subscribe input.submit { background-image:url(../../base/images/icons/icons-01.gif); background-repeat:no-repeat; background-color:transparent; @@ -347,6 +348,12 @@ background-position: 5px -2039px; .entity_flag p { background-position: 5px -2105px; } +.entity_subscribe input.accept { +background-position: 5px -2171px; +} +.entity_subscribe input.reject { +background-position: 5px -2237px; +} /* NOTICES */ .notice .attachment { -- cgit v1.2.3-54-g00ecf