Capitalization, smaleler codestyle fixes

refs #3776
Icinga · Aug 21, 2013 · cd1fb2e · cd1fb2e
1 parent 83d0539
commit cd1fb2e
Show file tree

Hide file tree

Showing 7 changed files with 25 additions and 21 deletions.
diff --git a/modules/monitoring/application/controllers/ConfigController.php b/modules/monitoring/application/controllers/ConfigController.php
@@ -59,7 +59,7 @@ static public function createProvidedTabs()
             'backends' => new Tab(array(
                 'name'  => 'backends',
                 'title' => 'Monitoring Backends',
-                'url'   => Url::fromPath('/monitoring/config/backend')
+                'url'   => Url::fromPath('/monitoring/config')
             ))
         );
     }
@@ -81,7 +81,7 @@ public function editbackendAction()
     {
         $backend = $this->getParam('backend');
         if (!$this->isExistingBackend($backend)) {
-            $this->view->error = "Unknown backend " . htmlentities($backend);
+            $this->view->error = 'Unknown backend ' . $backend;
             return;
         }
         $backendForm = new EditBackendForm();
@@ -135,7 +135,7 @@ public function removebackendAction()
     {
         $backend = $this->getParam('backend');
         if (!$this->isExistingBackend($backend)) {
-            $this->view->error = "Unknown backend " . $backend;
+            $this->view->error = 'Unknown backend ' . $backend;
             return;
         }
         $form = new ConfirmRemovalForm();
@@ -166,7 +166,7 @@ public function removeinstanceAction()
     {
         $instance = $this->getParam('instance');
         if (!$this->isExistingInstance($instance)) {
-            $this->view->error = "Unknown instance " . $instance;
+            $this->view->error = 'Unknown instance ' . $instance;
             return;
         }
 
@@ -197,7 +197,7 @@ public function editinstanceAction()
     {
         $instance = $this->getParam('instance');
         if (!$this->isExistingInstance($instance)) {
-            $this->view->error = "Unknown instance " . htmlentities($instance);
+            $this->view->error = 'Unknown instance ' . htmlentities($instance);
             return;
         }
         $form = new EditInstanceForm();

diff --git a/modules/monitoring/application/forms/Config/ConfirmRemovalForm.php b/modules/monitoring/application/forms/Config/ConfirmRemovalForm.php
@@ -78,6 +78,6 @@ public function create()
                 'required'  => true
             )
         );
-        $this->setSubmitLabel('Confirm removal');
+        $this->setSubmitLabel('Confirm Removal');
     }
 }
diff --git a/modules/monitoring/application/views/scripts/config/editbackend.phtml b/modules/monitoring/application/views/scripts/config/editbackend.phtml
@@ -1,8 +1,8 @@
 <?= $this->tabs->render($this); ?>
 <?php if ($this->name): ?>
-  <h4>Edit backend <?= $this->escape($this->name) ?></h4>
+  <h4>Edit Backend "<?= $this->escape($this->name) ?>"</h4>
 <?php else: ?>
-  <h4>Create new backend</h4>
+  <h4>Create New Backend</h4>
 <?php endif; ?>
 
 <?php if ($this->error): ?>

diff --git a/modules/monitoring/application/views/scripts/config/editinstance.phtml b/modules/monitoring/application/views/scripts/config/editinstance.phtml
@@ -1,9 +1,9 @@
 <?= $this->tabs->render($this); ?>
 
 <?php if (isset($this->name)): ?>
-    <h4>Edit instance configuration for <?= $this->escape($this->name) ?></h4>
+    <h4>Edit Instance Configuration for "<?= $this->escape($this->name) ?>"</h4>
 <?php else: ?>
-    <h4>Configure new icinga instance</h4>
+    <h4>Configure New Icinga Instance</h4>
 <?php endif; ?>
 
 <?php if ($this->error): ?>

diff --git a/modules/monitoring/application/views/scripts/config/index.phtml b/modules/monitoring/application/views/scripts/config/index.phtml
@@ -4,7 +4,9 @@
 <h3>Backends</h3>
 
 <div>
-  <a href="<?= Url::fromPath('/monitoring/config/createbackend')->getAbsoluteUrl();?>">Create new backend</a>
+  <a href="<?= Url::fromPath('/monitoring/config/createbackend')->getAbsoluteUrl();?>">
+      Create New Backend
+  </a>
 </div>
 <br/>
 
@@ -13,24 +15,26 @@
   <?php $removeUrl = Url::fromPath('/monitoring/config/removebackend', array('backend' => $backendName)); ?>
   <?php $editUrl = Url::fromPath('/monitoring/config/editbackend', array('backend' => $backendName)); ?>
   <b><?= $this->escape($backendName); ?></b>
-  <small>(Type: <?= $this->escape($config["type"]); ?>)</small>
+  <small>(Type: <?= $this->escape($config['type']); ?>)</small>
   <?php if ($config['disabled']): ?>
     - <b>Disabled</b>
   <?php endif; ?>
   <div>
-    <a href="<?= $removeUrl; ?>">Remove this backend</a><br/>
-    <a href="<?= $editUrl; ?>">Edit this backend</a>
+    <a href="<?= $removeUrl; ?>">Remove This Backend</a><br/>
+    <a href="<?= $editUrl; ?>">Edit This Backend</a>
   </div>
 </div>
 <br/>
 <?php endforeach; ?>
 
 <br/>
 
-<h3>Montoring instances</h3>
+<h3>Monitoring Instances</h3>
 
 <div>
-  <a href="<?= Url::fromPath('/monitoring/config/createinstance')->getAbsoluteUrl();?>">Create new instance </a>
+  <a href="<?= Url::fromPath('/monitoring/config/createinstance')->getAbsoluteUrl();?>">
+      Create New Instance
+  </a>
 </div>
 
 <br/>
@@ -39,11 +43,11 @@
   <?php $editUrl = Url::fromPath('/monitoring/config/editinstance', array('instance' => $instanceName)); ?>
 <div>
   <b><?= $this->escape($instanceName); ?></b>
-  <small>(Type: <?= isset($config["host"]) ? 'Remote' : 'Local'; ?>)</small>
+  <small>(Type: <?= isset($config['host']) ? 'Remote' : 'Local'; ?>)</small>
 
   <div>
-    <a href="<?= $removeUrl; ?>">Remove this instance</a><br/>
-    <a href="<?= $editUrl; ?>">Edit this instance</a>
+    <a href="<?= $removeUrl; ?>">Remove This Instance</a><br/>
+    <a href="<?= $editUrl; ?>">Edit This Instance</a>
   </div>
 </div>
 <br/>

diff --git a/modules/monitoring/application/views/scripts/config/removebackend.phtml b/modules/monitoring/application/views/scripts/config/removebackend.phtml
@@ -1,5 +1,5 @@
 <?= $this->tabs->render($this); ?>
-<h4>Remove backend <?= $this->escape($this->name) ?></h4>
+<h4>Remove Backend "<?= $this->escape($this->name) ?>"</h4>
 
 <p>
     Are you sure you want to remove the backend <?= $this->escape($this->name) ?>?

diff --git a/modules/monitoring/application/views/scripts/config/removeinstance.phtml b/modules/monitoring/application/views/scripts/config/removeinstance.phtml
@@ -1,5 +1,5 @@
 <?= $this->tabs->render($this); ?>
-<h4>Remove instance <?= $this->escape($this->name) ?></h4>
+<h4>Remove Instance "<?= $this->escape($this->name) ?>"</h4>
 
 <p>
     Are you sure you want to remove the instance <?= $this->escape($this->name) ?>?