Skip to content

Commit

Permalink
Merge branch 'ITC-609' of https://github.com/it-novum/openITCOCKPIT
Browse files Browse the repository at this point in the history
  • Loading branch information
cfleck committed Aug 4, 2016
2 parents 28c78dd + 1a11acf commit 21a8b9d
Showing 1 changed file with 14 additions and 14 deletions.
28 changes: 14 additions & 14 deletions app/View/Acknowledgements/host.ctp
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
<?php echo $this->Html->link(__('Search'), 'javascript:', array('class' => 'oitc-list-filter btn btn-xs btn-primary toggle', 'hide-on-render' => 'true', 'icon' => 'fa fa-search')); ?>
<?php
if($isFilter):
echo $this->ListFilter->resetLink(null, ['class' => 'btn-danger btn-xs', 'icon' => 'fa fa-times']);
echo $this->ListFilter->resetLink(null, ['class' => 'btn-danger btn-xs', 'icon' => 'fa fa-times']);
endif;
?>
</div>
Expand All @@ -70,26 +70,26 @@
</ul>
<div class="clearfix"></div>
</div>

<div id="switch-1" class="widget-toolbar" role="menu">
<?php
echo $this->Form->create('acknowledgements', [
'class' => 'form-horizontal clear',
'action' => 'host/'.$host['Host']['id'] //reset the URL on submit
'url' => 'host/'.$host['Host']['id'] //reset the URL on submit
]);

?>

<div class="widget-toolbar pull-left" role="menu">
<span style="line-height: 32px;" class="pull-left"><?php echo __('From:');?></span>
<input class="form-control text-center pull-left margin-left-10" style="width: 78%;" type="text" maxlength="255" value="<?php echo $AcknowledgementListsettings['from']; ?>" name="data[Listsettings][from]">
</div>

<div class="widget-toolbar pull-left" role="menu">
<span style="line-height: 32px;" class="pull-left"><?php echo __('To:');?></span>
<input class="form-control text-center pull-left margin-left-10" style="width: 85%;" type="text" maxlength="255" value="<?php echo $AcknowledgementListsettings['to']; ?>" name="data[Listsettings][to]">
</div>

<div class="btn-group">
<?php
$listoptions = [
Expand Down Expand Up @@ -118,7 +118,7 @@
'selector' => '#listoptions_limit'
]
];

$selected = 30;
if(isset($AcknowledgementListsettings['limit']) && isset($listoptions[$AcknowledgementListsettings['limit']]['human'])){
$selected = $listoptions[$AcknowledgementListsettings['limit']]['human'];
Expand All @@ -145,7 +145,7 @@
'unreachable' => __('Unreachable')
];
?>

<div class="btn-group">
<button data-toggle="dropdown" class="btn dropdown-toggle btn-xs btn-default">
<?php echo __('State types'); ?> <i class="fa fa-caret-down"></i>
Expand All @@ -159,20 +159,20 @@
endif;
?>
<li>
<input type="hidden" value="0" name="data[Listsettings][state_types][<?php echo $state_type; ?>]" />
<input type="hidden" value="0" name="data[Listsettings][state_types][<?php echo $state_type; ?>]" />
<li style="width: 100%;"><a href="javascript:void(0)" class="listoptions_checkbox text-left"><input type="checkbox" name="data[Listsettings][state_types][<?php echo $state_type; ?>]" value="1" <?php echo $checked; ?>/> &nbsp; <?php echo $name; ?></a></li>
</li>
<?php endforeach?>
</ul>
</div>

<button class="btn btn-xs btn-success toggle"><i class="fa fa-check"></i> <?php echo __('Apply'); ?></button>

<?php
echo $this->Form->end();
?>
</div>

<div class="jarviswidget-ctrls" role="menu">
</div>
<span class="widget-icon"> <i class="fa fa-history"></i> </span>
Expand All @@ -186,7 +186,7 @@
<!-- widget content -->
<div class="widget-body no-padding">
<?php echo $this->ListFilter->renderFilterbox($filters, ['formActionParams' => ['url' => Router::url(Hash::merge($this->params['named'], $this->params['pass'], ['Listsettings' => $AcknowledgementListsettings])), 'merge' => false]], '<i class="fa fa-search"></i> '.__('Search'), false, false); ?>

<table id="acknowledgements_list" class="table table-striped table-bordered smart-form" style="">
<thead>
<tr>
Expand Down

0 comments on commit 21a8b9d

Please sign in to comment.