From aeeaaa03a693805aa67c473df7607ac3ef8c8b5d Mon Sep 17 00:00:00 2001
From: jim-p <jim@pingle.org>
Date: Thu, 17 Dec 2009 16:47:09 -0500
Subject: Shorten squid tab names so they are less than 82chars total and do
 not trigger the change to a drop-down list navigation. Bump squid package
 version to _1.

---
 config/squid/squid.xml          | 14 +++++++-------
 config/squid/squid_auth.xml     | 14 +++++++-------
 config/squid/squid_cache.xml    | 14 +++++++-------
 config/squid/squid_extauth.xml  |  8 ++++----
 config/squid/squid_nac.xml      | 14 +++++++-------
 config/squid/squid_ng.xml       |  4 ++--
 config/squid/squid_traffic.xml  | 14 +++++++-------
 config/squid/squid_upstream.xml | 16 ++++++++--------
 config/squid/squid_users.xml    | 14 +++++++-------
 9 files changed, 56 insertions(+), 56 deletions(-)

(limited to 'config')

diff --git a/config/squid/squid.xml b/config/squid/squid.xml
index 7f2c1627..01669087 100644
--- a/config/squid/squid.xml
+++ b/config/squid/squid.xml
@@ -63,32 +63,32 @@
 	</service>
 	<tabs>
 		<tab>
-			<text>General settings</text>
+			<text>General</text>
 			<url>/pkg_edit.php?xml=squid.xml&amp;id=0</url>
 			<active/>
 		</tab>
 		<tab>
-			<text>Upstream proxy</text>
+			<text>Upstream Proxy</text>
 			<url>/pkg_edit.php?xml=squid_upstream.xml&amp;id=0</url>
 		</tab>
 		<tab>
-			<text>Cache management</text>
+			<text>Cache Mgmt</text>
 			<url>/pkg_edit.php?xml=squid_cache.xml&amp;id=0</url>
 		</tab>
 		<tab>
-			<text>Access control</text>
+			<text>Access Control</text>
 			<url>/pkg_edit.php?xml=squid_nac.xml&amp;id=0</url>
 		</tab>
 		<tab>
-			<text>Traffic management</text>
+			<text>Traffic Mgmt</text>
 			<url>/pkg_edit.php?xml=squid_traffic.xml&amp;id=0</url>
 		</tab>
 		<tab>
-			<text>Auth settings</text>
+			<text>Auth Settings</text>
 			<url>/pkg_edit.php?xml=squid_auth.xml&amp;id=0</url>
 		</tab>
 		<tab>
-			<text>Local users</text>
+			<text>Local Users</text>
 			<url>/pkg.php?xml=squid_users.xml</url>
 		</tab>
 	</tabs>
diff --git a/config/squid/squid_auth.xml b/config/squid/squid_auth.xml
index b3e7c5c1..33317d4a 100644
--- a/config/squid/squid_auth.xml
+++ b/config/squid/squid_auth.xml
@@ -51,32 +51,32 @@
 	<include_file>squid.inc</include_file>
 	<tabs>
 		<tab>
-			<text>General settings</text>
+			<text>General</text>
 			<url>/pkg_edit.php?xml=squid.xml&amp;id=0</url>
 		</tab>
 		<tab>
-			<text>Upstream proxy</text>
+			<text>Upstream Proxy</text>
 			<url>/pkg_edit.php?xml=squid_upstream.xml&amp;id=0</url>
 		</tab>
 		<tab>
-			<text>Cache management</text>
+			<text>Cache Mgmt</text>
 			<url>/pkg_edit.php?xml=squid_cache.xml&amp;id=0</url>
 		</tab>
 		<tab>
-			<text>Access control</text>
+			<text>Access Control</text>
 			<url>/pkg_edit.php?xml=squid_nac.xml&amp;id=0</url>
 		</tab>
 		<tab>
-			<text>Traffic management</text>
+			<text>Traffic Mgmt</text>
 			<url>/pkg_edit.php?xml=squid_traffic.xml&amp;id=0</url>
 		</tab>
 		<tab>
-			<text>Auth settings</text>
+			<text>Auth Settings</text>
 			<url>/pkg_edit.php?xml=squid_auth.xml&amp;id=0</url>
 			<active/>
 		</tab>
 		<tab>
-			<text>Local users</text>
+			<text>Local Users</text>
 			<url>/pkg.php?xml=squid_users.xml</url>
 		</tab>
 	</tabs>
diff --git a/config/squid/squid_cache.xml b/config/squid/squid_cache.xml
index a5efb83e..52735bbe 100644
--- a/config/squid/squid_cache.xml
+++ b/config/squid/squid_cache.xml
@@ -51,32 +51,32 @@
 	<include_file>squid.inc</include_file>
 	<tabs>
 		<tab>
-			<text>General settings</text>
+			<text>General</text>
 			<url>/pkg_edit.php?xml=squid.xml&amp;id=0</url>
 		</tab>
 		<tab>
-			<text>Upstream proxy</text>
+			<text>Upstream Proxy</text>
 			<url>/pkg_edit.php?xml=squid_upstream.xml&amp;id=0</url>
 		</tab>
 		<tab>
-			<text>Cache management</text>
+			<text>Cache Mgmt</text>
 			<url>/pkg_edit.php?xml=squid_cache.xml&amp;id=0</url>
 			<active/>
 		</tab>
 		<tab>
-			<text>Access control</text>
+			<text>Access Control</text>
 			<url>/pkg_edit.php?xml=squid_nac.xml&amp;id=0</url>
 		</tab>
 		<tab>
-			<text>Traffic management</text>
+			<text>Traffic Mgmt</text>
 			<url>/pkg_edit.php?xml=squid_traffic.xml&amp;id=0</url>
 		</tab>
 		<tab>
-			<text>Auth settings</text>
+			<text>Auth Settings</text>
 			<url>/pkg_edit.php?xml=squid_auth.xml&amp;id=0</url>
 		</tab>
 		<tab>
-			<text>Local users</text>
+			<text>Local Users</text>
 			<url>/pkg.php?xml=squid_users.xml</url>
 		</tab>
 	</tabs>
diff --git a/config/squid/squid_extauth.xml b/config/squid/squid_extauth.xml
index 745e85d5..41d9f633 100644
--- a/config/squid/squid_extauth.xml
+++ b/config/squid/squid_extauth.xml
@@ -51,7 +51,7 @@
 	<aftersaveredirect>/pkg_edit.php?xml=squid_extauth.xml&amp;id=0</aftersaveredirect>
 	<tabs>
 		<tab>
-			<text>General Settings</text>
+			<text>General</text>
 			<url>/pkg_edit.php?xml=squid_ng.xml&amp;id=0</url>
 		</tab>
 
@@ -66,7 +66,7 @@
 		</tab>
 
 		<tab>
-			<text>Network Access Control</text>
+			<text>Access Control</text>
 			<url>/pkg_edit.php?xml=squid_nac.xml&amp;id=0</url>
 		</tab>
 
@@ -76,12 +76,12 @@
 		</tab>
 
 		<tab>
-			<text>Auth Settings</text>
+			<text>Auth</text>
 			<url>/pkg_edit.php?xml=squid_auth.xml&amp;id=0</url>
 		</tab>
 
 		<tab>
-			<text>Extended Auth Settings</text>
+			<text>Extended Auth</text>
 			<url>/pkg_edit.php?xml=squid_extauth.xml&amp;id=0</url>
 			<active/>
 		</tab>
diff --git a/config/squid/squid_nac.xml b/config/squid/squid_nac.xml
index a61471ec..193a89c6 100644
--- a/config/squid/squid_nac.xml
+++ b/config/squid/squid_nac.xml
@@ -51,32 +51,32 @@
 	<include_file>squid.inc</include_file>
 	<tabs>
 		<tab>
-			<text>General settings</text>
+			<text>General</text>
 			<url>/pkg_edit.php?xml=squid.xml&amp;id=0</url>
 		</tab>
 		<tab>
-			<text>Upstream proxy</text>
+			<text>Upstream Proxy</text>
 			<url>/pkg_edit.php?xml=squid_upstream.xml&amp;id=0</url>
 		</tab>
 		<tab>
-			<text>Cache management</text>
+			<text>Cache Mgmt</text>
 			<url>/pkg_edit.php?xml=squid_cache.xml&amp;id=0</url>
 		</tab>
 		<tab>
-			<text>Access control</text>
+			<text>Access Control</text>
 			<url>/pkg_edit.php?xml=squid_nac.xml&amp;id=0</url>
 			<active/>
 		</tab>
 		<tab>
-			<text>Traffic management</text>
+			<text>Traffic Mgmt</text>
 			<url>/pkg_edit.php?xml=squid_traffic.xml&amp;id=0</url>
 		</tab>
 		<tab>
-			<text>Auth settings</text>
+			<text>Auth Settings</text>
 			<url>/pkg_edit.php?xml=squid_auth.xml&amp;id=0</url>
 		</tab>
 		<tab>
-			<text>Local users</text>
+			<text>Local Users</text>
 			<url>/pkg.php?xml=squid_users.xml</url>
 		</tab>
 	</tabs>
diff --git a/config/squid/squid_ng.xml b/config/squid/squid_ng.xml
index 5949606e..5d956387 100644
--- a/config/squid/squid_ng.xml
+++ b/config/squid/squid_ng.xml
@@ -90,11 +90,11 @@
 			<url>/pkg_edit.php?xml=squid_traffic.xml&amp;id=0</url>
 		</tab>
 		<tab>
-			<text>Auth Settings</text>
+			<text>Auth</text>
 			<url>/pkg_edit.php?xml=squid_auth.xml&amp;id=0</url>
 		</tab>
 		<tab>
-			<text>Extended Auth Settings</text>
+			<text>Extended Auth</text>
 			<url>/pkg_edit.php?xml=squid_extauth.xml&amp;id=0</url>
 		</tab>
 	</tabs>
diff --git a/config/squid/squid_traffic.xml b/config/squid/squid_traffic.xml
index 1330cac9..d560a7ad 100644
--- a/config/squid/squid_traffic.xml
+++ b/config/squid/squid_traffic.xml
@@ -51,32 +51,32 @@
 	<include_file>squid.inc</include_file>
 	<tabs>
 		<tab>
-			<text>General settings</text>
+			<text>General</text>
 			<url>/pkg_edit.php?xml=squid.xml&amp;id=0</url>
 		</tab>
 		<tab>
-			<text>Upstream proxy</text>
+			<text>Upstream Proxy</text>
 			<url>/pkg_edit.php?xml=squid_upstream.xml&amp;id=0</url>
 		</tab>
 		<tab>
-			<text>Cache management</text>
+			<text>Cache Mgmt</text>
 			<url>/pkg_edit.php?xml=squid_cache.xml&amp;id=0</url>
 		</tab>
 		<tab>
-			<text>Access control</text>
+			<text>Access Control</text>
 			<url>/pkg_edit.php?xml=squid_nac.xml&amp;id=0</url>
 		</tab>
 		<tab>
-			<text>Traffic management</text>
+			<text>Traffic Mgmt</text>
 			<url>/pkg_edit.php?xml=squid_traffic.xml&amp;id=0</url>
 			<active/>
 		</tab>
 		<tab>
-			<text>Auth settings</text>
+			<text>Auth Settings</text>
 			<url>/pkg_edit.php?xml=squid_auth.xml&amp;id=0</url>
 		</tab>
 		<tab>
-			<text>Local users</text>
+			<text>Local Users</text>
 			<url>/pkg.php?xml=squid_users.xml</url>
 		</tab>
 	</tabs>
diff --git a/config/squid/squid_upstream.xml b/config/squid/squid_upstream.xml
index 1102c672..ad494524 100644
--- a/config/squid/squid_upstream.xml
+++ b/config/squid/squid_upstream.xml
@@ -51,33 +51,33 @@
 	<include_file>squid.inc</include_file>
 	<tabs>
 		<tab>
-			<text>General settings</text>
+			<text>General</text>
 			<url>/pkg_edit.php?xml=squid.xml&amp;id=0</url>
 		</tab>
 		<tab>
-			<text>Upstream proxy</text>
+			<text>Upstream Proxy</text>
 			<url>/pkg_edit.php?xml=squid_upstream.xml&amp;id=0</url>
 			<active/>
 		</tab>
 		<tab>
-			<text>Cache management</text>
+			<text>Cache Mgmt</text>
 			<url>/pkg_edit.php?xml=squid_cache.xml&amp;id=0</url>
 		</tab>
 		<tab>
-			<text>Access control</text>
+			<text>Access Control</text>
 			<url>/pkg_edit.php?xml=squid_nac.xml&amp;id=0</url>
 		</tab>
 		<tab>
-			<text>Traffic management</text>
+			<text>Traffic Mgmt</text>
 			<url>/pkg_edit.php?xml=squid_traffic.xml&amp;id=0</url>
 		</tab>
 		<tab>
-			<text>Auth settings</text>
+			<text>Auth Settings</text>
 			<url>/pkg_edit.php?xml=squid_auth.xml&amp;id=0</url>
 		</tab>
 		<tab>
-			<text>Local users</text>
-			<url>/pkg.php?xml=squid_users.in</url>
+			<text>Local Users</text>
+			<url>/pkg.php?xml=squid_users.xml</url>
 		</tab>
 	</tabs>
 	<fields>
diff --git a/config/squid/squid_users.xml b/config/squid/squid_users.xml
index 34260817..eef6389f 100644
--- a/config/squid/squid_users.xml
+++ b/config/squid/squid_users.xml
@@ -53,31 +53,31 @@
 	<addedit_string>A proxy server user has been created/modified.</addedit_string>
 	<tabs>
 		<tab>
-			<text>General settings</text>
+			<text>General</text>
 			<url>/pkg_edit.php?xml=squid.xml&amp;id=0</url>
 		</tab>
 		<tab>
-			<text>Upstream proxy</text>
+			<text>Upstream Proxy</text>
 			<url>/pkg_edit.php?xml=squid_upstream.xml&amp;id=0</url>
 		</tab>
 		<tab>
-			<text>Cache management</text>
+			<text>Cache Mgmt</text>
 			<url>/pkg_edit.php?xml=squid_cache.xml&amp;id=0</url>
 		</tab>
 		<tab>
-			<text>Access control</text>
+			<text>Access Control</text>
 			<url>/pkg_edit.php?xml=squid_nac.xml&amp;id=0</url>
 		</tab>
 		<tab>
-			<text>Traffic management</text>
+			<text>Traffic Mgmt</text>
 			<url>/pkg_edit.php?xml=squid_traffic.xml&amp;id=0</url>
 		</tab>
 		<tab>
-			<text>Auth settings</text>
+			<text>Auth Settings</text>
 			<url>/pkg_edit.php?xml=squid_auth.xml&amp;id=0</url>
 		</tab>
 		<tab>
-			<text>Local users</text>
+			<text>Local Users</text>
 			<url>/pkg.php?xml=squid_users.xml</url>
 			<active/>
 		</tab>
-- 
cgit v1.2.3