From 1663d1e0bb8c514f6e397107c9790e7f20781b06 Mon Sep 17 00:00:00 2001 From: leo Date: Sun, 12 Jul 2015 17:33:43 +0200 Subject: [PATCH 1/3] Added lan defs (todo) to lan_admin php Added LAN's to mailoutphp (tabs CAPTIONS) for admin>create --- e107_admin/mailout.php | 2 +- e107_languages/English/admin/lan_admin.php | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/e107_admin/mailout.php b/e107_admin/mailout.php index 16c44d1fd..19b2572a1 100644 --- a/e107_admin/mailout.php +++ b/e107_admin/mailout.php @@ -280,7 +280,7 @@ class mailout_main_ui extends e_admin_ui protected $batchDelete = true; protected $batchCopy = true; - protected $tabs = array('Basic','Advanced'); //TODO Add LAN_BASIC and LAN_ADVANCED to lan_admin.php + protected $tabs = array(''.LAN_BASIC.'',''.LAN_ADVANCED.''); protected $fields = array( 'checkboxes' => array('title'=> '', 'type' => null, 'width' =>'5%', 'forced'=> TRUE, 'thclass'=>'center', 'class'=>'center'), diff --git a/e107_languages/English/admin/lan_admin.php b/e107_languages/English/admin/lan_admin.php index 72cbdc26c..9993ff2b0 100644 --- a/e107_languages/English/admin/lan_admin.php +++ b/e107_languages/English/admin/lan_admin.php @@ -410,7 +410,8 @@ define("LAN_USER_QUICKADD","Quick Add User"); define("LAN_USER_PRUNE", "Prune Users"); define("LAN_USER_OPTIONS", "User Options"); define("LAN_USER_RANKS", "User Ranks"); - +define("LAN_BASIC", "Basic"); +define("LAN_ADVANCED", "Advanced"); // TODO - move e_form related LANS below, add new lan_form.php file (for both front/back-end) From 0f4a14d07a635d415e53900303a1fd0ebb4393d2 Mon Sep 17 00:00:00 2001 From: leo Date: Sun, 12 Jul 2015 22:05:45 +0200 Subject: [PATCH 2/3] Revert "Added lan defs (todo) to lan_admin php " This reverts commit 1663d1e0bb8c514f6e397107c9790e7f20781b06. --- e107_admin/mailout.php | 2 +- e107_languages/English/admin/lan_admin.php | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/e107_admin/mailout.php b/e107_admin/mailout.php index 19b2572a1..16c44d1fd 100644 --- a/e107_admin/mailout.php +++ b/e107_admin/mailout.php @@ -280,7 +280,7 @@ class mailout_main_ui extends e_admin_ui protected $batchDelete = true; protected $batchCopy = true; - protected $tabs = array(''.LAN_BASIC.'',''.LAN_ADVANCED.''); + protected $tabs = array('Basic','Advanced'); //TODO Add LAN_BASIC and LAN_ADVANCED to lan_admin.php protected $fields = array( 'checkboxes' => array('title'=> '', 'type' => null, 'width' =>'5%', 'forced'=> TRUE, 'thclass'=>'center', 'class'=>'center'), diff --git a/e107_languages/English/admin/lan_admin.php b/e107_languages/English/admin/lan_admin.php index 9993ff2b0..72cbdc26c 100644 --- a/e107_languages/English/admin/lan_admin.php +++ b/e107_languages/English/admin/lan_admin.php @@ -410,8 +410,7 @@ define("LAN_USER_QUICKADD","Quick Add User"); define("LAN_USER_PRUNE", "Prune Users"); define("LAN_USER_OPTIONS", "User Options"); define("LAN_USER_RANKS", "User Ranks"); -define("LAN_BASIC", "Basic"); -define("LAN_ADVANCED", "Advanced"); + // TODO - move e_form related LANS below, add new lan_form.php file (for both front/back-end) From 78f56c3fe67ddd1c62e5d90251ba97db9f89da64 Mon Sep 17 00:00:00 2001 From: leo Date: Mon, 13 Jul 2015 13:48:39 +0200 Subject: [PATCH 3/3] Changed LAN's .. admin/mailout php to use lan defines in lan_mail out php (captions create tabs) --- e107_admin/mailout.php | 2 +- e107_languages/English/admin/lan_mailout.php | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/e107_admin/mailout.php b/e107_admin/mailout.php index 16c44d1fd..19b2572a1 100644 --- a/e107_admin/mailout.php +++ b/e107_admin/mailout.php @@ -280,7 +280,7 @@ class mailout_main_ui extends e_admin_ui protected $batchDelete = true; protected $batchCopy = true; - protected $tabs = array('Basic','Advanced'); //TODO Add LAN_BASIC and LAN_ADVANCED to lan_admin.php + protected $tabs = array(''.LAN_BASIC.'',''.LAN_ADVANCED.''); protected $fields = array( 'checkboxes' => array('title'=> '', 'type' => null, 'width' =>'5%', 'forced'=> TRUE, 'thclass'=>'center', 'class'=>'center'), diff --git a/e107_languages/English/admin/lan_mailout.php b/e107_languages/English/admin/lan_mailout.php index 023853f1b..d267064d2 100644 --- a/e107_languages/English/admin/lan_mailout.php +++ b/e107_languages/English/admin/lan_mailout.php @@ -280,6 +280,8 @@ define("LAN_MAILOUT_259", ""); define("LAN_SEND", "Send"); define("LAN_HOLD", "Hold"); define("LAN_MAILOUT_260", "User-Type"); +define("LAN_BASIC", "Basic"); +define("LAN_ADVANCED", "Advanced"); //define("LAN_SUBMIT", "Do it!"); LAN_RUN