diff options
author | Evan Prodromou <evan@status.net> | 2010-09-15 15:57:41 -0400 |
---|---|---|
committer | Evan Prodromou <evan@status.net> | 2010-09-15 15:57:41 -0400 |
commit | b2abae433de8ae625fc0420eb78ee74479f6e9b9 (patch) | |
tree | 7fb49dd863550c0a9fd3b2fd22ebf094e007d800 /plugins/Adsense/AdsensePlugin.php | |
parent | dc8068fa9eb2282b3ed3da2472860a0c0ad43daf (diff) | |
parent | db1d348135b223585fd96d3c7faac798ca040249 (diff) |
Merge remote branch 'gitorious/0.9.x' into 0.9.x
Diffstat (limited to 'plugins/Adsense/AdsensePlugin.php')
-rw-r--r-- | plugins/Adsense/AdsensePlugin.php | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/plugins/Adsense/AdsensePlugin.php b/plugins/Adsense/AdsensePlugin.php index cd6fc3503..c02430a58 100644 --- a/plugins/Adsense/AdsensePlugin.php +++ b/plugins/Adsense/AdsensePlugin.php @@ -77,7 +77,6 @@ if (!defined('STATUSNET')) { * * @seeAlso UAPPlugin */ - class AdsensePlugin extends UAPPlugin { public $adScript = 'http://pagead2.googlesyndication.com/pagead/show_ads.js'; @@ -89,7 +88,6 @@ class AdsensePlugin extends UAPPlugin // A little bit of chicanery so we avoid overwriting values that // are passed in with the constructor - foreach (array('mediumRectangle', 'rectangle', 'leaderboard', 'wideSkyscraper', 'adScript', 'client') as $setting) { $value = common_config('adsense', strtolower($setting)); if (!empty($value)) { // not found @@ -105,7 +103,6 @@ class AdsensePlugin extends UAPPlugin * * @return void */ - protected function showMediumRectangle($action) { $this->showAdsenseCode($action, 300, 250, $this->mediumRectangle); @@ -118,7 +115,6 @@ class AdsensePlugin extends UAPPlugin * * @return void */ - protected function showRectangle($action) { $this->showAdsenseCode($action, 180, 150, $this->rectangle); @@ -131,7 +127,6 @@ class AdsensePlugin extends UAPPlugin * * @return void */ - protected function showWideSkyscraper($action) { $this->showAdsenseCode($action, 160, 600, $this->wideSkyscraper); @@ -144,7 +139,6 @@ class AdsensePlugin extends UAPPlugin * * @return void */ - protected function showLeaderboard($action) { $this->showAdsenseCode($action, 728, 90, $this->leaderboard); @@ -160,7 +154,6 @@ class AdsensePlugin extends UAPPlugin * * @return void */ - protected function showAdsenseCode($action, $width, $height, $slot) { $code = 'google_ad_client = "'.$this->client.'"; '; @@ -198,11 +191,11 @@ class AdsensePlugin extends UAPPlugin function onEndAdminPanelNav($menu) { if (AdminPanelAction::canAdmin('adsense')) { // TRANS: Menu item title/tooltip - $menu_title = _('Adsense configuration'); + $menu_title = _m('AdSense configuration'); // TRANS: Menu item for site administration - $menu->out->menuItem(common_local_url('adsenseadminpanel'), _('Adsense'), + $menu->out->menuItem(common_local_url('adsenseadminpanel'), _m('AdSense'), $menu_title, $action_name == 'adsenseadminpanel', 'nav_adsense_admin_panel'); } return true; } -}
\ No newline at end of file +} |