removed help/billing, changed some email adesses

--HG--
extra : convert_revision : svn%3Ab2ef00c0-3703-41da-baef-cfe82387ac0c/trunk%4022

10 files changed, 6 insertions, 141 deletions

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 '&lt;<a class="obfuscemail" href="mailto:'+username+'@e***rp*d.com">'+
-    username+'@e***rp*d.com</a>&gt;';
+  return '&lt;<a class="obfuscemail" href="mailto:'+username+'@p*d.sp***e.inf.fu-berlin.de">'+
+    username+'@p*d.sp***e.inf.fu-berlin.de</a>&gt;';
 }
 
 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. */ %>
-<h1>Account Quotas and Billing</h1>
-
-<p>
-EtherPad Professional Edition allows you to create accounts for members
-of your team.  Account-holders may sign in at
-<tt>your-domain.etherpad.com</tt>.
-</p>
-
-<p>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.</p>
-
-<p>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
-<b>maximum number of accounts that existed throughout the month</b>.  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.</p>
-
-<p>EtherPad lets you to collaborate with <b>guests</b> 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.</p>
-
-
-
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. */ %>
-<h1>EtherPad Professional Essentials</h1>
-
-
-
-  
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. */ %>
-<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/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") %>
-
-<div class="fpcontent">
-  <div class="pro-help">
-    <%= renderContent() %>
-  </div>
-</div>
-
-
-
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
 
     <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>