Added apply button

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

diff --git a/plugins/admin/applications/class_applicationManagement.inc b/plugins/admin/applications/class_applicationManagement.inc
index e71dee31665b7293549b0385b4e8b93ad14a886a..4563f4fd70b51c85e60023a2a87e06f4325b5f47 100644 (file)
--- a/plugins/admin/applications/class_applicationManagement.inc
+++ b/plugins/admin/applications/class_applicationManagement.inc
@@ -197,7 +197,7 @@ class applicationManagement extends plugin
     /* Finish apps edit is triggered by the tabulator dialog, so
        the user wants to save edited data. Check and save at this
        point. */
-    if ((isset($_POST['edit_finish'])) && (isset($this->apptabs->config))){
+    if ((isset($_POST['edit_finish']) || isset($_POST['edit_apply']) ) && (isset($this->apptabs->config))){
 
       /* Check tabs, will feed message array */
       $this->apptabs->last= $this->apptabs->current;
@@ -212,14 +212,16 @@ class applicationManagement extends plugin
         $this->apptabs->save();
         gosa_log ("Application object'".$this->dn."' has been saved");
 
-        /* Application has been saved successfully, remove lock from
-           LDAP. */
-        if ($this->dn != "new"){
-          del_lock ($this->dn);
+        if (!isset($_POST['edit_apply'])){
+          /* Application has been saved successfully, remove lock from
+             LDAP. */
+          if ($this->dn != "new"){
+            del_lock ($this->dn);
+          }
+          unset ($this->apptabs);
+          $this->apptabs= NULL;
+          unset ($_SESSION['objectinfo']);
         }
-        unset ($this->apptabs);
-        $this->apptabs= NULL;
-        unset ($_SESSION['objectinfo']);
       } else {
         /* Ok. There seem to be errors regarding to the tab data,
            show message and continue as usual. */
@@ -345,8 +347,12 @@ class applicationManagement extends plugin
       /* Don't show buttons if tab dialog requests this */
       if (!$this->apptabs->by_object[$this->apptabs->current]->dialog){
         $display.= "<p style=\"text-align:right\">\n";
-        $display.= "<input type=\"submit\" name=\"edit_finish\" value=\""._("Save")."\">\n";
+        $display.= "<input type=\"submit\" name=\"edit_finish\" style=\"width:80px\" value=\""._("Ok")."\">\n";
         $display.= "&nbsp;\n";
+        if ($this->dn != "new"){
+          $display.= "<input type=submit name=\"edit_apply\" value=\""._("Apply")."\">\n";
+          $display.= "&nbsp;\n";
+        }
         $display.= "<input type=\"submit\" name=\"edit_cancel\" value=\""._("Cancel")."\">\n";
         $display.= "</p>";
       }

diff --git a/plugins/admin/departments/class_departmentManagement.inc b/plugins/admin/departments/class_departmentManagement.inc
index 9856fed429bbc4c9b26d60d45b83edbd0fcddedb..b095805fbf705cdd7a464ffbadfd8180f277bd5d 100644 (file)
--- a/plugins/admin/departments/class_departmentManagement.inc
+++ b/plugins/admin/departments/class_departmentManagement.inc
@@ -295,7 +295,7 @@ class departmentManagement extends plugin
       $display= $this->deptabs->execute();
       if (!$this->deptabs->by_object[$this->deptabs->current]->dialog){
         $display.= "<p style=\"text-align:right\">\n";
-        $display.= "<input type=submit name=\"edit_finish\" value=\""._("Save")."\">\n";
+        $display.= "<input type=submit name=\"edit_finish\" style=\"width:80px\" value=\""._("Ok")."\">\n";
         $display.= "&nbsp;\n";
         $display.= "<input type=submit name=\"edit_cancel\" value=\""._("Cancel")."\">\n";
         $display.= "</p>";

diff --git a/plugins/admin/fai/class_faiManagement.inc b/plugins/admin/fai/class_faiManagement.inc
index 0fac333facd739f0c5c01e62f83e8c5a7523ec48..b0b48dbbce4dfcca9730c7cdcaee1373d0cd5441 100644 (file)
--- a/plugins/admin/fai/class_faiManagement.inc
+++ b/plugins/admin/fai/class_faiManagement.inc
@@ -502,19 +502,22 @@ class faiManagement extends plugin
                 * If it was possible to save it, remove dialog object. 
                 * If it wasn't possible, show errors and keep dialog.
                 */
-               if((isset($_POST['edit_finish'])) && (isset($this->dialog->config))){
+               if((isset($_POST['edit_finish']) || isset($_POST['edit_apply'])) && (isset($this->dialog->config))){
                        $this->dialog->save_object();
-                       if(count($this->dialog->check())!=0){
-                               foreach($this->dialog->check() as $msg){
+      $msgs= $this->dialog->check();
+                       if(count($msgs)!=0){
+                               foreach($msgs as $msg){
                                        print_red($msg);
                                }
                        }else{
-                               del_lock ($this->dn);
                                $this->dialog->save();
-                               unset($this->dialog);
-                               $this->dialog=NULL;
-                               $this->is_dialog=false;
-                               unset($_SESSION['objectinfo']);
+        if (!isset($_POST['edit_apply'])){
+          del_lock ($this->dn);
+          unset($this->dialog);
+          $this->dialog=NULL;
+          $this->is_dialog=false;
+          unset($_SESSION['objectinfo']);
+        }
                        }
                }
 
@@ -536,8 +539,12 @@ class faiManagement extends plugin
                                
                        }elseif(((isset($this->dialog->current))&&(!$this->dialog->by_object[$this->dialog->current]->is_dialog))){
                                $display.= "<p style=\"text-align:right\">\n";
-                               $display.= "<input type=\"submit\" name=\"edit_finish\" value=\""._("Save")."\">\n";
+                               $display.= "<input type=\"submit\" name=\"edit_finish\" style=\"width:80px\" value=\""._("Ok")."\">\n";
                                $display.= "&nbsp;\n";
+        if ($this->dn != "new"){
+          $display.= "<input type=submit name=\"edit_apply\" value=\""._("Apply")."\">\n";
+          $display.= "&nbsp;\n";
+        }
                                $display.= "<input type=\"submit\" name=\"edit_cancel\" value=\""._("Cancel")."\">\n";
                                $display.= "</p>";
                        }elseif(!isset($this->dialog->current)){

diff --git a/plugins/admin/groups/class_groupManagement.inc b/plugins/admin/groups/class_groupManagement.inc
index ed891cc5951eb2bc61fe53638b98e7cf021e3798..30309740d75196d112843b707cab8be5088c7e9a 100644 (file)
--- a/plugins/admin/groups/class_groupManagement.inc
+++ b/plugins/admin/groups/class_groupManagement.inc
@@ -160,7 +160,7 @@ class groupManagement extends plugin
     /* Finish group edit is triggered by the tabulator dialog, so
        the user wants to save edited data. Check and save at this
        point. */
-    if ((isset($_POST['edit_finish'])) && (isset($this->grouptab->config)) ){
+    if ((isset($_POST['edit_finish']) || isset($_POST['edit_apply'])) && (isset($this->grouptab->config)) ){
 
       /* Check tabs, will feed message array 
          Save, or display error message? */
@@ -171,17 +171,18 @@ class groupManagement extends plugin
         $this->grouptab->save();
         gosa_log ("Group object'".$this->dn."' has been saved");
 
-        /* Group has been saved successfully, remove lock from LDAP. */
-        if ($this->dn != "new"){
-          del_lock ($this->dn);
+        if (!isset($_POST['edit_apply'])){
+          /* Group has been saved successfully, remove lock from LDAP. */
+          if ($this->dn != "new"){
+            del_lock ($this->dn);
+          }
+
+          /* There's no page reload so we have to read new users at this point. */
+          //$this->reload ();
+          unset ($this->grouptab);
+          $this->grouptab= NULL;
+          unset ($_SESSION['objectinfo']);
         }
-
-        /* There's no page reload so we have to read new users at this point. */
-        //$this->reload ();
-        unset ($this->grouptab);
-        $this->grouptab= NULL;
-        unset ($_SESSION['objectinfo']);
-
       } else {
         /* Ok. There seem to be errors regarding to the tab data,
            show message and continue as usual. */
@@ -323,8 +324,12 @@ class groupManagement extends plugin
       /* Don't show buttons if tab dialog requests this */
       if (!$this->grouptab->by_object[$this->grouptab->current]->dialog){
         $display.= "<p style=\"text-align:right\">\n";
-        $display.= "<input type=submit name=\"edit_finish\" value=\""._("Save")."\">\n";
+        $display.= "<input type=submit name=\"edit_finish\" style=\"width:80px\" value=\""._("Ok")."\">\n";
         $display.= "&nbsp;\n";
+        if ($this->dn != "new"){
+          $display.= "<input type=submit name=\"edit_apply\" value=\""._("Apply")."\">\n";
+          $display.= "&nbsp;\n";
+        }
         $display.= "<input type=submit name=\"edit_cancel\" value=\""._("Cancel")."\">\n";
         $display.= "</p>";
       }

diff --git a/plugins/admin/ogroups/class_ogroupManagement.inc b/plugins/admin/ogroups/class_ogroupManagement.inc
index ebc120a7a5c408454e0f13dfc51fdfe08f9344ca..ced638067314d75935daf0ae0f90306f8cac3d95 100644 (file)
--- a/plugins/admin/ogroups/class_ogroupManagement.inc
+++ b/plugins/admin/ogroups/class_ogroupManagement.inc
@@ -274,7 +274,7 @@ class ogroupManagement extends plugin
      ****************/
 
     /* Finish button has been pressed */
-    if ((isset($_POST['edit_finish'])) && (isset($this->ogroup->config)) ){
+    if ((isset($_POST['edit_finish']) || isset($_POST['edit_apply'])) && (isset($this->ogroup->config)) ){
 
       /* Check tabs, will feed message array */
       $message= $this->ogroup->check();
@@ -286,16 +286,17 @@ class ogroupManagement extends plugin
         $this->ogroup->save();
         gosa_log ("Object group'".$this->dn."' has been saved");
 
-        /* Group has been saved successfully, remove lock from
-           LDAP. */
-        if ($this->dn != "new"){
-          del_lock ($this->dn);
-        }
-
-        unset ($this->ogroup);
-        $this->ogroup= NULL;
-        unset ($_SESSION['objectinfo']);
+        if (!isset($_POST['edit_apply'])){
+          /* Group has been saved successfully, remove lock from
+             LDAP. */
+          if ($this->dn != "new"){
+            del_lock ($this->dn);
+          }
 
+          unset ($this->ogroup);
+          $this->ogroup= NULL;
+          unset ($_SESSION['objectinfo']);
+        }
       } else {
         /* Ok. There seem to be errors regarding to the tab data,
            show message and continue as usual. */
@@ -328,8 +329,12 @@ class ogroupManagement extends plugin
       /* Don't show buttons if tab dialog requests this */
       if (!$this->ogroup->by_object[$this->ogroup->current]->dialog){
         $display.= "<p style=\"text-align:right\">\n";
-        $display.= "<input type=submit name=\"edit_finish\" value=\""._("Save")."\">\n";
+        $display.= "<input type=submit name=\"edit_finish\" style=\"width:80px\" value=\""._("Ok")."\">\n";
         $display.= "&nbsp;\n";
+        if ($this->dn != "new"){
+          $display.= "<input type=submit name=\"edit_apply\" value=\""._("Apply")."\">\n";
+          $display.= "&nbsp;\n";
+        }
         $display.= "<input type=submit name=\"edit_cancel\" value=\""._("Cancel")."\">\n";
         $display.= "</p>";
       }

diff --git a/plugins/admin/systems/class_systemManagement.inc b/plugins/admin/systems/class_systemManagement.inc
index 5c37d6b904e6f4ef52e4e39bdd36e50b98fc1c74..697ec135c4cd400774d972ea7f4176d571ee9596 100644 (file)
--- a/plugins/admin/systems/class_systemManagement.inc
+++ b/plugins/admin/systems/class_systemManagement.inc
@@ -386,7 +386,7 @@ class systems extends plugin
     /* Finish user edit is triggered by the tabulator dialog, so
        the user wants to save edited data. Check and save at this
        point. */
-    if ((isset($_POST['edit_finish'])) && (isset($this->systab->config))){
+    if ((isset($_POST['edit_finish']) || isset($_POST['edit_apply'])) && (isset($this->systab->config))){
 
       /* Check tabs, will feed message array */
       $message= $this->systab->check();
@@ -428,15 +428,17 @@ class systems extends plugin
           $ldap->cd($this->config->current['BASE']);
         }
 
-        /* Terminal has been saved successfully, remove lock from
-           LDAP. */
-        if ($this->dn != "new"){
-          del_lock ($this->dn);
-        }
+        if (!isset($_POST['edit_apply'])){
+          /* Terminal has been saved successfully, remove lock from
+             LDAP. */
+          if ($this->dn != "new"){
+            del_lock ($this->dn);
+          }
 
-        unset ($this->systab);
-        $this->systab= NULL;
-        unset($_SESSION['objectinfo']);
+          unset ($this->systab);
+          $this->systab= NULL;
+          unset($_SESSION['objectinfo']);
+        }
       } else {
         /* Ok. There seem to be errors regarding to the tab data,
            show message and continue as usual. */
@@ -473,8 +475,12 @@ class systems extends plugin
       /* Don't show buttons if tab dialog requests this */
       if ((isset($this->systab->by_object))&&(!$this->systab->by_object[$this->systab->current]->dialog)){
         $display.= "<p style=\"text-align:right\">\n";
-        $display.= "<input type=\"submit\" name=\"edit_finish\" value=\""._("Save")."\">\n";
+        $display.= "<input type=\"submit\" name=\"edit_finish\" style=\"width:80px\" value=\""._("Ok")."\">\n";
         $display.= "&nbsp;\n";
+        if ($this->dn != "new"){
+          $display.= "<input type=submit name=\"edit_apply\" value=\""._("Apply")."\">\n";
+          $display.= "&nbsp;\n";
+        }
         $display.= "<input type=\"submit\" name=\"edit_cancel\" value=\""._("Cancel")."\">\n";
         $display.= "</p>";
       }

diff --git a/plugins/admin/users/class_userManagement.inc b/plugins/admin/users/class_userManagement.inc
index c03c089377109af6b4ecd6b18980996bec495736..5b5c8116265c2b7d352c2d382b792c0223997085 100644 (file)
--- a/plugins/admin/users/class_userManagement.inc
+++ b/plugins/admin/users/class_userManagement.inc
@@ -371,7 +371,7 @@ class userManagement extends plugin
     /* Finish user edit is triggered by the tabulator dialog, so
        the user wants to save edited data. Check and save at this
        point. */
-    if ((isset($_POST['edit_finish'])) && (isset($this->usertab->config))){
+    if ((isset($_POST['edit_finish']) || isset($_POST['edit_apply'])) && (isset($this->usertab->config))){
 
       /* Check tabs, will feed message array */
       $this->usertab->last= $this->usertab->current;
@@ -397,19 +397,21 @@ class userManagement extends plugin
         }
         gosa_log ("User object '".$this->dn."' has been saved");
 
-        /* User has been saved successfully, remove lock from LDAP. */
-        if ($this->dn != "new"){
-          del_lock ($this->dn);
-        }
+        if (!isset($_POST['edit_apply'])){
+          /* User has been saved successfully, remove lock from LDAP. */
+          if ($this->dn != "new"){
+            del_lock ($this->dn);
+          }
 
-        /* In case of new users, ask for a password, skip this for templates */
-        if (($set_pass || $this->usertab->password_change_needed()) && !$this->is_template){
-          return($smarty->fetch(get_template_path('password.tpl', TRUE)));
-        }
+          /* In case of new users, ask for a password, skip this for templates */
+          if (($set_pass || $this->usertab->password_change_needed()) && !$this->is_template){
+            return($smarty->fetch(get_template_path('password.tpl', TRUE)));
+          }
 
-        unset ($this->usertab);
-        $this->usertab= NULL;
-        unset ($_SESSION['objectinfo']);
+          unset ($this->usertab);
+          $this->usertab= NULL;
+          unset ($_SESSION['objectinfo']);
+        }
       } else {
         /* Ok. There seem to be errors regarding to the tab data,
            show message and continue as usual. */
@@ -620,8 +622,12 @@ class userManagement extends plugin
       /* Don't show buttons if tab dialog requests this */
       if (!$this->usertab->by_object[$this->usertab->current]->dialog){
         $display.= "<p style=\"text-align:right\">\n";
-        $display.= "<input type=submit name=\"edit_finish\" value=\""._("Save")."\">\n";
+        $display.= "<input type=submit name=\"edit_finish\" style=\"width:80px\" value=\""._("Ok")."\">\n";
         $display.= "&nbsp;\n";
+        if ($this->dn != "new"){
+          $display.= "<input type=submit name=\"edit_apply\" value=\""._("Apply")."\">\n";
+          $display.= "&nbsp;\n";
+        }
         $display.= "<input type=submit name=\"edit_cancel\" value=\""._("Cancel")."\">\n";
         $display.= "</p>";
       }

diff --git a/plugins/gofax/blocklists/class_blocklistManagement.inc b/plugins/gofax/blocklists/class_blocklistManagement.inc
index f5f523e8e4d4cc6bc365305703fef5d4701ac5a8..660a829542cfdb792b6da99463c967e25acbba77 100644 (file)
--- a/plugins/gofax/blocklists/class_blocklistManagement.inc
+++ b/plugins/gofax/blocklists/class_blocklistManagement.inc
@@ -221,7 +221,7 @@ class blocklist extends plugin
      ***************/
 
     /* What about finish? */
-    if ((isset($_POST['edit_finish'])) && (!empty($this->dn))){
+    if ((isset($_POST['edit_finish']) || isset($_POST['edit_apply'])) && (!empty($this->dn))){
       $message= $this->check();
       $this->remove_lock();
 
@@ -235,9 +235,12 @@ class blocklist extends plugin
 
         $this->save ();
         gosa_log ("Blocklist object'".$this->dn."' has been saved");
-        $this->dn= "";
-        del_lock ($this->ui->dn);
-        unset($_SESSION['objectinfo']);
+      
+        if (!isset($_POST['edit_apply'])){
+          $this->dn= "";
+          del_lock ($this->ui->dn);
+          unset($_SESSION['objectinfo']);
+        }
       } else {
         /* Errors found, show message */
         show_errors ($message);
@@ -293,9 +296,11 @@ class blocklist extends plugin
       if ($this->dn == "new" || preg_match ("/,ou=incoming,/", $this->dn)){
         $smarty->assign("selectmode", "");
         $smarty->assign("mode", "");
+        $smarty->assign("apply", "0");
       } else {
         $smarty->assign("selectmode", "disabled");
         $smarty->assign("mode", "readonly");
+        $smarty->assign("apply", "1");
       }
       foreach(array("cn", "description", "type", "goFaxBlocklist") as $val){
         $smarty->assign("$val", $this->$val);

diff --git a/plugins/gofax/blocklists/generic.tpl b/plugins/gofax/blocklists/generic.tpl
index 00e945a5302c52f47f4f473a54e92cbe7b0eac75..c6330add19005317f667d9c07117e177c0349a00 100644 (file)
--- a/plugins/gofax/blocklists/generic.tpl
+++ b/plugins/gofax/blocklists/generic.tpl
@@ -82,8 +82,12 @@
 
 
 <p class="plugbottom">
-  <input type=submit name="edit_finish" value="{t}Save{/t}">
+  <input type=submit name="edit_finish" style="width:80px" value="{t}Ok{/t}">
   &nbsp;
+  {if $apply eq "1"}
+  <input type=submit name="edit_apply" value="{t}Apply{/t}">
+  &nbsp;
+  {/if}
   <input type=submit name="edit_cancel" value="{t}Cancel{/t}">
 </p>
 

diff --git a/plugins/gofax/faxaccount/main.inc b/plugins/gofax/faxaccount/main.inc
index 24e0550b06c31f28ad2f611ee438d900a4a7e864..1227dd74b236e6e537dbf4ab91e1aea64dbac424 100644 (file)
--- a/plugins/gofax/faxaccount/main.inc
+++ b/plugins/gofax/faxaccount/main.inc
@@ -86,7 +86,7 @@ if (!$remove_lock){
 
                /* Are we in edit mode? */
                if (isset($_SESSION['edit'])){
-                       $display.= "<input type=submit name=\"edit_finish\" value=\""._("Save")."\">\n";
+                       $display.= "<input type=submit name=\"edit_finish\" style=\"width:80px\" value=\""._("Ok")."\">\n";
                        $display.= "&nbsp;\n";
                        $display.= "<input type=submit name=\"edit_cancel\" value=\""._("Cancel")."\">\n";
                        $info= "<img alt='' align=\"middle\" src=\"".get_template_path('images/closedlock.png')."\"> ".$ui->dn."&nbsp;";

diff --git a/plugins/gofon/conference/class_phoneConferenceManagment.inc b/plugins/gofon/conference/class_phoneConferenceManagment.inc
index 5bf53a119714f539f099a556426b76511e51a3ec..c7902f8f26cf2f3433dd25c977b633f6a6d52da5 100644 (file)
--- a/plugins/gofon/conference/class_phoneConferenceManagment.inc
+++ b/plugins/gofon/conference/class_phoneConferenceManagment.inc
@@ -197,7 +197,7 @@ class phoneConferenceManagment extends plugin
      ***************/
   
     /* Edit finished, check and save changes */
-    if ((isset($_POST['edit_finish'])) && (isset($this->conftab->config))){
+    if ((isset($_POST['edit_finish']) || isset($_POST['edit_apply'])) && (isset($this->conftab->config))){
       /* Check tabs, will feed message array */
       $this->conftab->last= $this->conftab->current;
       $this->conftab->save_object();
@@ -210,8 +210,10 @@ class phoneConferenceManagment extends plugin
         }
         gosa_log ("goFonConference object '".$this->dn."' has been saved");
 
-        if ($this->dn != "new"){
-          del_lock ($this->dn);
+        if (!isset($_POST['edit_apply'])){
+          if ($this->dn != "new"){
+            del_lock ($this->dn);
+          }
         }
 
         $this->conftab->save ();
@@ -236,8 +238,12 @@ class phoneConferenceManagment extends plugin
       /* Don't show buttons if tab dialog requests this */
       if (!$this->conftab->by_object[$this->conftab->current]->dialog){
         $display.= "<p style=\"text-align:right\">\n";
-        $display.= "<input type=\"submit\" name=\"edit_finish\" value=\""._("Save")."\">\n";
+        $display.= "<input type=\"submit\" name=\"edit_finish\" style=\"width:80px\" value=\""._("Ok")."\">\n";
         $display.= "&nbsp;\n";
+        if ($this->dn != "new"){
+          $display.= "<input type=submit name=\"edit_apply\" value=\""._("Apply")."\">\n";
+          $display.= "&nbsp;\n";
+        }
         $display.= "<input type=\"submit\" name=\"edit_cancel\" value=\""._("Cancel")."\">\n";
         $display.= "</p>";
       }

diff --git a/plugins/gofon/macro/class_gofonMacroManagement.inc b/plugins/gofon/macro/class_gofonMacroManagement.inc
index 23b1720b3a5ed5d3aacc7eccfa8a2e7bbbc03be6..859131b0b09dc31f99f5b1794dd385e850faa3cc 100755 (executable)
--- a/plugins/gofon/macro/class_gofonMacroManagement.inc
+++ b/plugins/gofon/macro/class_gofonMacroManagement.inc
@@ -124,7 +124,7 @@ class gofonMacro extends plugin
     /* Finish mac edit is triggered by the tabulator dialog, so
        the user wants to save edited data. Check and save at this
        point. */
-    if ((isset($_POST['edit_finish'])) && (isset($this->macrotabs->config))){
+    if ((isset($_POST['edit_finish']) || isset($_POST['edit_apply'])) && (isset($this->macrotabs->config))){
 
       /* Check tabs, will feed message array */
       $this->macrotabs->last= $this->macrotabs->current;
@@ -138,15 +138,17 @@ class gofonMacro extends plugin
         $this->macrotabs->save();
         gosa_log ("Macro object'".$this->dn."' has been saved");
 
-        /* macro has been saved successfully, remove lock from
-           LDAP. */
-        if ($this->dn != "new"){
-          del_lock ($this->dn);
-        }
+        if (!isset($_POST['edit_apply'])){
+          /* macro has been saved successfully, remove lock from
+             LDAP. */
+          if ($this->dn != "new"){
+            del_lock ($this->dn);
+          }
 
-        unset ($this->macrotabs);
-        $this->macrotabs= NULL;
-        unset ($_SESSION['objectinfo']);
+          unset ($this->macrotabs);
+          $this->macrotabs= NULL;
+          unset ($_SESSION['objectinfo']);
+        }
       } else {
         /* Ok. There seem to be errors regarding to the tab data,
            show message and continue as usual. */
@@ -258,8 +260,12 @@ class gofonMacro extends plugin
       /* Don't show buttons if tab dialog requests this */
       if (!$this->macrotabs->by_object[$this->macrotabs->current]->dialog){
         $display.= "<p style=\"text-align:right\">\n";
-        $display.= "<input type=\"submit\" name=\"edit_finish\" value=\""._("Save")."\">\n";
+        $display.= "<input type=\"submit\" name=\"edit_finish\" style=\"width:80px\" value=\""._("Ok")."\">\n";
         $display.= "&nbsp;\n";
+        if ($this->dn != "new"){
+          $display.= "<input type=submit name=\"edit_apply\" value=\""._("Apply")."\">\n";
+          $display.= "&nbsp;\n";
+        }
         $display.= "<input type=\"submit\" name=\"edit_cancel\" value=\""._("Cancel")."\">\n";
         $display.= "</p>";
       }

diff --git a/plugins/gofon/phoneaccount/main.inc b/plugins/gofon/phoneaccount/main.inc
index c81fbea4c7eeaf3dc63d411c044048b6441ad06d..62675fd740cb740b160a28a986255c4ac137bf60 100644 (file)
--- a/plugins/gofon/phoneaccount/main.inc
+++ b/plugins/gofon/phoneaccount/main.inc
@@ -102,7 +102,7 @@ if (!$remove_lock){
 
                /* Are we in edit mode? */
                if (isset($_SESSION['edit'])){
-                       $display.= "<input type=submit name=\"edit_finish\" value=\""._("Save")."\">\n";
+                       $display.= "<input type=submit name=\"edit_finish\" style=\"width:80px\" value=\""._("Ok")."\">\n";
                        $display.= "&nbsp;";
                        $display.= "<input type=submit name=\"edit_cancel\" value=\""._("Cancel")."\">\n";
                        $info= "<img alt=\"\" align=\"middle\" src=\"".get_template_path('images/closedlock.png')."\"> ".$ui->dn."&nbsp;";

diff --git a/plugins/personal/connectivity/main.inc b/plugins/personal/connectivity/main.inc
index 644bd98397bc4aa2447af989626c3ded900c3c8d..3b41137e53980a6ecf578fb5af2142c36e1512bf 100644 (file)
--- a/plugins/personal/connectivity/main.inc
+++ b/plugins/personal/connectivity/main.inc
@@ -115,7 +115,7 @@ if (!$remove_lock){
   if ($in_edit_mode){
     $display.="<div align='right'>";
     if (isset($_SESSION['edit'])){
-      $display.= "<input type=submit name=\"edit_finish\" value=\""._("Save")."\">\n";
+      $display.= "<input type=submit name=\"edit_finish\" style=\"width:80px\" value=\""._("Ok")."\">\n";
       $display.= "&nbsp;";
       $display.= "<input type=submit name=\"edit_cancel\" value=\""._("Cancel")."\">\n";
       $info= "<img class=\"center\" alt=\"\" align=\"middle\" src=\"".get_template_path('images/closedlock.png').

diff --git a/plugins/personal/environment/main.inc b/plugins/personal/environment/main.inc
index 5fbd38c065a90d7112cf579a3d4e06c69ef0a085..57439cfbd963a5e5667b561bc0a897ee3710e4fd 100644 (file)
--- a/plugins/personal/environment/main.inc
+++ b/plugins/personal/environment/main.inc
@@ -101,7 +101,7 @@ if (!$remove_lock){
 
     /* Are we in edit mode? */
     if ((isset($_SESSION['edit']))&&($environment->dialog==NULL)){
-      $display.= "<input type=submit name=\"edit_finish\" value=\""._("Save")."\">\n";
+      $display.= "<input type=submit name=\"edit_finish\" style=\"width:80px\" value=\""._("Ok")."\">\n";
       $display.= "&nbsp;";
       $display.= "<input type=submit name=\"edit_cancel\" value=\""._("Cancel")."\">\n";
       $info= "<img alt=\"\" align=\"middle\" src=\"".get_template_path('images/closedlock.png').

diff --git a/plugins/personal/generic/main.inc b/plugins/personal/generic/main.inc
index bebf8527c3d32023f9c41a6fc3fcb66a75baac37..9f5544311e152c219866703f795d20c7472ad461 100644 (file)
--- a/plugins/personal/generic/main.inc
+++ b/plugins/personal/generic/main.inc
@@ -155,7 +155,7 @@ if (!$remove_lock){
 
     /* Are we in edit mode? */
     if (isset($_SESSION['edit'])){
-      $display.= "<input type=submit name=\"edit_finish\" value=\""._("Save")."\">\n";
+      $display.= "<input type=submit name=\"edit_finish\" style=\"width:80px\" value=\""._("Ok")."\">\n";
       $display.= "&nbsp;";
       $display.= "<input type=submit name=\"edit_cancel\" value=\""._("Cancel")."\">\n";
       $display.="<script language='javascript'>";

diff --git a/plugins/personal/mail/main.inc b/plugins/personal/mail/main.inc
index fc1e05286a683d9ae8b4897f1d39641d90a12273..e7c0a7a36cb73cdc23f59e260960e924f38805fa 100644 (file)
--- a/plugins/personal/mail/main.inc
+++ b/plugins/personal/mail/main.inc
@@ -101,7 +101,7 @@ if (!$remove_lock){
 
     /* Are we in edit mode? */
     if (isset($_SESSION['edit'])){
-      $display.= "<input type=submit name=\"edit_finish\" value=\""._("Save")."\">\n";
+      $display.= "<input type=submit name=\"edit_finish\" style=\"width:80px\" value=\""._("Ok")."\">\n";
       $display.= "&nbsp;";
       $display.= "<input type=submit name=\"edit_cancel\" value=\""._("Cancel")."\">\n";
       $info= "<img alt=\"\" align=\"middle\" src=\"".get_template_path('images/closedlock.png').

diff --git a/plugins/personal/nagios/main.inc b/plugins/personal/nagios/main.inc
index b74cd21b76c5a07eeb5a0add032e61ab947b53ad..e707ebfd3c8bdae4f9cfa369f4f00cae1caaaf07 100644 (file)
--- a/plugins/personal/nagios/main.inc
+++ b/plugins/personal/nagios/main.inc
@@ -101,7 +101,7 @@ if (!$remove_lock){
 
     /* Are we in edit mode? */
     if (isset($_SESSION['edit'])){
-      $display.= "<input type=submit name=\"edit_finish\" value=\""._("Save")."\">\n";
+      $display.= "<input type=submit name=\"edit_finish\" style=\"width:80px\" value=\""._("Ok")."\">\n";
       $display.= "&nbsp;";
       $display.= "<input type=submit name=\"edit_cancel\" value=\""._("Cancel")."\">\n";
       $info= "<img alt=\"\" align=\"middle\" src=\"".get_template_path('images/closedlock.png').

diff --git a/plugins/personal/netatalk/main.inc b/plugins/personal/netatalk/main.inc
index b11774eab9a906c30e6ec29f0f60370e2d78906b..f46142a1b7f89ba1e3d3e65c6f56a23044e6ec8b 100644 (file)
--- a/plugins/personal/netatalk/main.inc
+++ b/plugins/personal/netatalk/main.inc
@@ -101,7 +101,7 @@ if (!$remove_lock) {
 
     /* Are we in edit mode? */
     if (isset ($_SESSION['edit'])) {
-      $display .= "<input type=submit name=\"edit_finish\" value=\""._("Finish")."\">\n";
+      $display .= "<input type=submit name=\"edit_finish\" style=\"width:80px\" value=\""._("Ok")."\">\n";
       $display .= "&nbsp;";
       $display .= "<input type=submit name=\"edit_cancel\" value=\""._("Cancel")."\">\n";
       $info = "<img alt=\"\" align=\"middle\" src=\"".get_template_path('images/closedlock.png')."\"> ".$ui->dn."&nbsp;";

diff --git a/plugins/personal/posix/main.inc b/plugins/personal/posix/main.inc
index 881eb8c02535cece9eb0c098686e3344d6d39531..a7bbdb43b6461d1c779fecdcf6e36cfa6a9092e4 100644 (file)
--- a/plugins/personal/posix/main.inc
+++ b/plugins/personal/posix/main.inc
@@ -107,7 +107,7 @@ if (!$remove_lock){
 
     /* Are we in edit mode? */
     if (isset($_SESSION['edit'])){
-      $display.= "<input type=submit name=\"edit_finish\" value=\""._("Save")."\">\n";
+      $display.= "<input type=submit name=\"edit_finish\" style=\"width:80px\" value=\""._("Ok")."\">\n";
       $display.= "&nbsp;";
       $display.= "<input type=submit name=\"edit_cancel\" value=\""._("Cancel")."\">\n";
       $info= "<img alt=\"\" align=\"middle\" src=\"".get_template_path('images/closedlock.png').

diff --git a/plugins/personal/samba/main.inc b/plugins/personal/samba/main.inc
index 9e6602fd86338fc7ff95028c5e13102c597a8586..915ede7059e88342352d40d14ee76099e4c7aa21 100644 (file)
--- a/plugins/personal/samba/main.inc
+++ b/plugins/personal/samba/main.inc
@@ -101,7 +101,7 @@ if (!$remove_lock){
 
     /* Are we in edit mode? */
     if (isset($_SESSION['edit'])){
-      $display.= "<input type=submit name=\"edit_finish\" value=\""._("Save")."\">\n";
+      $display.= "<input type=submit name=\"edit_finish\" style=\"width:80px\" value=\""._("Ok")."\">\n";
       $display.= "&nbsp;";
       $display.= "<input type=submit name=\"edit_cancel\" value=\""._("Cancel")."\">\n";
       $info= "<img alt=\"\" align=\"middle\" src=\"".get_template_path('images/closedlock.png').