Removed not necessary options from schema step.

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

diff --git a/setup/class_setupStep7.inc b/setup/class_setupStep7.inc
index 38ea41139697f2bab02e0f3b716137c14203749c..6dba41c0a32c4454d5e215d1e5c6e48cc434cbf7 100644 (file)
--- a/setup/class_setupStep7.inc
+++ b/setup/class_setupStep7.inc
@@ -26,7 +26,6 @@ class setup_step_7 extends setup_step
   var $not_checked = array();
   var $schema_readable  = FALSE;
   var $attributes       = array("enable_schema_check","samba_version");
-  var $display_type     = "failed";
   var $enable_schema_check = TRUE;
   var $samba_version       = 3;
 
@@ -62,7 +61,6 @@ class setup_step_7 extends setup_step
 
     $smarty = get_smarty();
     $smarty->assign("bool",array(FALSE => _("No"), TRUE => _("Yes")));
-    $smarty->assign("display_type",$this->display_type);
     $smarty->assign("schema_readable",$this->schema_readable);
     $smarty->assign("enable_schema_check",$this->enable_schema_check);
     $smarty->assign("checks",$this->checked);
@@ -82,11 +80,6 @@ class setup_step_7 extends setup_step
   {
     if(isset($_POST['step7_posted'])){
 
-      /* Get diplay method */
-      if(isset($_POST['display_type']) && in_array($_POST['display_type'],array("failed","checked","all"))){
-        $this->display_type = $_POST['display_type'];
-      }
-
       /* Get attributes */
       foreach($this->attributes as $attr){
         if(isset($_POST[$attr])){

diff --git a/setup/setup_step7.tpl b/setup/setup_step7.tpl
index 3f8e655277dab325d6eca6e79b181b8b288e58ea..fe1e0c58200ade92a137ae703d0165b960a7e1fe 100644 (file)
--- a/setup/setup_step7.tpl
+++ b/setup/setup_step7.tpl
@@ -1,11 +1,8 @@
-
-
 <div class='default' style='margin:12px; '>
     <div style='float:left; '>
         <br>
         <b>{t}Validate schema when login into GOsa?{/t}</b>
     </div>
-
        <div class='step4_container'>
         <div class='step4_name'>
             {t}Enable schema validation{/t}
@@ -21,51 +18,27 @@
         </div>
     </div>
        <div style='float:left;' >
-
                {if $failed_checks == 0}
                        <h2>{t}Schema check was completely successful{/t}</h2>
                {else}
-                       <h2>{t}The schema check returned the following results{/t}</h2>
+                       <h2><img src='images/warning.png' class='center'>
+                               <font color='red'>{t}The schema check returned the following results{/t}</font></h2>
                {/if}
-
-               <input {if $display_type == "failed"} checked  {/if} onClick='document.mainform.submit();' 
-                       type='radio' name='display_type' value='failed'>{t}Only display failed tests{/t}<br>
-               <input {if $display_type == "checked"} checked {/if} onClick='document.mainform.submit();' 
-                       type='radio' name='display_type' value='checked'>{t}Display checked object classes{/t}<br>
-               <input {if $display_type == "all"} checked {/if} onClick='document.mainform.submit();' 
-                       type='radio' name='display_type' value='all'>{t}Display all objectClasses also not checked but available classes{/t}
-
        <div style='float:left'>
                {foreach from=$checks item=val key=key}
-                       {if (   $display_type == "failed" && !$checks[$key].STATUS) || 
-                                       $display_type == "checked" || 
-                                       $display_type == "all"}
-
-                       <br>
+                               {if !$checks[$key].STATUS}
+                               <br>
                                <b>{$key}</b>
                                {$checks[$key].INFO}
                                <br>
-                               {if !$checks[$key].STATUS}
                                        {if $checks[$key].IS_MUST_HAVE}
                                                <i><font color='red'>{$checks[$key].MSG}</font></i>
                                        {else}
                                                <i><font color='orange'>{$checks[$key].MSG}</font></i>
                                        {/if}
-                               {else}
-                                       <i><font color='green'>{$checks[$key].MSG}</font></i>
+                               <br>
                                {/if}
-                       {/if}
                {/foreach}
        </div>
-
-</div>
-       {if $display_type == "all"}
-               <div style='float:left'>
-                       <h2>{t}All available objectClasses{/t}</h2>
-                       {foreach from=$not_checked item=val key=key}
-                               <b>{$key}</b> &nbsp; {$val}<br>
-                       {/foreach}
-               </div>
-       {/if}
 </div>
 <input type='hidden' value='1' name='step7_posted'>