Modified policy dialogs

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

diff --git a/gosa-plugins/heimdal/admin/systems/services/kerberos/class_krb5_policy.inc b/gosa-plugins/heimdal/admin/systems/services/kerberos/class_krb5_policy.inc
index 02234d73fcd0376dce1fac49e7a306c3885a34be..96b107465016fd68558ef05fbf9e088c95c4c3e6 100644 (file)
--- a/gosa-plugins/heimdal/admin/systems/services/kerberos/class_krb5_policy.inc
+++ b/gosa-plugins/heimdal/admin/systems/services/kerberos/class_krb5_policy.inc
@@ -69,6 +69,8 @@ class krb5_policy extends plugin
     foreach($this->attributes as $attr){
       $smarty->assign($attr,$this->data[$attr]);
     }
+
+    $smarty->assign("POLICY_REFCNT", sprintf("<i>"._("This policy is referenced %d times.")."</i>", $this->data["POLICY_REFCNT"]));
     return($smarty->fetch(get_template_path("krb5_policy.tpl",TRUE,dirname(__FILE__))));
   }
 
@@ -98,45 +100,45 @@ class krb5_policy extends plugin
     $message = array();
     $names = $this->parent->getPolicyNames();
     if($this->name != $this->init_name && in_array($this->name,$names)){
-      $message[] = msgPool::duplicated(_("Name"));
+      $message[] = msgPool::duplicated(_("Policy name"));
     }
     if(empty($this->name)){
-      $message[] = msgPool::required(_("Name"));
+      $message[] = msgPool::required(_("Policy name"));
     }
   
     if(!preg_match("/^[a-z0-9\@\.\-_]*$/i",$this->name)){
-      $message[] = msgPool::invalid(_("Name"),$this->name,"/[a-z0-9]/i");
+      $message[] = msgPool::invalid(_("Policy name"),$this->name,"/[a-z0-9]/i");
     }
 
     /* Check password history */
     if(!is_numeric($this->data['PW_HISTORY_NUM'])){
-      $message[] = msgPool::invalid(_("Password history"));
+      $message[] = msgPool::invalid(_("Password history size"));
     }elseif($this->data['PW_HISTORY_NUM'] <= 0){
-      $message[] = msgPool::toosmall(_("Password history"));
+      $message[] = msgPool::toosmall(_("Password history size"));
     }
 
     /* Check password minimum length */
     if(!is_numeric($this->data['PW_MIN_LENGTH'])){
-      $message[] = msgPool::invalid(_("Password minimum length"));
+      $message[] = msgPool::invalid(_("Minimum password length"));
     }elseif($this->data['PW_MIN_LENGTH'] <= 0){
-      $message[] = msgPool::toosmall(_("Password minimum length"));
+      $message[] = msgPool::toosmall(_("Minimum password length"));
     }
 
     /* Check password different character classes */
     if(!is_numeric($this->data['PW_MIN_CLASSES'])){
-      $message[] = msgPool::invalid(_("Password min characters"));
+      $message[] = msgPool::invalid(_("Required different characters"));
     }elseif($this->data['PW_MIN_CLASSES'] <= 0){
-      $message[] = msgPool::toosmall(_("Password min characters"));
+      $message[] = msgPool::toosmall(_("Required different characters"));
     }elseif($this->data['PW_MIN_CLASSES'] > $this->data['PW_MIN_LENGTH']){
       $message[] = sprintf(_("The value specified for '%s' must be smaller than the value specified for '%s'."),
-        _("Password min characters"),_("Password minimum length"));
+        _("Required different characters"),_("Minimum password length"));
     }
 
     /* Check password min lifetime */
     if(!is_numeric($this->data['PW_MIN_LIFE'])){
-      $message[] = msgPool::invalid(_("Password minimum lifetime"));
+      $message[] = msgPool::invalid(_("Minimum password lifetime"));
     }elseif($this->data['PW_MIN_LIFE'] <= 0){
-      $message[] = msgPool::toosmall(_("Password minimum lifetime"));
+      $message[] = msgPool::toosmall(_("Minimum password lifetime"));
     }
 
     /* Check password lifetime */
@@ -146,7 +148,7 @@ class krb5_policy extends plugin
       $message[] = msgPool::toosmall(_("Password lifetime"));
     }elseif($this->data['PW_MAX_LIFE'] < $this->data['PW_MIN_LIFE']){
       $message[] = sprintf(_("The value specified for '%s' must be smaller than the value specified for '%s'."),
-        _("Password minimum lifetime"),_("Password lifetime"));
+        _("Minimum password lifetime"),_("Password lifetime"));
     }
 
     return($message);

diff --git a/gosa-plugins/heimdal/admin/systems/services/kerberos/krb5_policy.tpl b/gosa-plugins/heimdal/admin/systems/services/kerberos/krb5_policy.tpl
index 167e91f1801873464dc72950104834cc78eeb49a..866a905676edece887f18884c944d9e7b4d3386c 100644 (file)
--- a/gosa-plugins/heimdal/admin/systems/services/kerberos/krb5_policy.tpl
+++ b/gosa-plugins/heimdal/admin/systems/services/kerberos/krb5_policy.tpl
@@ -1,39 +1,44 @@
-<h2>{t}Policy options{/t}</h2>
-<table>
-       <tr>
-               <td>{t}Policy name{/t}</td>
-               <td><input type="text" name="name" value="{$name}"></td>
-       </tr>
-<!--
-       <tr>
-               <td>{t}Mask{/t}</td>
-               <td><input type="text" name="MASK" value="{$MASK}"></td>
-       </tr>
--->
-       <tr>
-               <td>{t}Password minimum length{/t}</td>
-               <td><input type="text" name="PW_MIN_LENGTH" value="{$PW_MIN_LENGTH}"></td>
-       </tr>
-       <tr>
-               <td>{t}Password history{/t}</td>
-               <td><input type="text" name="PW_HISTORY_NUM" value="{$PW_HISTORY_NUM}"></td>
-       </tr>
-       <tr>
-               <td>{t}Password minimum lifetime{/t}</td>
-               <td><input type="text" name="PW_MIN_LIFE" value="{$PW_MIN_LIFE}">&nbsp;{t}seconds{/t}</td>
-       </tr>
-       <tr>
-               <td>{t}Password lifetime{/t}</td>
-               <td><input type="text" name="PW_MAX_LIFE" value="{$PW_MAX_LIFE}">&nbsp;{t}seconds{/t}</td>
-       </tr>
-       <tr>
-               <td>{t}Password min characters{/t}</td>
-               <td><input type="text" name="PW_MIN_CLASSES" value="{$PW_MIN_CLASSES}"></td>
-       </tr>
-       <tr>
-               <td colspan="2">{t}Number of principals referring to this policy{/t}:&nbsp;{$POLICY_REFCNT}</td>
-       </tr>
-</table>
+<h2>{t}Policy settings{/t}</h2>
+<table style="width:100%">
+ <tr>
+  <td style="border-right:1px solid #AAA">
+   <table>
+    <tr>
+      <td>{t}Policy name{/t}{$must}</td>
+      <td><input type="text" name="name" value="{$name}"></td>
+    </tr>
+    <tr>
+      <td>{t}Minimum password length{/t}</td>
+      <td><input type="text" name="PW_MIN_LENGTH" value="{$PW_MIN_LENGTH}"></td>
+    </tr>
+    <tr>
+      <td>{t}Required different characters{/t}</td>
+      <td><input type="text" name="PW_MIN_CLASSES" value="{$PW_MIN_CLASSES}"></td>
+    </tr>
+    <tr>
+      <td>{t}Password history size{/t}</td>
+      <td><input type="text" name="PW_HISTORY_NUM" value="{$PW_HISTORY_NUM}"></td>
+    </tr>
+   </table>
+   </td>
+   <td style="vertical-align:top">
+    <table>
+     <td>
+      <tr>
+        <td>{t}Minimum password lifetime{/t}</td>
+        <td><input type="text" name="PW_MIN_LIFE" value="{$PW_MIN_LIFE}">&nbsp;{t}seconds{/t}</td>
+      </tr>
+      <tr>
+        <td>{t}Password lifetime{/t}</td>
+        <td><input type="text" name="PW_MAX_LIFE" value="{$PW_MAX_LIFE}">&nbsp;{t}seconds{/t}</td>
+      </tr>
+    </table>
+   </td>
+  </tr>
+  <tr>
+    <td colspan="2"><br>{$POLICY_REFCNT}</td>
+  </tr>
+ </table>
 <input type="hidden" name="Policy_Posted" value="1">
 <p class="seperator">&nbsp;</p>