diff --git a/modules/laws/admin/main.php b/modules/laws/admin/main.php
index a32fef7a8..11ee403fb 100644
--- a/modules/laws/admin/main.php
+++ b/modules/laws/admin/main.php
@@ -255,6 +255,17 @@
                 $post['startvalid'] = 0;
             }
 
+			//Nếu là module văn bản bình thường(k cho góp ý) thì bắt lỗi ngày ban hành <= Ngày có hiệu lực <=ngày hết hiệu lực
+			if($module_config[$module_name]['activecomm']==0){
+				if($post['startvalid']>0){
+					if($post['startvalid'] < $post['publtime']){
+						die($lang_module['erroStartvalid']);
+					}elseif($post['exptime']>0 && ($post['exptime'] <= $post['publtime'] || $post['exptime'] <= $post['startvalid'])){
+						die($lang_module['erroExptime']);
+					}
+				}
+			}
+
 			$post['sgid'] = $nv_Request->get_title('sgid', 'post', '');
             if (!is_numeric($post['sgid']) and !empty($post['sgid'])) {
                 $result = $db->query("SELECT id FROM " . NV_PREFIXLANG . "_" . $module_data . "_signer WHERE title=" . $db->quote($post['title']) . " AND offices='' AND positions=''");
@@ -405,7 +416,8 @@
             $post['ptitle'] = $lang_module['editRow'];
             $post['action_url'] = NV_BASE_ADMINURL . "index.php?" . NV_LANG_VARIABLE . "=" . NV_LANG_DATA . "&" . NV_NAME_VARIABLE . "=" . $module_name . "&" . NV_OP_VARIABLE . "=main&edit&id=" . $post['id'];
         } else {
-            $post['relatement'] = $post['replacement'] = $post['title'] = $post['code'] = $post['introtext'] = $post['bodytext'] = $post['keywords'] = $post['author'] = $post['publtime'] = $post['exptime'] = "";
+        	$post['publtime'] = date("d.m.Y", NV_CURRENTTIME);
+            $post['relatement'] = $post['replacement'] = $post['title'] = $post['code'] = $post['introtext'] = $post['bodytext'] = $post['keywords'] = $post['author'] = $post['exptime'] = "";
             $post['groups_view'] = $post['groups_download'] = array(
                 6
             );
@@ -575,7 +587,7 @@
 
     if ($nv_Request->isset_request('list', 'get')) {
         $base_url = NV_BASE_ADMINURL . "index.php?" . NV_LANG_VARIABLE . "=" . NV_LANG_DATA . "&" . NV_NAME_VARIABLE . "=" . $module_name . "&" . NV_OP_VARIABLE . "=" . $op . "&list";
-        $join = "";
+        $join = 'INNER JOIN ' . NV_USERS_GLOBALTABLE . ' u1 ON t1.admin_add=u1.userid';
         $where = array();
         if ($nv_Request->isset_request('cat', 'get')) {
             $keywords = $nv_Request->get_title('keywords', 'get', '');
@@ -626,10 +638,11 @@
         $per_page = 30;
 
         if ($all_page) {
-            $sql = "SELECT * FROM " . NV_PREFIXLANG . "_" . $module_data . "_row t1 " . $join . ($where ? " WHERE " . implode(" AND ", $where) : "") . " ORDER BY t1.addtime DESC LIMIT " . (($page - 1) * $per_page) . "," . $per_page;
+            $sql = "SELECT t1.*, u1.username FROM " . NV_PREFIXLANG . "_" . $module_data . "_row t1 " . $join . ($where ? " WHERE " . implode(" AND ", $where) : "") . " ORDER BY t1.addtime DESC LIMIT " . (($page - 1) * $per_page) . "," . $per_page;
             $result = $db->query($sql);
             $a = 0;
             while ($row = $result->fetch()) {
+            	$row['admin_add'] = $row['username'];
                 $row['publtime'] = date("d-m-Y", $row['publtime']);
                 $row['exptime'] = $row['exptime'] ? date("d-m-Y", $row['exptime']) : "N/A";
 				$row['start_comm_time'] = $row['start_comm_time'] ? date("d/m/Y", $row['start_comm_time']) : "";
diff --git a/modules/laws/blocks/global.block_new_law.php b/modules/laws/blocks/global.block_new_law.php
index 5f88be391..6340d4c3a 100644
--- a/modules/laws/blocks/global.block_new_law.php
+++ b/modules/laws/blocks/global.block_new_law.php
@@ -14,7 +14,7 @@
 
     /**
      * nv_block_config_new_laws()
-     * 
+     *
      * @param mixed $module
      * @param mixed $data_block
      * @param mixed $lang_block
@@ -61,7 +61,7 @@ function nv_block_config_new_laws($module, $data_block, $lang_block)
         $ck = $data_block['duplicated'] ? 'checked="checked"' : '';
         $html .= '<td><input type="checkbox" name="config_duplicated" value="1" ' . $ck . ' /></td>';
         $html .= '</tr>';
-        
+
         $html .= '<tr>';
         $html .= '<td>' . $lang_block['order'] . '</td>';
         $html .= '<td><select name="config_order" class="form-control">';
@@ -80,7 +80,7 @@ function nv_block_config_new_laws($module, $data_block, $lang_block)
 
     /**
      * nv_block_config_new_laws_submit()
-     * 
+     *
      * @param mixed $module
      * @param mixed $lang_block
      * @return
@@ -104,42 +104,42 @@ function nv_block_config_new_laws_submit($module, $lang_block)
 
     /**
      * nv_law_block_newg()
-     * 
+     *
      * @param mixed $block_config
      * @return
      */
     function nv_law_block_newg($block_config)
     {
         global $module_info, $lang_module, $global_config, $site_mods, $db, $my_head, $module_name, $nv_laws_listcat, $nv_Cache;
-        
+
         $module = $block_config['module'];
         $data = $site_mods[$module]['module_data'];
         $modfile = $site_mods[$module]['module_file'];
-        
+
         $numrow = (isset($block_config['numrow'])) ? $block_config['numrow'] : 10;
         $title_length = (isset($block_config['title_length'])) ? $block_config['title_length'] : 0;
         $show_code = (isset($block_config['show_code'])) ? $block_config['show_code'] : 1;
-        
+
         $order = ($block_config['order'] == 2 or $block_config['order'] == 4) ? "ASC" : "DESC";
         $order_param = ($block_config['order'] == 1 or $block_config['order'] == 2) ? "publtime" : "addtime";
-        
+
         $sql = 'SELECT * FROM ' . NV_PREFIXLANG . '_' . $data . '_row WHERE status=1 ORDER BY ' . $order_param . ' ' . $order . ' LIMIT 0,' . $numrow;
         $result = $db->query($sql);
         $numrow = $result->rowCount();
-        
+
         if (!empty($numrow)) {
             if (file_exists(NV_ROOTDIR . '/themes/' . $global_config['module_theme'] . '/modules/' . $modfile . '/block_new_law.tpl')) {
                 $block_theme = $global_config['module_theme'];
             } else {
                 $block_theme = 'default';
             }
-            
+
             if ($module_name != $module) {
                 $sql = "SELECT id, parentid, alias, title, introduction, keywords, newday FROM " . NV_PREFIXLANG . "_" . $data . "_cat ORDER BY parentid,weight ASC";
                 $nv_laws_listcat = $nv_Cache->db($sql, 'id', $module);
-                
+
                 $my_head .= "<link rel=\"stylesheet\" type=\"text/css\" href=\"" . NV_BASE_SITEURL . "themes/" . $block_theme . "/css/laws.css\" />";
-                
+
                 $temp_lang_module = $lang_module;
                 $lang_module = array();
                 include NV_ROOTDIR . '/modules/' . $site_mods[$module]['module_file'] . '/language/' . NV_LANG_INTERFACE . '.php';
@@ -148,38 +148,39 @@ function nv_law_block_newg($block_config)
             } else {
                 $lang_block_module = $lang_module;
             }
-            
+
             $xtpl = new XTemplate('block_new_law.tpl', NV_ROOTDIR . '/themes/' . $block_theme . '/modules/' . $modfile);
             $xtpl->assign('LANG', $lang_block_module);
             $xtpl->assign('TEMPLATE', $block_theme);
-            
+
             while ($row = $result->fetch()) {
                 $newday = $row['publtime'] + (86400 * $nv_laws_listcat[$row['cid']]['newday']);
-                
+
                 $link = NV_BASE_SITEURL . 'index.php?' . NV_LANG_VARIABLE . '=' . NV_LANG_DATA . '&amp;' . NV_NAME_VARIABLE . '=' . $module . '&amp;' . NV_OP_VARIABLE . '=' . $site_mods[$module]['alias']['detail'] . '/' . $row['alias'];
                 $row['link'] = $link;
-                
+
                 if ($title_length > 0) {
                     $row['stitle'] = nv_clean60($row['title'], $title_length);
                 } else {
                     $row['stitle'] = $row['title'];
                 }
-                
+
                 $row['publtime'] = nv_date('d/m/Y', $row['publtime']);
-                
+				$row['addtime'] = nv_date('d/m/Y', $row['addtime']);
+
                 $xtpl->assign('ROW', $row);
-                
+
                 if ($show_code) {
                     $xtpl->parse('main.loop.code');
                 }
-                
+
                 if ($newday >= NV_CURRENTTIME) {
                     $xtpl->parse('main.loop.newday');
                 }
-                
+
                 $xtpl->parse('main.loop');
             }
-            
+
             if ($block_config['direction'] != 'none') {
                 $block_config['pauseOnHover'] = $block_config['pauseOnHover'] ? 'true' : 'false';
                 $block_config['duplicated'] = $block_config['duplicated'] ? 'true' : 'false';
@@ -187,7 +188,7 @@ function nv_law_block_newg($block_config)
                 $xtpl->parse('main.marquee_data');
                 $xtpl->parse('main.marquee_js');
             }
-            
+
             $xtpl->parse('main');
             return $xtpl->text('main');
         }
diff --git a/modules/laws/funcs/detail.php b/modules/laws/funcs/detail.php
index efa183373..d7f685ddc 100644
--- a/modules/laws/funcs/detail.php
+++ b/modules/laws/funcs/detail.php
@@ -25,6 +25,9 @@
     nv_redirect_location(NV_BASE_SITEURL . 'index.php?' . NV_LANG_VARIABLE . '=' . NV_LANG_DATA . '&' . NV_NAME_VARIABLE . '=' . $module_name, true);
 }
 
+$row['edit_link'] = NV_BASE_ADMINURL . "index.php?" . NV_LANG_VARIABLE . "=" . NV_LANG_DATA . "&amp;" . NV_NAME_VARIABLE . "=" . $module_name . "&amp;" . NV_OP_VARIABLE . "=main&amp;edit=1&amp;id=" . $row['id'];
+$row['delete_link'] = 'nv_delete_law(' . $row['id'] . ', \'' . md5($row['id'] . session_id()) . '\')';
+
 $row['aid'] = array();
 $result = $db->query('SELECT area_id FROM ' . NV_PREFIXLANG . '_' . $module_data . '_row_area WHERE row_id=' . $row['id']);
 while (list ($area_id) = $result->fetch(3)) {
diff --git a/modules/laws/funcs/main.php b/modules/laws/funcs/main.php
index e5c554089..df05b4853 100644
--- a/modules/laws/funcs/main.php
+++ b/modules/laws/funcs/main.php
@@ -81,6 +81,8 @@
             $row['number_comm'] = sprintf($lang_module['number_comm'],$num_comm);
             $row['comm_time'] = $row['start_comm_time'] . '-' . $row['end_comm_time'];
             $row['stt'] = $stt++;
+			$row['edit_link'] = NV_BASE_ADMINURL . "index.php?" . NV_LANG_VARIABLE . "=" . NV_LANG_DATA . "&amp;" . NV_NAME_VARIABLE . "=" . $module_name . "&amp;" . NV_OP_VARIABLE . "=main&amp;edit=1&amp;id=" . $row['id'];
+			$row['delete_link'] = 'nv_delete_law(' . $row['id'] . ', \'' . md5($row['id'] . session_id()) . '\')';
 
             if ($nv_laws_setting['down_in_home']) {
                 // File download
@@ -135,7 +137,9 @@
 		            $row['end_comm_time'] = ($row['end_comm_time']>0) ? sprintf($lang_module['end_comm_time'], nv_date('d/m/Y', $row['end_comm_time'])) : '';
 		            $row['comm_time'] = $row['start_comm_time'] . '-' . $row['end_comm_time'];
 					$row['number_comm'] = sprintf($lang_module['number_comm'],$num_comm);
-                    if ($nv_laws_setting['down_in_home']) {
+					$row['edit_link'] = NV_BASE_ADMINURL . "index.php?" . NV_LANG_VARIABLE . "=" . NV_LANG_DATA . "&amp;" . NV_NAME_VARIABLE . "=" . $module_name . "&amp;" . NV_OP_VARIABLE . "=main&amp;edit=1&amp;id=" . $row['id'];
+					$row['delete_link'] = 'nv_delete_law(' . $row['id'] . ', \'' . md5($row['id'] . session_id()) . '\')';
+					if ($nv_laws_setting['down_in_home']) {
                         // File download
                         if (!empty($row['files'])) {
                             $row['files'] = explode(",", $row['files']);
@@ -164,6 +168,32 @@
     }
 }
 
+if ($nv_Request->isset_request('id', 'get, post') and $nv_Request->isset_request('checkss', 'get, post')) {
+    $contents = 'NO_' . $id;
+
+    $id = $nv_Request->get_int('id', 'get, post', 0);
+    $checkss = $nv_Request->get_string('checkss', 'get, post', '');
+    if ($id > 0 and md5($id . session_id()) == $checkss) {
+    	$data = $db->query('SELECT sid FROM ' . NV_PREFIXLANG . '_' . $module_data . '_row WHERE id=' . $id)->fetch();
+        if(!empty($data)){
+	        $query = "DELETE FROM " . NV_PREFIXLANG . "_" . $module_data . "_row WHERE id = " . $id;
+	            $db->query($query);
+
+	            $query = "DELETE FROM " . NV_PREFIXLANG . "_" . $module_data . "_set_replace WHERE oid = " . $id;
+	            $db->query($query);
+
+	            // Cap nhat lai so luong van ban o chu de
+	            $db->query('UPDATE ' . NV_PREFIXLANG . '_' . $module_data . '_subject SET numcount=(SELECT COUNT(*) FROM ' . NV_PREFIXLANG . '_' . $module_data . '_row WHERE sid=' . $data['sid'] . ') WHERE id=' . $data['sid']);
+
+
+	        $nv_Cache->delMod($module_name);
+	        $contents = 'OK_' . $id;
+		}
+    }
+
+    die($contents);
+}
+
 include NV_ROOTDIR . '/includes/header.php';
 echo nv_site_theme($contents);
 include NV_ROOTDIR . '/includes/footer.php';
\ No newline at end of file
diff --git a/modules/laws/language/admin_en.php b/modules/laws/language/admin_en.php
index 0b3861b87..d1580e561 100644
--- a/modules/laws/language/admin_en.php
+++ b/modules/laws/language/admin_en.php
@@ -130,3 +130,4 @@
 $lang_module['type_view_1'] = 'Oldest on top';
 $lang_module['wait'] = 'Please wait....';
 $lang_module['search_error'] = 'Choose at least one search terms';
+$lang_module['admin_add'] = "Admin add";
\ No newline at end of file
diff --git a/modules/laws/language/admin_vi.php b/modules/laws/language/admin_vi.php
index d50182923..4c08db4ee 100644
--- a/modules/laws/language/admin_vi.php
+++ b/modules/laws/language/admin_vi.php
@@ -185,5 +185,8 @@
 $lang_module['editExamine'] = 'Sửa Ủy ban thẩm tra';
 $lang_module['logDelExamine'] = "Xóa Ủy ban thẩm tra";
 $lang_module['ExamineSel'] = "Chọn Ủy ban thẩm tra";
-$lang_module['erroNotSelectExamine'] = 'Lỗi! Bạn chưa chọn Ủy ban thẩm tra';
-$lang_module['approval'] = "Trang thái";
\ No newline at end of file
+$lang_module['erroNotSelectExamine'] = 'Lỗi! Bạn chưa chọn Ủy ban thẩm tra.';
+$lang_module['approval'] = "Trang thái";
+$lang_module['erroStartvalid'] = 'Lỗi! Ngày bắt đầu hiệu lực không thể trước ngày ban hành.';
+$lang_module['erroExptime'] = 'Lỗi! Ngày hết hiệu lực phải sau ngày ban hành và ngày bắt đầu hiệu lực.';
+$lang_module['admin_add'] = "Người đăng";
diff --git a/modules/laws/language/en.php b/modules/laws/language/en.php
index a486f870c..1f095923c 100644
--- a/modules/laws/language/en.php
+++ b/modules/laws/language/en.php
@@ -72,4 +72,6 @@
 $lang_module['s_result'] = 'Search result';
 $lang_module['s_noresult'] = 'There are no results that match your requirements';
 $lang_module['s_result_num'] = '%d laws';
-$lang_module['click_to_download'] = "Click here to download";
\ No newline at end of file
+$lang_module['click_to_download'] = "Click here to download";
+$lang_module['edit'] = "Edit";
+$lang_module['delete'] = "Delete";
diff --git a/modules/laws/language/vi.php b/modules/laws/language/vi.php
index bbd1169c5..59e7eaa62 100644
--- a/modules/laws/language/vi.php
+++ b/modules/laws/language/vi.php
@@ -91,3 +91,6 @@
 $lang_module['e1'] = "Đã thông qua";
 $lang_module['approval'] = "Trạng thái";
 $lang_module['examine'] = "Ủy ban thẩm tra";
+$lang_module['edit'] = "Sửa";
+$lang_module['delete'] = "Xóa";
+$lang_module['addtime'] = "Thời gian đăng";
diff --git a/modules/laws/theme.php b/modules/laws/theme.php
index 44671e585..461c88781 100644
--- a/modules/laws/theme.php
+++ b/modules/laws/theme.php
@@ -43,6 +43,9 @@ function nv_theme_laws_main($array_data, $generate_page)
             }
             $xtpl->parse('main.loop.down_in_home');
         }
+		if (defined('NV_IS_MODADMIN')) {
+			$xtpl->parse('main.loop.admin_link');
+		}
 		if($module_config[$module_name]['activecomm']){
 			$xtpl->parse('main.loop.comm');
 			if($row['allow_comm']){
@@ -69,7 +72,10 @@ function nv_theme_laws_main($array_data, $generate_page)
         $xtpl->parse('main.down_in_home');
         $xtpl->parse('main.down_in_home_col');
     }
-
+	if (defined('NV_IS_MODADMIN')) {
+		$xtpl->parse('main.admin_link_col');
+		$xtpl->parse('main.admin_link_title');
+	}
     $xtpl->parse('main');
     return $xtpl->text('main');
 }
@@ -110,6 +116,10 @@ function nv_theme_laws_maincat($mod, $array_data)
                     }
                     $xtpl->parse('main.loop.row.down_in_home');
                 }
+
+				if (defined('NV_IS_MODADMIN')) {
+					$xtpl->parse('main.loop.row.admin_link');
+				}
 				if($module_config[$module_name]['activecomm']){
 					$xtpl->parse('main.loop.row.comm');
 					if($rows['allow_comm']){
@@ -146,6 +156,10 @@ function nv_theme_laws_maincat($mod, $array_data)
     if ($nv_laws_setting['down_in_home']) {
         $xtpl->parse('main.down_in_home');
     }
+	if (defined('NV_IS_MODADMIN')) {
+		$xtpl->parse('main.admin_link_col');
+		$xtpl->parse('main.admin_link_title');
+	}
 
     $xtpl->parse('main');
     return $xtpl->text('main');
@@ -315,6 +329,11 @@ function nv_theme_laws_detail($array_data, $other_cat = array(), $other_area = a
         $xtpl->parse('main.nodownload');
     }
 
+	if (defined('NV_IS_MODADMIN')) {
+		$xtpl->parse('main.admin_link');
+		$xtpl->parse('main.admin_link_title');
+	}
+
     if (!empty($other_cat)) {
         $xtpl->assign('OTHER_CAT', nv_theme_laws_list_other($other_cat));
         $xtpl->parse('main.other_cat');
@@ -586,7 +605,7 @@ function nv_theme_laws_list_other($array_data)
         $xtpl->parse('main.loop');
         $i++;
     }
-	if(isset($site_mods['comment']) and isset($module_config[$module_name]['activecomm'])){
+	if(isset($site_mods['comment']) && $module_config[$module_name]['activecomm']==1){
 		$xtpl->parse('main.comm_time');
 	}else{
 		$xtpl->parse('main.publtime_title');
diff --git a/themes/admin_default/modules/laws/main.tpl b/themes/admin_default/modules/laws/main.tpl
index 5cf37636f..768a27a42 100644
--- a/themes/admin_default/modules/laws/main.tpl
+++ b/themes/admin_default/modules/laws/main.tpl
@@ -11,7 +11,8 @@
         <colgroup>
             <col />
             <col class="w100" />
-            <col span="4" class="w150" />
+            <col span="5" class="w150" />
+
         </colgroup>
         <thead>
             <tr>
@@ -25,6 +26,7 @@
                 <th>{LANG.start_comm_time}</th>
                 <th>{LANG.end_comm_time}</th>
                 <!-- END: view_comm_time_title -->
+                <th class="text-center">{LANG.admin_add}</th>
                 <th class="text-center">{LANG.status}</th>
                 <th class="text-center">{LANG.feature}</th>
             </tr>
@@ -42,6 +44,7 @@
                 <td>{DATA.start_comm_time}</td>
                 <td>{DATA.end_comm_time}</td>
                 <!-- END: view_comm_time -->
+                <td>{DATA.admin_add}</td>
                 <td class="text-center">
                 <select class="form-control" id="status_{DATA.id}" name="status[]" onchange="nv_change_status({DATA.id});">
                     <option value="0">{LANG.status0}</option>
@@ -252,7 +255,7 @@
                                 </select>
                                 <div id="exptimearea" style="display:{DATA.display}">
                                     <input class="form-control" name="exptime" id="exptime" value="{DATA.exptime}" style="width: 110px;" maxlength="10" type="text" />
-                                    <img src="{NV_BASE_SITEURL}{NV_ASSETS_DIR}/images/calendar.jpg" style="cursor: pointer; vertical-align: middle;" onclick="popCalendar.show(this, 'exptime', 'dd.mm.yyyy', true);" alt="" height="17" /> ({LANG.prm})
+                                    ({LANG.prm})
                                 </div>
                                 <script type="text/javascript">
                                     $(document).ready(function() {
@@ -396,7 +399,7 @@
 </div>
 <script type="text/javascript">
     //<![CDATA[
-    $("#publtime,#startvalid,#end_comm_time,#start_comm_time").datepicker({
+    $("#publtime,#startvalid,#end_comm_time,#start_comm_time,#exptime").datepicker({
         showOn : "both",
         yearRange: "2000:2025",
         dateFormat : "dd.mm.yy",
diff --git a/themes/default/js/laws.js b/themes/default/js/laws.js
index b93bd2384..3bc3d8cdf 100644
--- a/themes/default/js/laws.js
+++ b/themes/default/js/laws.js
@@ -15,3 +15,19 @@ $(function() {
         });
     });
 });
+function nv_delete_law(id, checkss) {
+	if (confirm(nv_is_del_confirm[0])) {
+		$.post(nv_base_siteurl + 'index.php?' + nv_lang_variable + '=' + nv_lang_data + '&' + nv_name_variable + '=' + nv_module_name + '&' + nv_fc_variable + '=main&nocache=' + new Date().getTime(), 'id=' + id + '&checkss=' + checkss, function(res) {
+			var r_split = res.split('_');
+			if (r_split[0] == 'OK') {
+
+				window.location.href = window.location.href;
+			} else if (r_split[0] == 'NO') {
+				alert(r_split[1]);
+			} else {
+				alert(nv_is_del_confirm[2]);
+			}
+		});
+	}
+	return false;
+}
\ No newline at end of file
diff --git a/themes/default/modules/laws/block_new_law.tpl b/themes/default/modules/laws/block_new_law.tpl
index b13fd4bbb..4341292db 100644
--- a/themes/default/modules/laws/block_new_law.tpl
+++ b/themes/default/modules/laws/block_new_law.tpl
@@ -9,6 +9,7 @@
 			<!-- END: newday -->
 		</h3>
 		<p class="law-title">{ROW.title}</p>
+		<p class="text-muted law-view">{LANG.addtime}: {ROW.addtime}</p>
 		<!-- BEGIN: code -->
 		<em class="text-muted law-view">{LANG.view_hits}: {ROW.view_hits} | {LANG.download_hits}:{ROW.download_hits}</em>
 		<!-- END: code -->
diff --git a/themes/default/modules/laws/detail.tpl b/themes/default/modules/laws/detail.tpl
index 6f42aa25b..5eee6d47c 100644
--- a/themes/default/modules/laws/detail.tpl
+++ b/themes/default/modules/laws/detail.tpl
@@ -161,6 +161,13 @@
 <p class="text-center m-bottom">{LANG.info_download_no}</p>
 <!-- END: nodownload -->
 
+<!-- BEGIN: admin_link -->
+<div class="text-right list-group clearfix">
+	<a class="btn btn-primary btn-xs btn_edit" href="{DATA.edit_link}"><em class="fa fa-edit margin-right"></em>{LANG.edit}</a>
+	<a class="btn btn-danger btn-xs" href="javascript:void(0);" onclick="{DATA.delete_link}"><em class="fa fa-trash-o margin-right"></em>{LANG.delete}</a>
+</div>
+<!-- END: admin_link -->
+
 <!-- BEGIN: comment -->
 <div class="news_column panel panel-default">
 	<div class="panel-body">
diff --git a/themes/default/modules/laws/main.tpl b/themes/default/modules/laws/main.tpl
index 7074f4b18..72c42ff4d 100644
--- a/themes/default/modules/laws/main.tpl
+++ b/themes/default/modules/laws/main.tpl
@@ -13,6 +13,7 @@
             <col />
             <!-- END: publtime_col -->
             <!-- BEGIN: down_in_home_col --><col width="130" /><!-- END: down_in_home_col -->
+            <!-- BEGIN: admin_link_col --><col width="80" /><!-- END: admin_link_col -->
         </colgroup>
         <thead>
             <tr>
@@ -28,6 +29,7 @@
                 <!-- BEGIN: send_comm_title -->
                 <th>{LANG.comm_time}</th>
                 <!-- END: send_comm_title -->
+                <!-- BEGIN: admin_link_title --><th></th><!-- END: admin_link_title -->
             </tr>
         </thead>
         <tbody>
@@ -69,6 +71,12 @@
             			<a href="{ROW.url}#comment" title="{ROW.send_comm_title}"><div class="comm_close"></div></a>
                 	</td>
                 <!-- END: comm_close -->
+                <!-- BEGIN: admin_link -->
+                <td>
+                	<a class="btn btn-primary btn-xs btn_edit margin-bottom" href="{ROW.edit_link}"><em class="fa fa-edit margin-right"></em>{LANG.edit}</a>
+					<a class="btn btn-danger btn-xs" href="javascript:void(0);" onclick="{ROW.delete_link}"><em class="fa fa-trash-o margin-right"></em>{LANG.delete}</a>
+                </td>
+                <!-- END: admin_link -->
             </tr>
             <!-- END: loop -->
         </tbody>
diff --git a/themes/default/modules/laws/main_subject.tpl b/themes/default/modules/laws/main_subject.tpl
index 8b360d32e..22db30a54 100644
--- a/themes/default/modules/laws/main_subject.tpl
+++ b/themes/default/modules/laws/main_subject.tpl
@@ -6,6 +6,7 @@
 			<col />
 			<col width="130" />
 			<col width="100" />
+			<!-- BEGIN: admin_link_col --><col width="80" /><!-- END: admin_link_col -->
 		</colgroup>
 		<thead>
 			<tr>
@@ -20,6 +21,7 @@
 				<!-- BEGIN: send_comm_title -->
                 <th>{LANG.comm_time}</th>
                 <!-- END: send_comm_title -->
+                <!-- BEGIN: admin_link_title --><th></th><!-- END: admin_link_title -->
 			</tr>
 		</thead>
 		<tbody>
@@ -64,6 +66,12 @@
             			<a href="{ROW.url}#comment" title="{ROW.send_comm_title}"><div class="comm_close"></div></a>
                 	</td>
                 <!-- END: comm_close -->
+                <!-- BEGIN: admin_link -->
+                <td>
+                	<a class="btn btn-primary btn-xs btn_edit margin-bottom" href="{ROW.edit_link}"><em class="fa fa-edit margin-right"></em>{LANG.edit}</a>
+					<a class="btn btn-danger btn-xs" href="javascript:void(0);" onclick="{ROW.delete_link}"><em class="fa fa-trash-o margin-right"></em>{LANG.delete}</a>
+                </td>
+                <!-- END: admin_link -->
 			</tr>
 			<!-- END: row -->
 			<!-- END: loop -->