From b9c9f564ec5bbb5b357226ffdc36c30c2df70ce3 Mon Sep 17 00:00:00 2001
From: Alexander Fuhr <alexander.fuhr@netways.de>
Date: Thu, 12 Feb 2015 15:12:10 +0100
Subject: [PATCH 1/6] Add editable auto_refresh parameter to the user
 preferences

refs #7945
---
 application/forms/PreferenceForm.php               | 11 +++++++++++
 library/Icinga/Web/Controller/ActionController.php |  4 ++++
 2 files changed, 15 insertions(+)

diff --git a/application/forms/PreferenceForm.php b/application/forms/PreferenceForm.php
index 424f76578..3ee1ebb38 100644
--- a/application/forms/PreferenceForm.php
+++ b/application/forms/PreferenceForm.php
@@ -185,6 +185,17 @@ class PreferenceForm extends Form
             )
         );
 
+        $this->addElement(
+            'checkbox',
+            'auto_refresh',
+            array(
+                'required'      => false,
+                'label'         => $this->translate('Enable auto refresh'),
+                'description'   => $this->translate('This option allows you to enable or to disable the global page content auto refresh'),
+                'value'         => 1
+            )
+        );
+
         if ($this->store) {
             $this->addElement(
                 'submit',
diff --git a/library/Icinga/Web/Controller/ActionController.php b/library/Icinga/Web/Controller/ActionController.php
index f7a21c20e..8764e49ee 100644
--- a/library/Icinga/Web/Controller/ActionController.php
+++ b/library/Icinga/Web/Controller/ActionController.php
@@ -399,6 +399,10 @@ class ActionController extends Zend_Controller_Action
                     $layout->benchmark = $this->renderBenchmark();
                 }
             }
+
+            if ((bool) $user->getPreferences()->getValue('icingaweb', 'auto_refresh', true) === false) {
+                $this->disableAutoRefresh();
+            }
         }
 
         if ($req->getParam('format') === 'pdf') {

From 2112676594f67ddfdee81c6a9615b8a350659321 Mon Sep 17 00:00:00 2001
From: Alexander Fuhr <alexander.fuhr@netways.de>
Date: Fri, 13 Feb 2015 14:34:29 +0100
Subject: [PATCH 2/6] Implement hidden accessible control for auto refresh on
 the page

refs #7945
---
 application/forms/AutoRefreshForm.php         | 79 +++++++++++++++++++
 application/layouts/scripts/body.phtml        |  5 ++
 .../Web/Controller/ActionController.php       | 11 +++
 public/css/icinga/menu.less                   | 19 +++++
 4 files changed, 114 insertions(+)
 create mode 100644 application/forms/AutoRefreshForm.php

diff --git a/application/forms/AutoRefreshForm.php b/application/forms/AutoRefreshForm.php
new file mode 100644
index 000000000..85992af27
--- /dev/null
+++ b/application/forms/AutoRefreshForm.php
@@ -0,0 +1,79 @@
+<?php
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
+
+namespace Icinga\Forms;
+
+use Icinga\Application\Logger;
+use Icinga\User\Preferences;
+use Icinga\Web\Form;
+use Icinga\Web\Notification;
+use Icinga\Web\Session;
+
+/**
+ * Form class to adjust user auto refresh preferences
+ */
+class AutoRefreshForm extends Form
+{
+    /**
+     * Initialize this form
+     */
+    public function init()
+    {
+        $this->setName('form_auto_refresh');
+    }
+
+    /**
+     * Adjust preferences and persist them
+     *
+     * @see Form::onSuccess()
+     */
+    public function onSuccess()
+    {
+        /** @var Preferences $preferences */
+        $preferences = $this->getRequest()->getUser()->getPreferences();
+        $icingaweb = $preferences->get('icingaweb');
+
+        if ((bool) $preferences->getValue('icingaweb', 'auto_refresh', true) === false) {
+            $icingaweb['auto_refresh'] = '1';
+            $notification = $this->translate('Auto refresh successfully enabled');
+        } else {
+            $icingaweb['auto_refresh'] = '0';
+            $notification = $this->translate('Auto refresh successfully disabled');
+        }
+        $preferences->icingaweb = $icingaweb;
+
+        Session::getSession()->user->setPreferences($preferences);
+        Notification::success($notification);
+
+        $this->getResponse()->setHeader('X-Icinga-Rerender-Layout', 'yes');
+    }
+
+    /**
+     * @see Form::createElements()
+     */
+    public function createElements(array $formData)
+    {
+        $preferences = $this->getRequest()->getUser()->getPreferences();
+
+        if ((bool) $preferences->getValue('icingaweb', 'auto_refresh', true) === false) {
+            $value = $this->translate('Enable auto refresh');
+        } else {
+            $value = $this->translate('Disable auto refresh');
+        }
+
+        $this->addElements(array(
+            array(
+                'button',
+                'btn_submit',
+                array(
+                    'ignore'        => true,
+                    'type'          => 'submit',
+                    'value'         => $value,
+                    'decorators'    => array('ViewHelper'),
+                    'escape'        => false,
+                    'class'         => 'link-like'
+                )
+            )
+        ));
+    }
+}
diff --git a/application/layouts/scripts/body.phtml b/application/layouts/scripts/body.phtml
index 9f0b78ce9..abf823750 100644
--- a/application/layouts/scripts/body.phtml
+++ b/application/layouts/scripts/body.phtml
@@ -23,6 +23,11 @@ if (Auth::getInstance()->isAuthenticated()): ?>
        </ul>
      </nav>
    </div>
+
+   <div class="auto-refresh-trigger">
+       <?= $this->layout()->autoRefreshForm ?>
+   </div>
+
    <ul id="notifications"><?php
 
 $moduleName = $this->layout()->moduleName;
diff --git a/library/Icinga/Web/Controller/ActionController.php b/library/Icinga/Web/Controller/ActionController.php
index 8764e49ee..0a1fe8ae4 100644
--- a/library/Icinga/Web/Controller/ActionController.php
+++ b/library/Icinga/Web/Controller/ActionController.php
@@ -10,6 +10,7 @@ use Icinga\Authentication\Manager;
 use Icinga\Exception\IcingaException;
 use Icinga\Exception\ProgrammingError;
 use Icinga\File\Pdf;
+use Icinga\Forms\AutoRefreshForm;
 use Icinga\Security\SecurityException;
 use Icinga\Util\Translator;
 use Icinga\Web\Notification;
@@ -379,6 +380,16 @@ class ActionController extends Zend_Controller_Action
         }
     }
 
+    /**
+     * @see Zend_Controller_Action::preDispatch()
+     */
+    public function preDispatch()
+    {
+        $form = new AutoRefreshForm();
+        $form->handleRequest();
+        $this->_helper->layout()->autoRefreshForm = $form;
+    }
+
     /**
      * Detect whether the current request requires changes in the layout and apply them before rendering
      *
diff --git a/public/css/icinga/menu.less b/public/css/icinga/menu.less
index 873e6abb0..53150f498 100644
--- a/public/css/icinga/menu.less
+++ b/public/css/icinga/menu.less
@@ -300,3 +300,22 @@ a:focus {
 .skip-links-inline {
   margin-top: -3.5em;
 }
+
+.auto-refresh-trigger {
+  position: absolute;
+  form {
+    button[type="submit"] {
+      position: absolute;
+      display: block;
+      left: -999em;
+      width: 12em !important;
+      top: 0.4em;
+      padding: 0.8em 0.8em !important;
+      background-color: white !important;
+      text-align: left !important;
+      &:focus {
+        left: 0;
+      }
+    }
+  }
+}
\ No newline at end of file

From 73a03ada83ea5f75a531a8b61827e7abc332b845 Mon Sep 17 00:00:00 2001
From: Alexander Fuhr <alexander.fuhr@netways.de>
Date: Fri, 13 Feb 2015 15:33:39 +0100
Subject: [PATCH 3/6] Move autoRefreshForm to skip-links

refs #7945
---
 application/layouts/scripts/body.phtml |  7 +++----
 public/css/icinga/menu.less            | 24 +++---------------------
 2 files changed, 6 insertions(+), 25 deletions(-)

diff --git a/application/layouts/scripts/body.phtml b/application/layouts/scripts/body.phtml
index abf823750..71f83ebd1 100644
--- a/application/layouts/scripts/body.phtml
+++ b/application/layouts/scripts/body.phtml
@@ -20,14 +20,13 @@ if (Auth::getInstance()->isAuthenticated()): ?>
          <li>
            <a tabindex="0" href="#navigation"><?= t('Skip to Navigation'); ?></a>
          </li>
+         <li>
+           <?= $this->layout()->autoRefreshForm ?>
+         </li>
        </ul>
      </nav>
    </div>
 
-   <div class="auto-refresh-trigger">
-       <?= $this->layout()->autoRefreshForm ?>
-   </div>
-
    <ul id="notifications"><?php
 
 $moduleName = $this->layout()->moduleName;
diff --git a/public/css/icinga/menu.less b/public/css/icinga/menu.less
index 53150f498..cc5156ebd 100644
--- a/public/css/icinga/menu.less
+++ b/public/css/icinga/menu.less
@@ -280,11 +280,12 @@ a:focus {
       display: inline;
       margin: 0;
       padding: 0;
-      a {
+      a, button[type="submit"] {
         position: absolute;
         display: block;
         left: -999em;
-        width: 10.4em;
+        width: 10.8em !important;
+        text-align: left !important;
         top: 0.4em;
         padding: 0.8em;
         background-color: white;
@@ -300,22 +301,3 @@ a:focus {
 .skip-links-inline {
   margin-top: -3.5em;
 }
-
-.auto-refresh-trigger {
-  position: absolute;
-  form {
-    button[type="submit"] {
-      position: absolute;
-      display: block;
-      left: -999em;
-      width: 12em !important;
-      top: 0.4em;
-      padding: 0.8em 0.8em !important;
-      background-color: white !important;
-      text-align: left !important;
-      &:focus {
-        left: 0;
-      }
-    }
-  }
-}
\ No newline at end of file

From b375a4f6ccd5e5388eae0184505568cee36c102b Mon Sep 17 00:00:00 2001
From: Alexander Fuhr <alexander.fuhr@netways.de>
Date: Fri, 13 Feb 2015 16:21:19 +0100
Subject: [PATCH 4/6] Fix multiple renderLayout parameters in the url

refs #7945
---
 application/forms/AutoRefreshForm.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/application/forms/AutoRefreshForm.php b/application/forms/AutoRefreshForm.php
index 85992af27..e1e436d34 100644
--- a/application/forms/AutoRefreshForm.php
+++ b/application/forms/AutoRefreshForm.php
@@ -8,6 +8,7 @@ use Icinga\User\Preferences;
 use Icinga\Web\Form;
 use Icinga\Web\Notification;
 use Icinga\Web\Session;
+use Icinga\Web\Url;
 
 /**
  * Form class to adjust user auto refresh preferences
@@ -46,6 +47,7 @@ class AutoRefreshForm extends Form
         Notification::success($notification);
 
         $this->getResponse()->setHeader('X-Icinga-Rerender-Layout', 'yes');
+        $this->setRedirectUrl(Url::fromRequest()->without('renderLayout'));
     }
 
     /**

From 28a8af19334983c6941207ba9a35c7a310b5fe74 Mon Sep 17 00:00:00 2001
From: Alexander Fuhr <alexander.fuhr@netways.de>
Date: Mon, 16 Feb 2015 12:04:54 +0100
Subject: [PATCH 5/6] Add auto refresh form to the navigation part

refs #7945
---
 application/layouts/scripts/parts/navigation.phtml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/application/layouts/scripts/parts/navigation.phtml b/application/layouts/scripts/parts/navigation.phtml
index 1a3c6dff9..2136c0fd5 100644
--- a/application/layouts/scripts/parts/navigation.phtml
+++ b/application/layouts/scripts/parts/navigation.phtml
@@ -16,6 +16,9 @@ if (! $this->auth()->isAuthenticated()) {
         <li>
             <a tabindex="0" href="#main"><?= t('Skip to Content'); ?></a>
         </li>
+        <li>
+            <?= $this->layout()->autoRefreshForm ?>
+        </li>
     </ul>
 </div>
 <div  id="menu" data-last-update="<?= (time() - 14) ?>000" data-base-target="_main" class="container"

From 240c55fcafb6226caa075d51483685b7a0359a86 Mon Sep 17 00:00:00 2001
From: Alexander Fuhr <alexander.fuhr@netways.de>
Date: Mon, 16 Feb 2015 12:05:26 +0100
Subject: [PATCH 6/6] Adjust on focus css style for the auto refresh trigger
 button

refs #7945
---
 public/css/icinga/menu.less | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/public/css/icinga/menu.less b/public/css/icinga/menu.less
index 9c8945396..c33c6670c 100644
--- a/public/css/icinga/menu.less
+++ b/public/css/icinga/menu.less
@@ -284,6 +284,7 @@ a:focus {
         position: absolute;
         display: block;
         left: -999em;
+        box-sizing: content-box;
         width: 10.4em !important;
         top: 0em;
         text-align: left !important;
@@ -293,6 +294,7 @@ a:focus {
         border: 1px @colorGray solid;
         &:focus {
           left: 0;
+          outline: 1px dotted black !important;
         }
       }
     }