diff options
| author | John McLear <john@mclear.co.uk> | 2012-10-25 09:41:24 -0700 |
|---|---|---|
| committer | John McLear <john@mclear.co.uk> | 2012-10-25 09:41:24 -0700 |
| commit | a80eb93f7516757368ac6932a28de4dc58b37ba7 (patch) | |
| tree | 0b133285a0965d270e7ae19223a118c0caa05adb /src | |
| parent | ff2e7ead0982b4db01680536ff3392b1abe2a02a (diff) | |
| parent | 2ecd5719fcc6ed34d14f2db81120822d4b813b18 (diff) | |
| download | etherpad-lite-a80eb93f7516757368ac6932a28de4dc58b37ba7.zip | |
Merge branch 'develop' of git://github.com/Pita/etherpad-lite into develop
Diffstat (limited to 'src')
| -rw-r--r-- | src/templates/index.html | 23 | ||||
| -rw-r--r-- | src/templates/pad.html | 26 | ||||
| -rw-r--r-- | src/templates/timeslider.html | 29 |
3 files changed, 72 insertions, 6 deletions
diff --git a/src/templates/index.html b/src/templates/index.html index b1d34eb4..40d46fc8 100644 --- a/src/templates/index.html +++ b/src/templates/index.html @@ -2,6 +2,29 @@ <html> <title>Etherpad Lite</title> + <script> + /* + |@licstart The following is the entire license notice for the + JavaScript code in this page.| + + Copyright 2011 Peter Martischka, Primary Technology. + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + + |@licend The above is the entire license notice + for the JavaScript code in this page.| + */ + </script> <meta charset="utf-8"> <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=0"> diff --git a/src/templates/pad.html b/src/templates/pad.html index 425e476d..2f86680e 100644 --- a/src/templates/pad.html +++ b/src/templates/pad.html @@ -3,8 +3,30 @@ %> <!doctype html> <html> - <title>Etherpad Lite</title> + <script> + /* + |@licstart The following is the entire license notice for the + JavaScript code in this page.| + + Copyright 2011 Peter Martischka, Primary Technology. + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + + |@licend The above is the entire license notice + for the JavaScript code in this page.| + */ + </script> <meta charset="utf-8"> <meta name="robots" content="noindex, nofollow"> @@ -233,7 +255,7 @@ </div> <div class="reconnecting"> <h1>Reestablishing connection...</h1> - <p><img alt="" border="0" src="/static/img/connectingbar.gif" /></p> + <p><img alt="" border="0" src="../static/img/connectingbar.gif" /></p> </div> <div class="userdup"> <h1>Opened in another window.</h1> diff --git a/src/templates/timeslider.html b/src/templates/timeslider.html index 469ddd94..30c4e676 100644 --- a/src/templates/timeslider.html +++ b/src/templates/timeslider.html @@ -1,11 +1,32 @@ <!doctype html> <html lang="en"> +<title>Etherpad Lite Timeslider</title> +<script> + /* + |@licstart The following is the entire license notice for the + JavaScript code in this page.| + + Copyright 2011 Peter Martischka, Primary Technology. + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + + |@licend The above is the entire license notice + for the JavaScript code in this page.| + */ +</script> <head> <meta charset="utf-8"> <meta name="robots" content="noindex, nofollow"> - - <title>Etherpad Lite Timeslider</title> - <link rel="shortcut icon" href="../../favicon.ico"> <link rel="stylesheet" href="../../static/css/pad.css"> <link rel="stylesheet" href="../../static/css/timeslider.css"> @@ -83,7 +104,7 @@ </div> <div class="reconnecting"> <h1>Reestablishing connection...</h1> - <p><img alt="" border="0" src="/static/img/connectingbar.gif" /></p> + <p><img alt="" border="0" src="../../static/img/connectingbar.gif" /></p> </div> <div class="userdup"> <h1>Opened in another window.</h1> |