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

1 files changed, 71 insertions, 0 deletions

diff --git a/etherpad/src/themes/default/templates/main/pro_signup_body.ejs b/etherpad/src/themes/default/templates/main/pro_signup_body.ejs
new file mode 100644
index 0000000..ff35dfc
--- /dev/null
+++ b/etherpad/src/themes/default/templates/main/pro_signup_body.ejs
@@ -0,0 +1,71 @@
+<% /* 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-signup.css') %>
+
+<div class="fpcontent">
+  <div class="pro-signup">
+
+    <h1>EtherPad Professional for Teams</h1>
+
+      <div id="about">
+
+        <p>Create a team site in order to keep track of pads and share
+        them privately within your team.</p>
+
+      </div>
+
+    <form id="pro-act-form"
+          method="post" action="<%= request.path %>">
+
+      <%= errorDiv() %>
+
+      <div>
+        <div class="inputdiv">
+          <h3>Your team site will live at:</h3>
+
+          <%= input("subdomain") %>.<%= request.host %>/
+        </div>
+        <div class="inputhelp">
+          This is where you and members of your team will sign
+          in.
+        </div>
+        <%= helpers.clearFloats() %>
+      </div>
+
+      <br/><br/>
+
+      <div>
+        <div class="inputdiv">
+          <h3>Administrator account</h3>
+          <%= inf("fullName", "Full Name") %>
+          <%= inf("email", "Email") %>
+        </div>
+        <div class="inputhelp">
+          <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>
+      
+      <br/>
+
+      <p><button type="submit" id="createbutton">Create team site now</button></p>
+
+    </form>
+
+    <p style="font-size: 80%;">Existing users: <a href="/ep/pro-account/sign-in">sign in
+    here</a></p>
+  </div>
+</div>
+