Changed "goFonQueueAnnounceHoldtime" into chkbox,

positioning of chkboxes changed

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

diff --git a/plugins/admin/ogroups/class_phonequeue.inc b/plugins/admin/ogroups/class_phonequeue.inc
index 400502e09d35e4c9d7afab826fa9406c989c75d1..8d901b400fb72c31054ba0c87cd5763220d8312d 100644 (file)
--- a/plugins/admin/ogroups/class_phonequeue.inc
+++ b/plugins/admin/ogroups/class_phonequeue.inc
@@ -66,6 +66,9 @@ class phonequeue extends plugin
       }
     }
 
+    if($this->goFonQueueAnnounceHoldtime == "no"){
+      $this->goFonQueueAnnounceHoldtime=false;
+    }
     $this->old_phone_numbers = $this->telephoneNumber;
   }
 
@@ -132,7 +135,6 @@ class phonequeue extends plugin
     $smarty= get_smarty();
 
     $smarty->assign("goFonQueueLanguageOptions",array('de'=>_('German'),'ur'=>_('Uruguai')));
-    $smarty->assign("goFonQueueAnnounceHoldtimeOptions",array('no'=>_("No"),'yes'=>_('Yes')));
     $types= array('ringall'    =>_("ring all"),
           'roundrobin' =>_("round robin"),
           'leastrecent'=>_("least recently called"),
@@ -377,6 +379,13 @@ class phonequeue extends plugin
             $this->goFonDialOption_r;
         }
 
+        if($this->goFonQueueAnnounceHoldtime != false) {
+          $this->goFonQueueAnnounceHoldtime = "yes";
+        }else{
+          $this->goFonQueueAnnounceHoldtime = "no";
+        }
+
+
         /* Generate Priority Entry */
         $queue["announce"]              = "";
         $queue["monitor_join"]          = "";
@@ -497,6 +506,12 @@ class phonequeue extends plugin
           $this->$val = false;
         }
       }
+      if(isset($_POST['goFonQueueAnnounceHoldtime'])){
+        $this->goFonQueueAnnounceHoldtime = "yes";
+      }else{
+        $this->goFonQueueAnnounceHoldtime = false;
+      }
+      
     }
 
   }
@@ -515,7 +530,13 @@ class phonequeue extends plugin
     }
     $this->generate_mysql_entension_entries(true);
     if($this->attrs['goFonDialOption']=="") $this->attrs['goFonDialOption']=array();
-    
+  
+    if($this->goFonQueueAnnounceHoldtime != "no" ){
+      $this->attrs['goFonQueueAnnounceHoldtime'] = "yes";
+    }else{
+      $this->attrs['goFonQueueAnnounceHoldtime'] = "no";
+    }
+ 
     /* Save data to LDAP */
     $ldap->cd($this->dn);
     $ldap->modify($this->attrs);

diff --git a/plugins/admin/ogroups/phonequeue.tpl b/plugins/admin/ogroups/phonequeue.tpl
index 2efbc828b7f3140c266bef4a37b94c8fdd93b807..4cfd3abf7b3b64097e5998340a3a96d941711721 100644 (file)
--- a/plugins/admin/ogroups/phonequeue.tpl
+++ b/plugins/admin/ogroups/phonequeue.tpl
@@ -86,47 +86,6 @@
                        {t}(in seconds){/t}     
                </td>
                </tr>
-               <tr>    
-               <td>    
-                       {t}Announce holdtime{/t}
-               </td>
-               <td>
-                       <select name="goFonQueueAnnounceHoldtime" {$goFonQueueAnnounceHoldtimeACL}>
-            {html_options options=$goFonQueueAnnounceHoldtimeOptions selected=$goFonQueueAnnounceHoldtime}
-            <option disabled>&nbsp;</option>
-            </select>
-               </td>
-               </tr>
-               <tr>
-               <td colspan=2>
-                       <input type="checkbox" name='goFonDialOption_t' value='t'  {$goFonDialOption_tCHK} {$goFonDialOption_tACL}>
-                       {t}Allow the called user to transfer his call{/t}
-               </td>
-               </tr>
-               <tr>
-               <td colspan=2>
-                       <input type="checkbox" name='goFonDialOption_T' value='T' {$goFonDialOption_TCHK} {$goFonDialOption_TACL}>
-                       {t}Allows calling user to transfer call{/t}
-               </td>
-               </tr>
-               <tr>
-               <td colspan=2>
-                       <input type="checkbox" name='goFonDialOption_h' value='h' {$goFonDialOption_hCHK} {$goFonDialOption_hACL}>
-                       {t}Allow the called to hangup by pressing *{/t}
-               </td>
-               </tr>
-               <tr>
-               <td colspan=2>
-                       <input type="checkbox" name='goFonDialOption_H' value='H' {$goFonDialOption_HCHK} {$goFonDialOption_HACL}>
-                       {t}Allows calling to hangup by pressing *{/t}
-               </td>
-               </tr>
-               <tr>
-               <td colspan=2>
-                       <input type="checkbox" name='goFonDialOption_r' value='r' {$goFonDialOption_rCHK} {$goFonDialOption_rACL}>
-                       {t}Ring instead of playing background music{/t}
-               </td>
-               </tr>
                </table>
 </td>
 <td valign='top' style="border-left: 1px solid rgb(160, 160, 160);">
@@ -227,7 +186,59 @@
 
                </table>
 </td>
+</tr>
+<tr>
+       <td colspan=2>
+               <p class="seperator">
+       </td>
+</tr>
+<tr>
+<td>
+               <h2><img alt="" src="images/select_phone.png" align="middle">&nbsp;{t}Phone attributes {/t}</h2>
+               <table summary="" style="width: 100%; vertical-align: top; text-align: left;" border="0" cellpadding="4">
+        <tr>
+        <td colspan=2>
+            <input type="checkbox" name='goFonQueueAnnounceHoldtime' value='yes'  {$goFonQueueAnnounceHoldtimeCHK} {$goFonQueueAnnounceHoldtimeACL}>
+            {t}Announce holdtime{/t}
+        </td>
+        </tr>
+        <tr>
+        <td colspan=2>
+            <input type="checkbox" name='goFonDialOption_t' value='t'  {$goFonDialOption_tCHK} {$goFonDialOption_tACL}>
+            {t}Allow the called user to transfer his call{/t}
+        </td>
+        </tr>
+        <tr>
+        <td colspan=2>
+            <input type="checkbox" name='goFonDialOption_T' value='T' {$goFonDialOption_TCHK} {$goFonDialOption_TACL}>
+            {t}Allows calling user to transfer call{/t}
+        </td>
+        </table>
 
+</td>
+<td valign='top' style="border-left: 1px solid rgb(160, 160, 160);">
+               <h2><img alt="" src="images/select_phone.png" align="middle">&nbsp;{t}Additional phone attributes {/t}</h2>
+               <table summary=""  style="width: 100%; vertical-align: top; text-align: left;" border="0" cellpadding="4">
+        <tr>
+        <td colspan=2>
+            <input type="checkbox" name='goFonDialOption_h' value='h' {$goFonDialOption_hCHK} {$goFonDialOption_hACL}>
+            {t}Allow the called to hangup by pressing *{/t}
+        </td>
+        </tr>
+        <tr>
+        <td colspan=2>
+            <input type="checkbox" name='goFonDialOption_H' value='H' {$goFonDialOption_HCHK} {$goFonDialOption_HACL}>
+            {t}Allows calling to hangup by pressing *{/t}
+        </td>
+        </tr>
+        <tr>
+        <td colspan=2>
+            <input type="checkbox" name='goFonDialOption_r' value='r' {$goFonDialOption_rCHK} {$goFonDialOption_rACL}>
+            {t}Ring instead of playing background music{/t}
+        </td>
+        </tr>
+        </table>
+</td>
 </tr>
 
 </table>