From: cajus <cajus@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Mon, 19 Sep 2005 14:39:25 +0000 (+0000)
Subject: Updated templates
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=6d616a278a0cdf88007b6b9ff320c29a8225837e;p=gosa.git

Updated templates


git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@1395 594d385d-05f5-0310-b6e9-bd551577e9d8
---

diff --git a/plugins/admin/fai/class_faiVariable.inc b/plugins/admin/fai/class_faiVariable.inc
index 606f18c3e..90faabf35 100644
--- a/plugins/admin/fai/class_faiVariable.inc
+++ b/plugins/admin/fai/class_faiVariable.inc
@@ -159,7 +159,11 @@ class faiVariable extends plugin
     $a_return=array();
     foreach($this->SubObjects as $obj){
       if($obj['status'] != "delete"){
-        $a_return[$obj['cn']]= $obj['cn']." [".$obj['description']."]";
+          if (preg_match("/\[\*\]/", $obj['description'])){
+            $a_return[$obj['cn']]= $obj['cn']." [".preg_replace("/\s*\[\*\]\s*/", "", $obj['description'])."]";
+          } else {
+            $a_return[$obj['cn']]= $obj['cn']."=".$obj['FAIvariableContent']." [".$obj['description']."]";
+          }
       }
     }
     return($a_return);
diff --git a/plugins/admin/fai/class_faiVariableEntry.inc b/plugins/admin/fai/class_faiVariableEntry.inc
index 3f993cb90..d3a19ebbe 100644
--- a/plugins/admin/fai/class_faiVariableEntry.inc
+++ b/plugins/admin/fai/class_faiVariableEntry.inc
@@ -72,7 +72,6 @@ class faiVariableEntry extends plugin
   {
     $message= array();
     
-    $str = utf8_encode("üöä");
     if(empty($this->Object_FAIvariableContent)) {
       $message[]=_("Please specify a value for the attribute 'content'."); 
     }
@@ -81,10 +80,6 @@ class faiVariableEntry extends plugin
       $message[] = _("Please enter a description.");
     }
 
-    if(preg_match("/[^a-z0-9".$str."\.,;:\-_\? ]/i",$this->Object_description)){
-      $message[] = _("Invalid character in description. Please enter a valid description.");
-    }
-
     if(empty($this->Object_cn)){
       $message[] = _("Please enter a name.");
     }
diff --git a/plugins/admin/fai/faiProfile.tpl b/plugins/admin/fai/faiProfile.tpl
index 11185d262..7c9d1e0b1 100644
--- a/plugins/admin/fai/faiProfile.tpl
+++ b/plugins/admin/fai/faiProfile.tpl
@@ -1,4 +1,4 @@
-<h2><img alt="" src="images/house.png" align="middle" title="{t}Generic{/t}">&nbsp;{t}Generic{/t}</h2><br>
+<h2><img alt="" src="images/house.png" align="middle" title="{t}Generic{/t}">&nbsp;{t}Generic{/t}</h2>
 <table summary="" cellspacing="4">
 	<tr>
 		<td>
diff --git a/plugins/admin/fai/faiScript.tpl b/plugins/admin/fai/faiScript.tpl
index 0d405a102..23345a416 100644
--- a/plugins/admin/fai/faiScript.tpl
+++ b/plugins/admin/fai/faiScript.tpl
@@ -1,7 +1,7 @@
 <table width="100%">
 	<tr>
 		<td width="50%" valign="top">
-				<h2><img alt="" src="images/house.png" align="middle" title="{t}Generic{/t}">&nbsp;{t}Generic{/t}</h2><br>
+				<h2><img alt="" src="images/fai_small.png" align="middle" title="{t}Generic{/t}">&nbsp;{t}Generic{/t}</h2>
 				<table summary="" cellspacing="4">
 					<tr>
 						<td>
@@ -20,7 +20,7 @@
 							</LABEL>
 						</td>
 						<td>
-							<input value="{$description}" {$description} name="description" id="description">
+							<input size=40 value="{$description}" {$description} name="description" id="description">
 						</td>
 					</tr>
 				</table>
@@ -29,15 +29,15 @@
 		   &nbsp;
 	 	</td>
 		<td>
-				<h2><img alt="" src="images/list_ogroup.png" align="middle" title="{t}Objects{/t}">&nbsp;
+				<h2><img alt="" src="images/fai_script.png" align="middle" title="{t}Objects{/t}">&nbsp;
 					<LABEL for="SubObject">
-						{t}This bundle contains the following objects{/t}
+						{t}List of scripts{/t}
 					</LABEL>
-				</h2><br>
+				</h2>
 				<table width="100%">
 				<tr>
 					<td>
-						<select name="SubObject" title="{t}Choose a script to delete or edit{/t}" style="width:350px;height:120px;" size=10 id="SubObject">
+						<select name="SubObject" title="{t}Choose a script to delete or edit{/t}" style="width:100%;" size=15 id="SubObject">
 							{html_options values=$SubObjectKeys output=$SubObjects}
 						</select><br>
 						<input type="submit" name="AddSubObject"     value="{t}Add{/t}"		title="{t}Add{/t}">
diff --git a/plugins/admin/fai/faiScriptEntry.tpl b/plugins/admin/fai/faiScriptEntry.tpl
index c07a8dc09..a410994a4 100644
--- a/plugins/admin/fai/faiScriptEntry.tpl
+++ b/plugins/admin/fai/faiScriptEntry.tpl
@@ -17,7 +17,7 @@
 							{t}Description{/t}{$must}&nbsp;
 						</td>
 						<td>
-							<input value="{$Object_description}" name="Object_description">
+							<input size=40 value="{$Object_description}" name="Object_description">
 						</td>
 					</tr>
 				</table>
@@ -26,7 +26,7 @@
            &nbsp;
         </td>
 		<td valign="top">
-				<h2><img alt="" src="images/edit.png" align="middle" title="{t}Script attributes{/t}">&nbsp;{t}Script attributes{/t}</h2>
+				<h2><img alt="" src="images/fai_script.png" align="middle" title="{t}Properties{/t}">&nbsp;{t}Script attributes{/t}</h2>
 				<table width="100%">
 					<tr>
 						<td>
@@ -45,24 +45,23 @@
 	</tr>
 </table>
 <p class="seperator">&nbsp;</p>
-<h2><img alt="" src="images/envelope.png" align="middle" title="{t}Script attributes{/t}">&nbsp;
+<h2><img alt="" src="images/fai_script.png" align="middle" title="{t}Script attributes{/t}">&nbsp;
 	<LABEL for="Object_FAIscript">
 		{t}Script{/t}
 	</LABEL>
 	</h2>
-<div>
-	{t}Import script{/t} &nbsp;
-	<input type="file" name="ImportFile">&nbsp;
-	<input type="submit" name="ImportUpload" value="{t}Import{/t}">
-</div>
-<br>
-<table width="100%">
+<table width="99%">
     <tr>
         <td>
             <textarea name="Object_FAIscript" style="width:100%;height:300px;" id="Object_FAIscript">{$Object_FAIscript}</textarea>
         </td>
     </tr>
 </table>
+<br>
+<div>
+	<input type="file" name="ImportFile">&nbsp;
+	<input type="submit" name="ImportUpload" value="{t}Import script{/t}">
+</div>
 
 <br>
 <div style="align:right;" align="right">
diff --git a/plugins/admin/fai/faiTemplate.tpl b/plugins/admin/fai/faiTemplate.tpl
index e310be27c..b22bc9102 100644
--- a/plugins/admin/fai/faiTemplate.tpl
+++ b/plugins/admin/fai/faiTemplate.tpl
@@ -1,7 +1,7 @@
 <table width="100%">
 	<tr>
 		<td width="50%" valign="top">
-				<h2><img alt="" src="images/house.png" align="middle" title="{t}Generic{/t}">&nbsp;{t}Generic{/t}</h2><br>
+				<h2><img alt="" src="images/fai_small.png" align="middle" title="{t}Generic{/t}">&nbsp;{t}Generic{/t}</h2>
 				<table summary="" cellspacing="4">
 					<tr>
 						<td>
@@ -31,13 +31,13 @@
 		<td>
 				<h2><img alt="" src="images/fai_template.png" align="middle" title="{t}Objects{/t}">&nbsp;
 					<LABEL for="SubObject">
-						{t}This bundle contains the following objects{/t}
+						{t}List of template files{/t}
 					</LABEL>
-				</h2><br>
+				</h2>
 				<table width="100%">
 				<tr>
 					<td>
-						<select name="SubObject" title="{t}Choose a template to delete or edit{/t}" style="width:350px;height:120px;" size=10 id="SubObject">
+						<select name="SubObject" title="{t}Choose a template to delete or edit{/t}" style="width:100%;" size=15 id="SubObject">
 							{html_options values=$SubObjectKeys output=$SubObjects}
 						</select><br>
 						<input type="submit" name="AddSubObject"     value="{t}Add{/t}"		title="{t}Add{/t}">
diff --git a/plugins/admin/fai/faiTemplateEntry.tpl b/plugins/admin/fai/faiTemplateEntry.tpl
index 70dd862f6..e0fda071b 100644
--- a/plugins/admin/fai/faiTemplateEntry.tpl
+++ b/plugins/admin/fai/faiTemplateEntry.tpl
@@ -17,7 +17,7 @@
 							{t}Description{/t}{$must}&nbsp;
 						</td>
 						<td>
-							<input value="{$Object_description}" name="Object_description">
+							<input size=40 value="{$Object_description}" name="Object_description">
 						</td>
 					</tr>
 				</table>
@@ -30,22 +30,22 @@
 				<table width="100%">
 					<tr>
 						<td>
-							<LABEL for="Object_FAItemplatePath">
-							{t}Path{/t}{$must}&nbsp;
+							<LABEL for="Object_FAItemplateFile">
+							{t}File{/t}{$must}&nbsp;
 							</LABEL>
 						</td>
 						<td>
-							<input type="text" name="Object_FAItemplatePath" value="{$Object_FAItemplatePath}" id="Object_FAItemplatePath">
+							<input type="text" name="Object_FAItemplateFile" value="{$Object_FAItemplateFile}" id="Object_FAItemplateFile">
 						</td>
 					</tr>
 					<tr>
 						<td>
-							<LABEL for="Object_FAItemplateFile">
-							{t}File{/t}{$must}&nbsp;
+							<LABEL for="Object_FAItemplatePath">
+							{t}Destination path{/t}{$must}&nbsp;
 							</LABEL>
 						</td>
 						<td>
-							<input type="text" name="Object_FAItemplateFile" value="{$Object_FAItemplateFile}" id="Object_FAItemplateFile">
+							<input type="text" name="Object_FAItemplatePath" value="{$Object_FAItemplatePath}" id="Object_FAItemplatePath">
 						</td>
 					</tr>
 				</table>
diff --git a/plugins/admin/fai/faiVariable.tpl b/plugins/admin/fai/faiVariable.tpl
index cc3871e7d..25843553c 100644
--- a/plugins/admin/fai/faiVariable.tpl
+++ b/plugins/admin/fai/faiVariable.tpl
@@ -1,7 +1,7 @@
 <table width="100%">
 	<tr>
 		<td width="50%" valign="top">
-				<h2><img alt="" src="images/house.png" align="middle" title="{t}Generic{/t}">&nbsp;{t}Generic{/t}</h2><br>
+				<h2><img alt="" src="images/fai_small.png" align="middle" title="{t}Generic{/t}">&nbsp;{t}Generic{/t}</h2>
 				<table summary="" cellspacing="4">
 					<tr>
 						<td>
@@ -20,7 +20,7 @@
 							</LABEL>
 						</td>
 						<td>
-							<input value="{$description}" {$description} name="description" id="description">
+							<input size=40 value="{$description}" {$description} name="description" id="description">
 						</td>
 					</tr>
 				</table>
@@ -31,13 +31,13 @@
 		<td>
 				<h2><img alt="" src="images/fai_variable.png" align="middle" title="{t}Objects{/t}">&nbsp;
 					<LABEL for="SubObject">
-						{t}This bundle contains the following objects{/t}
+						{t}List of assigned variables{/t}
 					</LABEL>
-				</h2><br>
+				</h2>
 				<table width="100%">
 				<tr>
 					<td>
-						<select name="SubObject" title="{t}Choose a variable to delete or edit{/t}" style="width:350px;height:120px;" size=10 id="SubObject">
+						<select name="SubObject" title="{t}Choose a variable to delete or edit{/t}" style="width:100%;" size=15 id="SubObject">
 							{html_options values=$SubObjectKeys output=$SubObjects}
 						</select><br>
 						<input type="submit" name="AddSubObject"     value="{t}Add{/t}"		title="{t}Add{/t}">
diff --git a/plugins/admin/fai/faiVariableEntry.tpl b/plugins/admin/fai/faiVariableEntry.tpl
index d2a80113a..655dd5d0b 100644
--- a/plugins/admin/fai/faiVariableEntry.tpl
+++ b/plugins/admin/fai/faiVariableEntry.tpl
@@ -2,7 +2,7 @@
 <table width="100%" summary="">
 	<tr>
 		<td valign="top" width="50%">
-			<h2><img alt="" src="images/house.png" align="middle" title="{t}Generic{/t}">&nbsp;{t}Generic{/t}</h2>
+			<h2><img alt="" src="images/fai_small.png" align="middle" title="{t}Generic{/t}">&nbsp;{t}Generic{/t}</h2>
 				<table>
 					<tr>
 						<td>
@@ -17,7 +17,7 @@
 							{t}Description{/t}{$must}&nbsp;
 						</td>
 						<td>
-							<input value="{$Object_description}" name="Object_description">
+							<input size=40 value="{$Object_description}" name="Object_description">
 						</td>
 					</tr>
 				</table>
@@ -31,7 +31,7 @@
 					<tr>
 						<td>
 							<LABEL for="Content">
-							{t}Variable Content{/t}{$must}&nbsp;
+							{t}Variable content{/t}{$must}&nbsp;
 							</LABEL>
 						</td>
 						<td>