From a908132a8c680556a313fe13a109c5b8166eb355 Mon Sep 17 00:00:00 2001 From: "VINADES.,JSC" Date: Mon, 28 May 2018 09:57:16 +0700 Subject: [PATCH 1/9] Change class namespaces --- includes/mainfile.php | 4 +- .../Cache/{Memcacheds.php => Memcached.php} | 14 +++--- .../nukeviet/Cache/{CRedis.php => Redis.php} | 48 +++++++++---------- vendor/vinades/nukeviet/Core/Error.php | 4 +- 4 files changed, 35 insertions(+), 35 deletions(-) rename vendor/vinades/nukeviet/Cache/{Memcacheds.php => Memcached.php} (95%) rename vendor/vinades/nukeviet/Cache/{CRedis.php => Redis.php} (93%) diff --git a/includes/mainfile.php b/includes/mainfile.php index 2946f8af3..5bb61b208 100644 --- a/includes/mainfile.php +++ b/includes/mainfile.php @@ -179,9 +179,9 @@ } // Ket noi Cache if ($global_config['cached'] == 'memcached') { - $nv_Cache = new NukeViet\Cache\Memcacheds(NV_MEMCACHED_HOST, NV_MEMCACHED_PORT, NV_LANG_DATA, NV_CACHE_PREFIX); + $nv_Cache = new NukeViet\Cache\Memcached(NV_MEMCACHED_HOST, NV_MEMCACHED_PORT, NV_LANG_DATA, NV_CACHE_PREFIX); } elseif ($global_config['cached'] == 'redis') { - $nv_Cache = new NukeViet\Cache\CRedis(NV_REDIS_HOST, NV_REDIS_PORT, NV_REDIS_TIMEOUT, NV_REDIS_PASSWORD, NV_REDIS_DBINDEX, NV_LANG_DATA, NV_CACHE_PREFIX); + $nv_Cache = new NukeViet\Cache\Redis(NV_REDIS_HOST, NV_REDIS_PORT, NV_REDIS_TIMEOUT, NV_REDIS_PASSWORD, NV_REDIS_DBINDEX, NV_LANG_DATA, NV_CACHE_PREFIX); } else { $nv_Cache = new NukeViet\Cache\Files(NV_ROOTDIR . '/' . NV_CACHEDIR, NV_LANG_DATA, NV_CACHE_PREFIX); } diff --git a/vendor/vinades/nukeviet/Cache/Memcacheds.php b/vendor/vinades/nukeviet/Cache/Memcached.php similarity index 95% rename from vendor/vinades/nukeviet/Cache/Memcacheds.php rename to vendor/vinades/nukeviet/Cache/Memcached.php index 4330bea8f..25dff7b3e 100644 --- a/vendor/vinades/nukeviet/Cache/Memcacheds.php +++ b/vendor/vinades/nukeviet/Cache/Memcached.php @@ -10,18 +10,18 @@ namespace NukeViet\Cache; -use Memcached; +use Memcached as GMemcached; /** - * Memcacheds - * + * Memcached + * * @package NukeViet Cache * @author VINADES.,JSC (contact@vinades.vn) * @copyright (C) 2016 VINADES.,JSC. All rights reserved * @version 4.0 * @access public */ -class Memcacheds +class Memcached { private $_Lang = 'vi'; @@ -33,8 +33,8 @@ class Memcacheds private $_Cache; /** - * Memcacheds::__construct() - * + * Memcached::__construct() + * * @param mixed $Host * @param mixed $Port * @param mixed $Lang @@ -45,7 +45,7 @@ public function __construct($Host, $Port, $Lang, $Cache_Prefix) { $this->_Lang = $Lang; $this->_Cache_Prefix = $Cache_Prefix; - $this->_Cache = new Memcached(); + $this->_Cache = new GMemcached(); $this->_Cache->addServer($Host, $Port); } diff --git a/vendor/vinades/nukeviet/Cache/CRedis.php b/vendor/vinades/nukeviet/Cache/Redis.php similarity index 93% rename from vendor/vinades/nukeviet/Cache/CRedis.php rename to vendor/vinades/nukeviet/Cache/Redis.php index 0bb20871c..9ac3615e3 100644 --- a/vendor/vinades/nukeviet/Cache/CRedis.php +++ b/vendor/vinades/nukeviet/Cache/Redis.php @@ -10,18 +10,18 @@ namespace NukeViet\Cache; -use Redis; +use Redis as CRedis; /** - * CRedis - * + * Redis + * * @package NukeViet Cache * @author VINADES.,JSC (contact@vinades.vn) * @copyright (C) 2016 VINADES.,JSC. All rights reserved * @version 4.0 * @access public */ -class CRedis +class Redis { private $_Lang = 'vi'; @@ -33,8 +33,8 @@ class CRedis private $_Cache; /** - * CRedis::__construct() - * + * Redis::__construct() + * * @param mixed $Host * @param mixed $Port * @param mixed $Timeout @@ -49,8 +49,8 @@ public function __construct($Host, $Port, $Timeout, $Password, $DBnumber, $Lang, $this->_Lang = $Lang; $this->_Cache_Prefix = $Cache_Prefix; - $redis = new Redis(); - + $redis = new CRedis(); + $connected = false; if ($redis->pconnect($Host, $Port, $Timeout) === true) { $connected = true; @@ -60,25 +60,25 @@ public function __construct($Host, $Port, $Timeout, $Password, $DBnumber, $Lang, if ($connected !== true) { trigger_error('Can not connect to Redis server!', 256); } - + if (!empty($Password) and $redis->auth($Password) !== true) { trigger_error('Can not Authenticate Redis server!', 256); } - + if ($redis->select($DBnumber) !== true) { trigger_error('Can not connect to Redis DB!', 256); } - + $checkOptions = array(); $checkOptions[] = $redis->setOption(Redis::OPT_PREFIX, $Cache_Prefix); $checkOptions[] = $redis->setOption(Redis::OPT_SERIALIZER, Redis::SERIALIZER_PHP); - + foreach ($checkOptions as $opt) { if ($opt !== true) { trigger_error('Can not set Redis option!', 256); } } - + $this->_Cache = $redis; } @@ -104,15 +104,15 @@ public function delAll($sys = true) public function delMod($module_name, $lang = '') { $AllKeys = $this->_Cache->keys(str_replace('-', '\-', $module_name) . '*'); - + foreach ($AllKeys as $key) { $this->_Cache->delete(substr($key, strlen($this->_Cache_Prefix))); } } /** - * CRedis::getItem() - * + * Redis::getItem() + * * @param mixed $module_name * @param mixed $filename * @param integer $ttl @@ -125,8 +125,8 @@ public function getItem($module_name, $filename, $ttl = 0) } /** - * CRedis::setItem() - * + * Redis::setItem() + * * @param mixed $module_name * @param mixed $filename * @param mixed $content @@ -148,8 +148,8 @@ public function setDb($db) } /** - * CRedis::db() - * + * Redis::db() + * * @param mixed $sql * @param mixed $key * @param mixed $modname @@ -186,10 +186,10 @@ public function db($sql, $key, $modname, $lang = '', $ttl = 0) return $_rows; } - + /** - * CRedis::set() - * + * Redis::set() + * * @param mixed $key * @param mixed $value * @param integer $ttl @@ -198,7 +198,7 @@ public function db($sql, $key, $modname, $lang = '', $ttl = 0) private function set($key, $value, $ttl = 0) { $this->_Cache->set($key, $value); - + if ($ttl > 0) { $this->_Cache->setTimeout($key, $ttl); } diff --git a/vendor/vinades/nukeviet/Core/Error.php b/vendor/vinades/nukeviet/Core/Error.php index 44efdf635..7bc2f1cd3 100644 --- a/vendor/vinades/nukeviet/Core/Error.php +++ b/vendor/vinades/nukeviet/Core/Error.php @@ -72,13 +72,13 @@ class Error ); private $track_fatal_error = array( array( - 'file' => 'vendor/vinades/nukeviet/Cache/CRedis.php', + 'file' => 'vendor/vinades/nukeviet/Cache/Redis.php', 'pattern' => array( array('/[\'|"]Redis[\'|"] not found/i', 'PHP Redis Extension does not exists!') ) ), array( - 'file' => 'vendor/vinades/nukeviet/Cache/Memcacheds.php', + 'file' => 'vendor/vinades/nukeviet/Cache/Memcached.php', 'pattern' => array( array('/[\'|"]Memcached[\'|"] not found/i', 'PHP Memcached Extension does not exists!') ) From 1d3210f23d27aca25d1dd815f029d29711d1c761 Mon Sep 17 00:00:00 2001 From: "VINADES.,JSC" Date: Wed, 30 May 2018 11:36:29 +0700 Subject: [PATCH 2/9] Fix error in function documents --- includes/core/phpinfo.php | 16 ++++++++-------- includes/functions.php | 6 +++--- includes/xtemplate.class.php | 2 +- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/includes/core/phpinfo.php b/includes/core/phpinfo.php index 130aa27d9..bc96665ef 100755 --- a/includes/core/phpinfo.php +++ b/includes/core/phpinfo.php @@ -18,14 +18,14 @@ * @param integer $option * @param bool $return * @return - * INFO_GENERAL => 1 The configuration line, php.ini location, build date, Web Server, System and more. - * INFO_CREDITS => 2 PHP Credits. See also phpcredits(). - * INFO_CONFIGURATION => 4 Current Local and Master values for PHP directives. See also ini_get(). - * INFO_MODULES => 8 Loaded modules and their respective settings. See also get_loaded_extensions(). - * INFO_ENVIRONMENT => 16 Environment Variable information that's also available in $_ENV. - * INFO_VARIABLES => 32 Shows all predefined variables from EGPCS (Environment, GET, POST, Cookie, Server). - * INFO_LICENSE => 64 PHP License information. See also the license FAQ. - * INFO_ALL => -1 Shows all of the above. + * - INFO_GENERAL => 1 The configuration line, php.ini location, build date, Web Server, System and more. + * - INFO_CREDITS => 2 PHP Credits. See also phpcredits(). + * - INFO_CONFIGURATION => 4 Current Local and Master values for PHP directives. See also ini_get(). + * - INFO_MODULES => 8 Loaded modules and their respective settings. See also get_loaded_extensions(). + * - INFO_ENVIRONMENT => 16 Environment Variable information that's also available in $_ENV. + * - INFO_VARIABLES => 32 Shows all predefined variables from EGPCS (Environment, GET, POST, Cookie, Server). + * - INFO_LICENSE => 64 PHP License information. See also the license FAQ. + * - INFO_ALL => -1 Shows all of the above. */ function phpinfo_array($option = 1, $return = false) { diff --git a/includes/functions.php b/includes/functions.php index d55c9473c..ecc82a810 100755 --- a/includes/functions.php +++ b/includes/functions.php @@ -1188,7 +1188,7 @@ function nv_sendmail($from, $to, $subject, $message, $files = '', $AddEmbeddedIm } return true; - } catch (phpmailerException $e) { + } catch (PHPMailer\PHPMailer\Exception $e) { trigger_error($e->errorMessage(), E_USER_WARNING); return false; @@ -1916,7 +1916,7 @@ function nv_status_notification($language, $module, $type, $obid, $status = 1, $ * nv_redirect_location() * * @param string $url - * @param interger $error_code + * @param integer $error_code * @return void * */ @@ -1943,7 +1943,7 @@ function nv_redirect_encrypt($url) /** * nv_redirect_decrypt() * - * @param tring $string + * @param string $string * @param boolean $insite * @return string * diff --git a/includes/xtemplate.class.php b/includes/xtemplate.class.php index 6c723beae..a2573bcdf 100644 --- a/includes/xtemplate.class.php +++ b/includes/xtemplate.class.php @@ -44,7 +44,7 @@ class XTemplate { /** * Parsed blocks * - * @var unknown_type + * @var array */ public $parsed_blocks = array(); From 648bb0e814cd2d67e89fc2ce00242a183b2c001e Mon Sep 17 00:00:00 2001 From: "VINADES.,JSC" Date: Fri, 1 Jun 2018 09:46:48 +0700 Subject: [PATCH 3/9] Fix contact/main.tpl --- modules/contact/admin/main.php | 9 +++++---- themes/admin_default/modules/contact/main.tpl | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/modules/contact/admin/main.php b/modules/contact/admin/main.php index dd80c0261..efeea037a 100755 --- a/modules/contact/admin/main.php +++ b/modules/contact/admin/main.php @@ -8,13 +8,13 @@ * @Createdate 2-9-2010 14:43 */ -if (! defined('NV_IS_FILE_ADMIN')) { +if (!defined('NV_IS_FILE_ADMIN')) { die('Stop!!!'); } $mark = $nv_Request->get_title('mark', 'post', ''); -if (! empty($mark) and ($mark == 'read' or $mark == 'unread')) { +if (!empty($mark) and ($mark == 'read' or $mark == 'unread')) { $mark = $mark == 'read' ? 1 : 0; $sends = $nv_Request->get_array('sends', 'post', array()); if (empty($sends)) { @@ -35,10 +35,11 @@ $xtpl = new XTemplate('main.tpl', NV_ROOTDIR . '/themes/' . $global_config['module_theme'] . '/modules/' . $module_file); $xtpl->assign('LANG', $lang_module); $xtpl->assign('GLANG', $lang_global); +$xtpl->assign('MODULE_NAME', $module_name); $contact_allowed = nv_getAllowed(); -if (! empty($contact_allowed['view'])) { +if (!empty($contact_allowed['view'])) { $in = implode(',', array_keys($contact_allowed['view'])); $page = $nv_Request->get_int('page', 'get', 1); @@ -104,7 +105,7 @@ $generate_page = nv_generate_page($base_url, $num_items, $per_page, $page); - if (! empty($generate_page)) { + if (!empty($generate_page)) { $xtpl->assign('GENERATE_PAGE', $generate_page); $xtpl->parse('main.data.generate_page'); } diff --git a/themes/admin_default/modules/contact/main.tpl b/themes/admin_default/modules/contact/main.tpl index 307be8889..f66ce80ad 100755 --- a/themes/admin_default/modules/contact/main.tpl +++ b/themes/admin_default/modules/contact/main.tpl @@ -55,7 +55,7 @@ \ No newline at end of file From dcfc56db751fa30c649f32fe17ff070662c1c395 Mon Sep 17 00:00:00 2001 From: "VINADES.,JSC" Date: Wed, 6 Jun 2018 08:05:29 +0700 Subject: [PATCH 4/9] Turn off error messages the debug mode off --- vendor/vinades/nukeviet/Core/Error.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vendor/vinades/nukeviet/Core/Error.php b/vendor/vinades/nukeviet/Core/Error.php index 44efdf635..edb6b5c6b 100644 --- a/vendor/vinades/nukeviet/Core/Error.php +++ b/vendor/vinades/nukeviet/Core/Error.php @@ -573,7 +573,7 @@ private function log_control() } } - if ((NV_DEBUG or (!$log_is_displayed and $this->error_set_logs)) and !empty($this->display_errors_list) and isset($this->display_errors_list[$this->errno])) { + if (NV_DEBUG and !empty($this->display_errors_list) and isset($this->display_errors_list[$this->errno])) { $this->_display(); } } From 5a924481c18c1c07fa9aef9c3cdeca837fc98033 Mon Sep 17 00:00:00 2001 From: "VINADES.,JSC" Date: Tue, 12 Jun 2018 14:24:50 +0700 Subject: [PATCH 5/9] Fix department.php --- modules/contact/admin/department.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/contact/admin/department.php b/modules/contact/admin/department.php index 9ea85cc7f..8b37b06a4 100755 --- a/modules/contact/admin/department.php +++ b/modules/contact/admin/department.php @@ -28,7 +28,7 @@ 'phone' => preg_replace("/(\[|[)[^\]]*(]|\])$/", "", $row['phone']), 'fax' => $row['fax'], 'id' => $row['id'], - 'url_department' => NV_BASE_SITEURL . 'index.php?' . NV_LANG_VARIABLE . '=' . NV_LANG_DATA . '&' . NV_NAME_VARIABLE . '=' . $module_name . '&' . NV_OP_VARIABLE . '=' . $row['alias'] . '/0', + 'url_department' => NV_BASE_SITEURL . 'index.php?' . NV_LANG_VARIABLE . '=' . NV_LANG_DATA . '&' . NV_NAME_VARIABLE . '=' . $module_name . '&' . NV_OP_VARIABLE . '=' . $row['alias'], 'url_edit' => NV_BASE_ADMINURL . 'index.php?' . NV_LANG_VARIABLE . '=' . NV_LANG_DATA . '&' . NV_NAME_VARIABLE . '=' . $module_name . '&' . NV_OP_VARIABLE . '=row&id=' . $row['id'] )); From 0f4a0671abea73e3f36ec184b95b3a8fab252799 Mon Sep 17 00:00:00 2001 From: "VINADES.,JSC" Date: Tue, 12 Jun 2018 15:13:29 +0700 Subject: [PATCH 6/9] Update CHANGELOG.txt, version --- CHANGELOG.txt | 6 ++++++ install/config.php | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.txt b/CHANGELOG.txt index 247e9a0f5..f5eea8665 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -1,6 +1,12 @@ CHANGE LOG: NukeViet eGovernment http://egov.nukeviet.vn +NukeViet eGovernment 1.1.01 +- Cập nhật NukeViet 4.3.02 +- Thêm giao diện cho block headling module news +- Thêm chức năng cấu hình CSS cho giao diện egov +- Thêm giao diện các kiểu hiển thị khác tại trang chủ của module news + NukeViet eGovernment 1.1.00 - Cập nhật NukeViet 4.3.01 - Cập nhật module laws 4.3.01 diff --git a/install/config.php b/install/config.php index b934ebd3c..bc670dc5a 100755 --- a/install/config.php +++ b/install/config.php @@ -35,7 +35,7 @@ $array_data['socialbutton'] = 1; $global_config['unofficial_mode'] = 0; // Cảnh báo bản thử nghiệm -$global_config['version'] = '1.1.00'; // NukeViet eGovernment +$global_config['version'] = '1.1.01'; // NukeViet eGovernment $global_config['site_email'] = ''; $global_config['site_phone'] = ''; From 1f8688533947da6d06ac4046ba00ee8487969903 Mon Sep 17 00:00:00 2001 From: "VINADES.,JSC" Date: Tue, 12 Jun 2018 17:45:39 +0700 Subject: [PATCH 7/9] Fix theme view cat grid, update theme view cat main --- themes/egov/css/custom.css | 2 +- themes/egov/css/news.css | 55 +++++++++++- themes/egov/modules/news/viewcat_grid.tpl | 88 ++++++++++++++----- .../egov/modules/news/viewcat_main_bottom.tpl | 4 +- .../egov/modules/news/viewcat_main_left.tpl | 4 +- .../egov/modules/news/viewcat_main_right.tpl | 4 +- 6 files changed, 128 insertions(+), 29 deletions(-) diff --git a/themes/egov/css/custom.css b/themes/egov/css/custom.css index 0b298f80a..915e2a285 100644 --- a/themes/egov/css/custom.css +++ b/themes/egov/css/custom.css @@ -837,7 +837,7 @@ div.breadcrumbs-bg { padding-bottom: 0; } -.news-catbox-single h2 { +.news-catbox-single h2, .viewcat-main-style > ul h2 { text-transform: uppercase; margin-bottom: 0px; } diff --git a/themes/egov/css/news.css b/themes/egov/css/news.css index f9463b162..b45357aa6 100644 --- a/themes/egov/css/news.css +++ b/themes/egov/css/news.css @@ -305,18 +305,69 @@ ul.related h4 { box-shadow: 1px 2px 2px rgba(0,0,0,0.08); } -.news-catbox-single { +.news-catbox-single, .viewcat-main-style { border: #ccc 1px solid; border-bottom: 0px; border-radius: 5px 5px 0px 0px; padding: 10px; } -.news-catbox-single h2 { +.news-catbox-single h2, .viewcat-main-style > ul { border-bottom: #fba919 2px solid; padding-bottom: 5px; } +.viewcat-main-style > ul h4 { + position: relative; + top: -2px; + line-height: 30px!important; +} + +.viewcat-main-style ul li { + position: relative; +} + +.viewcat-main-style ul li:nth-child(2) { + padding-left: 25px; +} + +.viewcat-main-style ul li:nth-child(2):before { + font-family: "FontAwesome"; + content: "\f105"; + position: absolute; + left: 0; + top: -2px; + width: 20px; + text-align: center; + font-size: 20px; +} + +.viewcat-main-style ul li:nth-child(n+3) { + padding-left: 10px; +} + +.viewcat-main-style ul li:nth-child(n+3):before { + content: "|"; + position: absolute; + top: 3px; + left: 0; +} + +.viewcat-main-style ul li.last-cat { + padding-left: 0; + margin-right: 15px; +} + +.viewcat-main-style ul li.last-cat:before { + display: none; +} + +.viewcat-main-style ul li.last-cat a { + position: absolute; + left: 0; + top: 5px; +} + .height-hometext { height: 165px; overflow: hidden; diff --git a/themes/egov/modules/news/viewcat_grid.tpl b/themes/egov/modules/news/viewcat_grid.tpl index b6fb3e11a..a3cba9ea5 100644 --- a/themes/egov/modules/news/viewcat_grid.tpl +++ b/themes/egov/modules/news/viewcat_grid.tpl @@ -13,7 +13,7 @@
-
+
{HOMEIMGALT1} @@ -49,18 +49,19 @@
- -
-
- {HOMEIMGALT1} -
-

data-content="{CONTENT.hometext_clean}" data-img="" data-rel="tooltip" data-placement="{TOOLTIP_POSITION}" title="{CONTENT.title}">{CONTENT.title}

- {ADMINLINK} -
-
+
+ +
+
+ {HOMEIMGALT1} +
+

data-content="{CONTENT.hometext_clean}" data-img="" data-rel="tooltip" data-placement="{TOOLTIP_POSITION}" title="{CONTENT.title}">{CONTENT.title}

+ {ADMINLINK} +
+
+
+
- -
 
@@ -68,14 +69,61 @@
\ No newline at end of file diff --git a/themes/egov/modules/news/viewcat_main_bottom.tpl b/themes/egov/modules/news/viewcat_main_bottom.tpl index ce5f294cc..4906be1e2 100644 --- a/themes/egov/modules/news/viewcat_main_bottom.tpl +++ b/themes/egov/modules/news/viewcat_main_bottom.tpl @@ -2,14 +2,14 @@
-
+
diff --git a/themes/egov/modules/news/viewcat_main_left.tpl b/themes/egov/modules/news/viewcat_main_left.tpl index aae4883dc..2522c9ab5 100644 --- a/themes/egov/modules/news/viewcat_main_left.tpl +++ b/themes/egov/modules/news/viewcat_main_left.tpl @@ -2,14 +2,14 @@
-
+
diff --git a/themes/egov/modules/news/viewcat_main_right.tpl b/themes/egov/modules/news/viewcat_main_right.tpl index 1aa3b351c..953b8791b 100644 --- a/themes/egov/modules/news/viewcat_main_right.tpl +++ b/themes/egov/modules/news/viewcat_main_right.tpl @@ -2,14 +2,14 @@
-
+
From 6bc898abc0d7a7222ddbbc7a5a1c33cdb0a93b03 Mon Sep 17 00:00:00 2001 From: "VINADES.,JSC" Date: Wed, 13 Jun 2018 06:28:23 +0700 Subject: [PATCH 8/9] Fix theme --- themes/admin_default/modules/laws/area.tpl | 2 +- themes/admin_default/modules/laws/cat.tpl | 2 +- themes/admin_default/modules/laws/examine.tpl | 2 +- themes/admin_default/modules/laws/subject.tpl | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/themes/admin_default/modules/laws/area.tpl b/themes/admin_default/modules/laws/area.tpl index e57d73d75..116113b68 100644 --- a/themes/admin_default/modules/laws/area.tpl +++ b/themes/admin_default/modules/laws/area.tpl @@ -146,7 +146,7 @@ {LANG.pos} {LANG.title} - + {LANG.feature} diff --git a/themes/admin_default/modules/laws/cat.tpl b/themes/admin_default/modules/laws/cat.tpl index c505d1739..c806613ba 100644 --- a/themes/admin_default/modules/laws/cat.tpl +++ b/themes/admin_default/modules/laws/cat.tpl @@ -147,7 +147,7 @@ {LANG.pos} {LANG.title} {LANG.newicon} ({LANG.day}) -   + {LANG.feature} diff --git a/themes/admin_default/modules/laws/examine.tpl b/themes/admin_default/modules/laws/examine.tpl index 8578b33cf..61614900c 100644 --- a/themes/admin_default/modules/laws/examine.tpl +++ b/themes/admin_default/modules/laws/examine.tpl @@ -81,7 +81,7 @@ {LANG.pos} {LANG.title} -   + {LANG.feature} diff --git a/themes/admin_default/modules/laws/subject.tpl b/themes/admin_default/modules/laws/subject.tpl index 93112c1e9..be31d1f87 100644 --- a/themes/admin_default/modules/laws/subject.tpl +++ b/themes/admin_default/modules/laws/subject.tpl @@ -125,7 +125,7 @@ {LANG.pos} {LANG.title} {LANG.numlink} -   + {LANG.feature} From e65d4125d9520f657e581794c10448e9a88892c3 Mon Sep 17 00:00:00 2001 From: "VINADES.,JSC" Date: Wed, 13 Jun 2018 06:49:33 +0700 Subject: [PATCH 9/9] Update theme block search --- themes/admin_default/modules/laws/main.tpl | 2 +- .../default/modules/laws/block_search_center.tpl | 15 +++++++++++++-- .../modules/laws/block_search_vertical.tpl | 15 +++++++++++++-- 3 files changed, 27 insertions(+), 5 deletions(-) diff --git a/themes/admin_default/modules/laws/main.tpl b/themes/admin_default/modules/laws/main.tpl index 6a1b87410..b61af4109 100644 --- a/themes/admin_default/modules/laws/main.tpl +++ b/themes/admin_default/modules/laws/main.tpl @@ -164,7 +164,7 @@ - +
diff --git a/themes/default/modules/laws/block_search_center.tpl b/themes/default/modules/laws/block_search_center.tpl index 97944ec9f..cd082ae02 100644 --- a/themes/default/modules/laws/block_search_center.tpl +++ b/themes/default/modules/laws/block_search_center.tpl @@ -1,6 +1,6 @@ - +
@@ -121,6 +121,8 @@
+ + + +