diff options
author | Brion Vibber <brion@pobox.com> | 2010-02-02 09:57:50 -0800 |
---|---|---|
committer | Brion Vibber <brion@pobox.com> | 2010-02-02 09:57:50 -0800 |
commit | f4c81fa1e138cbcbab27e6135f464a06d0209a37 (patch) | |
tree | 6af05efd09b29f0a3600e6d77f563b3fa68c4ff0 /plugins/UserFlag | |
parent | 2be00ce64221197f3c8ad1458eba2488c8836e5c (diff) | |
parent | 027c7e61fd6ecbb866a4f18111662902942d046e (diff) |
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into 0.9.x
Diffstat (limited to 'plugins/UserFlag')
-rw-r--r-- | plugins/UserFlag/UserFlagPlugin.php | 15 | ||||
-rw-r--r-- | plugins/UserFlag/clearflagform.php | 2 | ||||
-rw-r--r-- | plugins/UserFlag/icon_flag.gif | bin | 80 -> 0 bytes | |||
-rw-r--r-- | plugins/UserFlag/userflag.css | 4 |
4 files changed, 1 insertions, 20 deletions
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 @@ -183,21 +183,6 @@ class UserFlagPlugin extends Plugin } /** - * 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 * * @param Action $action action being shown 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/plugins/UserFlag/icon_flag.gif b/plugins/UserFlag/icon_flag.gif Binary files differdeleted file mode 100644 index 68c8aee25..000000000 --- a/plugins/UserFlag/icon_flag.gif +++ /dev/null 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; -} |