From b75fa8db1966aaf98263eaae79031f2e2abffacb Mon Sep 17 00:00:00 2001 From: Nate Jones Date: Wed, 26 Feb 2014 06:30:14 +0000 Subject: [PATCH] Unstack list control icons. Languages fix. --- core/users/app_languages.php | 10 +++---- core/users/group_permissions.php | 48 ++++++++++++++++---------------- core/users/groupmembers.php | 4 +-- core/users/groups.php | 13 +++++---- 4 files changed, 38 insertions(+), 37 deletions(-) diff --git a/core/users/app_languages.php b/core/users/app_languages.php index 44ea12f657..46066bbc53 100644 --- a/core/users/app_languages.php +++ b/core/users/app_languages.php @@ -64,13 +64,13 @@ $text['header-group_permissions']['en-us'] = "Group Permissions: "; $text['header-group_permissions']['es-cl'] = "Permisos de Grupo: "; - $text['header-group_permissions']['pt-pt'] = "Permissões do Grupo"; - $text['header-group_permissions']['fr-fr'] = "Permissions du Groupe"; + $text['header-group_permissions']['pt-pt'] = "Permissões do Grupo: "; + $text['header-group_permissions']['fr-fr'] = "Permissions du Groupe: "; - $text['header-group_members']['en-us'] = "Group Members"; + $text['header-group_members']['en-us'] = "Group Members: "; $text['header-group_members']['es-cl'] = "Miembros de Grupo: "; - $text['header-group_members']['pt-pt'] = "Membros do Grupo"; - $text['header-group_members']['fr-fr'] = "Membres du Groupe"; + $text['header-group_members']['pt-pt'] = "Membros do Grupo: "; + $text['header-group_members']['fr-fr'] = "Membres du Groupe: "; $text['description-user_manager']['en-us'] = "Add, edit, delete, and search users. "; $text['description-user_manager']['es-cl'] = "Agregar, Editar, Eliminar y Buscar Usuarios. "; diff --git a/core/users/group_permissions.php b/core/users/group_permissions.php index 8a45e53265..e336ac6dd7 100644 --- a/core/users/group_permissions.php +++ b/core/users/group_permissions.php @@ -105,7 +105,7 @@ require_once "resources/paging.php"; $permission_name = $row["permission_name"]; $permissions_db[$permission_name] = "true"; } - + //show the db checklist //echo "
";
 	//print_r($permissions_db);
@@ -121,8 +121,8 @@ require_once "resources/paging.php";
 				$permissions_db_checklist[$row['name']] = "false";
 			}
 		}
-	}	
-	
+	}
+
 //show the db checklist
 	//echo "
";
 	//print_r($permissions_db_checklist);
@@ -168,18 +168,18 @@ require_once "resources/paging.php";
 							$sql .= "and permission_name = '$permission' ";
 							$db->exec(check_sql($sql));
 							unset($sql);
-							
-						foreach($apps as $app) {							
+
+						foreach($apps as $app) {
 							foreach ($app['permissions'] as $row) {
 								if ($row['name'] == $permission) {
-																		
+
 									$sql = "delete from v_menu_item_groups ";
 									$sql .= "where menu_item_uuid = '".$row['menu']['uuid']."' ";
 									$sql .= "and group_name = '$group_name' ";
-									$sql .= "and menu_uuid = 'b4750c3f-2a86-b00d-b7d0-345c14eca286' ";									
+									$sql .= "and menu_uuid = 'b4750c3f-2a86-b00d-b7d0-345c14eca286' ";
 									$db->exec(check_sql($sql));
 									unset($sql);
-									
+
 									$sql = "";
 									$sql .= " select menu_item_parent_uuid from v_menu_items ";
 									$sql .= "where menu_item_uuid = '".$row['menu']['uuid']."' ";
@@ -191,7 +191,7 @@ require_once "resources/paging.php";
 										$menu_item_parent_uuid = $row["menu_item_parent_uuid"];
 									}
 									unset ($prep_statement);
-									
+
 									$sql = "";
 									$sql .= " select * from v_menu_items as i, v_menu_item_groups as g  ";
 									$sql .= "where i.menu_item_uuid = g.menu_item_uuid ";
@@ -206,16 +206,16 @@ require_once "resources/paging.php";
 										$sql = "delete from v_menu_item_groups ";
 										$sql .= "where menu_item_uuid = '$menu_item_parent_uuid' ";
 										$sql .= "and group_name = '$group_name' ";
-										$sql .= "and menu_uuid = 'b4750c3f-2a86-b00d-b7d0-345c14eca286' ";									
+										$sql .= "and menu_uuid = 'b4750c3f-2a86-b00d-b7d0-345c14eca286' ";
 										$db->exec(check_sql($sql));
 										unset($sql);
 									}
 									unset ($prep_statement);
-									
-									
-									
+
+
+
 								}
-							}							
+							}
 						}
 						//set the permission to false in the permissions_db_checklist
 							$permissions_db_checklist[$permission] = "false";
@@ -238,11 +238,11 @@ require_once "resources/paging.php";
 							$sql .= ")";
 							$db->exec(check_sql($sql));
 							unset($sql);
-							
-						foreach($apps as $app) {							
+
+						foreach($apps as $app) {
 							foreach ($app['permissions'] as $row) {
 								if ($row['name'] == $permission) {
-																		
+
 									$sql = "insert into v_menu_item_groups ";
 									$sql .= "(";
 									$sql .= "menu_uuid, ";
@@ -257,7 +257,7 @@ require_once "resources/paging.php";
 									$sql .= ")";
 									$db->exec(check_sql($sql));
 									unset($sql);
-									
+
 									$sql = "";
 									$sql .= " select menu_item_parent_uuid from v_menu_items ";
 									$sql .= "where menu_item_uuid = '".$row['menu']['uuid']."' ";
@@ -269,7 +269,7 @@ require_once "resources/paging.php";
 										$menu_item_parent_uuid = $row["menu_item_parent_uuid"];
 									}
 									unset ($prep_statement);
-									
+
 									$sql = "";
 									$sql .= " select * from v_menu_item_groups ";
 									$sql .= "where menu_item_uuid = '$menu_item_parent_uuid' ";
@@ -294,10 +294,10 @@ require_once "resources/paging.php";
 										$sql .= ")";
 										$db->exec(check_sql($sql));
 										unset($sql);
-									}									
+									}
 									unset ($prep_statement);
 								}
-							}							
+							}
 						}
 						//set the permission to true in the permissions_db_checklist
 							$permissions_db_checklist[$permission] = "true";
@@ -348,7 +348,7 @@ require_once "resources/paging.php";
 			echo "\n";
 			echo "	\n";
 			echo "".$app_name."
\n";
-			echo "	\n";			
+			echo "	\n";
 			echo "\n";
 			echo "\n";
 			echo "	\n";
@@ -356,7 +356,7 @@ require_once "resources/paging.php";
 			echo "	\n";
 			echo "\n";
 			echo "";
-			
+
 			echo "\n";
 			echo "\n";
 			echo "\n";
@@ -382,7 +382,7 @@ require_once "resources/paging.php";
 			}
 
 			echo "\n";
-			echo "	\n";
 			echo "\n";
diff --git a/core/users/groupmembers.php b/core/users/groupmembers.php
index 3a5cfdf0b5..4e98a814a8 100644
--- a/core/users/groupmembers.php
+++ b/core/users/groupmembers.php
@@ -110,9 +110,9 @@ else {
 		$strlist .= "";
 		$strlist .= "\n";
 		$strlist .= "\n";
-		$strlist .= "\n";
 		$strlist .= "\n";
diff --git a/core/users/groups.php b/core/users/groups.php
index 6bf1fd6582..8ff3155c39 100644
--- a/core/users/groups.php
+++ b/core/users/groups.php
@@ -89,9 +89,9 @@ else {
 	$strlist .= "	\n";
 	$strlist .= "	\n";
 
-	$strlist .= "	\n";
 	$strlist .= "\n";
@@ -133,8 +133,8 @@ else {
 			}
 			$strlist .= "\n";
 
-			$strlist .= "\n";
 			$strlist .= "\n";
@@ -144,9 +144,10 @@ else {
 	}
 
 	$strlist .= "\n";
-	$strlist .= "";
+	$strlist .= "\n";
 	$strlist .= "\n";

".$text['label-permission_permissions']."
\n";
+			echo "	\n";
 			echo "		\n";
 			echo "	
   $username      \n";
+		$strlist .= "";
 		if (permission_exists('group_member_delete')) {
-			$strlist .= "	$v_link_label_delete\n";
+			$strlist .= "$v_link_label_delete";
 		}
 		$strlist .= "
   ".$text['label-group_description']."    \n";
+	$strlist .= "	";
 	if (permission_exists('group_add')) {
-		$strlist .= "	$v_link_label_add\n";
+		$strlist .= "$v_link_label_add";
 	}
 	$strlist .= "	
\n";
-			$strlist .= "$v_link_label_delete\n";
+			$strlist .= "";
+			$strlist .= "$v_link_label_delete";
 
 			$strlist .= "
\n";
+	$strlist .= " ";
 	if (permission_exists('group_add')) {
-		$strlist .= "	$v_link_label_add\n";
+		$strlist .= "$v_link_label_add";
 	}
 	$strlist .= "