Merge remote branch 'upstream/master'

Conflicts:
	etherpad/src/etherpad/control/pro/admin/pro_admin_control.js
	etherpad/src/etherpad/control/pro/pro_main_control.js
	etherpad/src/etherpad/control/pro_help_control.js
	etherpad/src/etherpad/globals.js
	etherpad/src/etherpad/legacy_urls.js
	etherpad/src/etherpad/pne/pne_utils.js
	etherpad/src/etherpad/pro/pro_utils.js
	etherpad/src/main.js
	etherpad/src/plugins/fileUpload/templates/fileUpload.ejs
	etherpad/src/plugins/testplugin/templates/page.ejs
	etherpad/src/static/css/pad2_ejs.css
	etherpad/src/static/css/pro-help.css
	etherpad/src/static/img/jun09/pad/protop.gif
	etherpad/src/static/js/store.js
	etherpad/src/themes/default/templates/framed/framedheader-pro.ejs
	etherpad/src/themes/default/templates/main/home.ejs
	etherpad/src/themes/default/templates/pro-help/main.ejs
	etherpad/src/themes/default/templates/pro-help/pro-help-template.ejs
	infrastructure/com.etherpad/licensing.scala
	trunk/etherpad/src/etherpad/collab/ace/contentcollector.js
	trunk/etherpad/src/etherpad/collab/ace/linestylefilter.js
	trunk/etherpad/src/static/css/home-opensource.css
	trunk/etherpad/src/static/js/ace.js
	trunk/etherpad/src/static/js/linestylefilter_client.js
	trunk/etherpad/src/templates/email/eepnet_license_info.ejs
	trunk/etherpad/src/templates/pad/pad_body2.ejs
	trunk/etherpad/src/templates/pad/pad_content.ejs
	trunk/etherpad/src/templates/pad/padfull_body.ejs
	trunk/etherpad/src/templates/pro/admin/pne-license-manager.ejs

9 files changed, 0 insertions, 410 deletions

diff --git a/trunk/etherpad/src/templates/pro/account/account-welcome-email.ejs b/trunk/etherpad/src/templates/pro/account/account-welcome-email.ejs
deleted file mode 100644
index 33e1ac5..0000000
--- a/trunk/etherpad/src/templates/pro/account/account-welcome-email.ejs
+++ /dev/null
@@ -1,32 +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. */ %>
-Dear <%= account.fullName %>,
-
-<% if (adminAccount) { %>
-<%= adminAccount.fullName %> has created an EtherPad account for you on <%=
-request.host %> (<%= siteName %>).  You can sign in by clicking on the following link:
-<% } else { %>
-Thank you for signing up for EtherPad Professional Edition.  You can sign in by clicking on the following link:
-<% } %>
-
-<%= signinLink %>
-
-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.
-If you received it in error, you may safely ignore it.
-<%/* EtherPad's offices are located at Pier 38, The Embarcadero,
-San Francisco, CA 94107 */%>
-
diff --git a/trunk/etherpad/src/templates/pro/account/create-admin-account.ejs b/trunk/etherpad/src/templates/pro/account/create-admin-account.ejs
deleted file mode 100644
index 2a6c9f8..0000000
--- a/trunk/etherpad/src/templates/pro/account/create-admin-account.ejs
+++ /dev/null
@@ -1,37 +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.includeCss("pro/account.css") %>
-
-<div class="fpcontent">
-  <div class="account-container">
-
-  <h3>Welcome to your own EtherPad server!</h3>
-
-  <p>To get started, please create an administrator account.  This
-  account will also be the primary admin contact for this
-  system.</p>
-
-  <%= errorDiv() %>
-
-  <%= renderAccountForm('create-admin-account', [
-    {title: "Create Admin Account"},
-    {text: "fullName", label: "Full Name:"},
-    {text: "email", label: "Email:"},
-    {password: "password", label: "Password:"},
-    {password: "passwordConfirm", label: "Confirm Password:"},
-    {submit: "Create Account"}
-  ]) %>
-
-  </div>
-</div>
-
diff --git a/trunk/etherpad/src/templates/pro/account/forgot-password-email.ejs b/trunk/etherpad/src/templates/pro/account/forgot-password-email.ejs
deleted file mode 100644
index 4595cee..0000000
--- a/trunk/etherpad/src/templates/pro/account/forgot-password-email.ejs
+++ /dev/null
@@ -1,22 +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. */ %>
-Dear <%= account.fullName %>,
-
-We received a request to reset your EtherPad password.  To proceed, click the following link:
-
-<%= recoverUrl %>
-
-If you did not request a password reset, simply ignore this email.
-
-
diff --git a/trunk/etherpad/src/templates/pro/account/forgot-password.ejs b/trunk/etherpad/src/templates/pro/account/forgot-password.ejs
deleted file mode 100644
index bbc78dd..0000000
--- a/trunk/etherpad/src/templates/pro/account/forgot-password.ejs
+++ /dev/null
@@ -1,66 +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.includeCss("pro/account.css") %>
-<% helpers.setHtmlTitle("EtherPad: Forgot Password") %>
-
-<div class="fpcontent">
-  <div class="account-container forgotpass-container">
-
-    <% var md = messageDiv(); %>
-    <% if (md) { %>
-        <%= md %>
-    <% } else { %>
-
-      <form action="<%= request.path + '?' + request.query %>"
-            method="post">
-
-        <div class="bb bb-forgotpass">
-          <div class="bb-top">
-            <div class="bb-topleft"><!-- --></div>
-            <div class="bb-topright"><!-- --></div>
-            <div class="bb-title">Recover Lost Password</div>
-          </div>
-          <div class="bb-in">
-
-            <%= errorDiv() %>
-
-            <div id="instructions">
-              Enter your email address and we will send you a link
-              to reset your password.
-            </div>
-
-            <div>
-              <label for="email" id="email-label">Email</label>
-              <input class="textin" type="text" name="email" id="email" value="<%= email
-              %>" />
-              <%= helpers.clearFloats() %>
-            </div>
-
-            <div>
-              <button type="submit" class="bluebutton
-              bluebutton120">
-                Send Email
-              </button>
-              <%= helpers.clearFloats() %>
-            </div>
-
-          </div>
-        </div>
-      </form>
-    <% } %>
-
-    <p><a href="/ep/account/sign-in">&laquo; Back to sign-in</a></p>
-
-  </div>
-</div>
-
diff --git a/trunk/etherpad/src/templates/pro/account/global-multi-domain-recover-email.ejs b/trunk/etherpad/src/templates/pro/account/global-multi-domain-recover-email.ejs
deleted file mode 100644
index d2eb4de..0000000
--- a/trunk/etherpad/src/templates/pro/account/global-multi-domain-recover-email.ejs
+++ /dev/null
@@ -1,27 +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. */ %>
-Dear <%= accountList[0].fullName %>,
-
-We received a request to recover the EtherPad password for "<%=
-email %>.  We found multiple accounts linked to this email address.
-Please choose one of the following URLs to proceed with recovering the
-password for that EtherPad site:
-
-<% for (var i = 0; i < accountList.length; i++) { %>
-<%= recoverLink(accountList[i], domainList[i]) %>
-<% } %>
-
---
-If you did not request a password reset, simply ignore this email.
-
diff --git a/trunk/etherpad/src/templates/pro/account/guest-knock.ejs b/trunk/etherpad/src/templates/pro/account/guest-knock.ejs
deleted file mode 100644
index 44c69c0..0000000
--- a/trunk/etherpad/src/templates/pro/account/guest-knock.ejs
+++ /dev/null
@@ -1,27 +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("pro/guest-knock-client.js") %>
-<% helpers.includeCss("pro/account.css") %>
-
-<div id="guest-knock-box">
-  <p>
-    <img src="/static/img/misc/status-ball.gif">
-    Waiting for approval...
-  </p>
-</div>
-
-<div id="guest-knock-denied">
-  Access Denied.
-</div>
-
diff --git a/trunk/etherpad/src/templates/pro/account/my-account.ejs b/trunk/etherpad/src/templates/pro/account/my-account.ejs
deleted file mode 100644
index 9634285..0000000
--- a/trunk/etherpad/src/templates/pro/account/my-account.ejs
+++ /dev/null
@@ -1,67 +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.includeCss("pro/account.css") %>
-<% helpers.setHtmlTitle("EtherPad: My Account") %>
-
-<div class="fpcontent">
-<div class="my-account">
-  <%= messageDiv() %>
-  <%= errorDiv() %>
-
-<% if (!changePass) { %>
-  <h2>My Info</h2>
-
-  <form method="post" action="/ep/account/update-info">
-  <table>
-    <tr>
-      <th>Full Name:</th>
-      <td class="ti"><%= INPUT({type: 'text', name: 'fullName',
-      value: account.fullName}) %></td>
-    </tr>
-    <tr>
-      <th>Email:</th>
-      <td class="ti"><%= INPUT({type: 'text', name: 'email', value:
-      account.email}) %></td>
-    </tr>
-    <tr>
-      <td colspan="2" style="text-align: right;">
-        <input type="submit" value="Update Info" />
-      </td>
-    </tr>
-  </table>
-  </form>
-<% } %>
-
-<h2>Password</h2>
-
-<form method="post" action="/ep/account/update-password">
-<table>
-  <tr>
-    <th>New Password:</th>
-    <td class="ti"><%= INPUT({type: 'password', name: 'password', value: ''}) %></td>
-  </tr>
-  <tr>
-    <th>Confirm Password:</th>
-    <td class="ti"><%= INPUT({type: 'password', name: 'passwordConfirm', value: ''}) %></td>
-  </tr>
-  <tr>
-    <td colspan="2" style="text-align: right;">
-      <input type="submit" id="passwordSubmit" value="Update Password" />
-    </td>
-  </tr>
-</table>
-</form>
-
-</div>
-</div>
-
diff --git a/trunk/etherpad/src/templates/pro/account/signin-guest.ejs b/trunk/etherpad/src/templates/pro/account/signin-guest.ejs
deleted file mode 100644
index 621c381..0000000
--- a/trunk/etherpad/src/templates/pro/account/signin-guest.ejs
+++ /dev/null
@@ -1,51 +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.includeCss("pro/account.css") %>
-<% helpers.includeJQuery() %>
-<% helpers.includeJs("pro/signin-client.js") %>
-<% helpers.setHtmlTitle("EtherPad: Sign In") %>
-
-<div class="fpcontent">
-  <div class="account-container">
-
-    <form id="guest-signin-form"
-          action="<%= request.path + '?' + request.query %>" method="post"
-          style="border: 1px solid #5a5; background: #efe; padding: 1em;">
-
-      <div style="font-weight: bold;">Guest Sign In:</div>
-
-      <% if (errorMessage) { %>
-        <div style="margin: 1em 0; padding: 1em; border: 1px solid red; background: #fee;">
-          <%= errorMessage %>
-        </div>
-      <% } %>
-
-      <p>Enter your name to be displayed to other users:</p>
-      <input id="guestDisplayName" type="text" name="guestDisplayName" value="<%= guestName
-      %>" />
-      <input type="hidden" name="localPadId" value="<%= localPadId %>" />
-
-      <input type="submit" value="Request Access" />
-
-    </form>
-
-    <form id="account-signin-choice"
-          method="get"
-          action="/ep/account/sign-in">
-      <input type="hidden" name="guest" value="1" />
-      <input type="hidden" name="padId" value="<%= toHTML(localPadId) %>" />
-      Account holders: <button>Sign in</button>
-    </form>
-  </div>
-</div>
-
diff --git a/trunk/etherpad/src/templates/pro/account/signin.ejs b/trunk/etherpad/src/templates/pro/account/signin.ejs
deleted file mode 100644
index c67bea6..0000000
--- a/trunk/etherpad/src/templates/pro/account/signin.ejs
+++ /dev/null
@@ -1,81 +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("pro/signin-client.js") %>
-<% helpers.includeCss("pro/account.css") %>
-<% helpers.setHtmlTitle("EtherPad: Sign In") %>
-
-<div class="fpcontent">
-  <div class="account-container">
-
-  <%= signinNotice() %>
-
-  <form id="signin-form" action="<%= request.path + '?' + request.query %>" method="post">
-  <div class="bb bb-signin">
-    <div class="bb-top">
-      <div class="bb-topleft"><!-- --></div>
-      <div class="bb-topright"><!-- --></div>
-      <div class="bb-title">Sign In to <%= siteName %> EtherPad</div>
-    </div>
-    <div class="bb-in">
-      <%= errorDiv() %>
-      <div>
-        <label for="email" id="email-label">Email</label>
-        <input class="textin" type="text" name="email" id="email" value="<%= email
-        %>" />
-        <%= helpers.clearFloats() %>
-      </div>
-
-      <div>
-        <label for="password" id="password-label">Password</label>
-        <input class="passin" type="password" name="password"
-        id="password"
-        value="<%= password
-        %>" />
-        <%= helpers.clearFloats() %>
-      </div>
-
-      <div>
-        <input type="checkbox" id="rememberMe" name="rememberMe"
-          <%= (rememberMe ? 'checked="on"' : '') %> />
-        <label for="rememberMe" id="rememberMe-label">Remember me on this
-        computer</label>
-
-        <button type="submit" class="bluebutton bluebutton120" id="signInButton">
-          Sign In
-        </button>
-        <%= helpers.clearFloats() %>
-      </div>
-
-    </div>
-  </div>
-  </form>
-
-  <% if (showGuestBox) { %>
-    <form action="/ep/account/guest-sign-in"
-          id="guest-signin-choice"
-          method="get">
-      <input type="hidden" name="padId" value="<%= toHTML(localPadId) %>" />
-      Guests: <button type="submit">Request Guest Access</button>
-    </form>
-  <% } %>
-
-  <div id="bottom-text">
-      <a
-      href="/ep/account/forgot-password">Recover lost
-      password</a>
-  </div>
-
-  </div>
-</div>
-