From fc90e71584b1fe86bdd3673ec35b2a158a68b49a Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 24 Mar 2017 08:22:52 +0100
Subject: [PATCH 1/3] do not show spinner if data-no-spinner is set in '<div
 ..'

---
 styles/bootstrap/application.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/styles/bootstrap/application.js b/styles/bootstrap/application.js
index 731782192..4e89bdb76 100644
--- a/styles/bootstrap/application.js
+++ b/styles/bootstrap/application.js
@@ -367,6 +367,8 @@ $(document).ready( function() {
 			}
 		} else
 			url = href;
+		if(!element.data('no-spinner'))
+			element.prepend('<div style="position: _absolute; overflow: hidden; background: #f7f7f7; z-index: 1000; height: 200px; width: '+element.width()+'px; opacity: 0.7; display: table;"><div style="display: table-cell;text-align: center; vertical-align: middle; "><img src="../views/bootstrap/images/ajax-loader.gif"></div>');
 		$.get(url, function(data) {
 			element.html(data);
 //			$(".chzn-select").chosen();

From ae3946b6a9feca299ba692ca3d1795ec29c1ab2c Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 24 Mar 2017 08:26:39 +0100
Subject: [PATCH 2/3] turn of spinner for ajax call to show clipboard in menu

---
 views/bootstrap/class.Bootstrap.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php
index d1cec82e0..8a7423209 100644
--- a/views/bootstrap/class.Bootstrap.php
+++ b/views/bootstrap/class.Bootstrap.php
@@ -306,7 +306,7 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
 
 			if($this->params['enableclipboard']) {
 				echo "   <div id=\"menu-clipboard\">";
-				echo "     <div class=\"ajax\" data-view=\"Clipboard\" data-action=\"menuClipboard\"></div>";
+				echo "     <div class=\"ajax\" data-no-spinner=\"true\" data-view=\"Clipboard\" data-action=\"menuClipboard\"></div>";
 				echo "   </div>";
 			}
 

From 78d482e14eb934c064681870f5b93e443b3dac28 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 24 Mar 2017 08:28:01 +0100
Subject: [PATCH 3/3] add entries for 5.1.2

---
 CHANGELOG | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/CHANGELOG b/CHANGELOG
index 000bf1df1..6210b3659 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,10 @@
+--------------------------------------------------------------------------------
+                     Changes in version 5.1.2
+--------------------------------------------------------------------------------
+- do not show spinner when clipboard is loaded in menu (prevents flickering of
+  page)
+- merged changes from 5.0.12
+
 --------------------------------------------------------------------------------
                      Changes in version 5.1.1
 --------------------------------------------------------------------------------