Merge pull request #89 from hoaquynhtim99/egov1.1

Egov 1.1.01
nukeviet · Jun 13, 2018 · 2e58478 · 2e58478
2 parents 9ff9891 + 20a98eb
commit 2e58478
Show file tree

Hide file tree

Showing 25 changed files with 221 additions and 93 deletions.
diff --git 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/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
@@ -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/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/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();
 

diff --git 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'] = '';

diff --git a/modules/contact/admin/department.php b/modules/contact/admin/department.php
@@ -28,7 +28,7 @@
         'phone' => preg_replace("/(\[|&#91;)[^\]]*(&#93;|\])$/", "", $row['phone']),
         'fax' => $row['fax'],
         'id' => $row['id'],
-        'url_department' => NV_BASE_SITEURL . 'index.php?' . NV_LANG_VARIABLE . '=' . NV_LANG_DATA . '&amp;' . NV_NAME_VARIABLE . '=' . $module_name . '&amp;' . NV_OP_VARIABLE . '=' . $row['alias'] . '/0',
+        'url_department' => NV_BASE_SITEURL . 'index.php?' . NV_LANG_VARIABLE . '=' . NV_LANG_DATA . '&amp;' . NV_NAME_VARIABLE . '=' . $module_name . '&amp;' . NV_OP_VARIABLE . '=' . $row['alias'],
         'url_edit' => NV_BASE_ADMINURL . 'index.php?' . NV_LANG_VARIABLE . '=' . NV_LANG_DATA . '&amp;' . NV_NAME_VARIABLE . '=' . $module_name . '&amp;' . NV_OP_VARIABLE . '=row&amp;id=' . $row['id']
     ));
 

diff --git 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
@@ -55,7 +55,7 @@
 <!-- END: data -->
 <script type="text/javascript">
 	function open_browse_forward() {
-		nv_open_browse('{NV_BASE_ADMINURL}index.php?' + nv_name_variable + '=contact&' + nv_fc_variable + '=forward&id=1, 'NVImg', 850, 500, 'resizable=no,scrollbars=no,toolbar=no,location=no,status=no');
+		nv_open_browse('{NV_BASE_ADMINURL}index.php?' + nv_lang_variable + '=' + nv_lang_data + '&' + nv_name_variable + '={MODULE_NAME}&' + nv_fc_variable + '=forward&id=1', 'NVImg', 850, 500, 'resizable=no,scrollbars=no,toolbar=no,location=no,status=no');
 	}
 </script>
 <!-- END: main -->
diff --git a/themes/admin_default/modules/laws/area.tpl b/themes/admin_default/modules/laws/area.tpl
@@ -146,7 +146,7 @@
 			<tr>
 				<th style="width:100px"> {LANG.pos} </th>
 				<th>{LANG.title}</th>
-				<th style="width:130px"></th>
+				<th style="width:130px">{LANG.feature}</th>
 			</tr>
 		</thead>
 		<tbody>

diff --git a/themes/admin_default/modules/laws/cat.tpl b/themes/admin_default/modules/laws/cat.tpl
@@ -147,7 +147,7 @@
 				<th> {LANG.pos} </th>
 				<th> {LANG.title} </th>
 				<th>{LANG.newicon} ({LANG.day})</th>
-				<th>&nbsp;</th>
+				<th>{LANG.feature}</th>
 			</tr>
 		</thead>
 		<tbody>

diff --git a/themes/admin_default/modules/laws/examine.tpl b/themes/admin_default/modules/laws/examine.tpl
@@ -81,7 +81,7 @@
 		<tr>
 			<th style="width:100px"> {LANG.pos} </th>
 			<th> {LANG.title} </th>
-			<th style="width:120px">&nbsp;</th>
+			<th style="width:120px">{LANG.feature}</th>
 		</tr>
 	</thead>
 	<tbody>

diff --git a/themes/admin_default/modules/laws/main.tpl b/themes/admin_default/modules/laws/main.tpl
@@ -164,7 +164,7 @@
 <link rel="stylesheet" href="{NV_BASE_SITEURL}{NV_ASSETS_DIR}/js/select2/select2.min.css">
 <link rel="stylesheet" type="text/css" href="{NV_BASE_SITEURL}{NV_ASSETS_DIR}/js/jquery-ui/jquery-ui.min.css">
 <script type="text/javascript" src="{NV_BASE_SITEURL}{NV_ASSETS_DIR}/js/select2/select2.min.js"></script>
-<script type="text/javascript" src="{NV_BASE_SITEURL}{NV_ASSETS_DIR}/js/select2/i18n/{NV_LANG_DATA}.js"></script>
+<script type="text/javascript" src="{NV_BASE_SITEURL}{NV_ASSETS_DIR}/js/select2/i18n/{NV_LANG_INTERFACE}.js"></script>
 <script type="text/javascript" src="{NV_BASE_SITEURL}{NV_ASSETS_DIR}/js/jquery-ui/jquery-ui.min.js"></script>
 <script type="text/javascript" src="{NV_BASE_SITEURL}{NV_ASSETS_DIR}/js/language/jquery.ui.datepicker-{NV_LANG_INTERFACE}.js"></script>
 <div id="pageContent">

diff --git a/themes/admin_default/modules/laws/subject.tpl b/themes/admin_default/modules/laws/subject.tpl
@@ -125,7 +125,7 @@
 			<th style="width:100px"> {LANG.pos} </th>
 			<th> {LANG.title} </th>
 			<th class="w100"> {LANG.numlink} </th>
-			<th style="width:120px">&nbsp;</th>
+			<th style="width:120px">{LANG.feature}</th>
 		</tr>
 	</thead>
 	<tbody>

diff --git a/themes/default/modules/laws/block_search_center.tpl b/themes/default/modules/laws/block_search_center.tpl
@@ -1,6 +1,6 @@
 <!-- BEGIN: main -->
 <link rel="stylesheet" type="text/css" href="{NV_BASE_SITEURL}{NV_ASSETS_DIR}/js/jquery-ui/jquery-ui.min.css">
-
+<link rel="stylesheet" href="{NV_BASE_SITEURL}{NV_ASSETS_DIR}/js/select2/select2.min.css">
 <form id="ltablesearch{BLOCKID}" class="form-horizontal formsearch" action="{FORM_ACTION}" method="get" onsubmit="return nv_check_search_laws(this);">
     <!-- BEGIN: no_rewrite -->
     <input type="hidden" name="{NV_LANG_VARIABLE}" value="{NV_LANG_DATA}"/>
@@ -121,6 +121,8 @@
 </form>
 <script type="text/javascript" src="{NV_BASE_SITEURL}{NV_ASSETS_DIR}/js/jquery-ui/jquery-ui.min.js"></script>
 <script type="text/javascript" src="{NV_BASE_SITEURL}{NV_ASSETS_DIR}/js/language/jquery.ui.datepicker-{NV_LANG_INTERFACE}.js"></script>
+<script type="text/javascript" src="{NV_BASE_SITEURL}{NV_ASSETS_DIR}/js/select2/select2.min.js"></script>
+<script type="text/javascript" src="{NV_BASE_SITEURL}{NV_ASSETS_DIR}/js/select2/i18n/{NV_LANG_INTERFACE}.js"></script>
 <script type="text/javascript">
 $(document).ready(function() {
     $('#lclearform{BLOCKID}').click(function() {
@@ -141,7 +143,9 @@ $(document).ready(function() {
         e.preventDefault();
         var a = $(this);
         if( a.hasClass('advance')){
-            $('#advance').slideDown();
+            $('#advance').slideDown(function() {
+                select2search();
+            });
             a.html('<em class="fa fa-search">&nbsp;</em>{LANG.search_simple}');
             a.removeClass('advance');
             $('input[name="is_advance"]').val(1);
@@ -152,7 +156,14 @@ $(document).ready(function() {
             $('input[name="is_advance"]').val(0);
         }
     });
+    select2search();
 });
+function select2search() {
+    var form = $('#ltablesearch{BLOCKID}');
+    if ($('#advance', form).is(':visible')) {
+        $('[name="area"],[name="cat"],[name="approval"],[name="status"],[name="signer"],[name="subject"],[name="examine"]', form).select2();
+    }
+}
 function nv_check_search_laws(data) {
     if (($('#ls_key').val() == '' ) && ($('#ls_cat').val() == 0 ) && ($('#ls_area').val() == 0 ) && ($('#ls_subject').val() == 0 ) && ($('#ls_signer').val() == 0 ) && ($('#ls_status').val() == 0 ) && ($('#ls_from').val() == '' ) && ($('#ls_to').val() == '' )) {
         alert('{LANG.search_alert}');

diff --git a/themes/default/modules/laws/block_search_vertical.tpl b/themes/default/modules/laws/block_search_vertical.tpl
@@ -1,6 +1,6 @@
 <!-- BEGIN: main -->
 <link rel="stylesheet" type="text/css" href="{NV_BASE_SITEURL}{NV_ASSETS_DIR}/js/jquery-ui/jquery-ui.min.css">
-
+<link rel="stylesheet" href="{NV_BASE_SITEURL}{NV_ASSETS_DIR}/js/select2/select2.min.css">
 <form id="ltablesearch{BLOCKID}" action="{FORM_ACTION}" method="get" onsubmit="return nv_check_search_laws(this);">
     <!-- BEGIN: no_rewrite -->
     <input type="hidden" name="{NV_LANG_VARIABLE}" value="{NV_LANG_DATA}"/>
@@ -113,6 +113,8 @@
 </form>
 <script type="text/javascript" src="{NV_BASE_SITEURL}{NV_ASSETS_DIR}/js/jquery-ui/jquery-ui.min.js"></script>
 <script type="text/javascript" src="{NV_BASE_SITEURL}{NV_ASSETS_DIR}/js/language/jquery.ui.datepicker-{NV_LANG_INTERFACE}.js"></script>
+<script type="text/javascript" src="{NV_BASE_SITEURL}{NV_ASSETS_DIR}/js/select2/select2.min.js"></script>
+<script type="text/javascript" src="{NV_BASE_SITEURL}{NV_ASSETS_DIR}/js/select2/i18n/{NV_LANG_INTERFACE}.js"></script>
 <script type="text/javascript">
 $(document).ready(function() {
     $('#lclearform{BLOCKID}').click(function() {
@@ -133,7 +135,9 @@ $(document).ready(function() {
         e.preventDefault();
         var a = $(this);
         if( a.hasClass('advance')){
-            $('#advance').slideDown();
+            $('#advance').slideDown(function() {
+            	select2search();
+            });
             a.html('<em class="fa fa-search">&nbsp;</em>{LANG.search_simple}');
             a.removeClass('advance');
             $('input[name="is_advance"]').val(1);
@@ -144,7 +148,14 @@ $(document).ready(function() {
             $('input[name="is_advance"]').val(0);
         }
     });
+    select2search();
 });
+function select2search() {
+	var form = $('#ltablesearch{BLOCKID}');
+	if ($('#advance', form).is(':visible')) {
+	    $('[name="area"],[name="cat"],[name="approval"],[name="status"],[name="signer"],[name="subject"],[name="examine"]', form).select2();
+	}
+}
 function nv_check_search_laws(data) {
     if (($('#ls_key').val() == '' ) && ($('#ls_cat').val() == 0 ) && ($('#ls_area').val() == 0 ) && ($('#ls_subject').val() == 0 ) && ($('#ls_signer').val() == 0 ) && ($('#ls_status').val() == 0 ) && ($('#ls_from').val() == '' ) && ($('#ls_to').val() == '' )) {
         alert('{LANG.search_alert}');

diff --git 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
@@ -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;