diff options
Diffstat (limited to 'etherpad/src/themes/default')
12 files changed, 44 insertions, 88 deletions
diff --git a/etherpad/src/themes/default/templates/500_body.ejs b/etherpad/src/themes/default/templates/500_body.ejs index 291e0fd..34549ed 100644 --- a/etherpad/src/themes/default/templates/500_body.ejs +++ b/etherpad/src/themes/default/templates/500_body.ejs @@ -19,7 +19,7 @@ limitations under the License. */ %><% helpers.setHtmlTitle("EtherPad Internal S <div id="errorpage" class="fpcontent"> <div class="error500"> <p>Oops! A server error occured. It's been logged.</p> - <p>Please email <support@etherpad.com> if this persists.</p> + <p>Please email <support@pad.spline.inf.fu-berlin.de> if this persists.</p> </div> </div> <% } %> diff --git a/etherpad/src/themes/default/templates/email/padinvite.ejs b/etherpad/src/themes/default/templates/email/padinvite.ejs index c6467b8..0f729e3 100644 --- a/etherpad/src/themes/default/templates/email/padinvite.ejs +++ b/etherpad/src/themes/default/templates/email/padinvite.ejs @@ -15,4 +15,4 @@ limitations under the License. */ %><%= body %> -- Sent by <%= request.host %> at the request of an EtherPad user. Do not reply to this email. -Report abuse to: support@etherpad.com +Report abuse to: support@pad.spline.inf.fu-berlin.de diff --git a/etherpad/src/themes/default/templates/framed/framedheader-pro.ejs b/etherpad/src/themes/default/templates/framed/framedheader-pro.ejs index 73b0e99..afb8a67 100644 --- a/etherpad/src/themes/default/templates/framed/framedheader-pro.ejs +++ b/etherpad/src/themes/default/templates/framed/framedheader-pro.ejs @@ -47,7 +47,6 @@ limitations under the License. */ %><% helpers.addBodyClass("pro-withtopbar"); % ['/', 'Home', 'home'], ['/ep/padlist/', 'Pads', 'padlist'], ['/ep/account/', 'My Account', 'account'], - ['/ep/pro-help/', 'Help', 'help'] ]; if (account && account.isAdmin) { links.push(['/ep/admin/', 'Admin', 'admin']); @@ -66,8 +65,8 @@ limitations under the License. */ %><% helpers.addBodyClass("pro-withtopbar"); % <div id="pro-topnav"> <div id="pro-topnav-inner"> - <%= renderProTopNav() %> - <%= helpers.clearFloats() %> + <%= renderProTopNav() %> + <%= helpers.clearFloats() %> </div> </div> diff --git a/etherpad/src/themes/default/templates/main/home.ejs b/etherpad/src/themes/default/templates/main/home.ejs index aa5d934..7041bee 100644 --- a/etherpad/src/themes/default/templates/main/home.ejs +++ b/etherpad/src/themes/default/templates/main/home.ejs @@ -12,16 +12,16 @@ 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: Open-Sourced!"); %> +limitations under the License. */ %><% helpers.setHtmlTitle("SplinePad [beta]: Open-Sourced!"); %> <% helpers.includeCss("home-opensource.css"); %> <div id="home"> <div id="title"> - EtherPad: Open-Sourced! + SplinePad </div> - <div> + <div id="buttons"> <a id="home-newpad" href="/ep/pad/newpad"> Create new pad </a> @@ -31,6 +31,32 @@ limitations under the License. */ %><% helpers.setHtmlTitle("EtherPad: Open-Sour </a> <% } %> </div> + + <div id="tos"> + <h1> + <b>Terms of service and Privacy notice</b> + </h1> + + <p> + <b>Privacy:</b> We guarantee that we will not intentionally hand + over your data to any third party. + </p> + + <p> + <b>Terms:</b> By using splinepad, you certify to agree to the + following terms of service: We are not responsible, and cannot + be held liable for any loss or damages that may be caused by the + result of our service. + </p> + + <p> + <b>In short:</b> We love the "Datenschutzgesetz" and if + something is wrong, we didn't do it. + </p> + + Have fun with splinepad. + </div> + </div> diff --git a/etherpad/src/themes/default/templates/main/pro_signup_body.ejs b/etherpad/src/themes/default/templates/main/pro_signup_body.ejs index e984878..ff35dfc 100644 --- a/etherpad/src/themes/default/templates/main/pro_signup_body.ejs +++ b/etherpad/src/themes/default/templates/main/pro_signup_body.ejs @@ -51,8 +51,9 @@ limitations under the License. */ %><% helpers.includeCss('pro-signup.css') %> <%= inf("email", "Email") %> </div> <div class="inputhelp"> - Instructions for choosing a password and signing in will - be emailed here. + <p>Instructions for choosing a password and signing in will + be emailed here.</p> + <p>Please use your <strong>*.fu-berlin.de</strong> address.</p> </div> <%= helpers.clearFloats() %> </div> diff --git a/etherpad/src/themes/default/templates/pad/create_body.ejs b/etherpad/src/themes/default/templates/pad/create_body.ejs index 5fec49a..742821f 100644 --- a/etherpad/src/themes/default/templates/pad/create_body.ejs +++ b/etherpad/src/themes/default/templates/pad/create_body.ejs @@ -10,7 +10,7 @@ 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: Create a new pad?"); %> +limitations under the License. */ %><% helpers.setHtmlTitle("SplinePad [beta]: Create a new pad?"); %> <div id="createpadpage" class="fpcontent"> <form action="<%= request.path %>" method="post"> @@ -18,7 +18,7 @@ limitations under the License. */ %><% helpers.setHtmlTitle("EtherPad: Create a <p><tt id="padurl">http://<%= request.host %>/<%= toHTML(padId) %></tt></p> <br/> - <p>There is no EtherPad document here. Would you like to create one?</p> + <p>There is no SplinePad document here. Would you like to create one?</p> <input type="hidden" name="padId" value="<%= toHTML(padId) %>" /> <input type="submit" id="createPad" value="Create Pad" /> diff --git a/etherpad/src/themes/default/templates/pad/padview_body.ejs b/etherpad/src/themes/default/templates/pad/padview_body.ejs index 75c38fe..e18ff12 100644 --- a/etherpad/src/themes/default/templates/pad/padview_body.ejs +++ b/etherpad/src/themes/default/templates/pad/padview_body.ejs @@ -113,8 +113,6 @@ limitations under the License. */ %><% <h2>Download as</h2> <img src="/static/img/may09/html.gif"><a class="tlink" href="/ep/pad/export/<%= padId %>/<%= revisionId %>?format=html" thref="/ep/pad/export/<%= padId %>/rev.%revision%?format=html">HTML</a><br> <img src="/static/img/may09/txt.gif" ><a class="tlink" href="/ep/pad/export/<%= padId %>/<%= revisionId %>?format=html" thref="/ep/pad/export/<%= padId %>/rev.%revision%?format=txt" >Plain text</a><br> -<img src="/static/img/may09/doc.gif" ><a class="tlink" href="/ep/pad/export/<%= padId %>/<%= revisionId %>?format=html" thref="/ep/pad/export/<%= padId %>/rev.%revision%?format=doc" >Microsoft Word</a><br> -<img src="/static/img/may09/pdf.gif" ><a class="tlink" href="/ep/pad/export/<%= padId %>/<%= revisionId %>?format=html" thref="/ep/pad/export/<%= padId %>/rev.%revision%?format=pdf" >PDF</a> </div> diff --git a/etherpad/src/themes/default/templates/pro-help/main.ejs b/etherpad/src/themes/default/templates/pro-help/main.ejs deleted file mode 100644 index 428d7f7..0000000 --- a/etherpad/src/themes/default/templates/pro-help/main.ejs +++ /dev/null @@ -1,35 +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. */ %> -<h1>EtherPad Professional Edition Help</h1> - -<p>These pages are evolving. If you have any questions, or find -parts of EtherPad confusing, please write in to our Helpdesk by -emailing <%= helpers.oemail("support") %>.</p> - -<p>Please report bugs to <%= helpers.oemail("bugs") %>.</p> - -<p>Also note that you can also get help from other users in the <a -href="http://etherpad.com/ep/about/forums">UserVoice Community -Forums</a>.</p> - -<h2>Help Topics:</h2> - -<ul> -<% helpTopics.forEach(function(t) { %> - <li><%= A({href: "/ep/pro-help/"+t[0]}, t[1]) %></li> -<% }); %> -</ul> - - - diff --git a/etherpad/src/themes/default/templates/pro-help/pro-help-template.ejs b/etherpad/src/themes/default/templates/pro-help/pro-help-template.ejs deleted file mode 100644 index 9cc8205..0000000 --- a/etherpad/src/themes/default/templates/pro-help/pro-help-template.ejs +++ /dev/null @@ -1,24 +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.includeJQuery() %> -<% helpers.includeJs("etherpad.js") %> -<% helpers.includeCss("pro-help.css") %> - -<div class="fpcontent"> - <div class="pro-help"> - <%= renderContent() %> - </div> -</div> - - - diff --git a/etherpad/src/themes/default/templates/pro/account/account-welcome-email.ejs b/etherpad/src/themes/default/templates/pro/account/account-welcome-email.ejs index 25af6f8..33e1ac5 100644 --- a/etherpad/src/themes/default/templates/pro/account/account-welcome-email.ejs +++ b/etherpad/src/themes/default/templates/pro/account/account-welcome-email.ejs @@ -22,7 +22,7 @@ Thank you for signing up for EtherPad Professional Edition. You can sign in by <%= signinLink %> -For help signing in, or general support issues, please email support@etherpad.com. +For help signing in, or general support issues, please email support@pad.spline.inf.fu-berlin.de. -- This email was sent to <%= toEmail %> from an EtherPad user. diff --git a/etherpad/src/themes/default/templates/pro/admin/admin-template.ejs b/etherpad/src/themes/default/templates/pro/admin/admin-template.ejs index e1a7736..a54964f 100644 --- a/etherpad/src/themes/default/templates/pro/admin/admin-template.ejs +++ b/etherpad/src/themes/default/templates/pro/admin/admin-template.ejs @@ -16,11 +16,9 @@ limitations under the License. */ %><% helpers.setHtmlTitle("Etherpad Administra <div class="fpcontent"> <table id="admin-layout-table"> <tr> - <% if (validLicense) { %> - <td width="1%" id="admin-leftnav"> - <%= renderAdminLeftNav() %> - </td> - <% } %> + <td width="1%" id="admin-leftnav"> + <%= renderAdminLeftNav() %> + </td> <td width="99%" id="admin-right"> <%= getAdminContent() %> </td> diff --git a/etherpad/src/themes/default/templates/pro/pro_home.ejs b/etherpad/src/themes/default/templates/pro/pro_home.ejs index 8d92139..bcf7443 100644 --- a/etherpad/src/themes/default/templates/pro/pro_home.ejs +++ b/etherpad/src/themes/default/templates/pro/pro_home.ejs @@ -67,20 +67,13 @@ limitations under the License. */ %><% helpers.setHtmlTitle(orgName + " - EtherP <div class="news-item"> <p>Welcome to your EtherPad Beta Account! Please report bugs by - sending email to <%= helpers.oemail("bugs") %>. You can also give us - feedback and feature suggestions via <a target="_blank" - href="http://uservoice.etherpad.com/">UserVoice</a>.</p> - - <p>If you have any questions, just email <%= - helpers.oemail("support") %> and - we will respond to your inquiries.</p> + sending email to <%= helpers.oemail("bugs") %>. <p>We hope you enjoy EtherPad!</p> <p>Sincerely,</p> - <p>Aaron Iba<br/> - CEO, AppJet Inc. + <p>Spline</p> </p> </div> |