From 37c2673926c8831bbb99a531a0c691912c3a2860 Mon Sep 17 00:00:00 2001 From: "alexanders@b2ef00c0-3703-41da-baef-cfe82387ac0c" Date: Wed, 3 Feb 2010 11:24:35 +0000 Subject: removed help/billing, changed some email adesses --HG-- extra : convert_revision : svn%3Ab2ef00c0-3703-41da-baef-cfe82387ac0c/trunk%4022 --- .../control/pro/admin/pro_admin_control.js | 3 -- etherpad/src/etherpad/helpers.js | 4 +- etherpad/src/main.js | 2 - etherpad/src/static/js/etherpad.js | 4 +- etherpad/src/templates/framed/framedheader-pro.ejs | 1 - etherpad/src/templates/pro-help/billing.ejs | 45 ---------------------- etherpad/src/templates/pro-help/essentials.ejs | 18 --------- etherpad/src/templates/pro-help/main.ejs | 35 ----------------- .../src/templates/pro-help/pro-help-template.ejs | 24 ------------ etherpad/src/templates/pro/pro_home.ejs | 11 +----- 10 files changed, 6 insertions(+), 141 deletions(-) delete mode 100644 etherpad/src/templates/pro-help/billing.ejs delete mode 100644 etherpad/src/templates/pro-help/essentials.ejs delete mode 100644 etherpad/src/templates/pro-help/main.ejs delete mode 100644 etherpad/src/templates/pro-help/pro-help-template.ejs diff --git a/etherpad/src/etherpad/control/pro/admin/pro_admin_control.js b/etherpad/src/etherpad/control/pro/admin/pro_admin_control.js index 6d482ce..b42378f 100644 --- a/etherpad/src/etherpad/control/pro/admin/pro_admin_control.js +++ b/etherpad/src/etherpad/control/pro/admin/pro_admin_control.js @@ -56,9 +56,6 @@ function _getLeftnavItems() { [_PRO, "pro-config", "Application Configuration"]]], [_PNE_ONLY, null, "Documentation"], [_PNE_ONLY, "/ep/pne-manual/", "Administrator's Manual"], - [_ONDEMAND_ONLY, null, "Billing"], - [_ONDEMAND_ONLY, "billing/", "Payment Information"], - [_ONDEMAND_ONLY, "billing/invoices", "Past Invoices"], ] ]; return nav; diff --git a/etherpad/src/etherpad/helpers.js b/etherpad/src/etherpad/helpers.js index e16c2f7..cafa201 100644 --- a/etherpad/src/etherpad/helpers.js +++ b/etherpad/src/etherpad/helpers.js @@ -194,8 +194,8 @@ function cssIncludes() { } function oemail(username) { - return '<'+ - username+'@e***rp*d.com>'; + return '<'+ + username+'@p*d.sp***e.inf.fu-berlin.de>'; } function googleAnalytics() { diff --git a/etherpad/src/main.js b/etherpad/src/main.js index 6c9e959..2cddbac 100644 --- a/etherpad/src/main.js +++ b/etherpad/src/main.js @@ -48,7 +48,6 @@ import("etherpad.control.pro.admin.license_manager_control"); import("etherpad.control.pro_beta_control"); import("etherpad.control.pro.pro_main_control"); import("etherpad.control.pro_signup_control"); -import("etherpad.control.pro_help_control"); import("etherpad.control.scriptcontrol"); import("etherpad.control.static_control"); import("etherpad.control.store.storecontrol"); @@ -366,7 +365,6 @@ function handlePath() { [/^\/([^\/]+)$/, pad_control.render_pad], [DirMatcher('/ep/unit-tests/'), forward(testcontrol)], [DirMatcher('/ep/pne-manual/'), forward(pne_manual_control)], - [DirMatcher('/ep/pro-help/'), forward(pro_help_control)] ]); var etherpadDotComDispatcher = new Dispatcher(); diff --git a/etherpad/src/static/js/etherpad.js b/etherpad/src/static/js/etherpad.js index feca517..4e51dbf 100644 --- a/etherpad/src/static/js/etherpad.js +++ b/etherpad/src/static/js/etherpad.js @@ -47,8 +47,8 @@ etherpad.validEmail = function(x) { etherpad.deobfuscateEmails = function() { $("a.obfuscemail").each(function() { - $(this).html($(this).html().replace('e***rp*d','etherpad')); - this.href = this.href.replace('e***rp*d','etherpad'); + $(this).html($(this).html().replace('p*d.sp***e','pad.spline')); + this.href = this.href.replace('p*d.sp***e','pad.spline'); }); }; diff --git a/etherpad/src/templates/framed/framedheader-pro.ejs b/etherpad/src/templates/framed/framedheader-pro.ejs index 0265b6d..fac9eee 100644 --- a/etherpad/src/templates/framed/framedheader-pro.ejs +++ b/etherpad/src/templates/framed/framedheader-pro.ejs @@ -45,7 +45,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']); diff --git a/etherpad/src/templates/pro-help/billing.ejs b/etherpad/src/templates/pro-help/billing.ejs deleted file mode 100644 index 269d37b..0000000 --- a/etherpad/src/templates/pro-help/billing.ejs +++ /dev/null @@ -1,45 +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. */ %> -

Account Quotas and Billing

- -

-EtherPad Professional Edition allows you to create accounts for members -of your team. Account-holders may sign in at -your-domain.etherpad.com. -

- -

You may have up to <%= numFreeAccounts %> accounts for free. Once you -try to add more accounts, you will be prompted to enter payment -information. Above <%= numFreeAccounts %> accounts, you will be charged -$<%= pricePerAccount %> per account per month. For example, to have <%= -numFreeAccounts+1 %> accounts will cost a total of $<%= pricePerAccount * -(numFreeAccounts+1) %> per month.

- -

You are billed at the end of your monthly billing cycle, so if you -start on January 1st, you will not be billed until February 1st. To -compute the total amount charged at the end of the month, we use the -maximum number of accounts that existed throughout the month. So -if you create 10 accounts, but then delete 3 before the end of the month, - you will still be charged for 10 at the end of the month. Likewise, if - you create 10 accounts, delete them all, and create 10 new accounts, - you will be charged for 10 accounts.

- -

EtherPad lets you to collaborate with guests in -addition to account-holders. Guests are users who do not have accounts -but join you in public pads on your site. You can always have unlimited -guest collaborators, and you are not ever charged for guests. You are -only charged for account-holders.

- - - diff --git a/etherpad/src/templates/pro-help/essentials.ejs b/etherpad/src/templates/pro-help/essentials.ejs deleted file mode 100644 index a1bcc87..0000000 --- a/etherpad/src/templates/pro-help/essentials.ejs +++ /dev/null @@ -1,18 +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. */ %> -

EtherPad Professional Essentials

- - - - diff --git a/etherpad/src/templates/pro-help/main.ejs b/etherpad/src/templates/pro-help/main.ejs deleted file mode 100644 index 428d7f7..0000000 --- a/etherpad/src/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. */ %> -

EtherPad Professional Edition Help

- -

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") %>.

- -

Please report bugs to <%= helpers.oemail("bugs") %>.

- -

Also note that you can also get help from other users in the UserVoice Community -Forums.

- -

Help Topics:

- - - - - diff --git a/etherpad/src/templates/pro-help/pro-help-template.ejs b/etherpad/src/templates/pro-help/pro-help-template.ejs deleted file mode 100644 index 9cc8205..0000000 --- a/etherpad/src/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") %> - -
-
- <%= renderContent() %> -
-
- - - diff --git a/etherpad/src/templates/pro/pro_home.ejs b/etherpad/src/templates/pro/pro_home.ejs index 8d92139..bcf7443 100644 --- a/etherpad/src/templates/pro/pro_home.ejs +++ b/etherpad/src/templates/pro/pro_home.ejs @@ -67,20 +67,13 @@ limitations under the License. */ %><% helpers.setHtmlTitle(orgName + " - EtherP

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 UserVoice.

- -

If you have any questions, just email <%= - helpers.oemail("support") %> and - we will respond to your inquiries.

+ sending email to <%= helpers.oemail("bugs") %>.

We hope you enjoy EtherPad!

Sincerely,

-

Aaron Iba
- CEO, AppJet Inc. +

Spline

-- cgit v1.2.3