add paginator and edit click on ID

2024-02-05 21:39:09 +03:00
parent ceaca3ca54
commit a56bcd7864
5 changed files with 128 additions and 41 deletions
--- a/app/xml/lentaredaktor.xml
+++ b/app/xml/lentaredaktor.xml
@@ -6,7 +6,7 @@
 	<order_type>DESC</order_type>
 	<increment>news_id</increment>
 	<title>АН-Online</title>
-	<where>news.news_id > 607000</where>
+	<where>news.news_id > 707000</where>
 	<cache>cache/index.html</cache>
 	<search>title,text,anons</search>
 	<deleted>0</deleted>
@@ -329,6 +329,7 @@
 	<type>file</type>
    <dateversion>True</dateversion>
 	<folder>pub/images/arhnews</folder>
+	<preview>https://img.argumenti.ru/news/topday</preview>
 </item>
 <item>
 	<column>alt</column>
--- a/vendor/akdelf/akdmin/lib/akdmin.php
+++ b/vendor/akdelf/akdmin/lib/akdmin.php
@@ -129,7 +129,11 @@ function unlock_id($table, $id, $user){



-function fileimg($img, $id, $folder){
+function fileimg($img, $id, $folder = ''){
+
+	if ($img == ''){
+		return '';
+	}

    if (in_array($img, array('jpg', 'jpeg', 'gif', 'png', 'JPG'))) {
        $fileimg = $folder . '/' . $id . '.' . $img;
@@ -1001,6 +1005,7 @@ $order = (isset($_GET['order'])) ? strip_tags(trim($_GET['order'])) : '';
 				$component[$maxi]['column'] = (string)$item[$it]->column;
 				if (isset($item[$it]->link)) $component[$maxi]['link'] = (string)$item[$it]->link;
 				if (isset($item[$it]->folder)) $component[$maxi]['folder'] = (string)$item[$it]->folder;
+				if (isset($item[$it]->preview)) $component[$maxi]['preview'] = (string)$item[$it]->preview;
 				if (isset($item[$it]->folder)) $component[$maxi]['width'] = (string)$item[$it]->width;
 				if (isset($item[$it]->fieldate))
 					$component[$maxi]['fieldate'] = (string)$item[$it]->fieldate;
@@ -1215,11 +1220,9 @@ $order = (isset($_GET['order'])) ? strip_tags(trim($_GET['order'])) : '';
 							break;

 						case 'increment':
-							if ($inc_show) {
-								echo('<TD>');
-								echo (AnonsText($selectrow[$a], 30, 0));
-								echo('</td>');
-							}
+							if ($inc_show):?>
+								<td class="id-click"><div onClick="StartLink('<?=$admin?>', 'edit', 'forms', 'increment', '<?=$increment_value?>');"><?=AnonsText($selectrow[$a], 30, 0)?></div></td>
+							<?endif;
 						break;
 				        case 'spin':
 							echo('<TD>');
@@ -1231,7 +1234,18 @@ $order = (isset($_GET['order'])) ? strip_tags(trim($_GET['order'])) : '';

 						    echo '<TD>';

-						    $wwwname = SITE.fileimg($selectrow[$a], $increment_value, $component[$a]['folder']);
+							
+							$fileimg = fileimg($selectrow[$a], $increment_value);
+
+							if ($fileimg !== ''){
+
+								if (isset($component[$a]['preview'])){
+									$wwwname  = (string)$component[$a]['preview'].$fileimg;
+								} else {
+									$wwwname  = SITE.$component[$a]['folder'].$fileimg;
+								}
+
+						    	//$wwwname = SITE.$fileimg;

                            	$fwidth = 100;
                            	if ($component[$a]['width'])
@@ -1239,7 +1253,8 @@ $order = (isset($_GET['order'])) ? strip_tags(trim($_GET['order'])) : '';
                            	else
                                	$fwidth = 100;
                            	$nocacheprefix = date('Y_m_d_h_i_s');
-                            echo'<a href="'.$wwwname.'" target="_blank"><img src ="'.$wwwname.'" width="'.$fwidth.'"></a>';
+                            	echo'<a href="'.$wwwname.'" target="_blank"><img src ="'.$wwwname.'" width="'.$fwidth.'" loading="lazy"></a>';
+							}	

 							echo '</TD>';

@@ -1316,15 +1331,27 @@ $order = (isset($_GET['order'])) ? strip_tags(trim($_GET['order'])) : '';
 				echo('</TBODY></TABLE></div>');
 				if ($action != 'select' && $action != 'selecttable') {
 					if ($total_rows > $per_page) { //рисуем странички
-						echo('</div><br /><div id = "page"><b>Странички: </b>
-						<SELECT NAME = "pages" id="pages" onChange="'.js_func('select_page_link', array('select_id'=>'pages', 'admin'=>$admin)).'">');
+						echo('</div><br /><div id = "page"><b>Странички: </b>');?>
+
+						<?if ($page > 1):?>
+							<span class="pagenav page1" onClick="StartLink( '<?=$admin?>', 'selectpage', 'main',  'page', 1);"><<</span>
+							<span style="margin-left: 4px; margin-right: 4px;" class="pagenav page-prev" onClick="StartLink( '<?=$admin?>', 'selectpage', 'main',  'page', <?=$page-1?>);"><</span>
+						<?endif?>
+
+						<?echo('<SELECT NAME = "pages" id="pages" onChange="'.js_func('select_page_link', array('select_id'=>'pages', 'admin'=>$admin)).'">');

 						for($i = 1; $i <= $num_pages; $i++) {
 							$selected = ($i == $page) ? 'selected' : '';
 							echo('<option value = "'.$i.'" '.$selected.' accesskey="'.$i.'"> '.$i.'</option>');
 						}
-						echo('</SELECT> из <b>'.$num_pages.'</b>');
-						$olimits  = array('5', '10', '15', '20', '25', '30');
+						echo('</SELECT> из <b>'.$num_pages.'</b>');?>
+
+						<?if ($num_pages > $page):?>
+							<span class="pagenav page-next" onClick="StartLink( '<?=$admin?>', 'selectpage', 'main',  'page', <?=$page+1?>);">></span>
+							<span class="pagenav pageend" onClick="StartLink( '<?=$admin?>', 'selectpage', 'main',  'page', <?=$num_pages?>);">>></span>
+						<?endif?>
+
+						<?$olimits  = array('5', '10', '15', '20', '25', '30');
 						/*echo('&nbsp;&nbsp;&nbsp;&nbsp;<b>Элементы:</b>&nbsp;<select id = "limit">');
 						for ($it = 0; $it < sizeof($olimits) ;$it++) {
 							$selected = ($olimits[$it] == $per_page) ? 'selected' : '';
--- a/vendor/akdelf/akdmin/themes/office/pub/js/ajax.js
+++ b/vendor/akdelf/akdmin/themes/office/pub/js/ajax.js
@@ -16,16 +16,50 @@ function createHttpRequest() {
 return httpRequest;
 }

+function sendRequest_new(file, _resultId, request)
+{
+  
+	targetDiv = document.getElementById(resultId);
+	url = file;
+	 
+	resultId = _resultId;
+	targetDiv.innerHTML = 'Идет загрузка данных...';
+
+
+fetch(url)
+  .then(response => {
+    if (!response.ok) {
+      throw new Error('Network response was not ok');
+    }
+    return response.text();
+  })
+  .then(htmlContent => {
+    // Вставьте полученный HTML в целевой div
+    targetDiv.innerHTML = htmlContent;
+  })
+  .catch(error => {
+    console.error('Error during fetch operation:', error);
+  });
+
+  targetDiv.focus();
+
+
+	/** httpRequest.open('GET', file);
+	httpRequest.onreadystatechange = request;
+	httpRequest.send(null);**/
+	
+	  
+}
+

 function sendRequest(file, _resultId, request)
 {
  
-  	 
 	resultId = _resultId;
-	document.getElementById(resultId).innerHTML = 'Идет загрузка данных&hellip';
-	httpRequest.open('GET', file);
+	document.getElementById(resultId).innerHTML = 'Идет загрузка данных...';
+	httpRequest.open('GET', file, true);
 	httpRequest.onreadystatechange = request;
-	httpRequest.send(null);
+	httpRequest.send();

 	
 	  
@@ -34,26 +68,26 @@ function sendRequest(file, _resultId, request)

 function getRequestEditor() {
  
-  if (httpRequest.readyState == 4) {
+  if (httpRequest.readyState == 4 && httpRequest.status === 200) {
     document.getElementById(resultId).innerHTML = httpRequest.responseText;
 	 document.getElementById(resultId).focus();
 	 tinysetup();
-	 return True;
+	 return true;
   }
 else
-	return False;
+	return false;
 }


 function getRequest() {
  
-  if (httpRequest.readyState == 4) {
+  if (httpRequest.readyState == 4 && httpRequest.status === 200) {
    document.getElementById(resultId).innerHTML = httpRequest.responseText;
 	scroll(0, 0);
-	return True;
+	return true;
   }
 else
-	return False;
+	return false;
 }

 function getRequestActive() {
@@ -62,10 +96,10 @@ if (httpRequest.readyState == 4) {
 		if (httpRequest.responseText != 1)
 			document.getElementById(resultId).checked = !document.getElementById(resultId).checked;
 		document.getElementById(resultId).focus();
-		return True;
+		return true;
 	}
 	else
-		return False;
+		return false;
 		
 }

--- a/vendor/akdelf/akdmin/themes/office/pub/style/admin.css
+++ b/vendor/akdelf/akdmin/themes/office/pub/style/admin.css
@@ -242,6 +242,28 @@ span#closed a em{
 	padding-left: 12px;
 }	

+#pages{
+	margin-bottom: 22px;
+}
+
+.pagenav{
+	cursor: pointer;
+	padding: 4px;
+}
+
+.id-click{
+	cursor: pointer;
+}
+
+.pagenav:hover{
+	color: #909090;
+}
+
+.page-next{
+	margin-left: 4px;
+	margin-right: 4px;
+}
+	
 .sortup {
 	
 }
--- a/vendor/akdelf/akdmin/themes/office/views/layout/main.phtml
+++ b/vendor/akdelf/akdmin/themes/office/views/layout/main.phtml
@@ -1,14 +1,17 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
+<!DOCTYPE html>
+<html lang="ru-RU">
+<head>
+    <meta charset="utf-8"/>
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
+    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=0">
 <head>
 <title><?=maintitle?></title>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF8"> 
 <meta name="description" content='Интернет-версия общенационального еженедельник "Аргументы недели" ("Аргументы и время"). Все материалы бумажного издания. Самые важные события недели. Расследования, социальные проблемы, политика, экономика, культура, спорт, здоровье. Вопросы и ответы, комментарии и консультации. Еженедельный гороскоп.'> 
 <meta name="keywords" content="Газета, Общенациональная, События, Гороскоп, Общество, политика, экономика, культура, здоровье, спорт, звезды. Журналистские расследования. Интервью. Архив."> 
-<link rel="Stylesheet" type="text/css" href="<?=PUB?>style/admin.css" TYPE="text/css" />
+<link rel="Stylesheet" type="text/css" href="<?=PUB?>style/admin.css?ver=11" TYPE="text/css" />
 <link rel="stylesheet" type="text/css" href="<?=PUB?>THEMES/OFFICE_XP/office_xp.css" />
-<script language="javascript" type="text/javascript" src="<?=PUB?>js/menu/jsdomenu.js"></script>
+<script language="javascript" type="text/javascript" src="<?=PUB?>js/menu/jsdomenu.js?ver=3"></script>
 <script language="javascript" type="text/javascript" src="<?=PUB?>js/menu/jsdomenubar.js"></script>
 <script type="text/javascript">
 	function ismaxlength(obj){
@@ -26,9 +29,9 @@

 	

-<script src="http://ajax.googleapis.com/ajax/libs/jquery/2.0.3/jquery.min.js"></script>	
-<script language="javascript" type="text/javascript" src="<?=PUB?>js/ajax.js"></script> 
-<script language="javascript" type="text/javascript" src="<?=PUB?>js/greatelink.js?ver=13"></script>
+<script src="https://ajax.googleapis.com/ajax/libs/jquery/2.0.3/jquery.min.js"></script>	
+<script language="javascript" type="text/javascript" src="<?=PUB?>js/ajax.js?ver=13"></script> 
+<script language="javascript" type="text/javascript" src="<?=PUB?>js/greatelink.js?ver=20"></script>
 <script language="javascript" type="text/javascript" src="<?=PUB?>js/undelete.js"></script>
 <script language="javascript" type="text/javascript" src="<?=PUB?>js/rmarket.js"></script>
 <script language="javascript" type="text/javascript" src="<?=PUB?>js/tinymce/jscripts/tiny_mce/tiny_mce.js"></script>
@@ -113,7 +116,7 @@

 

-<p id="nameuser"><?=$nameuser?> <a href="http://adanar.argumenti.ru/cgi/cleancache.cgi?bal2%20www" target="_blank">Очистить кеш</a> / <a href="reauth.php">Выход</a></p>
+<p id="nameuser"><?=$nameuser?> <a href="https://adanar.argumenti.ru/cgi/cleancache.cgi?bal2%20www" target="_blank">Очистить кеш</a> / <a href="reauth.php">Выход</a></p>
 <div id="staticMenuBar"></div>

 <div id = "content">