From c8358af8f6666e3ce1ac270fa6dc64984fa9edc1 Mon Sep 17 00:00:00 2001 From: Alexander Sulfrian Date: Tue, 8 Jun 2010 17:15:21 +0200 Subject: ported changes from old version --- etherpad/src/static/css/home-opensource.css | 36 +- etherpad/src/static/img/jun09/pad/editbar_h1.gif | Bin 0 -> 119 bytes etherpad/src/static/img/jun09/pad/editbar_h2.gif | Bin 0 -> 185 bytes etherpad/src/static/img/jun09/pad/editbar_h3.gif | Bin 0 -> 187 bytes etherpad/src/static/img/jun09/pad/editbar_h4.gif | Bin 0 -> 122 bytes etherpad/src/static/img/jun09/pad/editbar_h5.gif | Bin 0 -> 186 bytes etherpad/src/static/img/jun09/pad/editbar_h6.gif | Bin 0 -> 189 bytes etherpad/src/static/img/jun09/pad/protop.png | Bin 0 -> 6768 bytes etherpad/src/static/img/jun09/pad/protop.xcf | Bin 0 -> 16565 bytes .../src/static/img/pro/header/pro-header-logo.xcf | Bin 0 -> 13274 bytes .../src/themes/default/templates/pad/pad_body2.ejs | 14 +- trunk/etherpad/src/static/css/home-opensource.css | 44 -- .../etherpad/src/static/img/jun09/pad/editbar3.png | Bin 16869 -> 0 bytes .../etherpad/src/static/img/jun09/pad/editbar3.xcf | Bin 79212 -> 0 bytes .../etherpad/src/static/img/jun09/pad/padtop4.png | Bin 17161 -> 0 bytes .../etherpad/src/static/img/jun09/pad/padtop4.xcf | Bin 41184 -> 0 bytes trunk/etherpad/src/static/img/jun09/pad/protop.png | Bin 6768 -> 0 bytes trunk/etherpad/src/static/img/jun09/pad/protop.xcf | Bin 16565 -> 0 bytes .../src/static/img/pro/header/pro-header-logo.xcf | Bin 13274 -> 0 bytes trunk/etherpad/src/templates/pad/pad_body2.ejs | 472 --------------------- 20 files changed, 31 insertions(+), 535 deletions(-) create mode 100644 etherpad/src/static/img/jun09/pad/editbar_h1.gif create mode 100644 etherpad/src/static/img/jun09/pad/editbar_h2.gif create mode 100644 etherpad/src/static/img/jun09/pad/editbar_h3.gif create mode 100644 etherpad/src/static/img/jun09/pad/editbar_h4.gif create mode 100644 etherpad/src/static/img/jun09/pad/editbar_h5.gif create mode 100644 etherpad/src/static/img/jun09/pad/editbar_h6.gif create mode 100644 etherpad/src/static/img/jun09/pad/protop.png create mode 100644 etherpad/src/static/img/jun09/pad/protop.xcf create mode 100644 etherpad/src/static/img/pro/header/pro-header-logo.xcf delete mode 100644 trunk/etherpad/src/static/css/home-opensource.css delete mode 100644 trunk/etherpad/src/static/img/jun09/pad/editbar3.png delete mode 100644 trunk/etherpad/src/static/img/jun09/pad/editbar3.xcf delete mode 100644 trunk/etherpad/src/static/img/jun09/pad/padtop4.png delete mode 100644 trunk/etherpad/src/static/img/jun09/pad/padtop4.xcf delete mode 100644 trunk/etherpad/src/static/img/jun09/pad/protop.png delete mode 100644 trunk/etherpad/src/static/img/jun09/pad/protop.xcf delete mode 100644 trunk/etherpad/src/static/img/pro/header/pro-header-logo.xcf delete mode 100644 trunk/etherpad/src/templates/pad/pad_body2.ejs diff --git a/etherpad/src/static/css/home-opensource.css b/etherpad/src/static/css/home-opensource.css index bb0201e..0d6da6d 100644 --- a/etherpad/src/static/css/home-opensource.css +++ b/etherpad/src/static/css/home-opensource.css @@ -1,8 +1,7 @@ - #home { width: 600px; margin: 0 auto; - padding: 2em; + padding: 4em; text-align: center; } @@ -10,31 +9,36 @@ font-size: 3.6em; } -#home a#home-newpad{ - display: block; +#home #buttons { + padding-top: 5em; +} + +#home a#home-newpad, #home a#home-newsite { padding: 1em; - margin: 12px 60px; + margin: 12px 40px; font-size: 1.6em; border: 1px solid black; background: #049; color: #fff; + width: 30%; } -#home a#home-newpad:hover{ +#home a#home-newpad:hover, #home a#home-newsite:hover { background: #26b; + text-decoration: none; } -#home a#home-newteam { - display: block; - padding: 1em; - margin: 12px 60px; - font-size: 1.6em; - border: 1px solid black; - background: #940; - color: #fff; +#tos { + margin-top: 8em; + color: #222; +} + +#tos h1, #tos p { + margin: 1.5em 0; } -#home a#home-newteam:hover { - background: #b26; +#tos h1 { + font-weight: bold; + font-size: 1.1em; } diff --git a/etherpad/src/static/img/jun09/pad/editbar_h1.gif b/etherpad/src/static/img/jun09/pad/editbar_h1.gif new file mode 100644 index 0000000..3b8799d Binary files /dev/null and b/etherpad/src/static/img/jun09/pad/editbar_h1.gif differ diff --git a/etherpad/src/static/img/jun09/pad/editbar_h2.gif b/etherpad/src/static/img/jun09/pad/editbar_h2.gif new file mode 100644 index 0000000..2bf8753 Binary files /dev/null and b/etherpad/src/static/img/jun09/pad/editbar_h2.gif differ diff --git a/etherpad/src/static/img/jun09/pad/editbar_h3.gif b/etherpad/src/static/img/jun09/pad/editbar_h3.gif new file mode 100644 index 0000000..67afb63 Binary files /dev/null and b/etherpad/src/static/img/jun09/pad/editbar_h3.gif differ diff --git a/etherpad/src/static/img/jun09/pad/editbar_h4.gif b/etherpad/src/static/img/jun09/pad/editbar_h4.gif new file mode 100644 index 0000000..606f152 Binary files /dev/null and b/etherpad/src/static/img/jun09/pad/editbar_h4.gif differ diff --git a/etherpad/src/static/img/jun09/pad/editbar_h5.gif b/etherpad/src/static/img/jun09/pad/editbar_h5.gif new file mode 100644 index 0000000..6489b4f Binary files /dev/null and b/etherpad/src/static/img/jun09/pad/editbar_h5.gif differ diff --git a/etherpad/src/static/img/jun09/pad/editbar_h6.gif b/etherpad/src/static/img/jun09/pad/editbar_h6.gif new file mode 100644 index 0000000..b0ec369 Binary files /dev/null and b/etherpad/src/static/img/jun09/pad/editbar_h6.gif differ diff --git a/etherpad/src/static/img/jun09/pad/protop.png b/etherpad/src/static/img/jun09/pad/protop.png new file mode 100644 index 0000000..740d903 Binary files /dev/null and b/etherpad/src/static/img/jun09/pad/protop.png differ diff --git a/etherpad/src/static/img/jun09/pad/protop.xcf b/etherpad/src/static/img/jun09/pad/protop.xcf new file mode 100644 index 0000000..4f3abfd Binary files /dev/null and b/etherpad/src/static/img/jun09/pad/protop.xcf differ diff --git a/etherpad/src/static/img/pro/header/pro-header-logo.xcf b/etherpad/src/static/img/pro/header/pro-header-logo.xcf new file mode 100644 index 0000000..524c00f Binary files /dev/null and b/etherpad/src/static/img/pro/header/pro-header-logo.xcf differ diff --git a/etherpad/src/themes/default/templates/pad/pad_body2.ejs b/etherpad/src/themes/default/templates/pad/pad_body2.ejs index 5c886fb..0a8a1af 100644 --- a/etherpad/src/themes/default/templates/pad/pad_body2.ejs +++ b/etherpad/src/themes/default/templates/pad/pad_body2.ejs @@ -139,9 +139,6 @@ limitations under the License. */ %> <%= exportLink('html', 1, 'HTML', false) %> <%= exportLink('txt', 2, 'Plain text', false) %> <%= exportLink('link', 3, 'Bookmark file', false, '/ep/pad/linkfile?padId='+localPadId, 'This will save a file that, when opened, takes you to this pad.') %> - <%= exportLink('doc', 4, 'Microsoft Word', true) %> - <%= exportLink('pdf', 5, 'PDF', true) %> - <%= exportLink('odt', 6, 'OpenDocument', true) %>
@@ -392,6 +389,17 @@ limitations under the License. */ %>    + + + + + + + + + +    + diff --git a/trunk/etherpad/src/static/css/home-opensource.css b/trunk/etherpad/src/static/css/home-opensource.css deleted file mode 100644 index 0d6da6d..0000000 --- a/trunk/etherpad/src/static/css/home-opensource.css +++ /dev/null @@ -1,44 +0,0 @@ -#home { - width: 600px; - margin: 0 auto; - padding: 4em; - text-align: center; -} - -#home #title { - font-size: 3.6em; -} - -#home #buttons { - padding-top: 5em; -} - -#home a#home-newpad, #home a#home-newsite { - padding: 1em; - margin: 12px 40px; - font-size: 1.6em; - border: 1px solid black; - background: #049; - color: #fff; - width: 30%; -} - -#home a#home-newpad:hover, #home a#home-newsite:hover { - background: #26b; - text-decoration: none; -} - -#tos { - margin-top: 8em; - color: #222; -} - -#tos h1, #tos p { - margin: 1.5em 0; -} - -#tos h1 { - font-weight: bold; - font-size: 1.1em; -} - diff --git a/trunk/etherpad/src/static/img/jun09/pad/editbar3.png b/trunk/etherpad/src/static/img/jun09/pad/editbar3.png deleted file mode 100644 index ff65146..0000000 Binary files a/trunk/etherpad/src/static/img/jun09/pad/editbar3.png and /dev/null differ diff --git a/trunk/etherpad/src/static/img/jun09/pad/editbar3.xcf b/trunk/etherpad/src/static/img/jun09/pad/editbar3.xcf deleted file mode 100644 index 91cae20..0000000 Binary files a/trunk/etherpad/src/static/img/jun09/pad/editbar3.xcf and /dev/null differ diff --git a/trunk/etherpad/src/static/img/jun09/pad/padtop4.png b/trunk/etherpad/src/static/img/jun09/pad/padtop4.png deleted file mode 100644 index 11c4595..0000000 Binary files a/trunk/etherpad/src/static/img/jun09/pad/padtop4.png and /dev/null differ diff --git a/trunk/etherpad/src/static/img/jun09/pad/padtop4.xcf b/trunk/etherpad/src/static/img/jun09/pad/padtop4.xcf deleted file mode 100644 index 1e735aa..0000000 Binary files a/trunk/etherpad/src/static/img/jun09/pad/padtop4.xcf and /dev/null differ diff --git a/trunk/etherpad/src/static/img/jun09/pad/protop.png b/trunk/etherpad/src/static/img/jun09/pad/protop.png deleted file mode 100644 index 740d903..0000000 Binary files a/trunk/etherpad/src/static/img/jun09/pad/protop.png and /dev/null differ diff --git a/trunk/etherpad/src/static/img/jun09/pad/protop.xcf b/trunk/etherpad/src/static/img/jun09/pad/protop.xcf deleted file mode 100644 index 4f3abfd..0000000 Binary files a/trunk/etherpad/src/static/img/jun09/pad/protop.xcf and /dev/null differ diff --git a/trunk/etherpad/src/static/img/pro/header/pro-header-logo.xcf b/trunk/etherpad/src/static/img/pro/header/pro-header-logo.xcf deleted file mode 100644 index 524c00f..0000000 Binary files a/trunk/etherpad/src/static/img/pro/header/pro-header-logo.xcf and /dev/null differ diff --git a/trunk/etherpad/src/templates/pad/pad_body2.ejs b/trunk/etherpad/src/templates/pad/pad_body2.ejs deleted file mode 100644 index 23b7adb..0000000 --- a/trunk/etherpad/src/templates/pad/pad_body2.ejs +++ /dev/null @@ -1,472 +0,0 @@ -<% /* Copyright 2009 Google Inc. - -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. */ %> -<% helpers.setHtmlTitle("EtherPad: "+pageTitle); %> -<% helpers.setBodyId("padbody") %> -<% helpers.addBodyClass(bodyClass) %> -<% helpers.includeCss("pad2_ejs.css") %> -<% helpers.includeJs("undo-xpopup.js") %> -<% helpers.includeCometJs() %> -<% helpers.includeJQuery(); %> -<% helpers.includeJs("json2.js") %> -<% helpers.includeJs("colorutils.js") %> -<% helpers.includeJs("ace.js") %> -<% helpers.includeJs("collab_client.js") %> -<% helpers.includeJs("draggable.js") %> -<% helpers.includeJs("pad_utils.js") %> -<% helpers.includeJs("pad_cookie.js") %> -<% helpers.includeJs("pad_editor.js") %> -<% helpers.includeJs("pad_userlist.js") %> -<% helpers.includeJs("pad_editbar.js") %> -<% helpers.includeJs("pad_chat.js") %> -<% helpers.includeJs("pad_docbar.js") %> -<% helpers.includeJs("pad_impexp.js") %> -<% helpers.includeJs("pad_savedrevs.js") %> -<% helpers.includeJs("pad_connectionstatus.js") %> -<% helpers.includeJs("pad_modals.js") %> -<% helpers.includeJs("pad2.js") %> -<% helpers.suppressGA() %> -<% helpers.setRobotsPolicy({index: false, follow: false}) %> -<% - var padUrlAttrValue = request.url.split("?", 1)[0].replace(/\"/g, '"'); //" -%> - -<% - function exportLink(type, n, label, requiresOffice, url, title) { - url = url || '/ep/pad/export/'+localPadId+'/latest?format='+type; - var classes = ["exportlink", "exporthref"+type, "n"+n]; - if (requiresOffice && !hasOffice) { - classes.push("disabledexport"); - } - else { - classes.push("requiresoffice"); - } - var pieces = ['', label); - /* if (title) { - pieces.push('?'); - }*/ - pieces.push(''); - return pieces.join(''); - } -%> - -
- -
-
- <% /* floated left */ %> -
- <% /* New Pad */ %> - <% /* floated right */ %> -
- <% /* Toggle Width */ %> - <% /* non-floated */ %> -
- EtherPad -
-<% if (isProAccountHolder) { %> - Return to pad list -
<%= toHTML(account.email) %> - (sign out) -
-<% } else if (isPro) { %> -
- sign in -
-<% } %> -
-
- -
-
-

Server Notice:

- hide -

-
-
- -
-
-
<%= initialTitle %>
-<% if (isProAccountHolder) { %> - -<% } /* isProAccountHolder */ %> - - - - -<% if (isProAccountHolder) { %> - -<% } /* isProAccountHolder */ %> - -
- Save - Cancel -
-
-
-
-
-
-
-
-
-
-
-
-
-
-
Import from text file, HTML:
-
-
- -
-
-
Successful!
-
- - - - - - -
-
-
-
-
Export current pad as:
- -
-
-
- Hide -
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- - Save Now - -
-
-
-
-
- -
-
-
- Hide -
-
-
-
Saved: Revision 1
-
-
-
-
-
-
-
-
-
-
-
-
-
-
Shared view options:
- - - - -
Display font:
- -
These options affect everyone's view of the pad.
- Hide -
-
-
-<% if (isProAccountHolder) { %> -
-
-
-
-
-
-
-
-
-
-
-
-
-
-
Pad Access:
- - - - -
-
-
Password:
-
-
-
None
- Set... - Clear -
-
- Save - Cancel - -
-
-
- Hide -
-
-
-<% } /* isProAccountHolder */ %> -
-
- -
-
-
-
-
-
- Connecting... -
-
- Reestablishing connection... -
-
-

Disconnected.

-

Opened in another window.

-

No Authorization.

-
-

We're having trouble talking to the EtherPad synchronization server. - You may be connecting through an incompatible firewall or proxy server.

-
-
-

We were unable to connect to the EtherPad synchronization server. - This may be due to an incompatibility with your web - browser or internet connection.

-
-
-

You seem to have opened this pad in another browser window. - If you'd like to use this window instead, you can reconnect.

-
-
-

Lost connection with the EtherPad synchronization - server. This may be due to a loss of network connectivity.

-
-
-

Server not responding. This may be due to network connectivity issues or high load on the server.

-
-
-

Your browser's credentials or permissions have changed while viewing this pad. Try reconnecting.

-
-
-

If this continues to happen, please let us know - (opens in new window).

-
-
- -
-
-
-
- -
- -
- -
-
-
-
-
-
-
-
-
-
-
Save
-
Cancel
-
-
-
-
-
-
-
- - -
-
Invite other users and they will show up here.
-
-
- Share -
-
- -
- -
- -
- Load more history... -
Loading history...
-
-
-
Chat:
-
-
-
-
- -
-
- <% /* floated left */ %> -
- <% /* floated right */ %> -
- <% /* non-floated */ %> -
-   -   -   -   -   -   -   -   -   -   -   -   -   -   -   -   -
-
-   -
-
-
-
Loading...
-
-
-
- -
-
-
Zoom:
- -
- -
-
-
- -
- -
- -
-
-
-
- -
-
- Public Pad: This pad is accessible to anyone who - visits its URL. To make it private, change security settings. -
-
- Private Pad: This pad is only accessible to team account-holders. To allow anyone to access it, change security settings. -
-
-
- -
or send an email invitation...
- - - - - -
To
-
Subject
-
Message
- -
-
-
-
-
-
-
- -<% if (request.params.djs) { %> -
-<% } %> - - -- cgit v1.2.3