Index: trunk/CHANGELOG
===================================================================
--- trunk/CHANGELOG	(revision 809)
+++ trunk/CHANGELOG	(revision 810)
@@ -12,6 +12,7 @@
 
 ------------------------------------- 2.7.0 -------------------------------------
 06-Apr-2008 Christian Sommer
+!	removed some obsolete language variables from news and form module (now defined in global WB language files)
 !	enlarged admin tool icon to match size 50x50px of the other icons
 05-Apr-2008 Matthias Gallas
 !	Moved language variables for edit module CSS from modules language files to core language files
Index: trunk/wb/framework/module.functions.php
===================================================================
--- trunk/wb/framework/module.functions.php	(revision 809)
+++ trunk/wb/framework/module.functions.php	(revision 810)
@@ -54,7 +54,8 @@
 // this function displays the "Edit CSS" button in modify.php 
 if (!function_exists('edit_module_css')) {
 	function edit_module_css($mod_dir) {
-		global $page_id, $section_id, $CAP_EDIT_CSS;
+		global $page_id, $section_id;
+				
 		// check if the required edit_module_css.php file exists
 		if(!file_exists(WB_PATH .'/modules/edit_module_files.php')) return;
 		
@@ -67,8 +68,8 @@
 		
 		// output the edit CSS submtin button if required
 		if($frontend_css || $backend_css) {
-			// default text used for the edit CSS routines if not defined in the modules language file
-			if(!isset($CAP_EDIT_CSS)) $CAP_EDIT_CSS	= 'Edit CSS';
+			// default text used for the edit CSS routines if not defined in the WB core language files
+			$edit_css_caption = (isset($GLOBALS['TEXT']['CAP_EDIT_CSS'])) ?$GLOBALS['TEXT']['CAP_EDIT_CSS'] :'Edit CSS';
 			?>
 			<form name="edit_module_file" action="<?php echo WB_URL .'/modules/edit_module_files.php?page_id='.$page_id;?>" 
 				method="post" style="margin: 0; align:right;">
@@ -77,7 +78,7 @@
 				<input type="hidden" name="mod_dir" value="<?php echo $mod_dir; ?>">
 				<input type="hidden" name="edit_file" value="<?php echo ($frontend_css) ?'frontend.css' : 'backend.css';?>">
 				<input type="hidden" name="action" value="edit">
-				<input type="submit" value="<?php echo $CAP_EDIT_CSS;?>" class="mod_<?php echo $mod_dir;?>_edit_css">
+				<input type="submit" value="<?php echo $edit_css_caption;?>" class="mod_<?php echo $mod_dir;?>_edit_css">
 			</form>
 			<?php
     }
Index: trunk/wb/modules/edit_module_files.php
===================================================================
--- trunk/wb/modules/edit_module_files.php	(revision 809)
+++ trunk/wb/modules/edit_module_files.php	(revision 810)
@@ -40,26 +40,14 @@
 
 // leave if the required module.functions.php file does not exist
 if(!file_exists(WB_PATH .'/framework/module.functions.php')) {
-	echo 'Uups, the required file: /framework/module.functions.php is missing - script stopped.';
+	echo 'The required file: /framework/module.functions.php is missing - script stopped.';
 	die;
 }
 
-/**
-	DEFINE LANGUAGE DEPENDING OUTPUTS FOR THE EDIT CSS PART
-*/
-$lang_dir = WB_PATH .'/modules/' .$_POST['mod_dir'] .'/languages/';
-if(file_exists($lang_dir .LANGUAGE .'.php')) {
-	// try to include custom language file if exists
-	require_once($lang_dir .LANGUAGE .'.php');
-} elseif(file_exists($lang_dir .'EN.php')) {
-	// try to include default module language file
-	require_once($lang_dir .'EN.php');
-}
+// set default text output if varibles are not defined in the global WB language files
+$HEADING_CSS_FILE = (isset($GLOBALS['TEXT']['HEADING_CSS_FILE'])) ?$GLOBALS['TEXT']['HEADING_CSS_FILE'] :'Actual module file: ';
+$TXT_EDIT_CSS_FILE = (isset($GLOBALS['TEXT']['TXT_EDIT_CSS_FILE'])) ?$GLOBALS['TEXT']['TXT_EDIT_CSS_FILE'] :'Edit the CSS definitions in the textarea below.';
 
-// set defaults if output varibles are not set in the languages files
-if(!isset($HEADING_CSS_FILE))	$HEADING_CSS_FILE = 'Actual module file: ';
-if(!isset($TXT_EDIT_CSS_FILE)) $TXT_EDIT_CSS_FILE = 'Edit the CSS definitions in the textarea below.';
-
 // include functions to edit the optional module CSS files (frontend.css, backend.css)
 require_once(WB_PATH .'/framework/module.functions.php');
 
Index: trunk/wb/modules/form/languages/NL.php
===================================================================
--- trunk/wb/modules/form/languages/NL.php	(revision 809)
+++ trunk/wb/modules/form/languages/NL.php	(revision 810)
@@ -29,9 +29,4 @@
 //Variables for the  backend
 $MOD_FORM['SETTINGS'] = 'Formulier instellingen';
 
-// Variables for the module CSS edit outputs
-$CAP_EDIT_CSS = 'Wijzig CSS';
-$HEADING_CSS_FILE = 'Actuele module bestand: ';
-$TXT_EDIT_CSS_FILE = 'Wijzig de CSS definities in het textveld hieronder.';
-
 ?>
\ No newline at end of file
Index: trunk/wb/modules/form/languages/NO.php
===================================================================
--- trunk/wb/modules/form/languages/NO.php	(revision 809)
+++ trunk/wb/modules/form/languages/NO.php	(revision 810)
@@ -29,9 +29,4 @@
 //Variables for the  backend
 $MOD_FORM['SETTINGS'] = 'Skjema Innstillinger';
   
-// Variables for the module CSS edit outputs
-$CAP_EDIT_CSS = 'Rediger CSS koden';
-$HEADING_CSS_FILE = 'Faktisk modul fil: ';
-$TXT_EDIT_CSS_FILE = 'Rediger  CSS koden i tekst viduet nedenfor.';
-  
 ?>
\ No newline at end of file
Index: trunk/wb/modules/form/languages/EN.php
===================================================================
--- trunk/wb/modules/form/languages/EN.php	(revision 809)
+++ trunk/wb/modules/form/languages/EN.php	(revision 810)
@@ -29,9 +29,4 @@
 //Variables for the  backend
 $MOD_FORM['SETTINGS'] = 'Form Settings';
 
-// Variables for the module CSS edit outputs
-$CAP_EDIT_CSS = 'Edit CSS';
-$HEADING_CSS_FILE = 'Actual module file: ';
-$TXT_EDIT_CSS_FILE = 'Edit the CSS definitions in the textarea below.';
-
 ?>
\ No newline at end of file
Index: trunk/wb/modules/form/languages/RU.php
===================================================================
--- trunk/wb/modules/form/languages/RU.php	(revision 809)
+++ trunk/wb/modules/form/languages/RU.php	(revision 810)
@@ -29,9 +29,4 @@
 //Variables for the  backend
 $MOD_FORM['SETTINGS'] = '&#1053;&#1072;&#1089;&#1090;&#1088;&#1086;&#1081;&#1082;&#1080; &#1092;&#1086;&#1088;&#1084;&#1099;';
 
-// Variables for the module CSS edit outputs
-$CAP_EDIT_CSS = '&#1056;&#1077;&#1076;&#1072;&#1082;&#1090;&#1080;&#1088;&#1086;&#1074;&#1072;&#1090;&#1100; CSS';
-$HEADING_CSS_FILE = '&#1048;&#1084;&#1103; &#1092;&#1072;&#1081;&#1083;&#1072;: ';
-$TXT_EDIT_CSS_FILE = '&#1048;&#1079;&#1084;&#1077;&#1085;&#1080;&#1090;&#1077; CSS &#1092;&#1072;&#1081;&#1083;, &#1077;&#1089;&#1083;&#1080; &#1085;&#1077;&#1086;&#1073;&#1093;&#1086;&#1076;&#1080;&#1084;&#1086;:';
-
 ?>
Index: trunk/wb/modules/form/languages/DE.php
===================================================================
--- trunk/wb/modules/form/languages/DE.php	(revision 809)
+++ trunk/wb/modules/form/languages/DE.php	(revision 810)
@@ -29,9 +29,4 @@
 //Variablen fuer backend Texte
 $MOD_FORM['SETTINGS'] = 'Formular Einstellungen';
 
-// Variablen fuer Textausgabe der frontend.css/backend.css Bearbeitung
-$CAP_EDIT_CSS = 'Bearbeite CSS';
-$HEADING_CSS_FILE = 'Aktuelle Moduldatei: ';
-$TXT_EDIT_CSS_FILE = 'Bearbeite die CSS Definitionen im nachfolgenden Textfeld.';
-
 ?>
\ No newline at end of file
Index: trunk/wb/modules/news/languages/NL.php
===================================================================
--- trunk/wb/modules/news/languages/NL.php	(revision 809)
+++ trunk/wb/modules/news/languages/NL.php	(revision 810)
@@ -29,9 +29,4 @@
 //Variables for the  backend
 $MOD_NEWS['SETTINGS'] = 'Eigenschappen van de Nieuwsmodule';
 
-// Variables for the module CSS edit outputs
-$CAP_EDIT_CSS = 'Wijzig CSS';
-$HEADING_CSS_FILE = 'Actuele module bestand: ';
-$TXT_EDIT_CSS_FILE = 'Wijzig de CSS definities in het textveld hieronder.';
-
 ?>
\ No newline at end of file
Index: trunk/wb/modules/news/languages/NO.php
===================================================================
--- trunk/wb/modules/news/languages/NO.php	(revision 809)
+++ trunk/wb/modules/news/languages/NO.php	(revision 810)
@@ -29,9 +29,4 @@
 //Variables for the  backend
 $MOD_NEWS['SETTINGS'] = 'Innstillinger for Nyheter';
   
-// Variables for the module CSS edit outputs
-$CAP_EDIT_CSS = 'Rediger CSS koden';
-$HEADING_CSS_FILE = 'Faktisk modul fil: ';
-$TXT_EDIT_CSS_FILE = 'Rediger  CSS koden i tekst viduet nedenfor.';
-
 ?>
\ No newline at end of file
Index: trunk/wb/modules/news/languages/EN.php
===================================================================
--- trunk/wb/modules/news/languages/EN.php	(revision 809)
+++ trunk/wb/modules/news/languages/EN.php	(revision 810)
@@ -29,9 +29,4 @@
 //Variables for the  backend
 $MOD_NEWS['SETTINGS'] = 'News Settings';
 
-// Variables for the module CSS edit outputs
-$CAP_EDIT_CSS = 'Edit CSS';
-$HEADING_CSS_FILE = 'Actual module file: ';
-$TXT_EDIT_CSS_FILE = 'Edit the CSS definitions in the textarea below.';
-
 ?>
\ No newline at end of file
Index: trunk/wb/modules/news/languages/RU.php
===================================================================
--- trunk/wb/modules/news/languages/RU.php	(revision 809)
+++ trunk/wb/modules/news/languages/RU.php	(revision 810)
@@ -29,9 +29,4 @@
 //Variables for the  backend
 $MOD_NEWS['SETTINGS'] = '&#1053;&#1072;&#1089;&#1090;&#1088;&#1086;&#1081;&#1082;&#1080; &#1085;&#1086;&#1074;&#1086;&#1089;&#1090;&#1085;&#1086;&#1081; &#1083;&#1077;&#1085;&#1090;&#1099;';
 
-// Variables for the module CSS edit outputs
-$CAP_EDIT_CSS = '&#1056;&#1077;&#1076;&#1072;&#1082;&#1090;&#1080;&#1088;&#1086;&#1074;&#1072;&#1090;&#1100; CSS';
-$HEADING_CSS_FILE = '&#1048;&#1084;&#1103; &#1092;&#1072;&#1081;&#1083;&#1072;: ';
-$TXT_EDIT_CSS_FILE = '&#1048;&#1079;&#1084;&#1077;&#1085;&#1080;&#1090;&#1077; CSS &#1092;&#1072;&#1081;&#1083;, &#1077;&#1089;&#1083;&#1080; &#1085;&#1077;&#1086;&#1073;&#1093;&#1086;&#1076;&#1080;&#1084;&#1086;:';
-
 ?>
Index: trunk/wb/modules/news/languages/DE.php
===================================================================
--- trunk/wb/modules/news/languages/DE.php	(revision 809)
+++ trunk/wb/modules/news/languages/DE.php	(revision 810)
@@ -29,9 +29,4 @@
 //Variablen fuer backend Texte
 $MOD_NEWS['SETTINGS'] = 'News Einstellungen';
 
-// Variablen fuer Textausgabe der frontend.css/backend.css Bearbeitung
-$CAP_EDIT_CSS = 'Bearbeite CSS';
-$HEADING_CSS_FILE = 'Aktuelle Moduldatei: ';
-$TXT_EDIT_CSS_FILE = 'Bearbeite die CSS Definitionen im nachfolgenden Textfeld.';
-
 ?>
\ No newline at end of file
