diff --git a/src/node/utils/Settings.js b/src/node/utils/Settings.js
index 5382d819..14e43305 100644
--- a/src/node/utils/Settings.js
+++ b/src/node/utils/Settings.js
@@ -95,7 +95,7 @@ exports.toolbar = {
["showusers"]
],
timeslider: [
- ["timeslider_export", "timeslider_returnToPad"]
+ ["timeslider_export", "timeslider_settings", "timeslider_returnToPad"]
]
}
diff --git a/src/node/utils/toolbar.js b/src/node/utils/toolbar.js
index 3bae0b1c..07b86496 100644
--- a/src/node/utils/toolbar.js
+++ b/src/node/utils/toolbar.js
@@ -210,6 +210,12 @@ module.exports = {
class: "buttonicon buttonicon-import_export"
},
+ timeslider_settings: {
+ command: "settings",
+ localizationId: "pad.toolbar.settings.title",
+ class: "buttonicon buttonicon-settings"
+ },
+
timeslider_returnToPad: {
command: "timeslider_returnToPad",
localizationId: "timeslider.toolbar.returnbutton",
diff --git a/src/static/css/timeslider.css b/src/static/css/timeslider.css
index 7bff7341..9f4e4683 100644
--- a/src/static/css/timeslider.css
+++ b/src/static/css/timeslider.css
@@ -205,12 +205,9 @@ stepper:active{
float:right;
height:30px;
}
-#settings,
-#import_export,
-#embed,
-#connectivity,
-#users {
- top: 62px;
+#import_export, #settings{
+ top: 115px;
+ position: fixed;
}
#import_export .popup {
width: 183px;
@@ -219,9 +216,7 @@ stepper:active{
border-radius: 0 0 0 6px;
}
#import_export {
- top: 115px;
width: 185px;
- position: fixed;
}
.timeslider-bar {
background: #f7f7f7;
@@ -237,7 +232,7 @@ stepper:active{
.timeslider-bar #editbar {
border-bottom: none;
float: right;
- width: 170px;
+ width: 180px;
}
.timeslider-bar h1 {
margin: 5px
diff --git a/src/static/js/timeslider.js b/src/static/js/timeslider.js
index 580a7a03..75c20022 100644
--- a/src/static/js/timeslider.js
+++ b/src/static/js/timeslider.js
@@ -163,6 +163,32 @@ function handleClientVars(message)
$('#leftstep').attr("title", html10n.get("timeslider.backRevision"));
$('#rightstep').attr("title", html10n.get("timeslider.forwardRevision"));
+ // font family change
+ $("#viewfontmenu").change(function(){
+ var font = $("#viewfontmenu").val();
+ if(font === "monospace") setFont("Courier new");
+ if(font === "opendyslexic") setFont("OpenDyslexic");
+ if(font === "comicsans") setFont("Comic Sans MS");
+ if(font === "georgia") setFont("Georgia");
+ if(font === "impact") setFont("Impact");
+ if(font === "lucida") setFont("Lucida");
+ if(font === "lucidasans") setFont("Lucida Sans Unicode");
+ if(font === "palatino") setFont("Palatino Linotype");
+ if(font === "tahoma") setFont("Tahoma");
+ if(font === "timesnewroman") setFont("Times New Roman");
+ if(font === "trebuchet") setFont("Trebuchet MS");
+ if(font === "verdana") setFont("Verdana");
+ if(font === "symbol") setFont("Symbol");
+ if(font === "webdings") setFont("Webdings");
+ if(font === "wingdings") setFont("Wingdings");
+ if(font === "sansserif") setFont("MS Sans Serif");
+ if(font === "serif") setFont("MS Serif");
+ });
+
+}
+
+function setFont(font){
+ $('#padcontent').css("font-family", font);
}
exports.baseURL = '';
diff --git a/src/templates/timeslider.html b/src/templates/timeslider.html
index 20688ea8..6ec27c05 100644
--- a/src/templates/timeslider.html
+++ b/src/templates/timeslider.html
@@ -176,11 +176,41 @@
<% e.end_block(); %>
+
+
-