From 8a7ac587d9d9c41e0dcae68cc0c6dd0e3602a9cc Mon Sep 17 00:00:00 2001
From: Thomas Gelf <thomas@gelf.net>
Date: Fri, 21 Mar 2014 10:27:46 +0000
Subject: [PATCH] Get rid of hardcoded target for action-tables

---
 .../application/views/scripts/list/comments.phtml      |  2 +-
 .../application/views/scripts/list/downtimes.phtml     |  2 +-
 .../application/views/scripts/list/eventhistory.phtml  |  2 +-
 .../application/views/scripts/list/hosts-compact.phtml |  2 +-
 .../application/views/scripts/list/hosts.phtml         |  2 +-
 .../application/views/scripts/list/notifications.phtml |  2 +-
 .../application/views/scripts/list/services.phtml      |  2 +-
 .../application/views/scripts/show/history.phtml       |  2 +-
 public/js/icinga/events.js                             | 10 +---------
 9 files changed, 9 insertions(+), 17 deletions(-)

diff --git a/modules/monitoring/application/views/scripts/list/comments.phtml b/modules/monitoring/application/views/scripts/list/comments.phtml
index 70120def4..8f1ea2d7b 100644
--- a/modules/monitoring/application/views/scripts/list/comments.phtml
+++ b/modules/monitoring/application/views/scripts/list/comments.phtml
@@ -7,7 +7,7 @@
 </div>
 
 <div class="content">
-<table class="action comments">
+<table data-base-target="_next" class="action comments">
 <tbody>
 <?php
 
diff --git a/modules/monitoring/application/views/scripts/list/downtimes.phtml b/modules/monitoring/application/views/scripts/list/downtimes.phtml
index 6a94f52c8..f53da1739 100644
--- a/modules/monitoring/application/views/scripts/list/downtimes.phtml
+++ b/modules/monitoring/application/views/scripts/list/downtimes.phtml
@@ -10,7 +10,7 @@ $helper = $this->getHelper('CommandForm');
 </div>
 
 <div class="content downtimes">
-<table class="action">
+<table data-base-target="_next" class="action">
 <tbody>
 <?php foreach ($this->downtimes as $downtime): ?>
 <tr>
diff --git a/modules/monitoring/application/views/scripts/list/eventhistory.phtml b/modules/monitoring/application/views/scripts/list/eventhistory.phtml
index 6a753a4f8..5fe526739 100644
--- a/modules/monitoring/application/views/scripts/list/eventhistory.phtml
+++ b/modules/monitoring/application/views/scripts/list/eventhistory.phtml
@@ -14,7 +14,7 @@ No entries found
 </div>
 <?php return; endif ?>
 
-<table class="action">
+<table data-base-target="_next" class="action">
   <tbody>
   <?php foreach ($history as $event): ?>
       <?php
diff --git a/modules/monitoring/application/views/scripts/list/hosts-compact.phtml b/modules/monitoring/application/views/scripts/list/hosts-compact.phtml
index 0f9a388e8..b6ac4e15e 100644
--- a/modules/monitoring/application/views/scripts/list/hosts-compact.phtml
+++ b/modules/monitoring/application/views/scripts/list/hosts-compact.phtml
@@ -5,7 +5,7 @@ if ($hosts->count() === 0) {
     return;
 }
 
-?><table class="action">
+?><table data-base-target="_next" class="action">
 <tbody>
 <?php
 
diff --git a/modules/monitoring/application/views/scripts/list/hosts.phtml b/modules/monitoring/application/views/scripts/list/hosts.phtml
index 0cb09b55e..c2979aa25 100644
--- a/modules/monitoring/application/views/scripts/list/hosts.phtml
+++ b/modules/monitoring/application/views/scripts/list/hosts.phtml
@@ -19,7 +19,7 @@ if ($hosts->count() === 0) {
 }
 ?>
 
-<table class="action multiselect">
+<table data-base-target="_next" class="action multiselect">
 <tbody>
 <?php foreach($hosts as $host):
 
diff --git a/modules/monitoring/application/views/scripts/list/notifications.phtml b/modules/monitoring/application/views/scripts/list/notifications.phtml
index 333b9f967..03dad8d97 100644
--- a/modules/monitoring/application/views/scripts/list/notifications.phtml
+++ b/modules/monitoring/application/views/scripts/list/notifications.phtml
@@ -16,7 +16,7 @@ if (empty($this->notifications)) {
 }
 ?>
 
-<table class="action">
+<table data-base-target="_next" class="action">
 <tbody>
 <?php
 
diff --git a/modules/monitoring/application/views/scripts/list/services.phtml b/modules/monitoring/application/views/scripts/list/services.phtml
index 0f4c68b65..643f6d419 100644
--- a/modules/monitoring/application/views/scripts/list/services.phtml
+++ b/modules/monitoring/application/views/scripts/list/services.phtml
@@ -13,7 +13,7 @@ Sort by <?= $this->sortControl ?>
 
 <div class="content">
 <?php endif ?>
-<table class="action multiselect<?php if ($this->compact): ?> compact<?php endif ?>" style="table-layout: auto;">
+<table data-base-target="_next" class="action multiselect<?php if ($this->compact): ?> compact<?php endif ?>" style="table-layout: auto;">
   <tbody>
 <?php
 
diff --git a/modules/monitoring/application/views/scripts/show/history.phtml b/modules/monitoring/application/views/scripts/show/history.phtml
index 06cf78f78..32e3cbdfb 100644
--- a/modules/monitoring/application/views/scripts/show/history.phtml
+++ b/modules/monitoring/application/views/scripts/show/history.phtml
@@ -43,7 +43,7 @@ No History Available For This Object
 <?php return; endif ?>
 
 <div class="content">
-<table class="action">
+<table data-base-target="_next" class="action">
 <tbody>
 
 <?php foreach ($this->history as $event):
diff --git a/public/js/icinga/events.js b/public/js/icinga/events.js
index 30008eaa0..a2f8d5d7c 100644
--- a/public/js/icinga/events.js
+++ b/public/js/icinga/events.js
@@ -257,15 +257,7 @@
                 $target = $container;
             }
 
-            // ...the only exception are class="action" tables...
-            if ($el.closest('table.action').length) {
-                if ($el.closest('#col2').length) {
-                    this.icinga.ui.moveToLeft();
-                }
-                $target = $('#col2');
-            }
-
-            // ...and you can of course override the default behaviour:
+            // You can of course override the default behaviour:
             if ($el.closest('[data-base-target]').length) {
                 targetId = $el.closest('[data-base-target]').data('baseTarget');