From 0571ac88b4127a766aa45fbd7e1056fd53d87551 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=A1bor?= Date: Sat, 30 Jan 2021 13:00:44 +0100 Subject: [PATCH 01/20] Update hero_template.php --- e107_plugins/hero/templates/hero_template.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/e107_plugins/hero/templates/hero_template.php b/e107_plugins/hero/templates/hero_template.php index 2653a20d0..a31722190 100644 --- a/e107_plugins/hero/templates/hero_template.php +++ b/e107_plugins/hero/templates/hero_template.php @@ -53,7 +53,7 @@ $HERO_TEMPLATE['default']['end'] = '
- + {HERO_BUTTON1_ICON} {HERO_BUTTON1_LABEL} From 5bbfdfb4c49c91fed4ef1ed6ea4d2787b0eababe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=A1bor?= Date: Sat, 30 Jan 2021 13:03:36 +0100 Subject: [PATCH 02/20] Update admin_config.php --- e107_plugins/hero/admin_config.php | 41 +++++++++++++++--------------- 1 file changed, 20 insertions(+), 21 deletions(-) diff --git a/e107_plugins/hero/admin_config.php b/e107_plugins/hero/admin_config.php index 21dd6c9a9..d9d21331a 100644 --- a/e107_plugins/hero/admin_config.php +++ b/e107_plugins/hero/admin_config.php @@ -9,7 +9,8 @@ if (!getperms('P')) exit; } -// e107::lan('hero',true); +//e107::lan('hero',true); +e107::lan('hero',true, true); e107::css('hero', 'css/bootstrap-iconpicker.min.css'); @@ -80,15 +81,15 @@ class hero_ui extends e_admin_ui protected $fields = array ( 'checkboxes' => array ( 'title' => '', 'type' => null, 'data' => null, 'width' => '5%', 'thclass' => 'center', 'forced' => '1', 'class' => 'center', 'toggle' => 'e-multiselect', ), 'hero_id' => array ( 'title' => LAN_ID, 'type' => null, 'data' => 'int', 'width' => '5%', 'help' => '', 'readParms' => '', 'writeParms' => '', 'class' => 'left', 'thclass' => 'left', ), - 'hero_media' => array('title'=> "Image/Video", 'type'=>'image', 'noedit'=>true, 'data'=>'str', 'readParms'=>array('thumb'=>'100x80'), 'writeParms'=>array('media'=>'hero^', 'video' => 1)), - 'hero_bg' => array('title'=> "Background", 'type'=>'image', 'noedit'=>true, 'data'=>'str', 'readParms'=>array('thumb'=>'100x80'), 'writeParms'=>array('media'=>'hero^')), + 'hero_media' => array('title'=> LAN_HERO_IMAGE_VIDEO, 'type'=>'image', 'noedit'=>true, 'data'=>'str', 'readParms'=>array('thumb'=>'100x80'), 'writeParms'=>array('media'=>'hero^', 'video' => 1)), + 'hero_bg' => array('title'=> LAN_HERO_BACKGROUND, 'type'=>'image', 'noedit'=>true, 'data'=>'str', 'readParms'=>array('thumb'=>'100x80'), 'writeParms'=>array('media'=>'hero^')), 'hero_title' => array ( 'title' => LAN_TITLE, 'type' => 'text', 'data' => 'str', 'width' => '18%', 'inline' => true, 'help' => '', 'readParms' => '', 'writeParms' => array('size'=>'block-level'), 'class' => 'left', 'thclass' => 'left', ), 'hero_description' => array ( 'title' => LAN_DESCRIPTION, 'type' => 'text', 'data' => 'str', 'width' => '30%', 'inline' => true, 'help' => '', 'readParms' => '', 'writeParms' => array('size'=>'block-level'), 'class' => 'left', 'thclass' => 'left', ), - 'hero_bullets' => array ( 'title' => 'Bullets', 'type' => 'method', 'data' => 'json', 'width' => '35%', 'help' => '', 'readParms' => '', 'writeParms' => '', 'class' => 'left', 'thclass' => 'left', ), - 'hero_images' => array('title'=> "Media", 'type'=>'method', 'data'=>false, 'nolist'=>true), - 'hero_button1' => array ( 'title' => 'Button-1', 'type' => 'method', 'data' => 'json', 'width' => '5%', 'help' => '', 'readParms' => '', 'writeParms' => '', 'class' => 'left', 'thclass' => 'left', ), - 'hero_button2' => array ( 'title' => 'Button-2', 'type' => 'method', 'data' => 'json', 'width' => '5%', 'help' => '', 'readParms' => '', 'writeParms' => '', 'class' => 'left', 'thclass' => 'left', ), + 'hero_bullets' => array ( 'title' => LAN_ICON, 'type' => 'method', 'data' => 'json', 'width' => '35%', 'help' => '', 'readParms' => '', 'writeParms' => '', 'class' => 'left', 'thclass' => 'left', ), + 'hero_images' => array('title'=> LAN_HERO_MEDIA, 'type'=>'method', 'data'=>false, 'nolist'=>true), + 'hero_button1' => array ( 'title' => LAN_HERO_BUTTON.'-1', 'type' => 'method', 'data' => 'json', 'width' => '5%', 'help' => '', 'readParms' => '', 'writeParms' => '', 'class' => 'left', 'thclass' => 'left', ), + 'hero_button2' => array ( 'title' => LAN_HERO_BUTTON.'-2', 'type' => 'method', 'data' => 'json', 'width' => '5%', 'help' => '', 'readParms' => '', 'writeParms' => '', 'class' => 'left', 'thclass' => 'left', ), 'hero_order' => array ( 'title' => LAN_ORDER, 'tab'=>1 , 'type' => 'number', 'data' => 'int', 'width' => '5%', 'help' => '', 'readParms' => '', 'writeParms' => '', 'class' => 'left', 'thclass' => 'left', ), 'hero_class' => array ( 'title' => LAN_VISIBILITY, 'tab'=>1, 'type' => 'userclass', 'data' => 'int', 'inline'=>true, 'width' => '10%', 'help' => '', 'readParms' => '', 'writeParms' => '', 'class' => 'left', 'thclass' => 'left', ), @@ -101,8 +102,8 @@ class hero_ui extends e_admin_ui // protected $preftabs = array('General', 'Other' ); protected $prefs = array( 'visibility' => array('title'=> LAN_VISIBILITY, 'tab'=>0, 'type'=>'userclass', 'data' => 'str', 'help'=>'', 'writeParms'=>array('classlist' => 'public,member,guest,admin,main,classes,nobody, no-excludes')), - 'icon_pack' => array('title'=> "Icon Pack", 'tab'=>0, 'type'=>'method', 'data' => 'str', 'writeParms'=>array(),'help'=>''), - 'slide_interval' => array('title'=>'Slide Interval', 'type'=>'dropdown', 'data'=>'int', 'writeParms'=>array('optArray'=>array())), + 'icon_pack' => array('title'=> LAN_HERO_ICON_PACK, 'tab'=>0, 'type'=>'method', 'data' => 'str', 'writeParms'=>array(),'help'=>''), + 'slide_interval' => array('title'=>LAN_HERO_SLIDE_INTERVAL, 'type'=>'dropdown', 'data'=>'int', 'writeParms'=>array('optArray'=>array())), ); @@ -114,7 +115,7 @@ class hero_ui extends e_admin_ui $opts = array(); foreach($r as $v) { - $opts[$v] = str_replace('000', '', $v).' second(s)'; + $opts[$v] = str_replace('000', '', $v).' '.LAN_HERO_SEC; } $this->prefs['slide_interval']['writeParms']['optArray'] = $opts; @@ -196,7 +197,7 @@ class hero_ui extends e_admin_ui public function renderHelp() { $caption = LAN_HELP; - $text = 'Be sure to enable the hero menu on your home page using the Menu Manager.'; + $text = LAN_HERO_HELP; return array('caption'=>$caption,'text'=> $text); @@ -415,11 +416,11 @@ class hero_form_ui extends e_admin_form_ui - Icon - Icon-style - Text - Animation - Delay (secs) + ".LAN_ICON." + ".LAN_HERO_ICON_STYLE." + ".LAN_HERO_TEXT." + ".LAN_HERO_ANIMATION." + ".LAN_HERO_DELAY." "; @@ -512,7 +513,7 @@ class hero_form_ui extends e_admin_form_ui $text .= " ".$this->glyphPicker($name.'[icon]', varset($val['icon']))." - ".$this->text($name.'[label]', varset($val['label']), 255, array('size'=>'block-level', 'placeholder'=>'Label'))." + ".$this->text($name.'[label]', varset($val['label']), 255, array('size'=>'block-level', 'placeholder'=>LAN_HERO_LABEL))." ".$this->text($name.'[url]', varset($val['url']), 255, array('size'=>'block-level', 'placeholder'=>'URL'))." ".$this->btnClass($name.'[class]', varset($val['class']))." "; @@ -614,8 +615,8 @@ class hero_form_ui extends e_admin_form_ui return " - - + + @@ -640,5 +641,3 @@ e107::js('hero', 'js/bootstrap-iconpicker.min.js'); require_once(e_ADMIN."footer.php"); - - From ce1ecf0d0f4c368d02a5918b746d6288bce14acf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=A1bor?= Date: Sat, 30 Jan 2021 13:04:30 +0100 Subject: [PATCH 03/20] Update plugin.xml --- e107_plugins/hero/plugin.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/e107_plugins/hero/plugin.xml b/e107_plugins/hero/plugin.xml index ef4784a54..1cab74f04 100644 --- a/e107_plugins/hero/plugin.xml +++ b/e107_plugins/hero/plugin.xml @@ -2,7 +2,7 @@ Home page 'Hero' area management - Image and text slider, animated bullet points for the hero area of your home page. + Image and text slider, animated bullet points for the hero area of your home page. generic hero @@ -22,4 +22,4 @@ Hero Images - \ No newline at end of file + From a9ad2f7a546ed679df1c5da9043d3db50f0a89e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=A1bor?= Date: Sat, 30 Jan 2021 13:06:05 +0100 Subject: [PATCH 04/20] Update hero_setup.php --- e107_plugins/hero/hero_setup.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/e107_plugins/hero/hero_setup.php b/e107_plugins/hero/hero_setup.php index c4f7c928f..5b2dee15c 100644 --- a/e107_plugins/hero/hero_setup.php +++ b/e107_plugins/hero/hero_setup.php @@ -31,12 +31,12 @@ if(!class_exists("hero_setup")) if(!empty($ret['success'])) { - e107::getMessage()->addSuccess("Default slides imported."); + e107::getMessage()->addSuccess(LAN_HERO_SUCC); } if(!empty($ret['failed'])) { - e107::getMessage()->addError("Failed to import default slides."); + e107::getMessage()->addError(LAN_HERO_ERR); e107::getMessage()->addDebug(print_a($ret['failed'],true)); } @@ -72,4 +72,4 @@ if(!class_exists("hero_setup")) } -} \ No newline at end of file +} From 3415558e637b1c276ee05cbd0af7674de3eeb1a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=A1bor?= Date: Sat, 30 Jan 2021 13:09:15 +0100 Subject: [PATCH 05/20] Create English_global.php --- .../hero/languages/English/English_global.php | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 e107_plugins/hero/languages/English/English_global.php diff --git a/e107_plugins/hero/languages/English/English_global.php b/e107_plugins/hero/languages/English/English_global.php new file mode 100644 index 000000000..1faa4369c --- /dev/null +++ b/e107_plugins/hero/languages/English/English_global.php @@ -0,0 +1,13 @@ + Date: Sat, 30 Jan 2021 13:10:39 +0100 Subject: [PATCH 06/20] Create English_admin.php --- .../hero/languages/English/English_admin.php | 29 +++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 e107_plugins/hero/languages/English/English_admin.php diff --git a/e107_plugins/hero/languages/English/English_admin.php b/e107_plugins/hero/languages/English/English_admin.php new file mode 100644 index 000000000..f87db742f --- /dev/null +++ b/e107_plugins/hero/languages/English/English_admin.php @@ -0,0 +1,29 @@ + Date: Sat, 30 Jan 2021 13:14:32 +0100 Subject: [PATCH 07/20] Update hero_menu.php --- e107_plugins/hero/hero_menu.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/e107_plugins/hero/hero_menu.php b/e107_plugins/hero/hero_menu.php index 6b1f18ae0..be02cbb4f 100644 --- a/e107_plugins/hero/hero_menu.php +++ b/e107_plugins/hero/hero_menu.php @@ -13,6 +13,8 @@ if (!defined('e107_INIT')) { exit; } +e107::lan('hero',true, true); + if(deftrue('e_FRONTPAGE')) { $text = e107::getParser()->parseTemplate("{HERO}", true); @@ -20,6 +22,6 @@ if(deftrue('e_FRONTPAGE')) } elseif(ADMIN) { - $text = "
Hero only runs on the frontpage of your site.
"; + $text = "
".LAN_HERO_ALERT_DANGER."
"; e107::getRender()->tablerender(null, $text,'hero-menu'); } From a5242b65e01060814feffa31879198816a6a7d3f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=A1bor?= Date: Sat, 30 Jan 2021 13:15:41 +0100 Subject: [PATCH 08/20] Update hero_setup.php --- e107_plugins/hero/hero_setup.php | 1 + 1 file changed, 1 insertion(+) diff --git a/e107_plugins/hero/hero_setup.php b/e107_plugins/hero/hero_setup.php index 5b2dee15c..9f3f52b3b 100644 --- a/e107_plugins/hero/hero_setup.php +++ b/e107_plugins/hero/hero_setup.php @@ -10,6 +10,7 @@ ** */ +e107::lan('hero',true, true); if(!class_exists("hero_setup")) { From 5d9702998387d18281923b479b0577394a424db0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=A1bor?= Date: Sat, 30 Jan 2021 13:18:53 +0100 Subject: [PATCH 09/20] Update admin_config.php --- e107_plugins/hero/admin_config.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/e107_plugins/hero/admin_config.php b/e107_plugins/hero/admin_config.php index d9d21331a..01567d4a2 100644 --- a/e107_plugins/hero/admin_config.php +++ b/e107_plugins/hero/admin_config.php @@ -86,7 +86,7 @@ class hero_ui extends e_admin_ui 'hero_title' => array ( 'title' => LAN_TITLE, 'type' => 'text', 'data' => 'str', 'width' => '18%', 'inline' => true, 'help' => '', 'readParms' => '', 'writeParms' => array('size'=>'block-level'), 'class' => 'left', 'thclass' => 'left', ), 'hero_description' => array ( 'title' => LAN_DESCRIPTION, 'type' => 'text', 'data' => 'str', 'width' => '30%', 'inline' => true, 'help' => '', 'readParms' => '', 'writeParms' => array('size'=>'block-level'), 'class' => 'left', 'thclass' => 'left', ), - 'hero_bullets' => array ( 'title' => LAN_ICON, 'type' => 'method', 'data' => 'json', 'width' => '35%', 'help' => '', 'readParms' => '', 'writeParms' => '', 'class' => 'left', 'thclass' => 'left', ), + 'hero_bullets' => array ( 'title' => LAN_HERO_BULLETS, 'type' => 'method', 'data' => 'json', 'width' => '35%', 'help' => '', 'readParms' => '', 'writeParms' => '', 'class' => 'left', 'thclass' => 'left', ), 'hero_images' => array('title'=> LAN_HERO_MEDIA, 'type'=>'method', 'data'=>false, 'nolist'=>true), 'hero_button1' => array ( 'title' => LAN_HERO_BUTTON.'-1', 'type' => 'method', 'data' => 'json', 'width' => '5%', 'help' => '', 'readParms' => '', 'writeParms' => '', 'class' => 'left', 'thclass' => 'left', ), 'hero_button2' => array ( 'title' => LAN_HERO_BUTTON.'-2', 'type' => 'method', 'data' => 'json', 'width' => '5%', 'help' => '', 'readParms' => '', 'writeParms' => '', 'class' => 'left', 'thclass' => 'left', ), From 7d33f6df9334787cd038f68eebbd35a5365373c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=A1bor?= Date: Sat, 6 Feb 2021 12:35:27 +0100 Subject: [PATCH 10/20] Update plugin.xml --- e107_plugins/hero/plugin.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/e107_plugins/hero/plugin.xml b/e107_plugins/hero/plugin.xml index 1cab74f04..d5282eb79 100644 --- a/e107_plugins/hero/plugin.xml +++ b/e107_plugins/hero/plugin.xml @@ -2,7 +2,7 @@ Home page 'Hero' area management - Image and text slider, animated bullet points for the hero area of your home page. + Image and text slider, animated bullet points for the hero area of your home page. generic hero From 6c5226cff97998bbe3030c7dc42eea726dcba545 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=A1bor?= Date: Sat, 6 Feb 2021 12:35:59 +0100 Subject: [PATCH 11/20] Update English_global.php --- e107_plugins/hero/languages/English/English_global.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/e107_plugins/hero/languages/English/English_global.php b/e107_plugins/hero/languages/English/English_global.php index 1faa4369c..cbd94f8c6 100644 --- a/e107_plugins/hero/languages/English/English_global.php +++ b/e107_plugins/hero/languages/English/English_global.php @@ -10,4 +10,4 @@ +----------------------------------------------------------------------+ */ -define("LAN_PLUGIN_HERO_DIZ", "Image and text slider, animated bullet points for the hero area of your home page."); +define("LAN_PLUGIN_HERO_DESCR", "Image and text slider, animated bullet points for the hero area of your home page."); From 7eafe3eecd710115556486e0255a4ac3b7c3a282 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=A1bor?= Date: Sat, 6 Feb 2021 12:38:33 +0100 Subject: [PATCH 12/20] Update English_admin.php --- e107_plugins/hero/languages/English/English_admin.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/e107_plugins/hero/languages/English/English_admin.php b/e107_plugins/hero/languages/English/English_admin.php index f87db742f..896709942 100644 --- a/e107_plugins/hero/languages/English/English_admin.php +++ b/e107_plugins/hero/languages/English/English_admin.php @@ -10,8 +10,8 @@ +----------------------------------------------------------------------+ */ -define("LAN_HERO_SUCC", "Default slides imported."); -define("LAN_HERO_ERR", "Failed to import default slides."); +define("LAN_HERO_ADMIN_001", "Default slides imported."); +define("LAN_HERO_ADMIN_002", "Failed to import default slides."); define("LAN_HERO_BACKGROUND", "Background"); define("LAN_HERO_IMAGE_VIDEO", "Image/Video"); define("LAN_HERO_MEDIA", "Media"); From 44a7d5f94eb673d972140d6afb07c9b3cb82ea28 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=A1bor?= Date: Sat, 6 Feb 2021 12:40:22 +0100 Subject: [PATCH 13/20] Update hero_setup.php --- e107_plugins/hero/hero_setup.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/e107_plugins/hero/hero_setup.php b/e107_plugins/hero/hero_setup.php index 9f3f52b3b..aadfd2e13 100644 --- a/e107_plugins/hero/hero_setup.php +++ b/e107_plugins/hero/hero_setup.php @@ -32,12 +32,12 @@ if(!class_exists("hero_setup")) if(!empty($ret['success'])) { - e107::getMessage()->addSuccess(LAN_HERO_SUCC); + e107::getMessage()->addSuccess(LAN_HERO_ADMIN_001); } if(!empty($ret['failed'])) { - e107::getMessage()->addError(LAN_HERO_ERR); + e107::getMessage()->addError(LAN_HERO_ADMIN_002); e107::getMessage()->addDebug(print_a($ret['failed'],true)); } From f3742ef52ff4e6ce5cb6ec6ece6ef27deb31293f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=A1bor?= Date: Sun, 21 Feb 2021 11:13:21 +0100 Subject: [PATCH 14/20] Update hero_menu.php --- e107_plugins/hero/hero_menu.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/e107_plugins/hero/hero_menu.php b/e107_plugins/hero/hero_menu.php index be02cbb4f..851bee366 100644 --- a/e107_plugins/hero/hero_menu.php +++ b/e107_plugins/hero/hero_menu.php @@ -22,6 +22,6 @@ if(deftrue('e_FRONTPAGE')) } elseif(ADMIN) { - $text = "
".LAN_HERO_ALERT_DANGER."
"; + $text = "
".LAN_HERO_MENU_001."
"; e107::getRender()->tablerender(null, $text,'hero-menu'); } From 5d62e31072ac73de85508a55edcc6944e8488b8d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=A1bor?= Date: Sun, 21 Feb 2021 11:15:44 +0100 Subject: [PATCH 15/20] Create English_menu.php --- e107_plugins/hero/languages/English/English_menu.php | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 e107_plugins/hero/languages/English/English_menu.php diff --git a/e107_plugins/hero/languages/English/English_menu.php b/e107_plugins/hero/languages/English/English_menu.php new file mode 100644 index 000000000..b4fa26ce5 --- /dev/null +++ b/e107_plugins/hero/languages/English/English_menu.php @@ -0,0 +1,12 @@ + Date: Sun, 21 Feb 2021 11:41:57 +0100 Subject: [PATCH 16/20] Update admin_config.php --- e107_plugins/hero/admin_config.php | 34 +++++++++++++++--------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/e107_plugins/hero/admin_config.php b/e107_plugins/hero/admin_config.php index 01567d4a2..6083832bb 100644 --- a/e107_plugins/hero/admin_config.php +++ b/e107_plugins/hero/admin_config.php @@ -81,15 +81,15 @@ class hero_ui extends e_admin_ui protected $fields = array ( 'checkboxes' => array ( 'title' => '', 'type' => null, 'data' => null, 'width' => '5%', 'thclass' => 'center', 'forced' => '1', 'class' => 'center', 'toggle' => 'e-multiselect', ), 'hero_id' => array ( 'title' => LAN_ID, 'type' => null, 'data' => 'int', 'width' => '5%', 'help' => '', 'readParms' => '', 'writeParms' => '', 'class' => 'left', 'thclass' => 'left', ), - 'hero_media' => array('title'=> LAN_HERO_IMAGE_VIDEO, 'type'=>'image', 'noedit'=>true, 'data'=>'str', 'readParms'=>array('thumb'=>'100x80'), 'writeParms'=>array('media'=>'hero^', 'video' => 1)), - 'hero_bg' => array('title'=> LAN_HERO_BACKGROUND, 'type'=>'image', 'noedit'=>true, 'data'=>'str', 'readParms'=>array('thumb'=>'100x80'), 'writeParms'=>array('media'=>'hero^')), + 'hero_media' => array('title'=> LAN_HERO_ADMIN_004, 'type'=>'image', 'noedit'=>true, 'data'=>'str', 'readParms'=>array('thumb'=>'100x80'), 'writeParms'=>array('media'=>'hero^', 'video' => 1)), + 'hero_bg' => array('title'=> LAN_HERO_ADMIN_003, 'type'=>'image', 'noedit'=>true, 'data'=>'str', 'readParms'=>array('thumb'=>'100x80'), 'writeParms'=>array('media'=>'hero^')), 'hero_title' => array ( 'title' => LAN_TITLE, 'type' => 'text', 'data' => 'str', 'width' => '18%', 'inline' => true, 'help' => '', 'readParms' => '', 'writeParms' => array('size'=>'block-level'), 'class' => 'left', 'thclass' => 'left', ), 'hero_description' => array ( 'title' => LAN_DESCRIPTION, 'type' => 'text', 'data' => 'str', 'width' => '30%', 'inline' => true, 'help' => '', 'readParms' => '', 'writeParms' => array('size'=>'block-level'), 'class' => 'left', 'thclass' => 'left', ), - 'hero_bullets' => array ( 'title' => LAN_HERO_BULLETS, 'type' => 'method', 'data' => 'json', 'width' => '35%', 'help' => '', 'readParms' => '', 'writeParms' => '', 'class' => 'left', 'thclass' => 'left', ), - 'hero_images' => array('title'=> LAN_HERO_MEDIA, 'type'=>'method', 'data'=>false, 'nolist'=>true), - 'hero_button1' => array ( 'title' => LAN_HERO_BUTTON.'-1', 'type' => 'method', 'data' => 'json', 'width' => '5%', 'help' => '', 'readParms' => '', 'writeParms' => '', 'class' => 'left', 'thclass' => 'left', ), - 'hero_button2' => array ( 'title' => LAN_HERO_BUTTON.'-2', 'type' => 'method', 'data' => 'json', 'width' => '5%', 'help' => '', 'readParms' => '', 'writeParms' => '', 'class' => 'left', 'thclass' => 'left', ), + 'hero_bullets' => array ( 'title' => LAN_ICON, 'type' => 'method', 'data' => 'json', 'width' => '35%', 'help' => '', 'readParms' => '', 'writeParms' => '', 'class' => 'left', 'thclass' => 'left', ), + 'hero_images' => array('title'=> LAN_HERO_ADMIN_005, 'type'=>'method', 'data'=>false, 'nolist'=>true), + 'hero_button1' => array ( 'title' => LAN_HERO_ADMIN_015.'-1', 'type' => 'method', 'data' => 'json', 'width' => '5%', 'help' => '', 'readParms' => '', 'writeParms' => '', 'class' => 'left', 'thclass' => 'left', ), + 'hero_button2' => array ( 'title' => LAN_HERO_ADMIN_015.'-2', 'type' => 'method', 'data' => 'json', 'width' => '5%', 'help' => '', 'readParms' => '', 'writeParms' => '', 'class' => 'left', 'thclass' => 'left', ), 'hero_order' => array ( 'title' => LAN_ORDER, 'tab'=>1 , 'type' => 'number', 'data' => 'int', 'width' => '5%', 'help' => '', 'readParms' => '', 'writeParms' => '', 'class' => 'left', 'thclass' => 'left', ), 'hero_class' => array ( 'title' => LAN_VISIBILITY, 'tab'=>1, 'type' => 'userclass', 'data' => 'int', 'inline'=>true, 'width' => '10%', 'help' => '', 'readParms' => '', 'writeParms' => '', 'class' => 'left', 'thclass' => 'left', ), @@ -102,8 +102,8 @@ class hero_ui extends e_admin_ui // protected $preftabs = array('General', 'Other' ); protected $prefs = array( 'visibility' => array('title'=> LAN_VISIBILITY, 'tab'=>0, 'type'=>'userclass', 'data' => 'str', 'help'=>'', 'writeParms'=>array('classlist' => 'public,member,guest,admin,main,classes,nobody, no-excludes')), - 'icon_pack' => array('title'=> LAN_HERO_ICON_PACK, 'tab'=>0, 'type'=>'method', 'data' => 'str', 'writeParms'=>array(),'help'=>''), - 'slide_interval' => array('title'=>LAN_HERO_SLIDE_INTERVAL, 'type'=>'dropdown', 'data'=>'int', 'writeParms'=>array('optArray'=>array())), + 'icon_pack' => array('title'=> LAN_HERO_ADMIN_009, 'tab'=>0, 'type'=>'method', 'data' => 'str', 'writeParms'=>array(),'help'=>''), + 'slide_interval' => array('title'=>LAN_HERO_ADMIN_011, 'type'=>'dropdown', 'data'=>'int', 'writeParms'=>array('optArray'=>array())), ); @@ -115,7 +115,7 @@ class hero_ui extends e_admin_ui $opts = array(); foreach($r as $v) { - $opts[$v] = str_replace('000', '', $v).' '.LAN_HERO_SEC; + $opts[$v] = str_replace('000', '', $v).' '.LAN_HERO_ADMIN_016; } $this->prefs['slide_interval']['writeParms']['optArray'] = $opts; @@ -197,7 +197,7 @@ class hero_ui extends e_admin_ui public function renderHelp() { $caption = LAN_HELP; - $text = LAN_HERO_HELP; + $text = LAN_HERO_ADMIN_007; return array('caption'=>$caption,'text'=> $text); @@ -417,10 +417,10 @@ class hero_form_ui extends e_admin_form_ui - - - - + + + + "; @@ -513,7 +513,7 @@ class hero_form_ui extends e_admin_form_ui $text .= " - + "; @@ -615,8 +615,8 @@ class hero_form_ui extends e_admin_form_ui return "
BackgroundImage/Video".LAN_HERO_BACKGROUND."".LAN_HERO_IMAGE_VIDEO."
".$this->imagepicker('hero_bg', $bg, null, array('media'=>'hero^'))."
".LAN_ICON."".LAN_HERO_ICON_STYLE."".LAN_HERO_TEXT."".LAN_HERO_ANIMATION."".LAN_HERO_DELAY."".LAN_HERO_ADMIN_010."".LAN_HERO_ADMIN_012."".LAN_HERO_ADMIN_013."".LAN_HERO_ADMIN_014."
".$this->glyphPicker($name.'[icon]', varset($val['icon']))."".$this->text($name.'[label]', varset($val['label']), 255, array('size'=>'block-level', 'placeholder'=>LAN_HERO_LABEL))."".$this->text($name.'[label]', varset($val['label']), 255, array('size'=>'block-level', 'placeholder'=>LAN_HERO_ADMIN_006))." ".$this->text($name.'[url]', varset($val['url']), 255, array('size'=>'block-level', 'placeholder'=>'URL'))." ".$this->btnClass($name.'[class]', varset($val['class']))."
- - + + From c85c5ca6e34aa8d61b74645e70140a3958b736f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=A1bor?= Date: Sun, 21 Feb 2021 11:47:49 +0100 Subject: [PATCH 17/20] Update English_admin.php --- .../hero/languages/English/English_admin.php | 28 +++++++++---------- 1 file changed, 13 insertions(+), 15 deletions(-) diff --git a/e107_plugins/hero/languages/English/English_admin.php b/e107_plugins/hero/languages/English/English_admin.php index 896709942..27a77dae1 100644 --- a/e107_plugins/hero/languages/English/English_admin.php +++ b/e107_plugins/hero/languages/English/English_admin.php @@ -12,18 +12,16 @@ define("LAN_HERO_ADMIN_001", "Default slides imported."); define("LAN_HERO_ADMIN_002", "Failed to import default slides."); -define("LAN_HERO_BACKGROUND", "Background"); -define("LAN_HERO_IMAGE_VIDEO", "Image/Video"); -define("LAN_HERO_MEDIA", "Media"); -define("LAN_HERO_LABEL", "Label"); -define("LAN_HERO_HELP", "Be sure to enable the hero menu on your home page using the Menu Manager."); -define("LAN_HERO_BULLETS", "Bullets"); -define("LAN_HERO_ICON_PACK", "Icon pack"); -define("LAN_HERO_ICON_STYLE", "Icon-style"); -define("LAN_HERO_SLIDE_INTERVAL", "Slide interval"); -define("LAN_HERO_TEXT", "Text"); -define("LAN_HERO_ANIMATION", "Animation"); -define("LAN_HERO_DELAY", "Delay (sec)"); -define("LAN_HERO_ALERT_DANGER", "Hero only runs on the frontpage of your site."); -define("LAN_HERO_BUTTON", "Button"); -define("LAN_HERO_SEC", "second(s)"); +define("LAN_HERO_ADMIN_003", "Background"); +define("LAN_HERO_ADMIN_004", "Image/Video"); +define("LAN_HERO_ADMIN_005", "Media"); +define("LAN_HERO_ADMIN_006", "Label"); +define("LAN_HERO_ADMIN_007", "Be sure to enable the hero menu on your home page using the Menu Manager."); +define("LAN_HERO_ADMIN_009", "Icon pack"); +define("LAN_HERO_ADMIN_010", "Icon-style"); +define("LAN_HERO_ADMIN_011", "Slide interval"); +define("LAN_HERO_ADMIN_012", "Text"); +define("LAN_HERO_ADMIN_013", "Animation"); +define("LAN_HERO_ADMIN_014", "Delay (sec)"); +define("LAN_HERO_ADMIN_015", "Button"); +define("LAN_HERO_ADMIN_016", "second(s)"); From 08599c88a2314f7c3ee29f12172a2aa4d123cdf1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=A1bor?= Date: Sun, 21 Feb 2021 11:58:36 +0100 Subject: [PATCH 18/20] Update English_global.php --- e107_plugins/hero/languages/English/English_global.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/e107_plugins/hero/languages/English/English_global.php b/e107_plugins/hero/languages/English/English_global.php index cbd94f8c6..9163daf37 100644 --- a/e107_plugins/hero/languages/English/English_global.php +++ b/e107_plugins/hero/languages/English/English_global.php @@ -10,4 +10,6 @@ +----------------------------------------------------------------------+ */ -define("LAN_PLUGIN_HERO_DESCR", "Image and text slider, animated bullet points for the hero area of your home page."); +define("LAN_PLUGIN_HERO_NAME", "Hero"); +define("LAN_PLUGIN_HERO_SUMMARY", "Home page 'Hero' area management"); +define("LAN_PLUGIN_HERO_DESCRIPTION", "Image and text slider, animated bullet points for the hero area of your home page."); From 9bac3c322db6521bc3ba32bd47276a6165bec371 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=A1bor?= Date: Sun, 21 Feb 2021 12:00:09 +0100 Subject: [PATCH 19/20] Update plugin.xml --- e107_plugins/hero/plugin.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/e107_plugins/hero/plugin.xml b/e107_plugins/hero/plugin.xml index d5282eb79..f61de4a83 100644 --- a/e107_plugins/hero/plugin.xml +++ b/e107_plugins/hero/plugin.xml @@ -1,8 +1,8 @@ - + - Home page 'Hero' area management - Image and text slider, animated bullet points for the hero area of your home page. + Home page 'Hero' area management + Image and text slider, animated bullet points for the hero area of your home page. generic hero From d8280e50285af5804595f746bc9ef6effb61af11 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=A1bor?= Date: Fri, 26 Feb 2021 15:54:46 +0100 Subject: [PATCH 20/20] Update hero_template.php --- e107_plugins/hero/templates/hero_template.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/e107_plugins/hero/templates/hero_template.php b/e107_plugins/hero/templates/hero_template.php index a31722190..2653a20d0 100644 --- a/e107_plugins/hero/templates/hero_template.php +++ b/e107_plugins/hero/templates/hero_template.php @@ -53,7 +53,7 @@ $HERO_TEMPLATE['default']['end'] = '
- + {HERO_BUTTON1_ICON} {HERO_BUTTON1_LABEL}
".LAN_HERO_BACKGROUND."".LAN_HERO_IMAGE_VIDEO."".LAN_HERO_ADMIN_003."".LAN_HERO_ADMIN_004."
".$this->imagepicker('hero_bg', $bg, null, array('media'=>'hero^'))."