Merge https://github.com/ether/etherpad-lite into patch-3

Conflicts: src/templates/index.html
author: rugk <rugk@posteo.de> 2016-09-30 19:20:40 +0200
committer: rugk <rugk@posteo.de> 2016-09-30 19:20:40 +0200
commit: f29e813ca000e3edfa0231dfc042463d635b075d (patch)
tree: ed31da12002bccea59481012cc22d5e8dc120da6 /src/templates
parent: b5632b3ac5b8db82d439a6bf29fa93e41712a607 (diff)
parent: f289611ba93a45cd7141f849c7ae896048f9861b (diff)
download: etherpad-lite-f29e813ca000e3edfa0231dfc042463d635b075d.zip
9 files changed, 247 insertions, 17 deletions
diff --git a/src/templates/admin/index.html b/src/templates/admin/index.html
index f6e9e29e..45755a49 100644
--- a/src/templates/admin/index.html
+++ b/src/templates/admin/index.html
@@ -20,5 +20,6 @@
         </ul>
       </div>
     </div>
+  <div style="display:none"><a href="/javascript" data-jslicense="1">JavaScript license information</a></div>
   </body>
 </html>
diff --git a/src/templates/admin/plugins-info.html b/src/templates/admin/plugins-info.html
index 5d39c388..8dd0bf88 100644
--- a/src/templates/admin/plugins-info.html
+++ b/src/templates/admin/plugins-info.html
@@ -41,5 +41,6 @@
 
       </div>
     </div>
+  <div style="display:none"><a href="/javascript" data-jslicense="1">JavaScript license information</a></div>
   </body>
 </html>
diff --git a/src/templates/admin/plugins.html b/src/templates/admin/plugins.html
index 71c4dbcc..0fff7843 100644
--- a/src/templates/admin/plugins.html
+++ b/src/templates/admin/plugins.html
@@ -112,5 +112,6 @@
 
       </div>
     </div>
+  <div style="display:none"><a href="/javascript" data-jslicense="1">JavaScript license information</a></div>
   </body>
 </html>
diff --git a/src/templates/admin/settings.html b/src/templates/admin/settings.html
index 560ac507..74f35521 100644
--- a/src/templates/admin/settings.html
+++ b/src/templates/admin/settings.html
@@ -50,5 +50,6 @@
       </div>
 
     </div>
+  <div style="display:none"><a href="/javascript" data-jslicense="1">JavaScript license information</a></div>
   </body>
 </html>
diff --git a/src/templates/export_html.html b/src/templates/export_html.html
new file mode 100644
index 00000000..b29941c9
--- /dev/null
+++ b/src/templates/export_html.html
@@ -0,0 +1,144 @@
+<!doctype html>
+<html lang="en">
+<head>
+<title><%- padId %></title>
+<meta name="generator" content="Etherpad">
+<meta name="author" content="Etherpad">
+<meta name="changedby" content="Etherpad">
+<meta charset="utf-8">
+<style>
+* {
+  font-family: arial, sans-serif;
+  font-size: 13px;
+  line-height: 17px;
+}
+ul.indent {
+  list-style-type: none;
+}
+ol {
+  list-style-type: none;
+  padding-left: 0;
+}
+body > ol {
+  counter-reset: first second third fourth fifth sixth seventh eigth ninth tenth eleventh twelth thirteenth fourteenth fifteenth sixteenth;
+}
+ol > li:before {
+  content: counter(first) ". ";
+  counter-increment: first;
+}
+ol > ol > li:before {
+  content: counter(first) "." counter(second) ". ";
+  counter-increment: second;
+}
+ol > ol > ol > li:before {
+  content: counter(first) "." counter(second) "." counter(third) ". ";
+  counter-increment: third;
+}
+ol > ol > ol > ol > li:before {
+  content: counter(first) "." counter(second) "." counter(third) "." counter(fourth) ". ";
+  counter-increment: fourth;
+}
+ol > ol > ol > ol > ol > li:before {
+  content: counter(first) "." counter(second) "." counter(third) "." counter(fourth) "." counter(fifth) ". ";
+  counter-increment: fifth;
+}
+ol > ol > ol > ol > ol > ol > li:before {
+  content: counter(first) "." counter(second) "." counter(third) "." counter(fourth) "." counter(fifth) "." counter(sixth) ". ";
+  counter-increment: sixth;
+}
+ol > ol > ol > ol > ol > ol > ol > li:before {
+  content: counter(first) "." counter(second) "." counter(third) "." counter(fourth) "." counter(fifth) "." counter(sixth) "." counter(seventh) ". ";
+  counter-increment: seventh;
+}
+ol > ol > ol > ol > ol > ol > ol > ol > li:before {
+  content: counter(first) "." counter(second) "." counter(third) "." counter(fourth) "." counter(fifth) "." counter(sixth) "." counter(seventh) "." counter(eigth) ". ";
+  counter-increment: eigth;
+}
+ol > ol > ol > ol > ol > ol > ol > ol > ol > li:before {
+  content: counter(first) "." counter(second) "." counter(third) "." counter(fourth) "." counter(fifth) "." counter(sixth) "." counter(seventh) "." counter(eigth) "." counter(ninth) ". ";
+  counter-increment: ninth;
+}
+ol > ol > ol > ol > ol > ol > ol > ol > ol > ol > li:before {
+  content: counter(first) "." counter(second) "." counter(third) "." counter(fourth) "." counter(fifth) "." counter(sixth) "." counter(seventh) "." counter(eigth) "." counter(ninth) "." counter(tenth) ". ";
+  counter-increment: tenth;
+}
+ol > ol > ol > ol > ol > ol > ol > ol > ol > ol > ol > li:before {
+  content: counter(first) "." counter(second) "." counter(third) "." counter(fourth) "." counter(fifth) "." counter(sixth) "." counter(seventh) "." counter(eigth) "." counter(ninth) "." counter(tenth) "." counter(eleventh) ". ";
+  counter-increment: eleventh;
+}
+ol > ol > ol > ol > ol > ol > ol > ol > ol > ol > ol > ol > li:before {
+  content: counter(first) "." counter(second) "." counter(third) "." counter(fourth) "." counter(fifth) "." counter(sixth) "." counter(seventh) "." counter(eigth) "." counter(ninth) "." counter(tenth) "." counter(eleventh) "." counter(twelth) ". ";
+  counter-increment: twelth;
+}
+ol > ol > ol > ol > ol > ol > ol > ol > ol > ol > ol > ol > ol > li:before {
+  content: counter(first) "." counter(second) "." counter(third) "." counter(fourth) "." counter(fifth) "." counter(sixth) "." counter(seventh) "." counter(eigth) "." counter(ninth) "." counter(tenth) "." counter(eleventh) "." counter(twelth) "." counter(thirteenth) ". ";
+  counter-increment: thirteenth;
+}
+ol > ol > ol > ol > ol > ol > ol > ol > ol > ol > ol > ol > ol > ol > li:before {
+  content: counter(first) "." counter(second) "." counter(third) "." counter(fourth) "." counter(fifth) "." counter(sixth) "." counter(seventh) "." counter(eigth) "." counter(ninth) "." counter(tenth) "." counter(eleventh) "." counter(twelth) "." counter(thirteenth) "." counter(fourteenth) ". ";
+  counter-increment: fourteenth;
+}
+ol > ol > ol > ol > ol > ol > ol > ol > ol > ol > ol > ol > ol > ol > ol > li:before {
+  content: counter(first) "." counter(second) "." counter(third) "." counter(fourth) "." counter(fifth) "." counter(sixth) "." counter(seventh) "." counter(eigth) "." counter(ninth) "." counter(tenth) "." counter(eleventh) "." counter(twelth) "." counter(thirteenth) "." counter(fourteenth) "." counter(fifteenth) ". ";
+  counter-increment: fifteenth;
+}
+ol > ol > ol > ol > ol > ol > ol > ol > ol > ol > ol > ol > ol > ol > ol > ol > li:before {
+  content: counter(first) "." counter(second) "." counter(third) "." counter(fourth) "." counter(fifth) "." counter(sixth) "." counter(seventh) "." counter(eigth) "." counter(ninth) "." counter(tenth) "." counter(eleventh) "." counter(twelth) "." counter(thirteenth) "." counter(fourteenth) "." counter(fifteenth) "." counter(sixthteenth) ". ";
+  counter-increment: sixthteenth;
+}
+ol {
+  text-indent: 0px;
+}
+ol > ol {
+  text-indent: 10px;
+}
+ol > ol > ol {
+  text-indent: 20px;
+}
+ol > ol > ol > ol {
+  text-indent: 30px;
+}
+ol > ol > ol > ol > ol {
+  text-indent: 40px;
+}
+ol > ol > ol > ol > ol > ol {
+  text-indent: 50px;
+}
+ol > ol > ol > ol > ol > ol > ol {
+  text-indent: 60px;
+}
+ol > ol > ol > ol > ol > ol > ol > ol {
+  text-indent: 70px;
+}
+ol > ol > ol > ol > ol > ol > ol > ol > ol {
+  text-indent: 80px;
+}
+ol > ol > ol > ol > ol > ol > ol > ol > ol > ol {
+  text-indent: 90px;
+}
+ol > ol > ol > ol > ol > ol > ol > ol > ol > ol > ol {
+  text-indent: 100px;
+}
+ol > ol > ol > ol > ol > ol > ol > ol > ol > ol > ol > ol {
+  text-indent: 110px;
+}
+ol > ol > ol > ol > ol > ol > ol > ol > ol > ol > ol > ol > ol {
+  text-indent: 120px;
+}
+ol > ol > ol > ol > ol > ol > ol > ol > ol > ol > ol > ol > ol > ol {
+  text-indent: 130px;
+}
+ol > ol > ol > ol > ol > ol > ol > ol > ol > ol > ol > ol > ol > ol > ol {
+  text-indent: 140px;
+}
+ol > ol > ol > ol > ol > ol > ol > ol > ol > ol > ol > ol > ol > ol > ol > ol {
+  text-indent: 150px;
+}
+<%- extraCSS %>
+</style>
+</head>
+<body>
+<%- body %>
+<div style="display:none"><a href="/javascript" data-jslicense="1">JavaScript license information</a></div>
+</body>
+</html>
diff --git a/src/templates/index.html b/src/templates/index.html
index f91e3fe6..e1f59c1e 100644
--- a/src/templates/index.html
+++ b/src/templates/index.html
@@ -29,7 +29,7 @@
       */
     </script>
 
-        <meta charset="utf-8"> 
+        <meta charset="utf-8">
         <meta name="referrer" content="no-referrer">
         <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=0">
         <link rel="shortcut icon" href="<%=settings.favicon%>">
@@ -122,7 +122,7 @@
             input[type="text"] {
               border-radius: 3px;
               box-sizing: border-box;
-              -moz-box-sizing: border-box;   
+              -moz-box-sizing: border-box;
               line-height:36px; /* IE8 hack */
               padding: 0px 45px 0 10px;
               *padding: 0; /* IE7 hack */
@@ -149,22 +149,22 @@
                 margin-top: 0;
               }
               #inner {
-                width: 95%;        
+                width: 95%;
               }
               #label {
                 text-align: center;
               }
             }
         </style>
-        <link href="static/custom/index.css" rel="stylesheet"> 
+        <link href="static/custom/index.css" rel="stylesheet">
 
         <div id="wrapper">
         <% e.begin_block("indexWrapper"); %>
             <div id="inner">
                 <buttOn id="button" onclick="go2Random()" data-l10n-id="index.newPad"></button>
-                <label id="label" for="padname" data-l10n-id="index.createOpenPad"></label> 
-                <form action="#" onsubmit="go2Name();return false;"> 
-                    <input type="text" id="padname" maxlength="50" autofocus x-webkit-speech> 
+                <label id="label" for="padname" data-l10n-id="index.createOpenPad"></label>
+                <form action="#" onsubmit="go2Name();return false;">
+                    <input type="text" id="padname" maxlength="50" autofocus x-webkit-speech>
                     <button type="submit">OK</button>
                 </form>
             </div>
@@ -172,33 +172,35 @@
         </div>
 
         <script src="static/custom/index.js"></script>
-        <script> 
-      
-            function go2Name() 
+        <script>
+            // @license magnet:?xt=urn:btih:8e4f440f4c65981c5bf93c76d35135ba5064d8b7&dn=apache-2.0.txt
+            function go2Name()
             {
                 var padname = document.getElementById("padname").value;
                 padname.length > 0 ? window.location = "p/" + padname : alert("Please enter a name")
             }
- 
-            function go2Random() 
+
+            function go2Random()
             {
                 window.location = "p/" + randomPadName();
             }
- 
-            function randomPadName() 
+
+            function randomPadName()
             {
                 var chars = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz";
                 var string_length = 10;
                 var randomstring = '';
-                for (var i = 0; i < string_length; i++) 
+                for (var i = 0; i < string_length; i++)
                 {
                     var rnum = Math.floor(Math.random() * chars.length);
                     randomstring += chars.substring(rnum, rnum + 1);
                 }
                 return randomstring;
             }
-            
+
             // start the custom js
             if (typeof customStart == "function") customStart();
+            // @license-end
         </script>
+        <div style="display:none"><a href="/javascript" data-jslicense="1">JavaScript license information</a></div>
 </html>
diff --git a/src/templates/javascript.html b/src/templates/javascript.html
new file mode 100644
index 00000000..29031c4b
--- /dev/null
+++ b/src/templates/javascript.html
@@ -0,0 +1,73 @@
+<!doctype html>
+<html>
+    <head>
+      <title>JavaScript license information</title>
+          <meta charset="utf-8">
+          <meta name="robots" content="noindex, nofollow">
+          <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=0">
+    </head>
+    <body>
+        <table id="jslicense-labels1">
+            <tr>
+                <td><a href="/static/js/jquery-2.1.1.min.js">jquery-2.1.1.min.js</a></td>
+                <td><a href="http://www.jclark.com/xml/copying.txt">Expat</a></td>
+                <td><a href="/static/js/jquery.js">jquery.js</a></td>
+            </tr>
+            <tr>
+                <td><a href="/static/js/html10n.js">html10n.js</a></td>
+                <td><a href="http://www.jclark.com/xml/copying.txt">Expat</a></td>
+                <td><a href="/static/js/html10n.js">html10n.js</a></td>
+            </tr>
+            <tr>
+                <td><a href="/static/js/l10n.js">l10n.js</a></td>
+                <td><a href="http://www.apache.org/licenses/LICENSE-2.0">Apache-2.0-only</a></td>
+                <td><a href="/static/js/l10n.js">l10n.js</a></td>
+            </tr>
+            <tr>
+                <td><a href="/static/js/socket.io.js">socket.io.js</a></td>
+                <td><a href="http://www.jclark.com/xml/copying.txt">Expat</a></td>
+                <td><a href="/static/js/socket.io.js">socket.io.js</a></td>
+            </tr>
+            <tr>
+                <td><a href="/static/js/require-kernel.js">require-kernel.js</a></td>
+                <td><a href="http://www.jclark.com/xml/copying.txt">Expat</a></td>
+                <td><a href="/static/js/require-kernel.js">require-kernel.js</a></td>
+            </tr>
+            <tr>
+                <td><a href="/static/custom/index.js">index.js</a></td>
+                <td><a href="http://www.apache.org/licenses/LICENSE-2.0">Apache-2.0-only</a></td>
+                <td><a href="/static/custom/index.js">index.js</a></td>
+            </tr>
+            <tr>
+                <td><a href="/static/custom/timeslider.js">timeslider.js</a></td>
+                <td><a href="http://www.apache.org/licenses/LICENSE-2.0">Apache-2.0-only</a></td>
+                <td><a href="/static/custom/timeslider.js">timeslider.js</a></td>
+            </tr>
+            <tr>
+                <td><a href="/static/custom/pad.js">pad.js</a></td>
+                <td><a href="http://www.apache.org/licenses/LICENSE-2.0">Apache-2.0-only</a></td>
+                <td><a href="/static/custom/pad.js">pad.js</a></td>
+            </tr>
+            <tr>
+                <td><a href="/static/js/admin/plugins.js">plugins.js</a></td>
+                <td><a href="http://www.apache.org/licenses/LICENSE-2.0">Apache-2.0-only</a></td>
+                <td><a href="/static/js/admin/plugins.js">plugins.js</a></td>
+            </tr>
+            <tr>
+                <td><a href="/static/js/admin/minify.json.js">minify.json.js</a></td>
+                <td><a href="http://www.jclark.com/xml/copying.txt">Expat</a></td>
+                <td><a href="/static/js/admin/minify.json.js">minify.json.js</a></td>
+            </tr>
+            <tr>
+                <td><a href="/static/js/admin/settings.js">settings.js</a></td>
+                <td><a href="http://www.apache.org/licenses/LICENSE-2.0">Apache-2.0-only</a></td>
+                <td><a href="/static/js/admin/settings.js">settings.js</a></td>
+            </tr>
+            <tr>
+                <td><a href="/static/js/admin/jquery.autosize.js">jquery.autosize.js</a></td>
+                <td><a href="http://www.jclark.com/xml/copying.txt">Expat</a></td>
+                <td><a href="/static/js/admin/jquery.autosize.js">jquery.autosize.js</a></td>
+            </tr>
+        </table>
+    </body>
+</html>
diff --git a/src/templates/pad.html b/src/templates/pad.html
index 79ea0b58..271bbb2d 100644
--- a/src/templates/pad.html
+++ b/src/templates/pad.html
@@ -351,6 +351,7 @@
 
         <% e.begin_block("scripts"); %>
         <script type="text/javascript">
+            // @license magnet:?xt=urn:btih:8e4f440f4c65981c5bf93c76d35135ba5064d8b7&dn=apache-2.0.txt
             (function() {
               // Display errors on page load to the user
               // (Gets overridden by padutils.setupGlobalExceptionHandler)
@@ -364,6 +365,7 @@
                 if(typeof(originalHandler) == 'function') originalHandler.call(null, arguments);
               };
             })();
+            // @license-end
         </script>
 
         <script type="text/javascript" src="../static/js/require-kernel.js"></script>
@@ -379,6 +381,7 @@
 
         <!-- Bootstrap page -->
         <script type="text/javascript">
+            // @license magnet:?xt=urn:btih:8e4f440f4c65981c5bf93c76d35135ba5064d8b7&dn=apache-2.0.txt
             var clientVars = {};
             (function () {
               var pathComponents = location.pathname.split('/');
@@ -416,6 +419,8 @@
               padeditbar = require('ep_etherpad-lite/static/js/pad_editbar').padeditbar;
               padimpexp = require('ep_etherpad-lite/static/js/pad_impexp').padimpexp;
             }());
+            // @license-end
         </script>
+        <div style="display:none"><a href="/javascript" data-jslicense="1">JavaScript license information</a></div>
         <% e.end_block(); %>
 </html>
diff --git a/src/templates/timeslider.html b/src/templates/timeslider.html
index a8c85241..395d0c47 100644
--- a/src/templates/timeslider.html
+++ b/src/templates/timeslider.html
@@ -231,6 +231,7 @@
 
 <!-- Bootstrap -->
 <script type="text/javascript" >
+  // @license magnet:?xt=urn:btih:8e4f440f4c65981c5bf93c76d35135ba5064d8b7&dn=apache-2.0.txt
   var clientVars = {};
   var BroadcastSlider;
   (function () {
@@ -267,8 +268,9 @@
       padeditbar.init()
     });
   })();
+  // @license-end
 </script>
 <% e.end_block(); %>
+<div style="display:none"><a href="/javascript" data-jslicense="1">JavaScript license information</a></div>
 </body>
 </html>
-
author	rugk <rugk@posteo.de>	2016-09-30 19:20:40 +0200
committer	rugk <rugk@posteo.de>	2016-09-30 19:20:40 +0200
commit	f29e813ca000e3edfa0231dfc042463d635b075d (patch)
tree	ed31da12002bccea59481012cc22d5e8dc120da6 /src/templates
parent	b5632b3ac5b8db82d439a6bf29fa93e41712a607 (diff)
parent	f289611ba93a45cd7141f849c7ae896048f9861b (diff)
download	etherpad-lite-f29e813ca000e3edfa0231dfc042463d635b075d.zip