Index: trunk/admin/users/adduser_images.php
===================================================================
diff -u -N -r374 -r624
--- trunk/admin/users/adduser_images.php	(.../adduser_images.php)	(revision 374)
+++ trunk/admin/users/adduser_images.php	(.../adduser_images.php)	(revision 624)
@@ -117,7 +117,7 @@
 $envar = "env=" . BuildEnv() . "&en=$en";
 $section = 'in-portal:edituser_images';
 $sec = $objSections->GetSection($section);
-$title = prompt_language("la_Text_Editing")." ".prompt_language("la_Text_User")." '".$c->Get("Login")."' - ".prompt_language("la_tab_Images");
+$title = GetTitle("la_Text_User", "la_tab_Images", $c->Get('PortalUserId'), $c->Get('Login'));//prompt_language("la_Text_Editing")." ".prompt_language("la_Text_User")." '".$c->Get("Login")."' - ".prompt_language("la_tab_Images");
 
 $SortFieldVar = "Image_LV_Sortfield";
 $SortOrderVar = "Image_LV_Sortorder";
Index: trunk/admin/config/addlang_labels.php
===================================================================
diff -u -N -r374 -r624
--- trunk/admin/config/addlang_labels.php	(.../addlang_labels.php)	(revision 374)
+++ trunk/admin/config/addlang_labels.php	(.../addlang_labels.php)	(revision 624)
@@ -348,7 +348,7 @@
   $objListView->RowIcons[] = $objPhrases->Items[$i]->AdminIcon();
 }
 
-$title = admin_language("la_Text_Configuration")." - '".$name."' ".admin_language("la_Text_Pack")." - ".admin_language("la_tab_Labels")." ($itemcount)";
+$title = $title = GetTitle("la_Text_Pack", "la_tab_Labels", $c->Get('LanguageId'), $c->Get('LocalName'));///admin_language("la_Text_Configuration")." - '".$name."' ".admin_language("la_Text_Pack")." - ".admin_language("la_tab_Labels")." ($itemcount)";
 $h = "\n\n<SCRIPT Language=\"JavaScript1.2\">\n".$objListView->GetViewMenu($imagesURL)."\n</SCRIPT>\n";
 int_header($objListToolBar,NULL, $title,NULL,$h);
 ?>
Index: trunk/themes/default/index.tpl
===================================================================
diff -u -N -r13 -r624
--- trunk/themes/default/index.tpl	(.../index.tpl)	(revision 13)
+++ trunk/themes/default/index.tpl	(.../index.tpl)	(revision 624)
@@ -9,8 +9,8 @@
 			<table width="100%" border="0" cellspacing="0" cellpadding="0">
 				<tr>
 					<td width="10000"><img src="img/s.gif" width="1" height="1" alt="" /><br /></td>
-					<td><img src="img/s.gif" width="1" height="1" alt="" /><br /></td>
-					<td><img src="img/s.gif" width="200" height="1" alt="" /><br /></td>
+					<td><img src="img/s.gif" width="1" height="1" alt="" /></td>
+					<td width="200"><img src="img/s.gif" width="200" height="1" alt="" /></td>
 				</tr>
 				<tr height="100%">
 					<td valign="top" class="bott-line">
@@ -42,7 +42,7 @@
 								</td>
 								<!--<td class="bgr-path"><img src="img/s.gif" width="1" height="1" alt="" /><br /></td>-->
 							</tr>
-							<tr><td><img src="img/s.gif" width="1" height="1" alt="" /><br /></td></tr>
+							<!--<tr><td><img src="img/s.gif" width="1" height="1" alt="" /><br /></td></tr>-->
 						</table>
 						<!-- path \\-->
 
Index: trunk/admin/users/adduser.php
===================================================================
diff -u -N -r509 -r624
--- trunk/admin/users/adduser.php	(.../adduser.php)	(revision 509)
+++ trunk/admin/users/adduser.php	(.../adduser.php)	(revision 624)
@@ -162,7 +162,8 @@
 	$editing_title = "";
 
 
-$title = prompt_language("la_Text_Editing")." ".prompt_language("la_Text_User")." $editing_title- ".prompt_language("la_tab_General");
+//$title = prompt_language("la_Text_Editing")." ".prompt_language("la_Text_User")." $editing_title- ".prompt_language("la_tab_General");
+$title = GetTitle("la_Text_User", "la_Text_General", $c->Get('PortalUserId'), $c->Get('Login'));
 
 //Display header
 $sec = $objSections->GetSection($section);
Index: trunk/admin/users/adduser_items.php
===================================================================
diff -u -N -r374 -r624
--- trunk/admin/users/adduser_items.php	(.../adduser_items.php)	(revision 374)
+++ trunk/admin/users/adduser_items.php	(.../adduser_items.php)	(revision 624)
@@ -129,7 +129,7 @@
 $section = 'in-portal:edituser_items';
 $sec = $objSections->GetSection($section);
 
-$title = admin_language("la_Text_Editing")." ".admin_language("la_Text_User")." '".$c->Get("Login")."' - ".admin_language("la_tab_Images");
+$title = GetTitle("la_Text_User", "la_tab_Images", $c->Get('PortalUserId'), $c->Get('Login'));//admin_language("la_Text_Editing")." ".admin_language("la_Text_User")." '".$c->Get("Login")."' - ".admin_language("la_tab_Images");
 
 $objListToolBar = new clsToolBar();
 $objListToolBar->Add("img_save", "la_Save","#","swap('img_save','toolbar/tool_select_f2.gif');", "swap('img_save', 'toolbar/tool_select.gif');","do_edit_save('save_edit_buttons','".$admin."/users/user_list.php',1);","tool_select.gif");
Index: trunk/admin/users/user_addimage.php
===================================================================
diff -u -N -r534 -r624
--- trunk/admin/users/user_addimage.php	(.../user_addimage.php)	(revision 534)
+++ trunk/admin/users/user_addimage.php	(.../user_addimage.php)	(revision 624)
@@ -170,7 +170,7 @@
 END;
 
 
-$title = prompt_language("la_Text_Editing")." ".prompt_language("la_Text_User")." '".$c->Get("Login")."' - ".prompt_language("la_Text_Image");
+$title = GetTitle("la_Text_User", "la_Text_General", $c->Get('PortalUserId'), $c->Get('Login'));//prompt_language("la_Text_Editing")." ".prompt_language("la_Text_User")." '".$c->Get("Login")."' - ".prompt_language("la_Text_Image");
 $title .= " '".$name."'";
 $objCatToolBar = new clsToolBar();
 $objCatToolBar->Add("img_save", "la_Save","#","swap('img_save','toolbar/tool_select_f2.gif');", "swap('img_save', 'toolbar/tool_select.gif');","edit_submit('user','UserEditStatus','".$admin."/users/adduser_images.php',0);",$imagesURL."/toolbar/tool_select.gif");
Index: trunk/admin/include/elements.php
===================================================================
diff -u -N -r564 -r624
--- trunk/admin/include/elements.php	(.../elements.php)	(revision 564)
+++ trunk/admin/include/elements.php	(.../elements.php)	(revision 624)
@@ -587,16 +587,29 @@
 	
 }
 
-function GetTitle($item_phrase, $tab_phrase, $id)
+function GetTitle($item_phrase, $tab_phrase, $id, $item_name = false)
 {
-	// gets correct caption for editing windows with tabs
+	//gets correct caption for editing windows with tabs
 	//echo "In: $item_phrase, $tab_phrase, $id";
-	$is_new = isset($_REQUEST['new']) && ($_REQUEST['new'] == 1) ? 1 : 0; 
+	$is_new = (isset($_REQUEST['new']) && ($_REQUEST['new'] == 1)) || $id <= 0 ? 1 : 0; 
 	$text = $is_new ? 'la_Text_Adding' : 'la_Text_Editing';
 	$text = admin_language($text).' '.admin_language($item_phrase);
 	
-	if($is_new == 0) $text .= ' #'.$id;
-	$text .= ' - '.admin_language($tab_phrase);
+	if($is_new == 0) {
+		if ($item_name == false) {
+			$text .= ' #'.$id;
+		}
+		else {
+			if ($item_name != '') {
+				$text .= " '".$item_name."'";
+			}
+		}
+	}
+	
+	if ($tab_phrase != '') {
+		$text .= ' - '.admin_language($tab_phrase);	
+	}
+	
 	return $text;
 }
 
Index: trunk/admin/users/group_addpermission.php
===================================================================
diff -u -N -r534 -r624
--- trunk/admin/users/group_addpermission.php	(.../group_addpermission.php)	(revision 534)
+++ trunk/admin/users/group_addpermission.php	(.../group_addpermission.php)	(revision 624)
@@ -124,7 +124,7 @@
 
 $PermModule = $_GET["module"];
 
-$title = prompt_language("la_Text_Editing")." ".prompt_language("la_Text_Group")." '".$c->Get("Name")."' - ".prompt_language("la_tab_Permissions");
+$title = GetTitle("la_Text_Group", "la_tab_Permissions", $c->Get('GroupId'), $c->Get('Name'));//prompt_language("la_Text_Editing")." ".prompt_language("la_Text_Group")." '".$c->Get("Name")."' - ".prompt_language("la_tab_Permissions");
 
 if ( isset($en_prev) || isset($en_next) )
 {
Index: trunk/admin/config/addlang_email.php
===================================================================
diff -u -N -r374 -r624
--- trunk/admin/config/addlang_email.php	(.../addlang_email.php)	(revision 374)
+++ trunk/admin/config/addlang_email.php	(.../addlang_email.php)	(revision 624)
@@ -338,7 +338,7 @@
 }
 
 
-$title = prompt_language("la_Text_Configuration")." - '".$name."' ".prompt_language("la_Text_Pack")." - ".prompt_language("la_tab_EmailEvents");
+$title = $title = GetTitle("la_Text_Pack", "la_tab_EmailEvents", $c->Get('LanguageId'), $c->Get('LocalName'));///prompt_language("la_Text_Configuration")." - '".$name."' ".prompt_language("la_Text_Pack")." - ".prompt_language("la_tab_EmailEvents");
 
 $h = "\n\n<SCRIPT Language=\"JavaScript1.2\">\n".$objListView->GetViewMenu($imagesURL)."\n</SCRIPT>\n";
 int_header($objListToolBar,NULL, $title,NULL,$h);
Index: trunk/admin/users/adduser_permissions.php
===================================================================
diff -u -N -r374 -r624
--- trunk/admin/users/adduser_permissions.php	(.../adduser_permissions.php)	(revision 374)
+++ trunk/admin/users/adduser_permissions.php	(.../adduser_permissions.php)	(revision 624)
@@ -125,7 +125,7 @@
 	
 $section = 'in-portal:edituser_permissions'; 
 
-$title = prompt_language("la_Text_Editing")." ".prompt_language("la_Text_User")." '".$c->Get("Login")."' - ".prompt_language("la_tab_Permissions");
+$title = GetTitle("la_Text_User", "la_tab_Permissions", $c->Get('PortalUserId'), $c->Get('Login'));//prompt_language("la_Text_Editing")." ".prompt_language("la_Text_User")." '".$c->Get("Login")."' - ".prompt_language("la_tab_Permissions");
 
 $formaction = $adminURL."/user/adduser_permissions.php?".$envar;
 
Index: trunk/admin/config/addlang.php
===================================================================
diff -u -N -r534 -r624
--- trunk/admin/config/addlang.php	(.../addlang.php)	(revision 534)
+++ trunk/admin/config/addlang.php	(.../addlang.php)	(revision 624)
@@ -164,7 +164,7 @@
 
 $envar = "env=".BuildEnv();
 
-$title = prompt_language("la_Text_Configuration")." - ".$name."' ".prompt_language("la_Text_Pack")." - ".prompt_language("la_tab_General");
+$title = $title = GetTitle("la_Text_Pack", "la_tab_General", $c->Get('LanguageId'), $c->Get('LocalName'));//prompt_language("la_Text_Configuration")." - ".$name."' ".prompt_language("la_Text_Pack")." - ".prompt_language("la_tab_General");
 
 //Display header
 $sec = $objSections->GetSection($section);
Index: trunk/admin/users/user_addpermission.php
===================================================================
diff -u -N -r534 -r624
--- trunk/admin/users/user_addpermission.php	(.../user_addpermission.php)	(revision 534)
+++ trunk/admin/users/user_addpermission.php	(.../user_addpermission.php)	(revision 624)
@@ -127,7 +127,7 @@
 
 $PermModule = $_GET["module"];
 
-$title = prompt_language("la_Text_Editing")." ".prompt_language("la_Text_User")." '".$c->Get("Login")."' - ".prompt_language("la_tab_Permissions");
+$title = GetTitle("la_Text_User", "la_tab_Permissions", $c->Get('PortalUserId'), $c->Get('Login'));//prompt_language("la_Text_Editing")." ".prompt_language("la_Text_User")." '".$c->Get("Login")."' - ".prompt_language("la_tab_Permissions");
 
 //$formaction = $adminURL."/user/adduser_custom.php?".$envar;
 
Index: trunk/admin/config/addtheme_templates.php
===================================================================
diff -u -N -r390 -r624
--- trunk/admin/config/addtheme_templates.php	(.../addtheme_templates.php)	(revision 390)
+++ trunk/admin/config/addtheme_templates.php	(.../addtheme_templates.php)	(revision 624)
@@ -272,7 +272,7 @@
 $objListView->ConfigureViewMenu("Template_LV_Sortfield","Template_LV_Sortorder","Module",
 								  "",0,0);
 
-$title = prompt_language("la_Text_Editing")." ".prompt_language("la_Text_Theme")." '".$c->Get("Name")."' - ".prompt_language("la_tab_Template");
+$title = GetTitle("la_Text_Theme", "la_tab_Template", $c->Get('ThemeId'), $c->Get('Name'));//prompt_language("la_Text_Editing")." ".prompt_language("la_Text_Theme")." '".$c->Get("Name")."' - ".prompt_language("la_tab_Template");
 $h = "\n\n<SCRIPT Language=\"JavaScript1.2\">\n".$objListView->GetViewMenu($imagesURL)."\n</SCRIPT>\n";
 int_header($objListToolBar,NULL, $title,NULL,$h);
 ?>
Index: trunk/admin/users/addgroup.php
===================================================================
diff -u -N -r374 -r624
--- trunk/admin/users/addgroup.php	(.../addgroup.php)	(revision 374)
+++ trunk/admin/users/addgroup.php	(.../addgroup.php)	(revision 624)
@@ -147,12 +147,12 @@
 $section = 'in-portal:editgroup_general';
 
 if (strlen($c->Get("Name")))
-	$editing_title = "'".$c->Get("Name")."' ";
+	$editing_title = $c->Get("Name");
 else
 	$editing_title = "";
 
 
-$title = prompt_language("la_Text_Editing")." ".prompt_language("la_Text_Group")." $editing_title- ".prompt_language("la_tab_General");
+$title = GetTitle("la_Text_Group", "la_tab_General", $c->Get('GroupId'), $editing_title);//prompt_language("la_Text_Editing")." ".prompt_language("la_Text_Group")." $editing_title- ".prompt_language("la_tab_General");
 //echo $envar."<br>\n";
 
 //Display header
Index: trunk/themes/default/index/welcomebox.tpl
===================================================================
diff -u -N -r13 -r624
--- trunk/themes/default/index/welcomebox.tpl	(.../welcomebox.tpl)	(revision 13)
+++ trunk/themes/default/index/welcomebox.tpl	(.../welcomebox.tpl)	(revision 624)
@@ -2,7 +2,7 @@
 <table width="100%" border="0" cellspacing="0" cellpadding="0" bgcolor="#ecede4">
 	<tr>
 		<td><img src="img/s.gif" width="20" height="1" alt="" /><br /></td>
-		<td valign="top" width="100%" class="welcome-text">
+		<td valign="top" width="10000" class="welcome-text">
 			<img src="img/s.gif" width="1" height="5" alt="" /><br />
 			<table border="0" cellspacing="0" cellpadding="0">
 				<tr>
Index: trunk/admin/users/addgroup_permissions.php
===================================================================
diff -u -N -r374 -r624
--- trunk/admin/users/addgroup_permissions.php	(.../addgroup_permissions.php)	(revision 374)
+++ trunk/admin/users/addgroup_permissions.php	(.../addgroup_permissions.php)	(revision 624)
@@ -127,7 +127,7 @@
 $objCatToolBar->Add("img_save", "la_Save","#","swap('img_save','toolbar/tool_select_f2.gif');", "swap('img_save', 'toolbar/tool_select.gif');","edit_submit('editgroup','GroupEditStatus','".$admin."/users/user_groups.php',1);","tool_select.gif");
 $objCatToolBar->Add("img_cancel", "la_Cancel","#","swap('img_cancel','toolbar/tool_cancel_f2.gif');", "swap('img_cancel', 'toolbar/tool_cancel.gif');","edit_submit('editgroup','GroupEditStatus','".$admin."/users/user_groups.php',2);","tool_cancel.gif");
 
-$title = prompt_language("la_Text_Editing")." ".prompt_language("la_Text_Group")." '".$c->Get("Name")."' - ".prompt_language("la_tab_Permissions");
+$title = GetTitle("la_Text_Group", "la_tab_Permissions", $c->Get('GroupId'), $c->Get('Name'));//prompt_language("la_Text_Editing")." ".prompt_language("la_Text_Group")." '".$c->Get("Name")."' - ".prompt_language("la_tab_Permissions");
 
 if ( isset($en_prev) || isset($en_next) )
 {
Index: trunk/admin/config/addtheme.php
===================================================================
diff -u -N -r374 -r624
--- trunk/admin/config/addtheme.php	(.../addtheme.php)	(revision 374)
+++ trunk/admin/config/addtheme.php	(.../addtheme.php)	(revision 624)
@@ -153,7 +153,7 @@
 
 $envar = "env=".BuildEnv();
 
-$title = prompt_language("la_Text_Editing")." ".prompt_language("la_Text_Theme")." -'".$name."'";
+$title = GetTitle("la_Text_Theme", "la_tab_General", $c->Get('ThemeId'), $c->Get('Name'));//prompt_language("la_Text_Editing")." ".prompt_language("la_Text_Theme")." -'".$name."'";
 
 //Display header
 $sec = $objSections->GetSection($section);
Index: trunk/admin/users/adduser_custom.php
===================================================================
diff -u -N -r518 -r624
--- trunk/admin/users/adduser_custom.php	(.../adduser_custom.php)	(revision 518)
+++ trunk/admin/users/adduser_custom.php	(.../adduser_custom.php)	(revision 624)
@@ -124,7 +124,7 @@
 	
 $section = 'in-portal:edituser_custom'; 
 
-$title = prompt_language("la_Text_Editing")." ".prompt_language("la_Text_User")." '".$c->Get("Login")."' - ".prompt_language("la_tab_Custom");
+$title = GetTitle("la_Text_User", "la_tab_Custom", $c->Get('PortalUserId'), $c->Get('Login'));//prompt_language("la_Text_Editing")." ".prompt_language("la_Text_User")." '".$c->Get("Login")."' - ".prompt_language("la_tab_Custom");
 
 $formaction = $adminURL."/user/adduser_custom.php?".$envar;
 
Index: trunk/admin/config/addcustomfield.php
===================================================================
diff -u -N -r534 -r624
--- trunk/admin/config/addcustomfield.php	(.../addcustomfield.php)	(revision 534)
+++ trunk/admin/config/addcustomfield.php	(.../addcustomfield.php)	(revision 624)
@@ -167,9 +167,8 @@
   <link rel="stylesheet" type="text/css" href="$browseURL/toolbar.css">
 END;
 
-
-$title = prompt_language("la_Text_Editing")." ".prompt_language("la_Text_CustomField")." ".prompt_language("la_text_for")." ".prompt_language("la_Text_DataType_".$_GET["DataType"]);
-$title .= " '".$name."'";
+$title = GetTitle("la_Text_CustomField", '', $FieldId, $name);//prompt_language("la_Text_Editing")." ".prompt_language("la_Text_CustomField")." ".prompt_language("la_text_for")." ".prompt_language("la_Text_DataType_".$_GET["DataType"]);
+$title .= " ".prompt_language("la_text_for")." ".prompt_language("la_Text_DataType_".$_GET["DataType"]);
 $objCatToolBar = new clsToolBar();
 $objCatToolBar->Add("img_save", "la_Save","#","swap('img_save','toolbar/tool_select_f2.gif');", "swap('img_save', 'toolbar/tool_select.gif');","submit_form('customfield','','".$admin."/config/edit_customfields.php',0,'&$section_env');",$imagesURL."/toolbar/tool_select.gif");
 $objCatToolBar->Add("img_cancel", "la_Cancel","#","swap('img_cancel','toolbar/tool_cancel_f2.gif');", "swap('img_cancel', 'toolbar/tool_cancel.gif');","submit_form('customfield','','".$admin."/config/edit_customfields.php',-1,'&$section_env');",$imagesURL."/toolbar/tool_cancel.gif");
Index: trunk/admin/users/addrule.php
===================================================================
diff -u -N -r374 -r624
--- trunk/admin/users/addrule.php	(.../addrule.php)	(revision 374)
+++ trunk/admin/users/addrule.php	(.../addrule.php)	(revision 624)
@@ -140,7 +140,7 @@
 
 $section = 'in-portal:user_rule_edit';
 
-$title = prompt_language("la_Text_Editing")." ".prompt_language("la_Text_Rule");
+$title = $title = GetTitle("la_Text_Rule", '', $c->Get('RuleId'));//prompt_language("la_Text_Editing")." ".prompt_language("la_Text_Rule");
 //echo $envar."<br>\n";
 
 //Display header
Index: trunk/admin/users/adduser_groups.php
===================================================================
diff -u -N -r374 -r624
--- trunk/admin/users/adduser_groups.php	(.../adduser_groups.php)	(revision 374)
+++ trunk/admin/users/adduser_groups.php	(.../adduser_groups.php)	(revision 624)
@@ -135,7 +135,7 @@
 
 $ListForm = "edituser";
 $CheckClass = "GroupChecks";	
-$title = prompt_language("la_Text_Editing")." ".prompt_language("la_Text_User")." '".$c->Get("Login")."' - ".prompt_language("la_tab_Groups");
+$title = GetTitle("la_Text_User", "la_Text_Groups", $c->Get('PortalUserId'), $c->Get('Login'));//prompt_language("la_Text_Editing")." ".prompt_language("la_Text_User")." '".$c->Get("Login")."' - ".prompt_language("la_tab_Groups");
 
 /* ------------------------------------- Configure the toolbar ------------------------------------------- */
 $objListToolBar = new clsToolBar();
Index: trunk/admin/users/addgroup_users.php
===================================================================
diff -u -N -r607 -r624
--- trunk/admin/users/addgroup_users.php	(.../addgroup_users.php)	(revision 607)
+++ trunk/admin/users/addgroup_users.php	(.../addgroup_users.php)	(revision 624)
@@ -278,7 +278,7 @@
   }		
   
 
-$title = prompt_language("la_Text_Editing")." ".prompt_language("la_Text_Group")." '".$c->Get("Name")."' - ".prompt_language("la_tab_Users");
+$title = GetTitle("la_Text_Group", "la_tab_Users", $c->Get('GroupId'), $c->Get('Name'));//prompt_language("la_Text_Editing")." ".prompt_language("la_Text_Group")." '".$c->Get("Name")."' - ".prompt_language("la_tab_Users");
 $h = "\n\n<SCRIPT Language=\"JavaScript1.2\">\n".$objListView->GetViewMenu($imagesURL)."\n</SCRIPT>\n";
 int_header($objListToolBar,NULL, $title,NULL,$h);
 ?>