[tokkee]

tokkee.org

Code

projects / gosa.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 6025b9e)
Merged icons for save/restore
authorcajus <cajus@594d385d-05f5-0310-b6e9-bd551577e9d8>
Tue, 27 Jun 2006 04:59:26 +0000 (04:59 +0000)
committercajus <cajus@594d385d-05f5-0310-b6e9-bd551577e9d8>
Tue, 27 Jun 2006 04:59:26 +0000 (04:59 +0000)
git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@3917 594d385d-05f5-0310-b6e9-bd551577e9d8

12 files changed:
html/images/restore.png patch | blob | history
include/class_MultiSelectWindow.inc patch | blob | history
plugins/admin/applications/class_divListApplication.inc patch | blob | history
plugins/admin/departments/class_divListDepartment.inc patch | blob | history
plugins/admin/fai/class_divListFai.inc patch | blob | history
plugins/admin/groups/class_divListGroup.inc patch | blob | history
plugins/admin/ogroups/class_divListOGroup.inc patch | blob | history
plugins/admin/systems/class_divListSystem.inc patch | blob | history
plugins/admin/users/class_divListUsers.inc patch | blob | history
plugins/gofax/blocklists/class_divListBlocklists.inc patch | blob | history
plugins/gofon/conference/class_divListConferences.inc patch | blob | history
plugins/gofon/macro/class_divListMacros.inc patch | blob | history

diff --git a/html/images/restore.png b/html/images/restore.png
index 037c2da98d1c629fd33957baa64edc60197ef767..f61bd38b16e2a6e352f51311d93c8f6ba43681f5 100644 (file)
Binary files a/html/images/restore.png and b/html/images/restore.png differ
diff --git a/include/class_MultiSelectWindow.inc b/include/class_MultiSelectWindow.inc
index 82aac59eee198e016f7bdae4c8acf11ecfb2b04b..d50f410078326a1cf24ae246da14e87e1867c499 100644 (file)
--- a/include/class_MultiSelectWindow.inc
+++ b/include/class_MultiSelectWindow.inc
@@ -511,16 +511,15 @@ class MultiSelectWindow{
     $str = "";
     if($this->parent->snapshotEnabled()){
 
-      $str .="<input class='center' type='image' src='images/snapshot.png'
+      $str= "<input class='center' type='image' src='images/snapshot.png'
         alt='"._("Create snapshot")."' name='CreateSnapShotDialog_".base64_encode($dn)."' title='"._("Create a new snapshot from this object")."'>&nbsp;";
 
       if(count($this->parent->Available_SnapsShots($dn))){
-        $str .="<input class='center' type='image' src='images/restore.png'
+        $str= "<input class='center' type='image' src='images/restore.png'
           alt='"._("Restore snapshot")."' name='RestoreSnapShotDialog_".base64_encode($dn)."' title='"._("Restore snapshot")."'>&nbsp;";
-      }else{
-        $str.= "<img src='images/empty.png' style='width:16px;' class='center'>&nbsp;";
       }
     }
+
     return($str);
   }
 
diff --git a/plugins/admin/applications/class_divListApplication.inc b/plugins/admin/applications/class_divListApplication.inc
index 86f1aa235fa5f1f2ff04bd043298ecc19b9fe30b..8487f9b4dc55b6b27d1b36583a817f5e2e8efd2b 100755 (executable)
--- a/plugins/admin/applications/class_divListApplication.inc
+++ b/plugins/admin/applications/class_divListApplication.inc
@@ -151,7 +151,7 @@ class divListApplication extends MultiSelectWindow
     foreach($list as $key => $val){
 
       /* Create action icons */
-      $actions = $this->GetSnapShotActions($val['dn']);
+      $actions= "";
       if($this->parent->CopyPasteHandler){
         $actions.= "<input class='center' type='image'
           src='images/editcut.png' alt='"._("cut")."' name='cut_%KEY%' title='"._("Cut this entry")."'>&nbsp;";
@@ -160,6 +160,7 @@ class divListApplication extends MultiSelectWindow
       }
       $actions.= "<input class='center' type='image'
         src='images/edit.png' alt='"._("edit")."' name='appl_edit_%KEY%' title='"._("Edit this entry")."'>";
+      $actions.= $this->GetSnapShotActions($val['dn']);
       $actions.= "<input class='center' type='image'
         src='images/edittrash.png' alt='"._("delete")."' name='appl_del_%KEY%' title='"._("Delete this entry")."'>";
 
diff --git a/plugins/admin/departments/class_divListDepartment.inc b/plugins/admin/departments/class_divListDepartment.inc
index f031451082f1f0092623cc05f0170a4f2b389782..e2b1509e63cc78e0eef04032205a99f3d2e7062b 100755 (executable)
--- a/plugins/admin/departments/class_divListDepartment.inc
+++ b/plugins/admin/departments/class_divListDepartment.inc
@@ -124,9 +124,9 @@ class divListDepartment extends MultiSelectWindow
         $disp = get_sub_department($cdn);
       }
   
-      $actions = $this->GetSnapShotActions($val['dn']);
-      $actions.= "<input class='center' type='image' src='images/edit.png'
+      $actions= "<input class='center' type='image' src='images/edit.png'
         alt='"._("edit")."'   name='dep_edit_%KEY%' title='"._("Edit this entry")."'>";
+      $actions.= $this->GetSnapShotActions($val['dn']);
       $actions.= "<input class='center' type='image' src='images/edittrash.png'
         alt='"._("delete")."'   name='dep_del_%KEY%' title='"._("Delete this entry")."'>";
 
diff --git a/plugins/admin/fai/class_divListFai.inc b/plugins/admin/fai/class_divListFai.inc
index b308def3cf1f9ca5b62d6abfb7dc37817b687bf7..fcbb7246872740921a01dd2b8c973421e6ed82d5 100644 (file)
--- a/plugins/admin/fai/class_divListFai.inc
+++ b/plugins/admin/fai/class_divListFai.inc
@@ -223,16 +223,16 @@ _("Submit")."'>&nbsp;".
          $desc= "";
        }
 
-       $action = $this->GetSnapShotActions($value['dn']);;
        if($value['FAIstate'] == "freeze"){
-         $action  .= "<input class='center' type='image' src='images/edit.png'  alt='"._("edit")."'
+         $action= "<input class='center' type='image' src='images/edit.png'  alt='"._("edit")."'
            name='entry_edit_%KEY%' title='"._("Edit class")."'>";
          $edi = $editlink;
          $acti = $action;
        }else{
-         $action  .= "<input class='center' type='image' src='images/edit.png'  alt='"._("edit")."'
+         $action= "<input class='center' type='image' src='images/edit.png'  alt='"._("edit")."'
            name='entry_edit_%KEY%' title='"._("Edit class")."'>";
-         $action .= "<input class='center' type='image' src='images/edittrash.png' alt='"._("delete")."'
+         $action.= $this->GetSnapShotActions($value['dn']);;
+         $action.= "<input class='center' type='image' src='images/edittrash.png' alt='"._("delete")."'
            name='entry_delete_%KEY%' title='"._("Delete class")."'>";
          $acti = $action;
          $edi = $editlink;
diff --git a/plugins/admin/groups/class_divListGroup.inc b/plugins/admin/groups/class_divListGroup.inc
index 0e8ac98f19b9e106f8c95f69b3ef3108eb2b18ee..06c9b5b4750696e56dea2ebe2ccd50b5e4450e88 100644 (file)
--- a/plugins/admin/groups/class_divListGroup.inc
+++ b/plugins/admin/groups/class_divListGroup.inc
@@ -165,7 +165,7 @@ class divListGroup extends MultiSelectWindow
     foreach($groups as $key => $val){
     
       /* Create action icons - copy & paste icons */
-      $actions = $this->GetSnapShotActions($val['dn']);
+      $actions= "";
       if($this->parent->CopyPasteHandler){
         $actions.= "<input class='center' type='image'
           src='images/editcut.png' alt='"._("cut")."' name='cut_%KEY%' title='"._("Cut this entry")."'>&nbsp;";
@@ -174,6 +174,7 @@ class divListGroup extends MultiSelectWindow
       }
       $actions.= "<input class='center' type='image'
         src='images/edit.png' alt='"._("edit")."' name='group_edit_%KEY%' title='"._("Edit this entry")."'>";
+      $actions.= $this->GetSnapShotActions($val['dn']);
       $actions.= "<input class='center' type='image'
         src='images/edittrash.png' alt='"._("delete")."' name='group_del_%KEY%' title='"._("Delete this entry")."'>";
 
diff --git a/plugins/admin/ogroups/class_divListOGroup.inc b/plugins/admin/ogroups/class_divListOGroup.inc
index 073286cbf871516a5c7806991dd6ec629ecf4940..607a6976ca2474d574a3d9f3a60e7e6d4d7d39e1 100755 (executable)
--- a/plugins/admin/ogroups/class_divListOGroup.inc
+++ b/plugins/admin/ogroups/class_divListOGroup.inc
@@ -157,7 +157,7 @@ class divListOGroup extends MultiSelectWindow
     foreach($list as $key => $val){
 
       /* Create action icons */
-      $actions = $this->GetSnapShotActions($val['dn']);
+      $actions= "";
       if($this->parent->CopyPasteHandler){
         $actions.= "<input class='center' type='image'
           src='images/editcut.png' alt='"._("cut")."' name='cut_%KEY%' title='"._("Cut this entry")."'>&nbsp;";
@@ -166,6 +166,7 @@ class divListOGroup extends MultiSelectWindow
       }
       $actions.= "<input class='center' type='image'
         src='images/edit.png' alt='"._("edit")."' name='group_edit_%KEY%' title='"._("Edit this entry")."'>";
+      $actions.= $this->GetSnapShotActions($val['dn']);
       $actions.= "<input class='center' type='image'
         src='images/edittrash.png' alt='"._("delete")."' name='group_del_%KEY%' title='"._("Delete this entry")."'>";
 
diff --git a/plugins/admin/systems/class_divListSystem.inc b/plugins/admin/systems/class_divListSystem.inc
index 1f804349ae451a350895928a2df0891b6d96ab42..fe125e2aa7090e760c6afafae5d23041836084b5 100644 (file)
--- a/plugins/admin/systems/class_divListSystem.inc
+++ b/plugins/admin/systems/class_divListSystem.inc
@@ -153,8 +153,8 @@ class divListSystem extends MultiSelectWindow
     // Test Every Entry and generate divlist Array
     foreach($terminals as $key => $val){
 
-      $action =  $this->GetSnapShotActions($val['dn']);
-      $action.= "<input class='center' type='image' src='images/edit.png' alt='"._("edit")."'     name='user_edit_%KEY%' title='"._("Edit system")."'>";
+      $action= "<input class='center' type='image' src='images/edit.png' alt='"._("edit")."'     name='user_edit_%KEY%' title='"._("Edit system")."'>";
+      $action.= $this->GetSnapShotActions($val['dn']);
       $action.= "<input class='center' type='image' src='images/edittrash.png' alt='"._("delete")."'   name='user_del_%KEY%' title='"._("Delete system")."'>";
 
       /* Generate picture list, which is currently disabled */
diff --git a/plugins/admin/users/class_divListUsers.inc b/plugins/admin/users/class_divListUsers.inc
index af5b0af65076b10bcca3b8b160ed2345e8fe4bd5..ed885c2d0cc8443d0f384cad8f3913f1a3f2fda0 100644 (file)
--- a/plugins/admin/users/class_divListUsers.inc
+++ b/plugins/admin/users/class_divListUsers.inc
@@ -211,7 +211,7 @@ class divListUsers extends MultiSelectWindow
     foreach($list as $key => $val){
 
       /* Create action icons */
-      $action = $this->GetSnapShotActions($val['dn']);
+      $action= "";
       if($this->parent->CopyPasteHandler){
         $action .= "<input class='center' type='image'
           src='images/editcut.png' alt='"._("cut")."' name='cut_%KEY%' title='"._("Cut this entry")."'>&nbsp;";
@@ -222,6 +222,7 @@ class divListUsers extends MultiSelectWindow
         name='user_edit_%KEY%' title='"._("Edit user")."'>";
       $action.= "<input class='center' type='image' src='images/list_password.png' alt='"._("password")."'
         name='user_chgpw_%KEY%' title='"._("Change password")."'>";
+      $action.= $this->GetSnapShotActions($val['dn']);
       $action.= "<input class='center' type='image' src='images/edittrash.png' alt='"._("delete")."'
         name='user_del_%KEY%' title='"._("Delete user")."'>";
 
diff --git a/plugins/gofax/blocklists/class_divListBlocklists.inc b/plugins/gofax/blocklists/class_divListBlocklists.inc
index e99ca587b654ade590a373a00131ecbc3265c533..171393df625718fc0be3aafab9e06e5a8ce7f089 100755 (executable)
--- a/plugins/gofax/blocklists/class_divListBlocklists.inc
+++ b/plugins/gofax/blocklists/class_divListBlocklists.inc
@@ -127,8 +127,8 @@ class divListBlocklist extends MultiSelectWindow
     /* Append to list */
     foreach($list as $key => $val){
   
-      $action = $this->GetSnapShotActions($val['dn']);
-      $action.= "<input class='center' type='image' src='images/edit.png' alt='"._("edit")."'     name='user_edit_%KEY%' title='"._("Edit user")."'>";
+      $action= "<input class='center' type='image' src='images/edit.png' alt='"._("edit")."'     name='user_edit_%KEY%' title='"._("Edit user")."'>";
+      $action.= $this->GetSnapShotActions($val['dn']);
       $action.= "<input class='center' type='image' src='images/edittrash.png' alt='"._("delete")."'   name='user_del_%KEY%' title='"._("Delete user")."'>";
 
       // Generate Array to Add
diff --git a/plugins/gofon/conference/class_divListConferences.inc b/plugins/gofon/conference/class_divListConferences.inc
index 7276357fb3bf8d7339be289e844c93aa1ab19f7e..073486bb02d4e437fdbb0f2440906407a2aae283 100755 (executable)
--- a/plugins/gofon/conference/class_divListConferences.inc
+++ b/plugins/gofon/conference/class_divListConferences.inc
@@ -126,9 +126,9 @@ class divListConference extends MultiSelectWindow
     /* Insert conferneces*/
     foreach($list as $conferencekey => $conference ){
 
-      $action = $this->GetSnapShotActions($conference['dn']);
       $actions= "<input class='center' type='image' src='images/edit.png'     
         alt='"._("edit")."'    name='conf_edit_%KEY%' title='"._("Edit this entry")."'>";
+      $actions.= $this->GetSnapShotActions($conference['dn']);
       $actions.= "<input class='center' type='image' src='images/edittrash.png' 
         alt='"._("delete")."'   name='conf_del_%KEY%'  title='"._("Delete this entry")."'>";
       $actions2= "<input class='center' type='image' src='images/edittrash.png' 
diff --git a/plugins/gofon/macro/class_divListMacros.inc b/plugins/gofon/macro/class_divListMacros.inc
index 73e3c0a5071a799d4e377716efd1df986e9164a9..dc17d6b6050b60413acfdec3f1cbf42408352474 100755 (executable)
--- a/plugins/gofon/macro/class_divListMacros.inc
+++ b/plugins/gofon/macro/class_divListMacros.inc
@@ -131,10 +131,10 @@ class divListMacro extends MultiSelectWindow
 
     foreach($list as $key => $val){
    
-      $action    = $this->GetSnapShotActions($val['dn']); 
-      $action    .= "<input class='center' type='image' src='images/edit.png' alt='"._("edit")."'     
+      $action= "<input class='center' type='image' src='images/edit.png' alt='"._("edit")."'     
         name='user_edit_%KEY%' title='"._("Edit macro")."'>";
-      $action    .= "<input class='center' type='image' src='images/edittrash.png' alt='"._("delete")."'   
+      $action.= $this->GetSnapShotActions($val['dn']); 
+      $action.= "<input class='center' type='image' src='images/edittrash.png' alt='"._("delete")."'   
         name='user_del_%KEY%' title='"._("Delete macro")."'>";
 
       $display= $val["displayName"][0];
GONICUS system administrator (SVN clone)