![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: a5fcc57)
raw | patch | inline | side by side (parent: a5fcc57)
| author | hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8> | |
| Mon, 5 Nov 2007 08:50:05 +0000 (08:50 +0000) | ||
| committer | hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8> | |
| Mon, 5 Nov 2007 08:50:05 +0000 (08:50 +0000) |
git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@7736 594d385d-05f5-0310-b6e9-bd551577e9d8
23 files changed:
index a9b9183ea03443c2f47ec56e042a7d89339b87c5..fd784ed0b8c9317a485dcc393281d0387b3f2435 100644 (file)
$s_tab= "generic";
}
+
+ /* handle C&P from layers menu */
+ if(isset($_POST['menu_action']) && preg_match("/^multiple_copy_systems/",$_POST['menu_action'])){
+ $s_action = "copy_multiple";
+ }
+ if(isset($_POST['menu_action']) && preg_match("/^multiple_cut_systems/",$_POST['menu_action'])){
+ $s_action = "cut_multiple";
+ }
+ if(isset($_POST['menu_action']) && preg_match("/^editPaste/",$_POST['menu_action'])){
+ $s_action = "editPaste";
+ }
+
+ /* Create options */
+ if(isset($_POST['menu_action']) && $_POST['menu_action'] == "new_acl_role"){
+ $s_action = "new";
+ }
+
+ /* handle remove from layers menu */
+ if(isset($_POST['menu_action']) && preg_match("/^remove_multiple/",$_POST['menu_action'])){
+ $s_action = "del_multiple";
+ }
/********************
Copy & Paste Handling ...
index 0d76a7af7d8a94db63cda6cd143dc4fae3721266..2c0374a05b58c455583f3046067620fb3793b9ed 100644 (file)
/* Add default header */
$listhead = MultiSelectWindow::get_default_header();
+ $listhead .=
+ _("Base")." <select name='CurrentMainBase' onChange='mainform.submit()' class='center'>$options</select>".
+ " <input class='center' type='image' src='images/list_submit.png' align='middle'
+ title='"._("Submit department")."' name='submit_department' alt='". _("Submit")."'> ";
- /* Get copy & paste icon */
- $Copy_Paste ="";
- if(preg_match("/(c.*w|w.*c)/",$acl_all) && $this->parent->CopyPasteHandler){
- $Copy_Paste = $this->parent->CopyPasteHandler->generatePasteIcon();
- $addsep = true;
- }
- /* Add snapshot icons */
- if(preg_match("/(c.*w|w.*c)/",$acl_all)){
- $listhead .= $this->get_snapshot_header($this->selectedBase);
- $add_sep = true;
- }
+ /* Create Layers menu */
+ $s = ".|"._("Actions")."|\n";
+ $s .= "..|<img src='images/list_new.png' alt='' border='0' class='center'>".
+ " "._("Create")."|\n";
- if(preg_match("/c/",$ui->get_permissions($this->selectedBase,"acl/acl"))){
- $add_sep = true;
- $listhead .= "<input class='center' type='image' align='middle' src='images/list_new_acl_role.png'
- name='new_acl_role' alt='"._("New acl role")."' title='"._("New acl role")."'> ";
+ /* Append create options */
+ if(preg_match("/c/",$acl)) {
+ $s.= "...|<input class='center' type='image' src='images/list_new_acl_role.png' alt=''>".
+ " "._("Role")."|new_acl_role|\n";
}
- $listhead .= $Copy_Paste.
- _("Base")." <select name='CurrentMainBase' onChange='mainform.submit()' class='center'>$options</select>".
- " <input class='center' type='image' src='images/list_submit.png' align='middle'
- title='"._("Submit department")."' name='submit_department' alt='". _("Submit")."'> ";
+ /* Multiple options */
+ $s.= "..|---|\n";
+ $s.= "..|<img src='images/edittrash.png' alt='' border='0' class='center'>".
+ " "._("Remove")."|"."remove_multiple|\n";
- /* Add multiple copy & cut icons */
+ /* Add multiple copy & cut icons */
if(is_object($this->parent->CopyPasteHandler)){
- $listhead .= " <input class='center' type='image' align='middle' src='images/editcopy.png'
- title='"._("Copy selected objects")."' alt='"._("Copy objects")."' name='multiple_copy_objects'> ";
- $listhead .= " <input class='center' type='image' align='middle' src='images/editcut.png'
- title='"._("cut selected objects")."' alt='"._("Cut objects")."' name='multiple_cut_objects'> ";
- $listhead .= "</div>";
+ $s.= "..|---|\n";
+ $s.= "..|<img src='images/editcopy.png' alt='' border='0' class='center'>".
+ " "._("Copy")."|"."multiple_copy_systems|\n";
+ $s.= "..|<img src='images/editcut.png' alt='' border='0' class='center'>".
+ " "._("Cut")."|"."multiple_cut_systems|\n";
+
+ if($this->parent->CopyPasteHandler->entries_queued()){
+ $img = "<img border='0' class='center' src='images/editpaste.png' alt=''>";
+ $s.="..|".$img." "._("Paste")."|editPaste|\n";
+ }else{
+ $img = "<img border='0' class='center' src='images/cant_editpaste.png' alt=''>";
+ $s.="..|".$img." "._("Paste")."\n";
+ }
}
- $listhead .= "</div>";
+ /* Add snapshot icons */
+ if(preg_match("/(c.*w|w.*c)/",$acl_all)){
+ $s .= "..|---|\n";
+ $s .= $this->get_snapshot_header(TRUE);
+ }
+ $this->SetDropDownHeaderMenu($s);
$this->SetListHeader($listhead);
}
diff --git a/plugins/admin/applications/class_applicationManagement.inc b/plugins/admin/applications/class_applicationManagement.inc
index 78f76d45feedcd5d7f9445a54b9ce3a794c083c4..69a4c0f4845f9d92c0f3fc7a51fcbc505058066b 100644 (file)
}
/* handle remove from layers menu */
- if(isset($_POST['menu_action']) && preg_match("/^remvove_multiple/",$_POST['menu_action'])){
+ if(isset($_POST['menu_action']) && preg_match("/^remove_multiple/",$_POST['menu_action'])){
$s_action = "del_multiple";
}
diff --git a/plugins/admin/applications/class_divListApplication.inc b/plugins/admin/applications/class_divListApplication.inc
index 5eaa67b739dfb0d195987fffc8588c2fa4d58040..15b09c6d728502db697f0055805138dcf87039ec 100755 (executable)
/* Multiple options */
$s.= "..|---|\n";
$s.= "..|<img src='images/edittrash.png' alt='' border='0' class='center'>".
- " "._("Remove")."|"."remvove_multiple|\n";
+ " "._("Remove")."|"."remove_multiple|\n";
/* Add multiple copy & cut icons */
if(is_object($this->parent->CopyPasteHandler) && preg_match("/(c.*w|w.*c)/",$acl_all)){
diff --git a/plugins/admin/departments/class_departmentManagement.inc b/plugins/admin/departments/class_departmentManagement.inc
index 2055e6cfac9a02eef0d38f23d1331011314a12e9..e2db188d1d4ad28d260a66edc56c446634a3340e 100644 (file)
}
/* handle remove from layers menu */
- if(isset($_POST['menu_action']) && preg_match("/^remvove_multiple/",$_POST['menu_action'])){
+ if(isset($_POST['menu_action']) && preg_match("/^remove_multiple/",$_POST['menu_action'])){
$s_action = "del_multiple";
}
diff --git a/plugins/admin/departments/class_divListDepartment.inc b/plugins/admin/departments/class_divListDepartment.inc
index 43171c777c31f9132c55fff2d941eee2475dd58d..b1f642dbf1edccab4eb653baa3f272c9323de1be 100755 (executable)
/* Add default header */
$listhead = MultiSelectWindow::get_default_header();
- $listhead .= " <img class='center' src='images/list_seperator.png' align='middle' ".
- " alt='' height='16' width='1'> ".
+ $listhead .=
" "._("Base")." <select name='CurrentMainBase' onChange='mainform.submit()' class='center'>$options</select>".
" <input class='center' type='image' src='images/list_submit.png' align='middle' ".
" title='"._("Submit department")."' name='submit_department' alt='"._("Submit")."'> ";
}
$s.= "..|---|\n";
$s.= "..|<img src='images/edittrash.png' alt='' border='0' class='center'>".
- " "._("Remove")."|"."remvove_multiple|\n";
+ " "._("Remove")."|"."remove_multiple|\n";
$this->SetDropDownHeaderMenu($s);
diff --git a/plugins/admin/devices/class_deviceManagement.inc b/plugins/admin/devices/class_deviceManagement.inc
index 4715ea0f32a146e423645cb80386f87ef5113d3e..dbdfc0fb476f769dd8401c6c30a5559bf9978ef7 100644 (file)
}
/* handle remove from layers menu */
- if(isset($_POST['menu_action']) && preg_match("/^remvove_multiple/",$_POST['menu_action'])){
+ if(isset($_POST['menu_action']) && preg_match("/^remove_multiple/",$_POST['menu_action'])){
$s_action = "del_multiple";
}
diff --git a/plugins/admin/devices/class_divListDevices.inc b/plugins/admin/devices/class_divListDevices.inc
index e2a8a34a47fc110a8a1e9945e8061a9f9451d9d0..fb09fe8c8647c91f392f360817b0bc6c29ae20ff 100755 (executable)
/* Multiple options */
$s.= "..|---|\n";
$s.= "..|<img src='images/edittrash.png' alt='' border='0' class='center'>".
- " "._("Remove")."|"."remvove_multiple|\n";
+ " "._("Remove")."|"."remove_multiple|\n";
/* Add multiple copy & cut icons */
if(is_object($this->parent->CopyPasteHandler) && preg_match("/(c.*w|w.*c)/",$acl_all)){
index 317ab9f08c69e985e79270468fcac4eea9d74c3c..c2ae1b9b56f6dcdc9f4eb393b13ea824ddc9ef10 100644 (file)
/* Multiple options */
$s.= "..|<img src='images/edittrash.png' alt='' border='0' class='center'>".
- " "._("Remove")."|"."remvove_multiple|\n";
+ " "._("Remove")."|"."remove_multiple|\n";
/* Add multiple copy & cut icons */
if(is_object($this->parent->CopyPasteHandler)){
index 017fa5dbb5728da2b37acc2630f41bf020f63b61..a9fc28fcf4d992d148e3c967b2d73fd4c8e77fac 100644 (file)
}
/* handle remove from layers menu */
- if(isset($_POST['menu_action']) && preg_match("/^remvove_multiple/",$_POST['menu_action'])){
+ if(isset($_POST['menu_action']) && preg_match("/^remove_multiple/",$_POST['menu_action'])){
$s_action = "del_multiple";
}
diff --git a/plugins/admin/groups/class_divListGroup.inc b/plugins/admin/groups/class_divListGroup.inc
index ab0cef77764f633410fb8a72f7746bb0e6839d8d..fcf32f84391f8ef4e8c884453ed927029a8468c2 100644 (file)
/* Multiple options */
$s.= "..|---|\n";
$s.= "..|<img src='images/edittrash.png' alt='' border='0' class='center'>".
- " "._("Remove")."|"."remvove_multiple|\n";
+ " "._("Remove")."|"."remove_multiple|\n";
/* Add multiple copy & cut icons */
if(is_object($this->parent->CopyPasteHandler) && preg_match("/(c.*w|w.*c)/",$acl_all)){
diff --git a/plugins/admin/groups/class_groupManagement.inc b/plugins/admin/groups/class_groupManagement.inc
index 664084fd142ced5b358c9a7579a624647e080c58..f146ad689b672c320b67afd6b2eb3490d7dda58c 100644 (file)
}
/* handle remove from layers menu */
- if(isset($_POST['menu_action']) && preg_match("/^remvove_multiple/",$_POST['menu_action'])){
+ if(isset($_POST['menu_action']) && preg_match("/^remove_multiple/",$_POST['menu_action'])){
$s_action = "del_multiple";
}
diff --git a/plugins/admin/mimetypes/class_divListMimeTypes.inc b/plugins/admin/mimetypes/class_divListMimeTypes.inc
index a34c10f786007f5de0528bd5af0c444daa621389..1c8677f463136f5d5a050cffa5057f77d6a6506c 100755 (executable)
/* Multiple options */
$s.= "..|---|\n";
$s.= "..|<img src='images/edittrash.png' alt='' border='0' class='center'>".
- " "._("Remove")."|"."remvove_multiple|\n";
+ " "._("Remove")."|"."remove_multiple|\n";
/* Add multiple copy & cut icons */
if(is_object($this->parent->CopyPasteHandler) && preg_match("/(c.*w|w.*c)/",$acl_all)){
diff --git a/plugins/admin/mimetypes/class_mimetypeManagement.inc b/plugins/admin/mimetypes/class_mimetypeManagement.inc
index caee8ddf1c56ba28ec01843659335b09f18ae7cf..e2dd047e29a8b3d73a30ee90b60ae37dbb3adfd0 100755 (executable)
}
/* handle remove from layers menu */
- if(isset($_POST['menu_action']) && preg_match("/^remvove_multiple/",$_POST['menu_action'])){
+ if(isset($_POST['menu_action']) && preg_match("/^remove_multiple/",$_POST['menu_action'])){
$s_action = "del_multiple";
}
diff --git a/plugins/admin/ogroups/class_ogroupManagement.inc b/plugins/admin/ogroups/class_ogroupManagement.inc
index 7ed769ac57c43a8b043cf45a69033cb8b13cfe33..5740877402040ba9736e3be50994c5d5dd4044e9 100644 (file)
}
/* handle remove from layers menu */
- if(isset($_POST['menu_action']) && preg_match("/^remvove_multiple/",$_POST['menu_action'])){
+ if(isset($_POST['menu_action']) && preg_match("/^remove_multiple/",$_POST['menu_action'])){
$s_action = "del_multiple";
}
diff --git a/plugins/admin/systems/class_divListSystem.inc b/plugins/admin/systems/class_divListSystem.inc
index 4befca1155597c052b37abc4aafe293bce94a037..61871b7a922260f3972ede91b09a9247f5f2eb1f 100644 (file)
" "._("Component")."|"."newsystem_component|\n";
}
$s.= "..|<img src='images/edittrash.png' alt='' border='0' class='center'>".
- " "._("Remove")."|"."remvove_multiple|\n";
+ " "._("Remove")."|"."remove_multiple|\n";
/* Add multiple copy & cut icons */
if(is_object($this->parent->CopyPasteHandler)){
diff --git a/plugins/admin/systems/class_systemManagement.inc b/plugins/admin/systems/class_systemManagement.inc
index f3b34c7fe75b835cedc3daf75ebcf6aa8a81a993..4b8198c4a51eaad307fe37d0f5c316131f1abfd4 100644 (file)
}
/* handle remove from layers menu */
- if(isset($_POST['menu_action']) && preg_match("/^remvove_multiple/",$_POST['menu_action'])){
+ if(isset($_POST['menu_action']) && preg_match("/^remove_multiple/",$_POST['menu_action'])){
$s_action = "del_multiple";
}
diff --git a/plugins/admin/users/class_divListUsers.inc b/plugins/admin/users/class_divListUsers.inc
index a571f5f07054437585cb65e100786a2994b6ffdd..6ba71d7146ce0c1b179a3d397662bc91b6ed6c1c 100644 (file)
$s.= "..|<img src='images/list_password.png' alt='' border='0' class='center'>".
" "._("Change password")."|"."multiple_password_change|\n";
$s.= "..|<img src='images/edittrash.png' alt='' border='0' class='center'>".
- " "._("Remove")."|"."remvove_multiple|\n";
+ " "._("Remove")."|"."remove_multiple|\n";
/* Add multiple copy & cut icons */
if(is_object($this->parent->CopyPasteHandler) && preg_match("/(c.*w|w.*c)/",$acl_all)){
diff --git a/plugins/admin/users/class_userManagement.inc b/plugins/admin/users/class_userManagement.inc
index 64fbb0707654100a3e1fae66fd674137eb29ec3a..f8a297c6dd86c4ae83f211a01baa9f9261a2a513 100644 (file)
}
/* handle remove from layers menu */
- if(isset($_POST['menu_action']) && preg_match("/^remvove_multiple/",$_POST['menu_action'])){
+ if(isset($_POST['menu_action']) && preg_match("/^remove_multiple/",$_POST['menu_action'])){
$s_action = "del_multiple";
}
diff --git a/plugins/gofon/conference/class_divListConferences.inc b/plugins/gofon/conference/class_divListConferences.inc
index e688523cea55e87b1890e8793ab927f79eb7dd43..cdcdcbc9d5a70a002a9df14a64dee0c261b81604 100755 (executable)
/* Add default header */
$listhead = MultiSelectWindow::get_default_header();
- /* Get copy & paste icon */
- $Copy_Paste ="";
- if(preg_match("/(c.*w|w.*c)/",$acls) && $this->parent->CopyPasteHandler){
- $Copy_Paste = $this->parent->CopyPasteHandler->generatePasteIcon();
- $addsep = true;
- }
-
-
- /* Only display snapshot settings if we are able to write && create new entries */
- if(preg_match("/(c.*w|w.*c)/",$acl_all)){
- $listhead .= $this->get_snapshot_header($this->selectedBase);
- }
- $listhead .= $Copy_Paste;
-
- /* Only display create new conference if we are allowed to create new confe... */
- if(preg_match("/c/",$acls)){
- $listhead .=" <img class='center' src='images/list_seperator.png' align='middle' alt='' height='16' width='1'> ".
- " <input class='center' type='image' align='middle' src='images/list_new_conference.png'
- title='"._("Create new conference")."' alt='"._("New conference")."' name='conference_new'> ".
- " <img class='center' src='images/list_seperator.png' align='middle' alt='' height='16' width='1'> ";
- }
-
/* Add the rest (base select ....)*/
$listhead .= _("Base")." <select name='CurrentMainBase' onChange='mainform.submit()' class='center'>$options</select>".
" <input class='center' type='image' src='images/list_submit.png' align='middle'
title='"._("Submit department")."' name='submit_department' alt='". _("Submit"). "'> ";
+ /* Create Layers menu */
+ $s = ".|"._("Actions")."|\n";
+ $s .= "..|<img src='images/list_new.png' alt='' border='0' class='center'>".
+ " "._("Create")."|\n";
+
+ /* Append create options */
+ if(preg_match("/(c.*w|w.*c)/",$acl_all)){
+ $s.= "...|<input class='center' type='image' src='images/list_new_conference.png' alt=''>".
+ " "._("Conference")."|conference_new|\n";
+ }
+
/* Multiple options */
- $listhead .= " <input class='center' type='image' align='middle' src='images/edittrash.png'
- title='"._("Remove selected conferences")."' alt='"._("Remove conferences")."' name='remove_multiple_conferences'> ";
+ $s.= "..|---|\n";
+ $s.= "..|<img src='images/edittrash.png' alt='' border='0' class='center'>".
+ " "._("Remove")."|"."remove_multiple|\n";
/* Add multiple copy & cut icons */
if(is_object($this->parent->CopyPasteHandler)){
- $listhead .= " <input class='center' type='image' align='middle' src='images/editcopy.png'
- title='"._("Copy selected objects")."' alt='"._("Copy objects")."' name='multiple_copy_objects'> ";
- $listhead .= " <input class='center' type='image' align='middle' src='images/editcut.png'
- title='"._("cut selected objects")."' alt='"._("Cut objects")."' name='multiple_cut_objects'> ";
- $listhead .= "</div>";
+ $s.= "..|---|\n";
+ $s.= "..|<img src='images/editcopy.png' alt='' border='0' class='center'>".
+ " "._("Copy")."|"."multiple_copy_systems|\n";
+ $s.= "..|<img src='images/editcut.png' alt='' border='0' class='center'>".
+ " "._("Cut")."|"."multiple_cut_systems|\n";
+
+ if($this->parent->CopyPasteHandler->entries_queued()){
+ $img = "<img border='0' class='center' src='images/editpaste.png' alt=''>";
+ $s.="..|".$img." "._("Paste")."|editPaste|\n";
+ }else{
+ $img = "<img border='0' class='center' src='images/cant_editpaste.png' alt=''>";
+ $s.="..|".$img." "._("Paste")."\n";
+ }
}
- $listhead .="</div>";
+ /* Add snapshot icons */
+ if(preg_match("/(c.*w|w.*c)/",$acls)){
+ $s .= "..|---|\n";
+ $s .= $this->get_snapshot_header(TRUE);
+ }
+ $this->SetDropDownHeaderMenu($s);
$this->SetListHeader($listhead);
}
diff --git a/plugins/gofon/conference/class_phoneConferenceManagment.inc b/plugins/gofon/conference/class_phoneConferenceManagment.inc
index c10b37a08721564eab1e91c1a502ea6cd88b2ce1..2dadfabd221475c08922b2e414a82d3bbca9d26a 100644 (file)
$s_entry = $_GET['id'];
}
+ /* handle C&P from layers menu */
+ if(isset($_POST['menu_action']) && preg_match("/^multiple_copy_systems/",$_POST['menu_action'])){
+ $s_action = "copy_multiple";
+ }
+ if(isset($_POST['menu_action']) && preg_match("/^multiple_cut_systems/",$_POST['menu_action'])){
+ $s_action = "cut_multiple";
+ }
+ if(isset($_POST['menu_action']) && preg_match("/^editPaste/",$_POST['menu_action'])){
+ $s_action = "editPaste";
+ }
+
+ /* Create options */
+ if(isset($_POST['menu_action']) && $_POST['menu_action'] == "conference_new"){
+ $s_action = "new";
+ }
+
+ /* handle remove from layers menu */
+ if(isset($_POST['menu_action']) && preg_match("/^remove_multiple/",$_POST['menu_action'])){
+ $s_action = "del_multiple";
+ }
+
/***************
Cancel dialogs
diff --git a/plugins/gofon/macro/class_divListMacros.inc b/plugins/gofon/macro/class_divListMacros.inc
index b66f327fd6aca1b7d27dca5869b0652cbba4e657..de822bb544cabbcb8220243faf2991ebc0e3a8b9 100755 (executable)
/* Multiple options */
$s.= "..|---|\n";
$s.= "..|<img src='images/edittrash.png' alt='' border='0' class='center'>".
- " "._("Remove")."|"."remvove_multiple|\n";
+ " "._("Remove")."|"."remove_multiple|\n";
/* Add multiple copy & cut icons */
if(preg_match("/(c.*w|w.*c)/",$acls) && is_object( $this->parent->CopyPasteHandler)){
diff --git a/plugins/gofon/macro/class_gofonMacroManagement.inc b/plugins/gofon/macro/class_gofonMacroManagement.inc
index a2a7858d3b4e23d5a7db5b2b4867eb122942ff90..f25f49521a8df9ec25b70e13153def1bbaeeb79a 100755 (executable)
}
/* handle remove from layers menu */
- if(isset($_POST['menu_action']) && preg_match("/^remvove_multiple/",$_POST['menu_action'])){
+ if(isset($_POST['menu_action']) && preg_match("/^remove_multiple/",$_POST['menu_action'])){
$s_action = "del_multiple";
}