Prepared headpage conformance

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

diff --git a/html/images/fai_hook.png b/html/images/fai_hook.png
index 120f2ff738b49341bb51cd91e639a2730187adad..1930fb233f6ac09c41a8b0107c911a6fb8a27633 100644 (file)
Binary files a/html/images/fai_hook.png and b/html/images/fai_hook.png differ

diff --git a/html/images/fai_new_hook.png b/html/images/fai_new_hook.png
new file mode 100644 (file)
index 0000000..f02e6a4
Binary files /dev/null and b/html/images/fai_new_hook.png differ

diff --git a/html/images/fai_new_packages.png b/html/images/fai_new_packages.png
new file mode 100644 (file)
index 0000000..15cad1e
Binary files /dev/null and b/html/images/fai_new_packages.png differ

diff --git a/html/images/fai_new_partitionTable.png b/html/images/fai_new_partitionTable.png
new file mode 100644 (file)
index 0000000..9ac4600
Binary files /dev/null and b/html/images/fai_new_partitionTable.png differ

diff --git a/html/images/fai_new_profile.png b/html/images/fai_new_profile.png
new file mode 100644 (file)
index 0000000..6808820
Binary files /dev/null and b/html/images/fai_new_profile.png differ

diff --git a/html/images/fai_new_script.png b/html/images/fai_new_script.png
new file mode 100644 (file)
index 0000000..b8333c7
Binary files /dev/null and b/html/images/fai_new_script.png differ

diff --git a/html/images/fai_new_template.png b/html/images/fai_new_template.png
new file mode 100644 (file)
index 0000000..9a88da9
Binary files /dev/null and b/html/images/fai_new_template.png differ

diff --git a/html/images/fai_new_variable.png b/html/images/fai_new_variable.png
new file mode 100644 (file)
index 0000000..d915c53
Binary files /dev/null and b/html/images/fai_new_variable.png differ

diff --git a/html/images/fai_packages.png b/html/images/fai_packages.png
index af23ddfaae1b9bb3353433ffef8ce47babf4343d..dd6de2f62d02d020e5941474f5e34997fe12aa5b 100644 (file)
Binary files a/html/images/fai_packages.png and b/html/images/fai_packages.png differ

diff --git a/html/images/fai_partitionTable.png b/html/images/fai_partitionTable.png
index c7c34a1a764d3f131a5e95731aa125bca4ec313b..7e8d7017f66d582574d6d274625b71bc896f2502 100644 (file)
Binary files a/html/images/fai_partitionTable.png and b/html/images/fai_partitionTable.png differ

diff --git a/html/images/fai_profile.png b/html/images/fai_profile.png
index 477387c6111d7f115823587940e634a7a588d190..07391b6ec087e2c3277031d01e654c64850e2202 100644 (file)
Binary files a/html/images/fai_profile.png and b/html/images/fai_profile.png differ

diff --git a/html/images/fai_script.png b/html/images/fai_script.png
index a8b69f73fe3ed52ad616c4fbc6fca2679a9e8c1d..f8aaba2e3e3e488dffb292b58a0143b7d8341b91 100644 (file)
Binary files a/html/images/fai_script.png and b/html/images/fai_script.png differ

diff --git a/html/images/fai_variable.png b/html/images/fai_variable.png
index 7d26d9937b0a65d953e786b80c948d729911ed6a..d7915fe524c4a595f09ab09ce10c62adbd1c95b1 100644 (file)
Binary files a/html/images/fai_variable.png and b/html/images/fai_variable.png differ

diff --git a/plugins/admin/fai/class_faiManagement.inc b/plugins/admin/fai/class_faiManagement.inc
index 7ec7329f6d149b55ede689a65a554989deb3454b..b5d697f138c3bcb9873314fdb5df9828194ff6c6 100644 (file)
--- a/plugins/admin/fai/class_faiManagement.inc
+++ b/plugins/admin/fai/class_faiManagement.inc
@@ -192,7 +192,7 @@ class faiManagement extends plugin
 
                                $this->dialog->by_object[$type[1]]->remove_from_parent ();
                                unset ($this->dialog);
-                               gosa_log ("System object'".$this->dn."' has been removed");
+                               gosa_log ("FAI class '".$this->dn."' has been removed");
                                $this->dialog= NULL;
 
                                /* Terminal list has changed, reload it. */
@@ -359,28 +359,28 @@ class faiManagement extends plugin
                $faihead = 
                        "<div style='background:#F0F0F9;padding:5px;'>&nbsp;".
 
-                       " <input type='image' src='images/fai_partitionTable.png' align='middle' 
+                       " <input type='image' src='images/fai_new_profile.png' align='middle' 
+                       title='"._("New profile bundle")."' name='Create_profile' alt='"._("P")."'>&nbsp;".
+                       
+                       "<img src=\"images/list_seperator.png\" alt=\"\" align=\"middle\" height=\"16\" width=\"1\">&nbsp;".
+                               
+                       " <input type='image' src='images/fai_new_partitionTable.png' align='middle' 
                        title='"._("New partition table")."' name='Create_partition' alt='"._("PT")."'>&nbsp;".
 
-                       " <input type='image' src='images/fai_script.png' align='middle' 
+                       " <input type='image' src='images/fai_new_script.png' align='middle' 
                        title='"._("New script bundle")."' name='Create_script' alt='"._("S")."'>&nbsp;".
 
-                       " <input type='image' src='images/fai_hook.png' align='middle' 
+                       " <input type='image' src='images/fai_new_hook.png' align='middle' 
                        title='"._("New hook bundle")."' name='Create_hook' alt='"._("H")."'>&nbsp;".
 
-                       " <input type='image' src='images/fai_variable.png' align='middle' 
+                       " <input type='image' src='images/fai_new_variable.png' align='middle' 
                        title='"._("New variable bundle")."' name='Create_variable' alt='"._("V")."'>&nbsp;".
                        
-                       " <input type='image' src='images/fai_template.png' align='middle' 
+                       " <input type='image' src='images/fai_new_template.png' align='middle' 
                        title='"._("New template bundle")."' name='Create_template' alt='"._("T")."'>&nbsp;".
 
-                       " <input type='image' src='images/fai_packages.png' align='middle' 
-                       title='"._("New package bundle")."' name='Create_package' alt='"._("PK")."'>&nbsp;".
-                       
-                       "<img src=\"images/list_seperator.png\" alt=\"\" align=\"middle\" height=\"16\" width=\"1\">&nbsp;".
-                               
-                       " <input type='image' src='images/fai_profile.png' align='middle' 
-                       title='"._("New profile bundle")."' name='Create_profile' alt='"._("P")."'>&nbsp;".
+                       " <input type='image' src='images/fai_new_packages.png' align='middle' 
+                       title='"._("New package list")."' name='Create_package' alt='"._("PK")."'>&nbsp;".
                        
                        "</div>";
 
@@ -393,13 +393,13 @@ class faiManagement extends plugin
 
                $divlist->SetHeader(array(
                                        array("string" => "&nbsp;"),
-                                       array("string" => _("FAI objects / ObjectClasses")),
-                                       array("string" => _("Object group")),
-                                       array("string" => _("Options"), "attach" => "style='border:none'" )));
+                                       array("string" => _("Name of FAI class")),
+                                       array("string" => _("Class type")),
+                                       array("string" => _("Actions"), "attach"=>"style='border:none;width:40px;'")));
 
 
                $action  = "<input type='image' src='images/edit.png'   alt='"._("edit")."'   name='entry_edit_%KEY%' title='"._("Edit object")."'>";
-               $action .= "<input type='image' src='images/editdelete.png' alt='"._("delete")."' name='entry_delete_%KEY%' title='"._("Delete object")."'>";
+               $action .= "<input type='image' src='images/edittrash.png' alt='"._("delete")."' name='entry_delete_%KEY%' title='"._("Delete object")."'>";
 
                /* Attach objects */
                foreach($this->objects as $key => $value){
@@ -428,21 +428,21 @@ class faiManagement extends plugin
                                                        $abort = true;
                                                }
                                        $img="<img src='images/fai_script' title='Set of scripts' alt='S'>";
-                                       $info = _("Script set");
+                                       $info = _("Scripts");
                                        break;
                                        case "FAIvariable"                      : 
                                                if(!$faifilter['ShowVariables']){ 
                                                        $abort = true;
                                                }
                                        $img="<img src='images/fai_variable.png' title='Variable set' alt='V'>";
-                                       $info = _("Variable set");
+                                       $info = _("Variables");
                                        break;
                                        case "FAIhook"                          :
                                                if(!$faifilter['ShowHooks']){ 
                                                        $abort = true;
                                                }
                                        $img="<img src='images/fai_hook.png' title='Hooks' alt='H'>";
-                                       $info = _("Hook set");
+                                       $info = _("Hooks");
                                        break;
                                        case "FAIprofile"                       : 
                                                if(!$faifilter['ShowProfiles']){ 
@@ -456,7 +456,7 @@ class faiManagement extends plugin
                                                        $abort = true;
                                                }
                                        $img="<img src='images/fai_template.png' title='Template' alt='T'>";
-                                       $info = _("Template");
+                                       $info = _("Templates");
                                        break;
                                        default                                         : 
                                        $img="<img src='images/empty.png' >";$info = "";break;
@@ -472,7 +472,7 @@ class faiManagement extends plugin
                                        $field1 = array("string" => $img , "attach" => "style='height:26px;width=20px;'");
                                        $field2 = array("string" => $value['cn'].$desc , "attach" => "");
                                        $field3 = array("string" => $info, "attach" => "");
-                                       $field4 = array("string" => preg_replace("/%KEY%/",$key,$action) , "attach" => "style='border-right:none;'");
+                                       $field4 = array("string" => preg_replace("/%KEY%/",$key,$action) , "attach"=>"style='text-align:right;border:none'");
                                        $divlist->AddEntry(array($field1,$field2,$field3,$field4));
 
                        }

diff --git a/plugins/admin/fai/headpage.tpl b/plugins/admin/fai/headpage.tpl
index 2a4714c951cc73cf70a7c88a130fc0653e972a77..a3bd5b1300736bcde6884a8106f7d7a3f68927fd 100644 (file)
--- a/plugins/admin/fai/headpage.tpl
+++ b/plugins/admin/fai/headpage.tpl
@@ -3,7 +3,7 @@
   <td style="vertical-align:top;width:600px">
   <div class="contentboxh">
     <p class="contentboxh">
-     {t}List of FAI objects (Fully Automatic Installation){/t}
+     {t}List of FAI classes{/t}
     </p>
   </div>
   <div class="contentboxb">
@@ -21,7 +21,7 @@
    </div>
    <div class="contentboxb">
    <p class="contentboxb">
-     {t}This menu allows you to create, delete and edit FAI objects.{/t}
+     {t}This menu allows you to create, delete and edit FAI classes.{/t}
    </p>
    </div>
    <br>