diff --git a/src/locales/en.json b/src/locales/en.json
index 3e16c5de..8aa5287e 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -47,6 +47,7 @@
"pad.settings.fontType.lucida": "Lucida",
"pad.settings.fontType.lucidasans": "Lucida Sans",
"pad.settings.fontType.palatino": "Palatino",
+ "pad.settings.fontType.robotomono": "RobotoMono",
"pad.settings.fontType.tahoma": "Tahoma",
"pad.settings.fontType.timesnewroman": "Times New Roman",
"pad.settings.fontType.trebuchet": "Trebuchet",
diff --git a/src/static/css/pad.css b/src/static/css/pad.css
index 5764c5e4..ebe31bde 100644
--- a/src/static/css/pad.css
+++ b/src/static/css/pad.css
@@ -1260,6 +1260,21 @@ input[type=checkbox] {
src: url("../../static/font/opendyslexic.otf") format("opentype");
}
+/* Roboto Mono */
+@font-face {
+ font-family: "RobotoMono";
+ src: url("../../static/font/RobotoMono-Regular.ttf") format("truetype");
+ font-weight: normal;
+ font-style: normal;
+}
+@font-face {
+ font-family: "RobotoMono";
+ src: url("../../static/font/RobotoMono-Bold.ttf") format("truetype");
+ font-weight: bold;
+ font-style: normal;
+}
+/* End of Roboto Mono */
+
@font-face {
font-family: "fontawesome-etherpad";
src:url("../../static/font/fontawesome-etherpad.eot");
@@ -1304,5 +1319,3 @@ input[type=checkbox] {
.hideControlsEditbar{
display:none !important;
}
-
-
diff --git a/src/static/font/RobotoMono-Bold.ttf b/src/static/font/RobotoMono-Bold.ttf
new file mode 100755
index 00000000..07ef607d
Binary files /dev/null and b/src/static/font/RobotoMono-Bold.ttf differ
diff --git a/src/static/font/RobotoMono-Regular.ttf b/src/static/font/RobotoMono-Regular.ttf
new file mode 100755
index 00000000..b158a334
Binary files /dev/null and b/src/static/font/RobotoMono-Regular.ttf differ
diff --git a/src/static/js/pad.js b/src/static/js/pad.js
index c967e461..8208f5e4 100644
--- a/src/static/js/pad.js
+++ b/src/static/js/pad.js
@@ -1,5 +1,5 @@
/**
- * This code is mostly from the old Etherpad. Please help us to comment this code.
+ * This code is mostly from the old Etherpad. Please help us to comment this code.
* This helps other people to understand this code better and helps them to improve it.
* TL;DR COMMENTS ON THIS FILE ARE HIGHLY APPRECIATED
*/
@@ -99,15 +99,15 @@ function getParams()
setting.callback(value);
}
}
-
+
// Then URL applied stuff
var params = getUrlVars()
-
+
for(var i = 0; i < getParameters.length; i++)
{
var setting = getParameters[i];
var value = params[setting.name];
-
+
if(value && (value == setting.checkVal || setting.checkVal == null))
{
setting.callback(value);
@@ -156,7 +156,7 @@ function sendClientReady(isReconnect, messageType)
token = "t." + randomString();
createCookie("token", token, 60);
}
-
+
var sessionID = decodeURIComponent(readCookie("sessionID"));
var password = readCookie("password");
@@ -169,14 +169,14 @@ function sendClientReady(isReconnect, messageType)
"token": token,
"protocolVersion": 2
};
-
+
//this is a reconnect, lets tell the server our revisionnumber
if(isReconnect == true)
{
msg.client_rev=pad.collabClient.getCurrentRevisionNumber();
msg.reconnect=true;
}
-
+
socket.json.send(msg);
}
@@ -203,12 +203,12 @@ function handshake()
socket.once('connect', function () {
sendClientReady(false);
});
-
+
socket.on('reconnect', function () {
pad.collabClient.setChannelState("CONNECTED");
pad.sendClientReady(true);
});
-
+
socket.on('reconnecting', function() {
pad.collabClient.setChannelState("RECONNECTING");
});
@@ -254,7 +254,7 @@ function handshake()
$("#passwordinput").focus();
}
}
-
+
//if we haven't recieved the clientVars yet, then this message should it be
else if (!receivedClientVars && obj.type == "CLIENT_VARS")
{
@@ -267,7 +267,7 @@ function handshake()
clientVars = obj.data;
clientVars.userAgent = "Anonymous";
clientVars.collab_client_vars.clientAgent = "Anonymous";
-
+
//initalize the pad
pad._afterHandshake();
initalized = true;
@@ -298,7 +298,7 @@ function handshake()
{
pad.changeViewOption('noColors', true);
}
-
+
if (settings.rtlIsTrue == true)
{
pad.changeViewOption('rtlIsTrue', true);
@@ -345,13 +345,13 @@ function handshake()
});
// Bind the colorpicker
var fb = $('#colorpicker').farbtastic({ callback: '#mycolorpickerpreview', width: 220});
- // Bind the read only button
+ // Bind the read only button
$('#readonlyinput').on('click',function(){
padeditbar.setEmbedLinks();
});
}
-$.extend($.gritter.options, {
+$.extend($.gritter.options, {
position: 'bottom-right', // defaults to 'top-right' but can be 'bottom-left', 'bottom-right', 'top-left', 'top-right' (added in 1.7.1)
fade: false, // dont fade, too jerky on mobile
time: 6000 // hang on the screen for...
@@ -424,7 +424,7 @@ var pad = {
if(window.history && window.history.pushState)
{
$('#chattext p').remove(); //clear the chat messages
- window.history.pushState("", "", newHref);
+ window.history.pushState("", "", newHref);
receivedClientVars = false;
sendClientReady(false, 'SWITCH_TO_PAD');
}
@@ -549,7 +549,7 @@ var pad = {
}
var fonts = ['useMonospaceFont', 'useOpenDyslexicFont', 'useComicSansFont', 'useCourierNewFont', 'useGeorgiaFont', 'useImpactFont',
- 'useLucidaFont', 'useLucidaSansFont', 'usePalatinoFont', 'useTahomaFont', 'useTimesNewRomanFont',
+ 'useLucidaFont', 'useLucidaSansFont', 'usePalatinoFont', 'useRobotoMonoFont', 'useTahomaFont', 'useTimesNewRomanFont',
'useTrebuchetFont', 'useVerdanaFont', 'useSymbolFont', 'useWebdingsFont', 'useWingDingsFont', 'useSansSerifFont',
'useSerifFont'];
@@ -731,20 +731,20 @@ var pad = {
pad.diagnosticInfo.disconnectedMessage = message;
pad.diagnosticInfo.padId = pad.getPadId();
pad.diagnosticInfo.socket = {};
-
- //we filter non objects from the socket object and put them in the diagnosticInfo
+
+ //we filter non objects from the socket object and put them in the diagnosticInfo
//this ensures we have no cyclic data - this allows us to stringify the data
for(var i in socket.socket)
{
var value = socket.socket[i];
var type = typeof value;
-
+
if(type == "string" || type == "number")
{
pad.diagnosticInfo.socket[i] = value;
}
}
-
+
pad.asyncSendDiagnosticInfo();
if (typeof window.ajlog == "string")
{
diff --git a/src/static/js/pad_editor.js b/src/static/js/pad_editor.js
index 3e6b49d3..a1a901cb 100644
--- a/src/static/js/pad_editor.js
+++ b/src/static/js/pad_editor.js
@@ -1,5 +1,5 @@
/**
- * This code is mostly from the old Etherpad. Please help us to comment this code.
+ * This code is mostly from the old Etherpad. Please help us to comment this code.
* This helps other people to understand this code better and helps them to improve it.
* TL;DR COMMENTS ON THIS FILE ARE HIGHLY APPRECIATED
*/
@@ -31,7 +31,7 @@ var padeditor = (function()
// Array of available fonts
var fonts = ['useMonospaceFont', 'useOpenDyslexicFont', 'useComicSansFont', 'useCourierNewFont', 'useGeorgiaFont', 'useImpactFont',
- 'useLucidaFont', 'useLucidaSansFont', 'usePalatinoFont', 'useTahomaFont', 'useTimesNewRomanFont',
+ 'useLucidaFont', 'useLucidaSansFont', 'usePalatinoFont', 'useRobotoMonoFont', 'useTahomaFont', 'useTimesNewRomanFont',
'useTrebuchetFont', 'useVerdanaFont', 'useSymbolFont', 'useWebdingsFont', 'useWingDingsFont', 'useSansSerifFont',
'useSerifFont'];
@@ -102,7 +102,7 @@ var padeditor = (function()
pad.changeViewOption(font, $("#viewfontmenu").val() == sfont);
});
});
-
+
// Language
html10n.bind('localized', function() {
$("#languagemenu").val(html10n.getLanguage());
@@ -168,6 +168,7 @@ var padeditor = (function()
if(font === "lucida") self.ace.setProperty("textface", "Lucida,'Lucida Serif','Lucida Bright',serif");
if(font === "lucidasans") self.ace.setProperty("textface", "'Lucida Sans','Lucida Grande','Lucida Sans Unicode','Luxi Sans',sans-serif");
if(font === "palatino") self.ace.setProperty("textface", "Palatino,'Palatino Linotype','URW Palladio L',Georgia,serif");
+ if(font === "robotomono") self.ace.setProperty("textface", "RobotoMono");
if(font === "tahoma") self.ace.setProperty("textface", "Tahoma,sans-serif");
if(font === "timesnewroman") self.ace.setProperty("textface", "'Times New Roman',Times,serif");
if(font === "trebuchet") self.ace.setProperty("textface", "'Trebuchet MS',sans-serif");
diff --git a/src/templates/pad.html b/src/templates/pad.html
index 3d89f9d0..6613f611 100644
--- a/src/templates/pad.html
+++ b/src/templates/pad.html
@@ -168,6 +168,7 @@
+