From 9656fc29f80e96c43d2e09834fed41820be697d1 Mon Sep 17 00:00:00 2001 From: rica-carv Date: Thu, 20 Apr 2017 09:21:27 +0100 Subject: [PATCH 1/6] PM cleanup... --- e107_plugins/pm/templates/pm_menu_template.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/e107_plugins/pm/templates/pm_menu_template.php b/e107_plugins/pm/templates/pm_menu_template.php index 0fb507213..fb758b42d 100644 --- a/e107_plugins/pm/templates/pm_menu_template.php +++ b/e107_plugins/pm/templates/pm_menu_template.php @@ -27,7 +27,7 @@ if (!defined('e107_INIT')) { exit; } define('PM_INBOX_ICON', "".LAN_PLUGIN_PM_INBOX.""); define('PM_OUTBOX_ICON', "".LAN_PLUGIN_PM_OUTBOX.""); -define('PM_SEND_LINK', LAN_PLUGIN_PM_NEW); +//define('PM_SEND_LINK', LAN_PLUGIN_PM_NEW); define('NEWPM_ANIMATION', ""); /* $sc_style['PM_SEND_PM_LINK']['pre'] = "

"; From 3489288b4730cb0146e62dd8fee99ffd8a6f0245 Mon Sep 17 00:00:00 2001 From: rica-carv Date: Thu, 20 Apr 2017 09:22:55 +0100 Subject: [PATCH 2/6] PM Cleanup --- e107_plugins/pm/pm_shortcodes.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/e107_plugins/pm/pm_shortcodes.php b/e107_plugins/pm/pm_shortcodes.php index c31fe8fbe..22fa97d0d 100644 --- a/e107_plugins/pm/pm_shortcodes.php +++ b/e107_plugins/pm/pm_shortcodes.php @@ -646,7 +646,7 @@ if(!class_exists('plugin_pm_pm_shortcodes')) if($pm_outbox['outbox']['filled'] < 100) { $link = $this->url('action/new'); - return "".PM_SEND_LINK.""; + return "".LAN_PLUGIN_PM_NEW.""; } return ''; } From 328908869973ccc815b62ab745c1a84e07a1c200 Mon Sep 17 00:00:00 2001 From: rica-carv Date: Thu, 20 Apr 2017 09:43:06 +0100 Subject: [PATCH 3/6] Icons reverted from PNG -> Glyphs Icons reverted from PNG to Glyphs - Can PNG's be deleted? - PM_OUTBOX_ICON is a candidate to Fontawesome stacked icon, since there's no native fontawesome outbox icon... - NEWPM_ANIMATION is a candidate to Fontawesome animated icon, since there's no native fontawesome animated new message icon... --- e107_plugins/pm/templates/pm_menu_template.php | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/e107_plugins/pm/templates/pm_menu_template.php b/e107_plugins/pm/templates/pm_menu_template.php index fb758b42d..13d0c21eb 100644 --- a/e107_plugins/pm/templates/pm_menu_template.php +++ b/e107_plugins/pm/templates/pm_menu_template.php @@ -25,10 +25,15 @@ if (!defined('e107_INIT')) { exit; } -define('PM_INBOX_ICON', "".LAN_PLUGIN_PM_INBOX.""); -define('PM_OUTBOX_ICON', "".LAN_PLUGIN_PM_OUTBOX.""); +//define('PM_INBOX_ICON', "".LAN_PLUGIN_PM_INBOX.""); +define('PM_INBOX_ICON', e107::getParser()->toGlyph('fa-inbox')); +//define('PM_OUTBOX_ICON', "".LAN_PLUGIN_PM_OUTBOX.""); +// Icon candidate to stacked fontawesome icons... +define('PM_OUTBOX_ICON', e107::getParser()->toGlyph('fa-inbox').e107::getParser()->toGlyph('fa-arrow-up')); //define('PM_SEND_LINK', LAN_PLUGIN_PM_NEW); -define('NEWPM_ANIMATION', ""); +//define('NEWPM_ANIMATION', ""); +// Icon candidate to animated fontawesome icons... +define('NEWPM_ANIMATION', e107::getParser()->toGlyph('fa-envelope')); /* $sc_style['PM_SEND_PM_LINK']['pre'] = "

"; $sc_style['PM_SEND_PM_LINK']['post'] = ""; From 0171cedeee6166ec208d2feed8857ce4f65fee4d Mon Sep 17 00:00:00 2001 From: rica-carv Date: Sun, 23 Apr 2017 17:47:00 +0100 Subject: [PATCH 4/6] Update pm_shortcodes.php --- e107_plugins/pm/pm_shortcodes.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/e107_plugins/pm/pm_shortcodes.php b/e107_plugins/pm/pm_shortcodes.php index 22fa97d0d..3778cdb1a 100644 --- a/e107_plugins/pm/pm_shortcodes.php +++ b/e107_plugins/pm/pm_shortcodes.php @@ -646,7 +646,8 @@ if(!class_exists('plugin_pm_pm_shortcodes')) if($pm_outbox['outbox']['filled'] < 100) { $link = $this->url('action/new'); - return "".LAN_PLUGIN_PM_NEW.""; +// return "".LAN_PLUGIN_PM_NEW.""; + return $link; } return ''; } From d6733e4f8d51346ce5bffaf6e175ef644f54070d Mon Sep 17 00:00:00 2001 From: rica-carv Date: Sun, 23 Apr 2017 17:48:18 +0100 Subject: [PATCH 5/6] Update pm_menu_template.php --- e107_plugins/pm/templates/pm_menu_template.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/e107_plugins/pm/templates/pm_menu_template.php b/e107_plugins/pm/templates/pm_menu_template.php index 13d0c21eb..ef8e93465 100644 --- a/e107_plugins/pm/templates/pm_menu_template.php +++ b/e107_plugins/pm/templates/pm_menu_template.php @@ -50,7 +50,8 @@ $sc_style['PM_NEWPM_ANIMATE']['post'] = ""; $sc_style['PM_BLOCKED_SENDERS_MANAGE']['pre'] = "
[ "; $sc_style['PM_BLOCKED_SENDERS_MANAGE']['post'] = ' ]'; */ -$PM_MENU_WRAPPER['PM_SEND_PM_LINK']= "

{---}"; +//$PM_MENU_WRAPPER['PM_SEND_PM_LINK']= "

{---}"; +$PM_MENU_WRAPPER['PM_SEND_PM_LINK']= "".LAN_PLUGIN_PM_NEW.""; $PM_MENU_WRAPPER['PM_INBOX_FILLED']=$PM_MENU_WRAPPER['PM_OUTBOX_FILLED']= "[{---}%]"; $PM_MENU_WRAPPER['PM_NEWPM_ANIMATE']= "{---}"; $PM_MENU_WRAPPER['PM_BLOCKED_SENDERS_MANAGE']= "
[ {---} ]"; From b2b81cf0e26464552673b7bc5c51a2c915210438 Mon Sep 17 00:00:00 2001 From: rica-carv Date: Sun, 23 Apr 2017 17:51:33 +0100 Subject: [PATCH 6/6] Update pm_shortcodes.php --- e107_plugins/pm/pm_shortcodes.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/e107_plugins/pm/pm_shortcodes.php b/e107_plugins/pm/pm_shortcodes.php index 3778cdb1a..b6a0cbd3e 100644 --- a/e107_plugins/pm/pm_shortcodes.php +++ b/e107_plugins/pm/pm_shortcodes.php @@ -645,11 +645,11 @@ if(!class_exists('plugin_pm_pm_shortcodes')) $pm_outbox = $this->pmManager->pm_getInfo('outbox'); if($pm_outbox['outbox']['filled'] < 100) { - $link = $this->url('action/new'); +// $link = $this->url('action/new'); // return "".LAN_PLUGIN_PM_NEW.""; - return $link; + return $this->url('action/new'); } - return ''; +// return ''; }