tool menu slide effect removed, language file changed for dashboatrd instructions

git-svn-id: https://code.elgg.org/elgg/trunk@1727 36083f99-b078-4883-b0ff-0f9b5a30f544

2 files changed, 39 insertions, 42 deletions

diff --git a/languages/en.php b/languages/en.php
index 8a30ff4ff..787ec58e3 100644
--- a/languages/en.php
+++ b/languages/en.php
@@ -168,7 +168,7 @@
 		 */

 	

 			'dashboard' => "Dashboard",

-			'dashboard:nowidgets' => "Your dashboard is your gateway into the site. Click 'Customise Layout' to add widgets to keep track of content and your life within the system.", 

+			'dashboard:nowidgets' => "Your dashboard is your gateway into the site. Click 'Edit page' to add widgets to keep track of content and your life within the system.", 

 	

 		/**

 		 * Groups

@@ -340,7 +340,7 @@
 			'register' => "Register",

 			'registerok' => "You have successfully registered for %s, please confirm your email address by clicking on the link we sent you.",

 			'registerbad' => "Your registration was unsuccessful. The username may already exist, or your passwords might not match.",

-			'registerdisabled' => "Registration has been disabled by the system administrator",
+			'registerdisabled' => "Registration has been disabled by the system administrator",

 	

 			'adduser' => "Add User",

 			'adduser:ok' => "You have successfully added a new user.",

@@ -362,14 +362,14 @@
 			'user:set:language' => "Language settings",

 			'user:language:label' => "Your language",

 			'user:language:success' => "Your language settings have been updated.",

-			'user:language:fail' => "Your language settings could not be saved.",
-	
-			'user:username:notfound' => 'Username %s not found.',
-	
-			'user:password:lost' => 'Lost password',
-			'user:password:resetreq:success' => 'Successfully requested a new password, email sent',
-			'user:password:resetreq:fail' => 'Could not request a new password.',
-	
+			'user:language:fail' => "Your language settings could not be saved.",

+	

+			'user:username:notfound' => 'Username %s not found.',

+	

+			'user:password:lost' => 'Lost password',

+			'user:password:resetreq:success' => 'Successfully requested a new password, email sent',

+			'user:password:resetreq:fail' => 'Could not request a new password.',

+	

 			'user:password:text' => 'To generate a new password, enter your username below. We will send the address of a unique verification page to you via email click on the link in the body of the message and a new password will be sent to you.',

 	

 		/**

@@ -475,7 +475,7 @@
 			'upload' => "Upload",

 			'ban' => "Ban",

 			'enable' => "Enable",

-			'disable' => "Disable",
+			'disable' => "Disable",

 			'request' => "Request",

 	

 			'invite' => "Invite",

@@ -484,8 +484,8 @@
 			'makeadmin' => "Make admin",

 	

 			'option:yes' => "Yes",

-			'option:no' => "No",
-	
+			'option:no' => "No",

+	

 			'unknown' => 'Unknown',

 	

 		/**

@@ -498,10 +498,10 @@
 			'spotlight' => "Spotlight",

 			'all' => "All",

 	

-			'by' => 'by',
-	
-			'annotations' => "Annotations",
-			'relationships' => "Relationships",
+			'by' => 'by',

+	

+			'annotations' => "Annotations",

+			'relationships' => "Relationships",

 			'metadata' => "Metadata",

 	

 		/**

@@ -641,18 +641,18 @@ Congratulations, you have successfully validated your email address.",
 			'email:resetpassword:body' => "Hi %s,

 			

 Your password has been reset to: %s",

-	
-	
-			'email:resetreq:subject' => "Request for new password.",
-			'email:resetreq:body' => "Hi %s,
-			
-Somebody (from the IP address %s) has requested a new password for their account.
-
-If you requested this click on the link below, otherwise ignore this email.
-
-%s
-",
-
+	

+	

+			'email:resetreq:subject' => "Request for new password.",

+			'email:resetreq:body' => "Hi %s,

+			

+Somebody (from the IP address %s) has requested a new password for their account.

+

+If you requested this click on the link below, otherwise ignore this email.

+

+%s

+",

+

 	

 		/**

 		 * XML-RPC

@@ -688,15 +688,15 @@ To view %s's profile, click here:
 

 	%s

 

-You cannot reply to this email.",
-	
-		/**
-		 * Entities
-		 */
-			'entity:default:strapline' => 'Created %s by %s',
-			'entity:default:missingsupport:popup' => 'This entity cannot be displayed correctly. This may be because it requires support provided by a plugin that is no longer installed.',
-	
-			'entity:delete:success' => 'Entity %s has been deleted',
+You cannot reply to this email.",

+	

+		/**

+		 * Entities

+		 */

+			'entity:default:strapline' => 'Created %s by %s',

+			'entity:default:missingsupport:popup' => 'This entity cannot be displayed correctly. This may be because it requires support provided by a plugin that is no longer installed.',

+	

+			'entity:delete:success' => 'Entity %s has been deleted',

 			'entity:delete:fail' => 'Entity %s could not be deleted',

 	

 		/**

diff --git a/views/default/navigation/topbar_tools.php b/views/default/navigation/topbar_tools.php
index bb9021380..e9b40b5c3 100644
--- a/views/default/navigation/topbar_tools.php
+++ b/views/default/navigation/topbar_tools.php
@@ -46,11 +46,9 @@
 <script type="text/javascript">
 function tools_menu(){
 $(" #tools_menu li").hover(function(){
-        $(this).find('ul:first').slideDown("fast");
 		$(this).parent().parent().parent().find("#tools_menu a").addClass('tools_menu_on');
 		
 		},function(){
-		$(this).find('ul:first').slideUp("fast");
 		$(this).parent().parent().parent().find("#tools_menu a").removeClass('tools_menu_on');
 		});
 }
@@ -60,5 +58,4 @@ $(" #tools_menu li").hover(function(){
  $(document).ready(function(){					
 	tools_menu();
 });
-</script>
-
+</script>
\ No newline at end of file