tyler.durden
/
icingaweb2
mirror of https://github.com/Icinga/icingaweb2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Get rid of hardcoded target for action-tables

This commit is contained in:
Thomas Gelf 2014-03-21 10:27:46 +00:00
parent 4378282e9f
commit 8a7ac587d9
9 changed files with 9 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/monitoring/application/views/scripts/list/comments.phtml
View File

@ -7,7 +7,7 @@
</div> </div>
<div class="content"> <div class="content">
<table class="action comments"> <table data-base-target="_next" class="action comments">
<tbody> <tbody>
<?php <?php

2
modules/monitoring/application/views/scripts/list/downtimes.phtml
View File

@ -10,7 +10,7 @@ $helper = $this->getHelper('CommandForm');
</div> </div>
<div class="content downtimes"> <div class="content downtimes">
<table class="action"> <table data-base-target="_next" class="action">
<tbody> <tbody>
<?php foreach ($this->downtimes as $downtime): ?> <?php foreach ($this->downtimes as $downtime): ?>
<tr> <tr>

2
modules/monitoring/application/views/scripts/list/eventhistory.phtml
View File

@ -14,7 +14,7 @@ No entries found
</div> </div>
<?php return; endif ?> <?php return; endif ?>
<table class="action"> <table data-base-target="_next" class="action">
<tbody> <tbody>
<?php foreach ($history as $event): ?> <?php foreach ($history as $event): ?>
<?php <?php

2
modules/monitoring/application/views/scripts/list/hosts-compact.phtml
View File

@ -5,7 +5,7 @@ if ($hosts->count() === 0) {
return; return;
} }
?><table class="action"> ?><table data-base-target="_next" class="action">
<tbody> <tbody>
<?php <?php

2
modules/monitoring/application/views/scripts/list/hosts.phtml
View File

@ -19,7 +19,7 @@ if ($hosts->count() === 0) {
} }
?> ?>
<table class="action multiselect"> <table data-base-target="_next" class="action multiselect">
<tbody> <tbody>
<?php foreach($hosts as $host): <?php foreach($hosts as $host):

2
modules/monitoring/application/views/scripts/list/notifications.phtml
View File

@ -16,7 +16,7 @@ if (empty($this->notifications)) {
} }
?> ?>
<table class="action"> <table data-base-target="_next" class="action">
<tbody> <tbody>
<?php <?php

2
modules/monitoring/application/views/scripts/list/services.phtml
View File

@ -13,7 +13,7 @@ Sort by <?= $this->sortControl ?>
<div class="content"> <div class="content">
<?php endif ?> <?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> <tbody>
<?php <?php

2
modules/monitoring/application/views/scripts/show/history.phtml
View File

@ -43,7 +43,7 @@ No History Available For This Object
<?php return; endif ?> <?php return; endif ?>
<div class="content"> <div class="content">
<table class="action"> <table data-base-target="_next" class="action">
<tbody> <tbody>
<?php foreach ($this->history as $event): <?php foreach ($this->history as $event):

10
public/js/icinga/events.js
View File

@ -257,15 +257,7 @@
$target = $container; $target = $container;
} }
// ...the only exception are class="action" tables... // You can of course override the default behaviour:
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:
if ($el.closest('[data-base-target]').length) { if ($el.closest('[data-base-target]').length) {
targetId = $el.closest('[data-base-target]').data('baseTarget'); targetId = $el.closest('[data-base-target]').data('baseTarget');