diff --git a/gosa-core/include/class_sortableListing.inc b/gosa-core/include/class_sortableListing.inc
index b0539c2029bdd44afafb947aade2339d0eff0466..55c3bbfe9bc5617b76eabbc41a0c9de330ad8334 100644 (file)
// Transfer information
$this->displayData= array();
+ $this->modes= array();
foreach ($data as $key => $value) {
$this->displayData[]= $value['data'];
+ if (isset($value['mode'])) {
+ $this->modes[]= $value['mode'];
+ }
}
$this->keys= array_keys($data);
public function render()
{
$result= "<div class='sortableListContainer' id='scroll_".$this->id."' style='min-width:".$this->width.";height: ".$this->height."'>\n";
- $result.= "<table border='0' cellpadding='0' cellspacing='0' width='100%' height='100%' ".(!empty($this->cssclass)?" class='".$this->cssclass."'":"").">\n";
+ $result.= "<table summary='"._("Sortable list")."' border='0' cellpadding='0' cellspacing='0' width='100%' style='width:100%' ".(!empty($this->cssclass)?" class='".$this->cssclass."'":"").">\n";
$action_width= 0;
if (strpos($this->acl, 'w') === false) {
- $edit_image= $this->editable?"<img class='center' src='images/lists/edit-grey.png' alt='"._("Edit")."'>":"";
+ $edit_image= $this->editable?image("images/lists/edit-grey.png"):"";
} else {
- $edit_image= $this->editable?"<input class='center' type='image' src='images/lists/edit.png' alt='"._("Edit")."' name='%ID' id='%ID' title='"._("Edit this entry")."'>":"";
+ $edit_image= $this->editable?image('images/lists/edit.png', "%ID", _("Edit this entry")):"";
}
if (strpos($this->acl, 'd') === false) {
- $delete_image= $this->deleteable?"<img class='center' src='images/lists/trash-grey.png' alt='"._("Delete")."'>":"";
+ $delete_image= $this->deleteable?image('images/lists/trash-grey.png'):"";
} else {
- $delete_image= $this->deleteable?"<input class='center' type='image' src='images/lists/trash.png' alt='"._("Delete")."' name='%ID' title='"._("Delete this entry")."'>":"";
+ $delete_image= $this->deleteable?image('images/lists/trash.png', "%ID", _("Delete this entry")):"";
}
// Do we need colspecs?
if ($this->colspecs) {
$result.= " <colgroup>\n";
for ($i= 0; $i<$this->columns; $i++) {
- $result.= " <col style='width:".(isset($this->colspecs[$i])?$this->colspecs[$i]:"*")."'/>\n";
+ if(isset($this->colspecs[$i]) && $this->colspecs[$i] != '*'){
+ $result.= " <col style='width:".($this->colspecs[$i])."'>\n";
+ }else{
+ $result.= " <col>\n";
+ }
}
// Extend by another column if we've actions specified
if ($action_width) {
- $result.= " <col style='width:".$action_width."px'/>\n";
+ $result.= " <col style='width:".$action_width."px' >\n";
}
$result.= " </colgroup>\n";
}
// Do we need a header?
if ($this->header) {
$result.= " <thead>\n <tr>\n";
- $first= " style='border:0'";
+ $first= " style='border-left:0'";
for ($i= 0; $i<$this->columns; $i++) {
$link= "href='?plug=".$_GET['plug']."&PID=".$this->id."&act=SORT_$i'";
$sorter= "";
if ($i == $this->sortColumn){
- $sorter= " <img border='0' title='".($this->sortDirection[$i]?_("Up"):_("Down"))."' src='images/lists/sort-".($this->sortDirection[$i]?"up":"down").".png' align='top'>";
+ $sorter= " ".image("images/lists/sort-".($this->sortDirection[$i]?"up":"down").".png", null, $this->sortDirection[$i]?_("Up"):_("Down"));
}
if ($this->reorderable) {
switch ($this->modes[$row]) {
case LIST_DISABLED:
$id= " sortableListItemDisabled";
- $editable= false;
+ $editable= "";
break;
case LIST_MARKED:
$id= " sortableListItemMarked";
}
// Delete requested?
+ $this->action = "";
if (strpos($this->acl, 'd') !== false){
foreach ($_POST as $key => $value) {
- if (preg_match('/^del_'.$this->id.'_([0-9]+)_x.*$/', $key, $matches)) {
+ if (preg_match('/^del_'.$this->id.'_([0-9]+)$/', $key, $matches)) {
$this->active_index= $this->mapping[$matches[1]];
+
+ // Ignore request if mode requests it
+ if (isset($this->modes[$this->active_index]) && $this->modes[$this->active_index] == LIST_DISABLED) {
+ $this->active_index= null;
+ continue;
+ }
+
+ // Set action
$this->action= "delete";
+
+ // Remove value if requested
if ($this->instantDelete) {
$this->deleteEntry($this->active_index);
}
// Edit requested?
if (strpos($this->acl, 'w') !== false){
foreach ($_POST as $key => $value) {
- if (preg_match('/^edit_'.$this->id.'_([0-9]+)_x.*$/', $key, $matches)) {
+ if (preg_match('/^edit_'.$this->id.'_([0-9]+)$/', $key, $matches)) {
$this->active_index= $this->mapping[$matches[1]];
+
+ // Ignore request if mode requests it
+ if (isset($this->modes[$this->active_index]) && $this->modes[$this->active_index] == LIST_DISABLED) {
+ $this->active_index= null;
+ continue;
+ }
+
$this->action= "edit";
}
}