Эх сурвалжийг харах

(Modified) Usability Enhancement: Click on list rows to Edit items. Now uses jQuery (instead of onclick) to avoid being redirected to Edit when canceling a Delete.

Nate Jones 11 жил өмнө
parent
commit
5e56b10d3f

+ 1 - 1
core/apps/apps.php

@@ -100,7 +100,7 @@ require_once "resources/paging.php";
 	foreach($apps as $row) {
 		if ($row['uuid'] != "d8704214-75a0-e52f-1336-f0780e29fef8") {
 			/*
-			$tr_link = (permission_exists('app_edit')) ? " onclick=\"document.location.href='apps_edit.php?id=".$row['uuid']."';\"" : null;
+			$tr_link = (permission_exists('app_edit')) ? "href='apps_edit.php?id=".$row['uuid']."'" : null;
 			*/
 			echo "<tr ".$tr_link.">\n";
 			echo "	<td valign='top' class='".$row_style[$c]."' nowrap='nowrap'>";

+ 1 - 1
core/databases/databases.php

@@ -124,7 +124,7 @@ require_once "resources/paging.php";
 
 	if ($result_count > 0) {
 		foreach($result as $row) {
-			$tr_link = " onclick=\"document.location.href='database_edit.php?id=".$row['database_uuid']."';\"";
+			$tr_link = "href='database_edit.php?id=".$row['database_uuid']."'";
 			echo "<tr ".$tr_link.">\n";
 			echo "	<td valign='top' class='".$row_style[$c]."'>".$row['database_driver']."&nbsp;</td>\n";
 			echo "	<td valign='top' class='".$row_style[$c]."'>".$row['database_type']."&nbsp;</td>\n";

+ 1 - 1
core/default_settings/default_settings.php

@@ -148,7 +148,7 @@ require_once "resources/paging.php";
 				echo "</td>\n";
 				echo "</tr>\n";
 			}
-			$tr_link = (permission_exists('default_setting_edit')) ? " onclick=\"document.location.href='default_setting_edit.php?id=".$row['default_setting_uuid']."';\"" : null;
+			$tr_link = (permission_exists('default_setting_edit')) ? "href='default_setting_edit.php?id=".$row['default_setting_uuid']."'" : null;
 			echo "<tr ".$tr_link.">\n";
 			echo "	<td valign='top' class='".$row_style[$c]."'>";
 			if (permission_exists('default_setting_edit')) {

+ 1 - 1
core/domain_settings/domain_settings.php

@@ -132,7 +132,7 @@ require_once "resources/paging.php";
 				echo "</td>\n";
 				echo "</tr>\n";
 			}
-			$tr_link = (permission_exists('domain_setting_edit')) ? " onclick=\"document.location.href='domain_setting_edit.php?domain_uuid=".$row['domain_uuid']."&id=".$row['domain_setting_uuid']."';\"" : null;
+			$tr_link = (permission_exists('domain_setting_edit')) ? " href='domain_setting_edit.php?domain_uuid=".$row['domain_uuid']."&id=".$row['domain_setting_uuid']."'" : null;
 			echo "<tr ".$tr_link.">\n";
 			echo "	<td valign='top' class='".$row_style[$c]."'>";
 			if (permission_exists('domain_setting_edit')) {

+ 1 - 1
core/domain_settings/domains.php

@@ -177,7 +177,7 @@ else {
 
 	if ($result_count > 0) {
 		foreach($result as $row) {
-			$tr_link = (permission_exists('domain_edit')) ? " onclick=\"document.location.href='domain_edit.php?id=".$row['domain_uuid']."';\"" : null;
+			$tr_link = (permission_exists('domain_edit')) ? "href='domain_edit.php?id=".$row['domain_uuid']."'" : null;
 			echo "<tr ".$tr_link.">\n";
 			echo "	<td valign='top' class='".$row_style[$c]."'>";
 			if (permission_exists('domain_edit')) {

+ 1 - 1
core/menu/menu.php

@@ -117,7 +117,7 @@ require_once "resources/paging.php";
 
 	if ($result_count > 0) {
 		foreach($result as $row) {
-			$tr_link = " onclick=\"document.location.href='menu_edit.php?id=".$row['menu_uuid']."';\"";
+			$tr_link = "href='menu_edit.php?id=".$row['menu_uuid']."'";
 			echo "<tr ".$tr_link.">\n";
 			echo "	<td valign='top' class='".$row_style[$c]."'><a href='menu_edit.php?id=".$row['menu_uuid']."'>".$row['menu_name']."</a></td>\n";
 			echo "	<td valign='top' class='".$row_style[$c]."'>".$row['menu_language']."</td>\n";

+ 2 - 2
core/menu/menu_item_list.php

@@ -101,7 +101,7 @@ function build_db_child_menu_list ($db, $menu_item_level, $menu_item_uuid, $c) {
 					}
 
 				//display the content of the list
-					$tr_link = (permission_exists('menu_edit')) ? " onclick=\"document.location.href='menu_item_edit.php?id=".$menu_uuid."&menu_item_uuid=".$row2['menu_item_uuid']."&menu_item_parent_uuid=".$row2['menu_item_parent_uuid']."';\"" : null;
+					$tr_link = (permission_exists('menu_edit')) ? "href='menu_item_edit.php?id=".$menu_uuid."&menu_item_uuid=".$row2['menu_item_uuid']."&menu_item_parent_uuid=".$row2['menu_item_parent_uuid']."'" : null;
 					echo "<tr ".$tr_link.">\n";
 					echo "<td valign='top' class='".$row_style[$c]."'>";
 					echo "  <table cellpadding='0' cellspacing='0' border='0'>";
@@ -269,7 +269,7 @@ $order = $_GET["order"];
 				}
 
 			//display the content of the list
-				$tr_link = (permission_exists('menu_edit')) ? " onclick=\"document.location.href='menu_item_edit.php?id=".$menu_uuid."&menu_item_uuid=".$row['menu_item_uuid']."&menu_uuid=".$menu_uuid."';\"" : null;
+				$tr_link = (permission_exists('menu_edit')) ? "href='menu_item_edit.php?id=".$menu_uuid."&menu_item_uuid=".$row['menu_item_uuid']."&menu_uuid=".$menu_uuid."'" : null;
 				echo "<tr style='".$row_style[$c]."' ".$tr_link.">\n";
 				echo "<td valign='top' class='".$row_style[$c]."'>".$menu_item_title."&nbsp;</td>";
 				echo "<td valign='top' class='".$row_style[$c]."'>".$group_list."&nbsp;</td>";

+ 1 - 1
core/users/groups.php

@@ -114,7 +114,7 @@ else {
 		}
 		else {
 			/*
-			$tr_link = (permission_exists('group_edit')) ? " onclick=\"document.location.href='groupedit.php?id=".$group_uuid."';\"" : null;
+			$tr_link = (permission_exists('group_edit')) ? "href='groupedit.php?id=".$group_uuid."'" : null;
 			*/
 			$strlist .= "<tr ".$tr_link.">\n";
 			$strlist .= "<td class='".$row_style[$c]."' nowrap>";

+ 1 - 1
core/users/users.php

@@ -149,7 +149,7 @@ echo "	<td align=\"center\">\n";
 			if (if_superadmin($superadmins, $row['user_uuid']) && !if_group("superadmin")) {
 				//hide
 			} else {
-				$tr_link = (permission_exists('user_edit')) ? " onclick=\"document.location.href='usersupdate.php?id=".$row['user_uuid']."';\"" : null;
+				$tr_link = (permission_exists('user_edit')) ? "href='usersupdate.php?id=".$row['user_uuid']."'" : null;
 				echo "<tr ".$tr_link.">\n";
 				echo "	<td valign='top' class='".$row_style[$c]."'>";
 				if (permission_exists('user_edit')) {

+ 10 - 1
themes/enhanced/template.php

@@ -774,7 +774,6 @@ legend {
 <script language="javascript" type="text/javascript" src="<?php echo PROJECT_PATH; ?>/resources/jquery/jquery-1.8.3.js"></script>
 <script language="javascript" type="text/javascript" src="<?php echo PROJECT_PATH; ?>/resources/jquery/jquery.autosize.input.js"></script>
 
-
 <script language="JavaScript" type="text/javascript">
 	function display_message() {
 		$(document).ready(function() {
@@ -801,6 +800,16 @@ legend {
 
 		});
 
+		// linkify rows (except the last - the list_control_icons cell)
+		// on a table with a class of 'tr_hover', according to the href
+		// attribute of the <tr> tag
+		$('.tr_hover tr').each(function(i,e) {
+		  $(e).children('td:not(:last)').click(function() {
+			 var href = $(this).closest("tr").attr("href");
+			 if (href) { window.location = href; }
+		  });
+		});
+
 	});
 
 	function hide_domains() {