From 918584d22f8dbd538f5f73b0f90954ef99e95035 Mon Sep 17 00:00:00 2001 From: MikeyGMT Date: Sat, 7 Jan 2017 17:00:45 +0000 Subject: [PATCH] Text to LANS #6 Welcome Messages Text to LANS #6 Welcome Messages --- e107_admin/wmessage.php | 26 ++++++++--------- e107_languages/English/English.php | 1 + e107_languages/English/admin/lan_wmessage.php | 29 ++++++++++--------- 3 files changed, 29 insertions(+), 27 deletions(-) diff --git a/e107_admin/wmessage.php b/e107_admin/wmessage.php index 02917e02e..612e8b441 100644 --- a/e107_admin/wmessage.php +++ b/e107_admin/wmessage.php @@ -2,7 +2,7 @@ /* * e107 website system * - * Copyright (C) 2008-2013 e107 Inc (e107.org) + * Copyright (C) 2008-2017 e107 Inc (e107.org) * Released under the terms and conditions of the * GNU General Public License (http://www.gnu.org/licenses/gpl.txt) * @@ -74,15 +74,15 @@ class generic_ui extends e_admin_ui protected $listOrder = 'gen_id DESC'; - protected $fields = array ( - 'checkboxes' => array ( 'title' => '', 'type' => null, 'data' => null, 'width' => '5%', 'thclass' => 'center', 'forced' => '1', 'class' => 'center', 'toggle' => 'e-multiselect', ), - 'gen_id' => array ( 'title' => LAN_ID, 'data' => 'int', 'width' => '5%', 'help' => '', 'readParms' => '', 'writeParms' => '', 'class' => 'left', 'thclass' => 'left', ), - 'gen_type' => array ( 'title' => LAN_TYPE, 'type' => 'hidden', 'data' => 'str', 'width' => 'auto', 'help' => '', 'readParms' => '', 'writeParms' => 'default=wmessage', 'class' => 'left', 'thclass' => 'left', ), + protected $fields = array ( + 'checkboxes' => array ( 'title' => '', 'type' => null, 'data' => null, 'width' => '5%', 'thclass' => 'center', 'forced' => '1', 'class' => 'center', 'toggle' => 'e-multiselect', ), + 'gen_id' => array ( 'title' => LAN_ID, 'data' => 'int', 'width' => '5%', 'help' => '', 'readParms' => '', 'writeParms' => '', 'class' => 'left', 'thclass' => 'left', ), + 'gen_type' => array ( 'title' => LAN_TYPE, 'type' => 'hidden', 'data' => 'str', 'width' => 'auto', 'help' => '', 'readParms' => '', 'writeParms' => 'default=wmessage', 'class' => 'left', 'thclass' => 'left', ), 'gen_datestamp' => array ( 'title' => LAN_DATESTAMP, 'type' => 'hidden', 'data' => 'int', 'width' => 'auto', 'filter' => true, 'help' => '', 'readParms' => '', 'writeParms' => '', 'class' => 'left', 'thclass' => 'left', ), - 'gen_user_id' => array ( 'title' => LAN_ID, 'type' => 'hidden', 'data' => 'int', 'width' => '5%', 'help' => '', 'readParms' => '', 'writeParms' => '', 'class' => 'left', 'thclass' => 'left', ), - 'gen_ip' => array ( 'title' => WMLAN_10, 'type' => 'text', 'data' => 'str', 'width' => 'auto', 'inline' => true, 'help' => '', 'readParms' => '', 'writeParms' => 'size=xxlarge', 'class' => 'left', 'thclass' => 'left', ), - 'gen_intdata' => array ( 'title' => LAN_VISIBILITY, 'type' => 'userclass', 'data' => 'int', 'inline'=>true, 'batch'=>true, 'filter'=>true, 'width' => 'auto', 'help' => '', 'readParms' => '', 'writeParms' => '', 'class' => 'left', 'thclass' => 'left', ), - 'gen_chardata' => array ( 'title' => WMLAN_04, 'type' => 'bbarea', 'data' => 'str', 'width' => 'auto', 'help' => '', 'readParms' => '', 'writeParms' => '', 'class' => 'center', 'thclass' => 'center', ), + 'gen_user_id' => array ( 'title' => LAN_AUTHOR, 'type' => 'hidden', 'data' => 'int', 'width' => '5%', 'help' => '', 'readParms' => '', 'writeParms' => '', 'class' => 'left', 'thclass' => 'left', ), + 'gen_ip' => array ( 'title' => LAN_TITLE, 'type' => 'text', 'data' => 'str', 'width' => 'auto', 'inline' => true, 'help' => '', 'readParms' => '', 'writeParms' => 'size=xxlarge', 'class' => 'left', 'thclass' => 'left', ), + 'gen_intdata' => array ( 'title' => LAN_VISIBILITY, 'type' => 'userclass', 'data' => 'int', 'inline'=>true, 'batch'=>true, 'filter'=>true, 'width' => 'auto', 'help' => '', 'readParms' => '', 'writeParms' => '', 'class' => 'left', 'thclass' => 'left', ), + 'gen_chardata' => array ( 'title' => LAN_MESSAGE, 'type' => 'bbarea', 'data' => 'str', 'width' => 'auto', 'help' => '', 'readParms' => '', 'writeParms' => '', 'class' => 'center', 'thclass' => 'center', ), 'options' => array ( 'title' => LAN_OPTIONS, 'type' => null, 'data' => null, 'width' => '10%', 'thclass' => 'center last', 'class' => 'center last', 'forced' => '1', ), ); @@ -90,7 +90,7 @@ class generic_ui extends e_admin_ui protected $prefs = array( - 'wm_enclose' => array('title'=> WMLAN_05, 'type'=>'radio', 'data' => 'int','help'=> WMLAN_06, 'writeParms'=>array('optArray'=>array(0=> LAN_DISABLED, 1=> LAN_ENABLED, 2=> "Enclosed with Carousel"))), + 'wm_enclose' => array('title'=> WMLAN_05, 'type'=>'radio', 'data' => 'int','help'=> WMLAN_06, 'writeParms'=>array('optArray'=>array(0=> LAN_DISABLED, 1=> LAN_ENABLED, 2=> WMLAN_11))), ); @@ -306,7 +306,7 @@ if ($action == "main" || $action == "") ".LAN_ID." - ".WMLAN_02." + ".LAN_MESSAGE." ".LAN_VISIBILITY." ".LAN_OPTIONS." @@ -360,7 +360,7 @@ if ($action == "create" || $action == "edit") ".$frm->text('wm_caption', $tp->toForm(vartrue($row['gen_ip'])), 80)." - ".WMLAN_04." + ".LAN_MESSAGE." "; $text .= $frm->bbarea('data',$row['gen_chardata']); @@ -473,4 +473,4 @@ function welcome_adminlog($msg_num='00', $id=0, $woffle='') } */ -?> \ No newline at end of file +?> diff --git a/e107_languages/English/English.php b/e107_languages/English/English.php index e493d06f6..3f878ca1b 100644 --- a/e107_languages/English/English.php +++ b/e107_languages/English/English.php @@ -121,6 +121,7 @@ define("LAN_RATING", "Rating"); define("LAN_IMAGE","Image"); define("LAN_ABOUT", "About"); define("LAN_TITLE", "Title"); +define("LAN_MESSAGE", "Message"); define("LAN_USER", "User"); define("LAN_EMAIL","Email address"); define("LAN_WROTE", "wrote"); // as in John wrote.." "; diff --git a/e107_languages/English/admin/lan_wmessage.php b/e107_languages/English/admin/lan_wmessage.php index db277f53f..4a713c7d5 100644 --- a/e107_languages/English/admin/lan_wmessage.php +++ b/e107_languages/English/admin/lan_wmessage.php @@ -1,14 +1,13 @@ \ No newline at end of file +define("WMLAN_11","Enclosed with Carousel"); + +?>