diff --git a/gosa-core/include/class_MultiSelectWindow.inc b/gosa-core/include/class_MultiSelectWindow.inc
index fee26be039adeaa10cbc133a46a80d9559a62ef7..e76ee82ffe76c1f3b03b584ae666d11c30ea83f5 100644 (file)
}
/* Adds a regex input field to the current dialog */
- function AddRegex($name,$string,$value,$conn,$image="images/search.png")
+ function AddRegex($name,$string,$value,$conn,$image="images/lists/search.png")
{
$arr = array();
/* Return default header part. With back, home and root icons and department selection */
- function get_default_header()
+ function get_default_header($seperator= TRUE)
{
$enable_back = TRUE;
$enable_root = TRUE;
/* Draw root button */
if($enable_root){
- $listhead .= " <input class='center' type='image' src='images/list_root.png' align='middle'
+ $listhead .= " <input class='center' type='image' src='images/lists/root.png' align='middle'
title='"._("Go to root department")."' name='dep_root' alt='"._("Root")."'> ";
}else{
- $listhead .= " <img src='images/list_root_gray.png' class='center' alt='"._("Root")."'> ";
+ $listhead .= " <img src='images/lists/root_grey.png' class='center' alt='"._("Root")."'> ";
}
/* Draw back button */
if($enable_back){
- $listhead .= " <input class='center' type='image' align='middle' src='images/list_back.png'
+ $listhead .= " <input class='center' type='image' align='middle' src='images/lists/back.png'
title='"._("Go up one department")."' alt='"._("Up")."' name='dep_back'> ";
}else{
- $listhead .= " <img src='images/list_back_gray.png' class='center' alt='"._("Up")."'> ";
+ $listhead .= " <img src='images/lists/back_grey.png' class='center' alt='"._("Up")."'> ";
}
/* Draw home button */
if($enable_home){
- $listhead .= " <input class='center' type='image' align='middle' src='images/list_home.png'
+ $listhead .= " <input class='center' type='image' align='middle' src='images/lists/home.png'
title='"._("Go to users department")."' alt='"._("Home")."' name='dep_home'> ";
}else{
- $listhead .= " <img src='images/list_home_gray.png' class='center' alt='"._("Home")."'> ";
+ $listhead .= " <img src='images/lists/home_grey.png' class='center' alt='"._("Home")."'> ";
}
/* And at least draw reload button, this button is enabled everytime */
- $listhead .= " <input class='center' type='image' src='images/list_reload.png' align='middle'
- title='"._("Reload list")."' name='submit_department' alt='"._("Submit")."'> ".
- " <img class='center' src='images/list_seperator.png' align='middle' alt='-' height='16' width='1'> ";
-
+ $listhead .= " <input class='center' type='image' src='images/lists/reload.png' align='middle'
+ title='"._("Reload list")."' name='submit_department' alt='"._("Submit")."'> ";
+ if ($seperator){
+ $listhead.= " <img class='center' src='images/lists/seperator.png' align='middle' alt='-' height='16' width='1'> ";
+ }
return ($listhead);
}
/* Check if box is checked */
if($box['default'] == true){
- $boxes .="<input type='checkbox' name=\"".$box['name']."\" value='1' title=\"".htmlentities($box['value'])."\" checked ".$boxClick."> ".$box['string']."<br>";
+ $boxes .="<input type='checkbox' name=\"".$box['name']."\" value='1' title=\"".htmlspecialchars($box['value'])."\" checked ".$boxClick."> ".$box['string']."<br>";
}else{
- $boxes .="<input type='checkbox' name=\"".$box['name']."\" value='1' title=\"".htmlentities($box['value'])."\" ".$boxClick."> ".$box['string']."<br>";
+ $boxes .="<input type='checkbox' name=\"".$box['name']."\" value='1' title=\"".htmlspecialchars($box['value'])."\" ".$boxClick."> ".$box['string']."<br>";
}
}
$smarty->assign("CheckBoxes", $boxes);
</td>
<td width=\"99%\">
<input id=\"".$regex['name']."\" type=\"text\" style='width:99%' name=\"".$regex['name']."\" maxlength='20'
- value=\"".htmlentities($regex['value'])."\" title=\"".htmlentities($regex['string'])."\">
+ value=\"".htmlspecialchars($regex['value'])."\" title=\"".htmlspecialchars($regex['string'])."\">
</td>
</tr>
</table>";
/* Check for exeeded sizelimit */
$smarty->assign("hint" , print_sizelimit_warning());
- $smarty->assign("DivList" , $divlist->DrawList().$this->footer);
+ $smarty->assign("DivList" , $divlist->DrawList()."\n\n\n\n\n".$this->footer."\n\n\n\n\n");
if($this->is_headpage){
- $smarty->assign("tree_image", get_template_path('images/tree.png'));
+ $smarty->assign("tree_image", get_template_path('images/lists/search-subtree.png'));
$smarty->assign("infoimage", get_template_path('images/info.png'));
$smarty->assign("launchimage", get_template_path('images/launch.png'));
$smarty->assign("apply", apply_filter());
}else{
- $smarty->assign("tree_image", get_template_path('images/tree.png'));
+ $smarty->assign("tree_image", get_template_path('images/lists/search-subtree.png'));
$smarty->assign("infoimage", get_template_path('images/info_small.png'));
$smarty->assign("launchimage", get_template_path('images/rocket.png'));
$smarty->assign("apply", apply_filter());
}
if($ok){
if($layer_menu){
- $str = "..|<img class='center' src='images/restore.png' alt='"._("Restore")."'> "._("Restore")."|RestoreDeletedSnapShot|\n";
+ $str = "..|<img class='center' src='images/lists/restore.png' alt='"._("Restore")."'> "._("Restore")."|RestoreDeletedSnapShot|\n";
}else{
- $str = "<input class='center' type='image' align='middle' src='images/restore.png'
+ $str = "<input class='center' type='image' align='middle' src='images/lists/restore.png'
title='"._("Restore snapshopts of already deleted objects")."'
alt='"._("Restore")."' name='RestoreDeletedSnapShot'> ";
}
}else{
if($layer_menu){
- $str = "..|<img class='center' src='images/restore_grey.png' alt=''> "._("Restore")."||\n";
+ $str = "..|<img class='center' src='images/lists/restore_grey.png' alt=''> "._("Restore")."||\n";
}else{
- $str = "<img class='center' src='images/restore_grey.png' alt=''> ";
+ $str = "<img class='center' src='images/lists/restore_grey.png' alt=''> ";
}
}
-# $str .= "<img class='center' src='images/list_seperator.png' align='middle' alt='' height='16' width='1'> ";
}
return($str);
}
if($this->parent->snapshotEnabled()){
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/lists/restore.png'
alt='"._("Restore snapshot")."' name='RestoreSnapShotDialog_".base64_encode($dn)."' title='"._("Restore snapshot")."'> ";
} else {
- $str = "<img class='center' src='images/restore_grey.png' alt=''> ";
+ $str = "<img class='center' src='images/lists/restore_grey.png' alt=''> ";
}
$str.= "<input class='center' type='image' src='images/snapshot.png'
$nkey= normalizePreg($key);
foreach($this->config->departments as $keyd=>$vald ){
if(preg_match('/$nkey\/.*/',$keyd)){
- $non_empty="full";
+ $non_empty="-full";
}
}
}
}
- $row[]=$field1=array("string"=>"<img src='images/".$non_empty."folder.png' alt='department'>","attach"=>"style='text-align:center;width:20px;'");
+ $row[]=$field1=array("string"=>"<img src='images/lists/folder".$non_empty.".png' alt='department'>","attach"=>"style='text-align:center;width:20px;'");
$row[]=$field2=array("string"=>sprintf($linkopen,base64_encode($key),$val), "attach" => "style=''");
if($numtabs > 2){