[icinga-checkins] icinga.org: icingaweb2/feature/security-gui-5647: Dashboard: Update descriptions

git at icinga.org git at icinga.org
Thu Nov 20 16:13:00 CET 2014


Module: icingaweb2
Branch: feature/security-gui-5647
Commit: 2c4b73088706fe55e89b19de56b00eb1bdc219c5
URL:    https://git.icinga.org/?p=icingaweb2.git;a=commit;h=2c4b73088706fe55e89b19de56b00eb1bdc219c5

Author: Marius Hein <marius.hein at netways.de>
Date:   Thu Nov 20 11:36:04 2014 +0100

Dashboard: Update descriptions

refs #7751

---

 application/controllers/DashboardController.php            |    8 ++++----
 application/views/scripts/dashboard/new-component.phtml    |    2 +-
 application/views/scripts/dashboard/remove-component.phtml |    2 +-
 application/views/scripts/dashboard/remove-pane.phtml      |    2 +-
 application/views/scripts/dashboard/settings.phtml         |    4 ++--
 application/views/scripts/dashboard/update-component.phtml |    2 +-
 6 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/application/controllers/DashboardController.php b/application/controllers/DashboardController.php
index 94a6b38..d987a69 100644
--- a/application/controllers/DashboardController.php
+++ b/application/controllers/DashboardController.php
@@ -78,7 +78,7 @@ class DashboardController extends ActionController
         $dashboard = $this->dashboard;
         $form = new ComponentForm();
         $form->setDashboard($dashboard);
-        $form->setSubmitLabel(t('Update Component'));
+        $form->setSubmitLabel(t('Update Dashlet'));
         if (! $this->_request->getParam('pane')) {
             throw new Zend_Controller_Action_Exception(
                 'Missing parameter "pane"',
@@ -125,7 +125,7 @@ class DashboardController extends ActionController
                 $action->render('error');
                 return false;
             }
-            Notification::success(t('Component updated'));
+            Notification::success(t('Dashlet updated'));
             return true;
         });
         $form->setRedirectUrl('dashboard/settings');
@@ -162,7 +162,7 @@ class DashboardController extends ActionController
                 $pane = $dashboard->getPane($pane);
                 $pane->removeComponent($component);
                 $dashboard->write();
-                Notification::success(t('Component has been removed from') . ' ' . $pane->getTitle());
+                Notification::success(t('Dashlet has been removed from') . ' ' . $pane->getTitle());
                 return true;
             }  catch (\Zend_Config_Exception $e) {
                 $action->view->error = $e;
@@ -200,7 +200,7 @@ class DashboardController extends ActionController
                 $pane = $dashboard->getPane($pane);
                 $dashboard->removePane($pane->getTitle());
                 $dashboard->write();
-                Notification::success(t('Pane has been removed') . ': ' . $pane->getTitle());
+                Notification::success(t('Dashboard has been removed') . ': ' . $pane->getTitle());
                 return true;
             }  catch (\Zend_Config_Exception $e) {
                 $action->view->error = $e;
diff --git a/application/views/scripts/dashboard/new-component.phtml b/application/views/scripts/dashboard/new-component.phtml
index 46c8b22..98b0554 100644
--- a/application/views/scripts/dashboard/new-component.phtml
+++ b/application/views/scripts/dashboard/new-component.phtml
@@ -2,6 +2,6 @@
     <?= $this->tabs ?>
 </div>
 <div class="content">
-    <h1><?= t('Add Component To Dashboard'); ?></h1>
+    <h1><?= t('Add Dashlet To Dashboard'); ?></h1>
     <?= $this->form; ?>
 </div>
\ No newline at end of file
diff --git a/application/views/scripts/dashboard/remove-component.phtml b/application/views/scripts/dashboard/remove-component.phtml
index c394727..c0097d4 100644
--- a/application/views/scripts/dashboard/remove-component.phtml
+++ b/application/views/scripts/dashboard/remove-component.phtml
@@ -3,7 +3,7 @@
 </div>
 
 <div class="content">
-    <h1><?= t('Remove Component From Dashboard'); ?></h1>
+    <h1><?= t('Remove Dashlet From Dashboard'); ?></h1>
 
     <p>
         <?= $this->translate('Please confirm the removal'); ?>:
diff --git a/application/views/scripts/dashboard/remove-pane.phtml b/application/views/scripts/dashboard/remove-pane.phtml
index 637774c..45455d3 100644
--- a/application/views/scripts/dashboard/remove-pane.phtml
+++ b/application/views/scripts/dashboard/remove-pane.phtml
@@ -3,7 +3,7 @@
 </div>
 
 <div class="content">
-    <h1><?= t('Remove Pane'); ?></h1>
+    <h1><?= t('Remove Dashboard'); ?></h1>
 
     <p>
         <?= $this->translate('Please confirm the removal of'); ?>:
diff --git a/application/views/scripts/dashboard/settings.phtml b/application/views/scripts/dashboard/settings.phtml
index 83fba65..97f7740 100644
--- a/application/views/scripts/dashboard/settings.phtml
+++ b/application/views/scripts/dashboard/settings.phtml
@@ -10,7 +10,7 @@
         <thead>
             <tr>
                 <th>
-                    <strong><?= t('Component Name') ?></strong>
+                    <strong><?= t('Dashlet Name') ?></strong>
                 </th>
                 <th>
                     <strong><?= t('Url') ?></strong>
@@ -33,7 +33,7 @@
                 <?php if(empty($components)): ?>
                     <tr>
                         <td colspan="3">
-                            <?= $this->translate('No compoments added to dashboard') ?>.
+                            <?= $this->translate('No dashlets added to dashboard') ?>.
                         </td>
                     </tr>
                 <?php else: ?>
diff --git a/application/views/scripts/dashboard/update-component.phtml b/application/views/scripts/dashboard/update-component.phtml
index 0493f56..e83c8b6 100644
--- a/application/views/scripts/dashboard/update-component.phtml
+++ b/application/views/scripts/dashboard/update-component.phtml
@@ -3,6 +3,6 @@
 </div>
 
 <div class="content">
-    <h1><?= t('Edit Component'); ?></h1>
+    <h1><?= t('Edit Dashlet'); ?></h1>
     <?= $this->form; ?>
 </div>
\ No newline at end of file



More information about the icinga-checkins mailing list