From c276343216dc02df1783c07f9e101a2ec3a107b8 Mon Sep 17 00:00:00 2001
From: John McLear <john@mclear.co.uk>
Date: Sat, 27 Dec 2014 22:31:23 +0100
Subject: [PATCH] timeslider fixes

---
 src/static/css/timeslider.css     | 12 +++++++++---
 src/static/js/broadcast_slider.js |  3 +++
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/src/static/css/timeslider.css b/src/static/css/timeslider.css
index e314831f4..4c84a7fcc 100644
--- a/src/static/css/timeslider.css
+++ b/src/static/css/timeslider.css
@@ -188,8 +188,15 @@ stepper:active{
   -ms-user-select: none;
   user-select: none;
 }
-#editbarright {
-  float: right
+.editbarright {
+  float: right;
+  text-align: right;
+  height: 30px !important;
+}
+.toolbar ul{
+  position:relative;
+  float:right;
+  height:30px;
 }
 #settings,
 #import_export,
@@ -224,7 +231,6 @@ stepper:active{
   border-bottom: none;
   float: right;
   width: 170px;
-  width: initial;
 }
 .timeslider-bar h1 {
   margin: 5px
diff --git a/src/static/js/broadcast_slider.js b/src/static/js/broadcast_slider.js
index 822526a38..344a7b549 100644
--- a/src/static/js/broadcast_slider.js
+++ b/src/static/js/broadcast_slider.js
@@ -29,6 +29,9 @@ function loadBroadcastSliderJS(fireWhenAllScriptsAreLoaded)
 {
   var BroadcastSlider;
 
+  // Hack to ensure timeslider i18n values are in
+  $("[data-key='timeslider_returnToPad'] > a > span").html(html10n.get("timeslider.toolbar.returnbutton"));
+
   (function()
   { // wrap this code in its own namespace
     var sliderLength = 1000;