From 4f85bf09ccb322ed5473287ef067fe4de8f9b249 Mon Sep 17 00:00:00 2001 From: johnyma22 Date: Mon, 29 Oct 2012 19:20:02 +0000 Subject: [PATCH 1/6] make anything less than 400px span 2 lines on toolbar and make popups appear below this --- src/static/css/pad.css | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/src/static/css/pad.css b/src/static/css/pad.css index df9dde143..5ee6b3c56 100644 --- a/src/static/css/pad.css +++ b/src/static/css/pad.css @@ -783,6 +783,23 @@ input[type=checkbox] { padding: 4px 1px } } +@media screen and (max-width: 400px){ + #editorcontainer { + top: 68px; + } + #editbar { + height: 62px; + } + .toolbar ul.menu_right { + float: left; + margin-top:2px; + } + .popup { + width:100%; + max-width:300px; + top: 72px !important; + } +} @media only screen and (min-device-width: 320px) and (max-device-width: 720px) { #users { top: 36px; From 0e41e9fdfcae40e8c9525094275fb04754c6b5cb Mon Sep 17 00:00:00 2001 From: johnyma22 Date: Mon, 29 Oct 2012 19:29:30 +0000 Subject: [PATCH 2/6] allow max chat to be 999 chars --- src/templates/pad.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/templates/pad.html b/src/templates/pad.html index 425e476d8..f11b13098 100644 --- a/src/templates/pad.html +++ b/src/templates/pad.html @@ -312,7 +312,7 @@
- +
From 898331b680858c39a18e66bbb93102a206839573 Mon Sep 17 00:00:00 2001 From: johnyma22 Date: Mon, 29 Oct 2012 21:55:57 +0000 Subject: [PATCH 3/6] fix rtl sanity --- src/static/js/pad_editor.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/static/js/pad_editor.js b/src/static/js/pad_editor.js index 09f3d79f2..5a9e7b9b6 100644 --- a/src/static/js/pad_editor.js +++ b/src/static/js/pad_editor.js @@ -85,11 +85,13 @@ var padeditor = (function() if (value == "false") return false; return defaultValue; } - self.ace.setProperty("rtlIsTrue", settings.rtlIsTrue); var v; + v = getOption('rtlIsTrue', false); + self.ace.setProperty("rtlIsTrue", v); + v = getOption('showLineNumbers', true); self.ace.setProperty("showslinenumbers", v); padutils.setCheckbox($("#options-linenoscheck"), v); From 8d7a02816f6cb23cf3b973c177b12f6f6e9fb09c Mon Sep 17 00:00:00 2001 From: johnyma22 Date: Mon, 29 Oct 2012 22:47:42 +0000 Subject: [PATCH 4/6] remove opacity to fix opera bug #941 --- src/templates/index.html | 1 - 1 file changed, 1 deletion(-) diff --git a/src/templates/index.html b/src/templates/index.html index 40d46fc8a..cdd9346de 100644 --- a/src/templates/index.html +++ b/src/templates/index.html @@ -55,7 +55,6 @@ background: -moz-linear-gradient(#fff,#ccc); background: -ms-linear-gradient(#fff,#ccc); background: -o-linear-gradient(#fff,#ccc); - opacity: .9; box-shadow: 0px 1px 8px rgba(0,0,0,0.3); } #inner { From 82f1abf7cfea712ee192d602d1e10b45e4ad0de3 Mon Sep 17 00:00:00 2001 From: John McLear Date: Tue, 30 Oct 2012 12:59:16 +0000 Subject: [PATCH 5/6] Don't depend on Bit.ly to get people to the EP MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bit.ly is a problem if we change endpoints.  Using etherpad.org gives us full control.  https://github.com/Pita/etherpad-lite/issues/1099 --- settings.json.template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/settings.json.template b/settings.json.template index 7d175a34e..165726f40 100644 --- a/settings.json.template +++ b/settings.json.template @@ -27,7 +27,7 @@ */ //the default text of a pad - "defaultPadText" : "Welcome to Etherpad Lite!\n\nThis pad text is synchronized as you type, so that everyone viewing this page sees the same text. This allows you to collaborate seamlessly on documents!\n\nEtherpad Lite on Github: http:\/\/j.mp/ep-lite\n", + "defaultPadText" : "Welcome to Etherpad Lite!\n\nThis pad text is synchronized as you type, so that everyone viewing this page sees the same text. This allows you to collaborate seamlessly on documents!\n\nEtherpad Lite on Github: http:\/\/etherpad.org\n", /* Users must have a session to access pads. This effectively allows only group pads to be accessed. */ "requireSession" : false, From 0702f4e58c3b606e079649c472e52d062c202f5b Mon Sep 17 00:00:00 2001 From: John McLear Date: Tue, 30 Oct 2012 13:03:33 +0000 Subject: [PATCH 6/6] Get involved text --- settings.json.template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/settings.json.template b/settings.json.template index 165726f40..087c710c5 100644 --- a/settings.json.template +++ b/settings.json.template @@ -27,7 +27,7 @@ */ //the default text of a pad - "defaultPadText" : "Welcome to Etherpad Lite!\n\nThis pad text is synchronized as you type, so that everyone viewing this page sees the same text. This allows you to collaborate seamlessly on documents!\n\nEtherpad Lite on Github: http:\/\/etherpad.org\n", + "defaultPadText" : "Welcome to Etherpad Lite!\n\nThis pad text is synchronized as you type, so that everyone viewing this page sees the same text. This allows you to collaborate seamlessly on documents!\n\nGet involved with Etherpad at http:\/\/etherpad.org\n", /* Users must have a session to access pads. This effectively allows only group pads to be accessed. */ "requireSession" : false,