Merge pull request #515 from it-novum/english

English
it-novum · Apr 6, 2017 · c75b83c · c75b83c
2 parents ac487fc + d9069e3
commit c75b83c
Show file tree

Hide file tree

Showing 73 changed files with 183 additions and 180 deletions.
diff --git a/app/Plugin/ListFilter/View/Helper/ListFilterHelper.php b/app/Plugin/ListFilter/View/Helper/ListFilterHelper.php
@@ -307,7 +307,7 @@ public function close($includeButton = true, $includeResetLink = true, $isPlugin
     public function button($title = null)
     {
         if (!$title) {
-            $title = __('list_filter.search');
+            $title = __('Filter');
         }
 
         return $this->Form->submit(__($title), ['div' => false, 'class' => 'btn btn-mini btn-primary']);

diff --git a/app/View/Acknowledgements/host.ctp b/app/View/Acknowledgements/host.ctp
@@ -54,7 +54,7 @@
             <div class="jarviswidget jarviswidget-color-blueDark" id="wid-id-1" data-widget-editbutton="false">
                 <header>
                     <div class="widget-toolbar" role="menu">
-                        <?php echo $this->Html->link(__('Search'), 'javascript:', ['class' => 'oitc-list-filter btn btn-xs btn-primary toggle', 'hide-on-render' => 'true', 'icon' => 'fa fa-search']); ?>
+                        <?php echo $this->Html->link(__('Filter'), 'javascript:', ['class' => 'oitc-list-filter btn btn-xs btn-primary toggle', 'hide-on-render' => 'true', 'icon' => 'fa fa-filter']); ?>
                         <?php
                         if ($isFilter):
                             echo $this->ListFilter->resetLink(null, ['class' => 'btn-danger btn-xs', 'icon' => 'fa fa-times']);
@@ -216,7 +216,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); ?>
+                        <?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-filter"></i> '.__('Filter'), false, false); ?>
 
                         <table id="acknowledgements_list" class="table table-striped table-bordered smart-form"
                                style="">

diff --git a/app/View/Acknowledgements/service.ctp b/app/View/Acknowledgements/service.ctp
@@ -79,7 +79,7 @@
                 -->
                 <header>
                     <div class="widget-toolbar" role="menu">
-                        <?php echo $this->Html->link(__('Search'), 'javascript:', ['class' => 'oitc-list-filter btn btn-xs btn-primary toggle', 'hide-on-render' => 'true', 'icon' => 'fa fa-search']); ?>
+                        <?php echo $this->Html->link(__('Filter'), 'javascript:', ['class' => 'oitc-list-filter btn btn-xs btn-primary toggle', 'hide-on-render' => 'true', 'icon' => 'fa fa-filter']); ?>
                         <?php
                         if ($isFilter):
                             echo $this->ListFilter->resetLink(null, ['class' => 'btn-danger btn-xs', 'icon' => 'fa fa-times']);
@@ -242,7 +242,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); ?>
+                        <?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-filter"></i> '.__('Filter'), false, false); ?>
 
                         <table id="acknowledgements_list" class="table table-striped table-bordered smart-form"
                                style="">

diff --git a/app/View/Automaps/index.ctp b/app/View/Automaps/index.ctp
@@ -44,7 +44,7 @@
                     <header>
                         <div class="widget-toolbar" role="menu">
                             <?php echo $this->Html->link(__('New'), '/'.$this->params['controller'].'/add', ['class' => 'btn btn-xs btn-success', 'icon' => 'fa fa-plus']); ?>
-                            <?php echo $this->Html->link(__('Search'), 'javascript:', ['class' => 'oitc-list-filter btn btn-xs btn-primary toggle', 'hide-on-render' => 'true', 'icon' => 'fa fa-search']); ?>
+                            <?php echo $this->Html->link(__('Filter'), 'javascript:', ['class' => 'oitc-list-filter btn btn-xs btn-primary toggle', 'hide-on-render' => 'true', 'icon' => 'fa fa-filter']); ?>
                             <?php
                             if ($isFilter):
                                 echo $this->ListFilter->resetLink(null, ['class' => 'btn-danger btn-xs', 'icon' => 'fa fa-times']);

diff --git a/app/View/Browsers/tenant_browser.ctp b/app/View/Browsers/tenant_browser.ctp
@@ -188,7 +188,7 @@
                                     <?php $order = $this->Paginator->param('order'); ?>
                                     <th class="select_datatable no-sort"><?php echo __('Hoststatus'); ?></th>
                                     <th class="no-sort text-center"><i class="fa fa-gear fa-lg"></i></th>
-                                    <th class="no-sort"><?php echo __('Hostname'); ?></th>
+                                    <th class="no-sort"><?php echo __('Host Name'); ?></th>
                                     <th class="no-sort"><?php echo __('IP address'); ?></th>
                                     <th class="no-sort"><?php echo __('State since'); ?></th>
                                     <th class="no-sort"><?php echo __('Last check'); ?></th>

diff --git a/app/View/Changelogs/index.ctp b/app/View/Changelogs/index.ctp
@@ -45,7 +45,7 @@
                 <div class="jarviswidget jarviswidget-color-blueDark" id="wid-id-1" data-widget-editbutton="false">
                     <header>
                         <div class="widget-toolbar" role="menu">
-                            <?php echo $this->Html->link(__('Search'), 'javascript:', ['class' => 'oitc-list-filter btn btn-xs btn-primary toggle', 'hide-on-render' => 'true', 'icon' => 'fa fa-search']); ?>
+                            <?php echo $this->Html->link(__('Filter'), 'javascript:', ['class' => 'oitc-list-filter btn btn-xs btn-primary toggle', 'hide-on-render' => 'true', 'icon' => 'fa fa-filter']); ?>
                             <?php
                             if ($isFilter):
                                 echo $this->ListFilter->resetLink(null, ['class' => 'btn-danger btn-xs', 'icon' => 'fa fa-times']);
@@ -58,7 +58,7 @@
 
                     <!-- widget div-->
                     <div>
-                        <?php echo $this->ListFilter->renderFilterbox($filters, [], '<i class="fa fa-search"></i> ' . __('search'), false, false); ?>
+                        <?php echo $this->ListFilter->renderFilterbox($filters, [], '<i class="fa fa-filter"></i> ' . __('Filter'), false, false); ?>
                         <!-- widget edit box -->
                         <div class="jarviswidget-editbox">
                             <!-- This area used as dropdown edit box -->

diff --git a/app/View/Commands/handler.ctp b/app/View/Commands/handler.ctp
@@ -48,7 +48,7 @@
                             echo $this->Html->link(__('New'), Router::url(['action' => 'add', '_controller' => 'commands', '_action' => 'handler']), ['class' => 'btn btn-xs btn-success', 'icon' => 'fa fa-plus']);
                             echo " "; //Fix HTML
                         endif;
-                        echo $this->Html->link(__('Search'), 'javascript:', ['class' => 'oitc-list-filter btn btn-xs btn-primary toggle', 'hide-on-render' => 'true', 'icon' => 'fa fa-search']);
+                        echo $this->Html->link(__('Filter'), 'javascript:', ['class' => 'oitc-list-filter btn btn-xs btn-primary toggle', 'hide-on-render' => 'true', 'icon' => 'fa fa-filter']);
                         if ($isFilter):
                             echo " "; //Fix HTML
                             echo $this->ListFilter->resetLink(null, ['class' => 'btn-danger btn-xs', 'icon' => 'fa fa-times']);
@@ -91,7 +91,7 @@
 
                 <div>
                     <div class="widget-body no-padding">
-                        <?php echo $this->ListFilter->renderFilterbox($filters, [], '<i class="fa fa-search"></i> '.__('search'), false, false); ?>
+                        <?php echo $this->ListFilter->renderFilterbox($filters, [], '<i class="fa fa-filter"></i> '.__('Filter'), false, false); ?>
                         <div class="mobile_table">
                             <table id="datatable_fixed_column" class="table table-striped table-bordered smart-form">
                                 <thead>

diff --git a/app/View/Commands/hostchecks.ctp b/app/View/Commands/hostchecks.ctp
@@ -48,7 +48,7 @@
                             echo $this->Html->link(__('New'), Router::url(['action' => 'add', '_controller' => 'commands', '_action' => 'hostchecks']), ['class' => 'btn btn-xs btn-success', 'icon' => 'fa fa-plus']);
                             echo " "; //Fix HTML;
                         endif;
-                        echo $this->Html->link(__('Search'), 'javascript:', ['class' => 'oitc-list-filter btn btn-xs btn-primary toggle', 'hide-on-render' => 'true', 'icon' => 'fa fa-search']);
+                        echo $this->Html->link(__('Filter'), 'javascript:', ['class' => 'oitc-list-filter btn btn-xs btn-primary toggle', 'hide-on-render' => 'true', 'icon' => 'fa fa-search']);
                         if ($isFilter):
                             echo " "; //Fix HTML
                             echo $this->ListFilter->resetLink(null, ['class' => 'btn-danger btn-xs', 'icon' => 'fa fa-times']);
@@ -90,7 +90,7 @@
 
                 <div>
                     <div class="widget-body no-padding">
-                        <?php echo $this->ListFilter->renderFilterbox($filters, [], '<i class="fa fa-search"></i> '.__('search'), false, false); ?>
+                        <?php echo $this->ListFilter->renderFilterbox($filters, [], '<i class="fa fa-filter"></i> '.__('Filter'), false, false); ?>
                         <div class="mobile_table">
                             <table id="datatable_fixed_column" class="table table-striped table-bordered smart-form">
                                 <thead>

diff --git a/app/View/Commands/index.ctp b/app/View/Commands/index.ctp
@@ -48,7 +48,7 @@
                             echo $this->Html->link(__('New'), '/'.$this->params['controller'].'/add', ['class' => 'btn btn-xs btn-success', 'icon' => 'fa fa-plus']);
                             echo " "; //Hix HTML
                         endif;
-                        echo $this->Html->link(__('Search'), 'javascript:', ['class' => 'oitc-list-filter btn btn-xs btn-primary toggle', 'hide-on-render' => 'true', 'icon' => 'fa fa-search']);
+                        echo $this->Html->link(__('Filter'), 'javascript:', ['class' => 'oitc-list-filter btn btn-xs btn-primary toggle', 'hide-on-render' => 'true', 'icon' => 'fa fa-filter']);
                         if ($isFilter):
                             echo " "; //Fix HTML
                             echo $this->ListFilter->resetLink(null, ['class' => 'btn-danger btn-xs', 'icon' => 'fa fa-times']);
@@ -90,7 +90,7 @@
 
                 <div>
                     <div class="widget-body no-padding">
-                        <?php echo $this->ListFilter->renderFilterbox($filters, [], '<i class="fa fa-search"></i> '.__('search'), false, false); ?>
+                        <?php echo $this->ListFilter->renderFilterbox($filters, [], '<i class="fa fa-filter"></i> '.__('Filter'), false, false); ?>
                         <div class="mobile_table">
                             <table id="datatable_fixed_column" class="table table-striped table-bordered smart-form">
                                 <thead>

diff --git a/app/View/Commands/notifications.ctp b/app/View/Commands/notifications.ctp
@@ -48,7 +48,7 @@
                             echo $this->Html->link(__('New'), Router::url(['action' => 'add', '_controller' => 'commands', '_action' => 'notifications']), ['class' => 'btn btn-xs btn-success', 'icon' => 'fa fa-plus']);
                             echo " "; //Fix HTML
                         endif;
-                        echo $this->Html->link(__('Search'), 'javascript:', ['class' => 'oitc-list-filter btn btn-xs btn-primary toggle', 'hide-on-render' => 'true', 'icon' => 'fa fa-search']);
+                        echo $this->Html->link(__('Filter'), 'javascript:', ['class' => 'oitc-list-filter btn btn-xs btn-primary toggle', 'hide-on-render' => 'true', 'icon' => 'fa fa-filter']);
                         if ($isFilter):
                             echo " "; //Fix HTML
                             echo $this->ListFilter->resetLink(null, ['class' => 'btn-danger btn-xs', 'icon' => 'fa fa-times']);
@@ -90,7 +90,7 @@
                 </header>
                 <div>
                     <div class="widget-body no-padding">
-                        <?php echo $this->ListFilter->renderFilterbox($filters, [], '<i class="fa fa-search"></i> '.__('search'), false, false); ?>
+                        <?php echo $this->ListFilter->renderFilterbox($filters, [], '<i class="fa fa-filter"></i> '.__('Filter'), false, false); ?>
                         <div class="mobile_table">
                             <table id="datatable_fixed_column" class="table table-striped table-bordered smart-form">
                                 <thead>

diff --git a/app/View/Contactgroups/edit.ctp b/app/View/Contactgroups/edit.ctp
@@ -29,7 +29,7 @@
             <i class="fa fa-users fa-fw "></i>
             <?php echo __('Monitoring'); ?>
             <span>>
-                <?php echo __('Contactgroups'); ?>
+                <?php echo __('Contact Groups'); ?>
 			</span>
             <div class="third_level"> <?php echo ucfirst($this->params['action']); ?></div>
         </h1>

diff --git a/app/View/Contactgroups/index.ctp b/app/View/Contactgroups/index.ctp
@@ -31,7 +31,7 @@
             <i class="fa fa-users fa-fw "></i>
             <?php echo __('Monitoring'); ?>
             <span>>
-                <?php echo __('Contactgroups'); ?>
+                <?php echo __('Contact Groups'); ?>
 			</span>
         </h1>
     </div>
@@ -48,7 +48,7 @@
                             echo $this->Html->link(__('New'), '/'.$this->params['controller'].'/add', ['class' => 'btn btn-xs btn-success', 'icon' => 'fa fa-plus']);
                             echo " "; //Fix HTML
                         endif;
-                        echo $this->Html->link(__('Search'), 'javascript:', ['class' => 'oitc-list-filter btn btn-xs btn-primary toggle', 'hide-on-render' => 'true', 'icon' => 'fa fa-search']);
+                        echo $this->Html->link(__('Filter'), 'javascript:', ['class' => 'oitc-list-filter btn btn-xs btn-primary toggle', 'hide-on-render' => 'true', 'icon' => 'fa fa-filter']);
                         if ($isFilter):
                             echo " "; //Fix HTML;
                             echo $this->ListFilter->resetLink(null, ['class' => 'btn-danger btn-xs', 'icon' => 'fa fa-times']);
@@ -62,7 +62,7 @@
                             <li style="width: 100%;"><a href="javascript:void(0)" class="select_datatable text-left"
                                                         class="select_datatable text-left" my-column="1"><input
                                             type="checkbox" class="pull-left"/>
-                                    &nbsp; <?php echo __('Contactgroup name'); ?></a></li>
+                                    &nbsp; <?php echo __('Contact group name'); ?></a></li>
                             <li style="width: 100%;"><a href="javascript:void(0)" class="select_datatable text-left"
                                                         class="select_datatable text-left" my-column="2"><input
                                             type="checkbox" class="pull-left"/> &nbsp; <?php echo __('Description'); ?>
@@ -77,11 +77,11 @@
                     <div class="jarviswidget-ctrls" role="menu">
                     </div>
                     <span class="widget-icon hidden-mobile"> <i class="fa fa-users"></i> </span>
-                    <h2 class="hidden-mobile"><?php echo __('Contactgroups'); ?> </h2>
+                    <h2 class="hidden-mobile"><?php echo __('Contact Groups'); ?> </h2>
                 </header>
                 <div>
                     <div class="widget-body no-padding">
-                        <?php echo $this->ListFilter->renderFilterbox($filters, [], '<i class="fa fa-search"></i> '.__('search'), false, false); ?>
+                        <?php echo $this->ListFilter->renderFilterbox($filters, [], '<i class="fa fa-filter"></i> '.__('Filter'), false, false); ?>
                         <div class="mobile_table">
                             <table id="contactgroup_list" class="table table-striped table-bordered smart-form"
                                    style="">
@@ -91,7 +91,7 @@
                                     <th class="no-sort" style="width: 15px;"><i class="fa fa-check-square-o fa-lg"></i>
                                     </th>
                                     <th class="select_datatable no-sort"><?php echo $this->Utils->getDirection($order, 'Container.name');
-                                        echo $this->Paginator->sort('Container.name', __('Contactgroup name')); ?></th>
+                                        echo $this->Paginator->sort('Container.name', __('Contact group name')); ?></th>
                                     <th class="no-sort"><?php echo $this->Utils->getDirection($order, 'Contacts.description');
                                         echo $this->Paginator->sort('Contactgroup.description', __('Description')); ?></th>
                                     <th class="no-sort"><?php echo __('Contacts'); ?></th>

diff --git a/app/View/Contacts/index.ctp b/app/View/Contacts/index.ctp
@@ -51,7 +51,7 @@
                                 echo " "; //Fix HTML
                             endif;
                         endif;
-                        echo $this->Html->link(__('Search'), 'javascript:', ['class' => 'oitc-list-filter btn btn-xs btn-primary toggle', 'hide-on-render' => 'true', 'icon' => 'fa fa-search']);
+                        echo $this->Html->link(__('Filter'), 'javascript:', ['class' => 'oitc-list-filter btn btn-xs btn-primary toggle', 'hide-on-render' => 'true', 'icon' => 'fa fa-filter']);
                         if ($isFilter):
                             echo " "; //Fix HTML
                             echo $this->ListFilter->resetLink(null, ['class' => 'btn-danger btn-xs', 'icon' => 'fa fa-times']);
@@ -98,7 +98,7 @@
 
                 <div>
                     <div class="widget-body no-padding">
-                        <?php echo $this->ListFilter->renderFilterbox($filters, [], '<i class="fa fa-search"></i> '.__('search'), false, false); ?>
+                        <?php echo $this->ListFilter->renderFilterbox($filters, [], '<i class="fa fa-filter"></i> '.__('Filter'), false, false); ?>
                         <div class="mobile_table">
                             <table id="contact_list" class="table table-striped table-bordered smart-form" style="">
                                 <thead>

diff --git a/app/View/DeletedHosts/index.ctp b/app/View/DeletedHosts/index.ctp
@@ -69,7 +69,7 @@ foreach ($this->params->named as $key => $value) {
                 -->
                 <header>
                     <div class="widget-toolbar" role="menu">
-                        <?php echo $this->Html->link(__('Search'), 'javascript:', ['class' => 'oitc-list-filter btn btn-xs btn-primary toggle', 'hide-on-render' => 'true', 'icon' => 'fa fa-search']); ?>
+                        <?php echo $this->Html->link(__('Filter'), 'javascript:', ['class' => 'oitc-list-filter btn btn-xs btn-primary toggle', 'hide-on-render' => 'true', 'icon' => 'fa fa-filter']); ?>
                         <?php
                         if ($isFilter):
                             echo $this->ListFilter->resetLink(null, ['class' => 'btn-danger btn-xs', 'icon' => 'fa fa-times']);
@@ -125,7 +125,7 @@ foreach ($this->params->named as $key => $value) {
                     <div class="widget-body no-padding">
                         <?php
                         $options = ['avoid_cut' => true];
-                        echo $this->ListFilter->renderFilterbox($filters, $options, '<i class="fa fa-search"></i> '.__('search'), false, false);
+                        echo $this->ListFilter->renderFilterbox($filters, $options, '<i class="fa fa-filter"></i> '.__('Filter'), false, false);
                         ?>
                         <div class="mobile_table">
                             <table id="host_list" class="table table-striped table-bordered smart-form" style="">