Merge branch 'develop' of git://github.com/Pita/etherpad-lite into body-block

Conflicts:
	src/templates/pad.html

bin/checkPad.js

@@ -4,17 +4,17 @@
 
 if(process.argv.length != 3)
 {
-  console.error("Use: node checkPad.js $PADID");
+  console.error("Use: node bin/checkPad.js $PADID");
   process.exit(1);
 }
 //get the padID
 var padId = process.argv[2];
 
 //initalize the database
-var log4js = require("log4js");
+var log4js = require("../src/node_modules/log4js");
 log4js.setGlobalLogLevel("INFO");
-var async = require("async");
-var db = require('../node/db/DB');
+var async = require("../src/node_modules/async");
+var db = require('../src/node/db/DB');
 
 var Changeset = require("ep_etherpad-lite/static/js/Changeset");
 var padManager;
@@ -28,7 +28,7 @@ async.series([
   //get the pad 
   function (callback)
   {
-    padManager = require('../node/db/PadManager');
+    padManager = require('../src/node/db/PadManager');
     
     padManager.doesPadExists(padId, function(err, exists)
     {

src/static/css/admin.css

@@ -25,7 +25,7 @@ h1 {
 h2 {
   font-size: 24px;
 }
-.seperator {
+.separator {
   margin: 10px 0;
   height: 1px;
   background: #aaa;

src/static/css/pad.css

@@ -1318,31 +1318,6 @@ ul#colorpickerswatches li:hover {
   line-height: 18px;
   position: fixed;
 }
-#qr_center {
-  margin: 10px 10px auto 0;
-  text-align: center;
-}
-#embedreadonlyqr {
-  -webkit-box-shadow: 0 0 10px #000;
-  -moz-box-shadow: 0 0 10px #000;
-  box-shadow: 0 0 10px #000;
-  -webkit-border-radius: 3px;
-  -moz-border-radius: 3px;
-  border-radius: 3px;
-  -webkit-transition: all .2s ease-in-out;
-  -moz-transition: all .2s ease-in-out;
-  -o-transition: all .2s ease-in-out;
-  -ms-transition: all .2s ease-in-out;
-  transition: all .2s ease-in-out;
-}
-#embedreadonlyqr:hover {
-  cursor: none;
-  -webkit-transform: scale(1.5);
-  -moz-transform: scale(1.5);
-  -o-transform: scale(1.5);
-  -ms-transform: scale(1.5);
-  transform: scale(1.5);
-}
 .rtl {
   direction: RTL
 }
@@ -1518,9 +1493,6 @@ input[type=checkbox] {
     #usericonback {
       margin-top: 4px
     }
-    #qrcode {
-      display: none
-    }
     .toolbar ul.menu_right li:not(:last-child) {
       display: block
     }

src/static/js/pad.js

@@ -102,7 +102,6 @@ function getParams()
   var showLineNumbers = params["showLineNumbers"];
   var useMonospaceFont = params["useMonospaceFont"];
   var IsnoColors = params["noColors"];
-  var hideQRCode = params["hideQRCode"];
   var rtl = params["rtl"];
   var alwaysShowChat = params["alwaysShowChat"];
 
@@ -148,10 +147,6 @@ function getParams()
     // If the username is set as a parameter we should set a global value that we can call once we have initiated the pad.
     settings.globalUserName = decodeURIComponent(userName);
   }
-  if(hideQRCode)
-  {
-    $('#qrcode').hide();
-  }
   if(rtl)
   {
     if(rtl == "true")
@@ -1024,7 +1019,6 @@ var settings = {
 , noColors: false
 , useMonospaceFontGlobal: false
 , globalUserName: false
-, hideQRCode: false
 , rtlIsTrue: false
 };
 

src/static/js/pad_editbar.js

@@ -237,14 +237,12 @@ var padeditbar = (function()
         var readonlyLink = basePath + "/ro/" + clientVars.readOnlyId;
         $('#embedinput').val("<iframe name='embed_readonly' src='" + readonlyLink + "?showControls=true&showChat=true&showLineNumbers=true&useMonospaceFont=false' width=600 height=400>");
         $('#linkinput').val(readonlyLink);
-        $('#embedreadonlyqr').attr("src","https://chart.googleapis.com/chart?chs=200x200&cht=qr&chld=|0&chl=" + readonlyLink);
       }
       else
       {
         var padurl = window.location.href.split("?")[0];
         $('#embedinput').val("<iframe name='embed_readwrite' src='" + padurl + "?showControls=true&showChat=true&showLineNumbers=true&useMonospaceFont=false' width=600 height=400>");
         $('#linkinput').val(padurl);
-        $('#embedreadonlyqr').attr("src","https://chart.googleapis.com/chart?chs=200x200&cht=qr&chld=|0&chl=" + padurl);
       }
     }
   };

src/static/js/pad_editor.js

@@ -98,8 +98,9 @@ var padeditor = (function()
       v = getOption('showAuthorColors', true);
       self.ace.setProperty("showsauthorcolors", v);
       padutils.setCheckbox($("#options-colorscheck"), v);
-      // Override from parameters
-      self.ace.setProperty("showsauthorcolors", !settings.noColors);
+      // Override from parameters if true
+      if (settings.noColors !== false)
+        self.ace.setProperty("showsauthorcolors", !settings.noColors);
 
       v = getOption('useMonospaceFont', false);
       self.ace.setProperty("textface", (v ? "monospace" : "Arial, sans-serif"));

src/templates/admin/plugins.html

@@ -20,7 +20,7 @@
 
 
       <h1>Etherpad Lite</h1>
-      <div class="seperator"></div>
+      <div class="separator"></div>
       <h2>Installed plugins</h2>
       <table>
         <thead>
@@ -44,7 +44,7 @@
       </table>
 
       <div class="paged listing search-results">
-        <div class="seperator"></div>
+        <div class="separator"></div>
         <h2>Search for plugins to install</h2>
         <form>
           <input type="text" name="search" placeholder="Search term" id="search-query">

src/templates/pad.html

@@ -201,12 +201,6 @@
                 <h2>Embed URL</h2>
                 <input id="embedinput" type="text" value="">
             </div>
-            <br>
-            <div id="qrcode">
-                <h2>QR code</h2>
-                <div id="qr_center"><img id="embedreadonlyqr"></div>
-            </div>
-            <% e.end_block(); %>
         </div>
 
         <div id="chatthrob"></div>