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, 413 deletions

diff --git a/trunk/etherpad/src/templates/pad/create_body.ejs b/trunk/etherpad/src/templates/pad/create_body.ejs
deleted file mode 100644
index 742821f..0000000
--- a/trunk/etherpad/src/templates/pad/create_body.ejs
+++ /dev/null
@@ -1,26 +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.setHtmlTitle("SplinePad [beta]: Create a new pad?"); %>
-
-<div id="createpadpage" class="fpcontent">
-  <form action="<%= request.path %>" method="post">
-
-    <p><tt id="padurl">http://<%= request.host %>/<%= toHTML(padId) %></tt></p>
-
-    <br/>
-    <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" />
-  </form>
-</div>
diff --git a/trunk/etherpad/src/templates/pad/create_body_rafter.ejs b/trunk/etherpad/src/templates/pad/create_body_rafter.ejs
deleted file mode 100644
index 28252c7..0000000
--- a/trunk/etherpad/src/templates/pad/create_body_rafter.ejs
+++ /dev/null
@@ -1,23 +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.setHtmlTitle("EtherPad: Create a new pad?"); %>
-
-<div id="createpadpage" class="fpcontent">
-
-    <p><tt>http://<%= request.host %>/<%= toHTML(padId) %></tt></p>
-
-    <p><strong>There is no EtherPad document here.</strong></p>
-
-  <p style="color:red">Creation of new free pads is permanently disabled as part of EtherPad's acquisition by Google. <a href="http://<%= fullSuperdomain %>/ep/blog/posts/google-acquires-appjet">Read more.</a></p>
-
-</div>
diff --git a/trunk/etherpad/src/templates/pad/exporthtml.ejs b/trunk/etherpad/src/templates/pad/exporthtml.ejs
deleted file mode 100644
index 288a595..0000000
--- a/trunk/etherpad/src/templates/pad/exporthtml.ejs
+++ /dev/null
@@ -1,28 +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. */ %><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-<HEAD>
-	<META HTTP-EQUIV="CONTENT-TYPE" CONTENT="text/html; charset=utf-8">
-	<TITLE></TITLE>
-	<STYLE TYPE="text/css">
-	<!--
-		@page { margin: 0.79in }
-		P { margin-bottom: 0.08in }
-	-->
-	</STYLE>
-</HEAD>
-<BODY LANG="en-US" DIR="LTR">
-<%= pre ? '<PRE>' : '' %><%= content %><%= pre ? '</PRE>' : '' %>
-</BODY>
-</HTML>
\ No newline at end of file
diff --git a/trunk/etherpad/src/templates/pad/pad_body.ejs b/trunk/etherpad/src/templates/pad/pad_body.ejs
deleted file mode 100644
index d932cd6..0000000
--- a/trunk/etherpad/src/templates/pad/pad_body.ejs
+++ /dev/null
@@ -1,69 +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. */ %><%
-  var padIdHtml = toHTML(request.url.split("?", 1)[0]);
-%>
-
-<% helpers.setHtmlTitle("EtherPad: "+toHTML(proTitle || request.path.substr(1))); %>
-<% helpers.setBodyId("padbody") %>
-<% helpers.addBodyClass(bodyClass) %>
-<% helpers.includeCss("pad.css") %>
-<% helpers.includeJs("undo-xpopup.js") %>
-<% helpers.includeCometJs() %>
-<% helpers.includeJQuery(); %>
-<% helpers.includeJs("json2.js") %>
-<% helpers.includeJs("ace.js") %>
-<% helpers.includeJs("collab_client.js") %>    
-<% helpers.includeJs("pad.js") %>
-<% helpers.suppressGA() %>
-<% helpers.setRobotsPolicy({index: false, follow: false}) %>
-
-<div id="padpage">
-
-<div id="modaloverlay">
-  <div id="modaldialog">
-    <div id="dialogtopbar">Foo.</div>
-    <table id="dialogcontenttable" cellpadding="0" cellspacing="0" border="0"><tr>
-      <td id="dialogcontent">This is a modal dialog!</td>
-    </tr></table>
-  </div>
-</div>
-<table id="padoutertable" cellpadding="0" cellspacing="0" border="0">
-<tr id="pot_toptr">
-  <td id="pot_shadlefttopseg" class="potshad">&nbsp;</td>
-  <td id="pot_top">
-    <a id="headhomelink" href="/">EtherPad</a>
-    <div id="headurl">
-      <label for="shareurl">Share this URL:</label>
-       &nbsp;<span id="shareurl"><%= padIdHtml %></span>
-    </div>
-    <a id="widthlink" href="javascript: void pad.toggleFullWidth()">M</a>
-    <a id="newpadlink" href="javascript:void pad.newPad()" 
-        title="Create and open a new pad in a new window">New Pad</a>
-  </td>
-  <td id="pot_shadrighttopseg" class="potshad">&nbsp;</td>
-</tr>
-
-<tr>
-  <td id="pot_shadleft" class="potshad"><div><!-- --></div></td>
-  <td id="pot_main">
-    <div id="padcontent">
-      <%= contentHtml %>
-    </div><!-- /padcontent -->
-  </td>
-  <td id="pot_shadright" class="potshad"><div><!-- --></div></td>
-</tr>
-
-</table><!-- /padoutertable -->
-  
-</div><!-- /padpage -->
diff --git a/trunk/etherpad/src/templates/pad/pad_download_link.ejs b/trunk/etherpad/src/templates/pad/pad_download_link.ejs
deleted file mode 100644
index e05d7d0..0000000
--- a/trunk/etherpad/src/templates/pad/pad_download_link.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. */ %><%
-
-var host = request.host;
-helpers.addToHead('<meta http-equiv="refresh" content="0;url=http://'+host+'/'+padId+'" />');
-
-%>
-
-<div id="refreshpage">
-  <h1>Etherpad</h1>
-
-  <p>This pad document, <a href="http://<%= host %>/<%= padId %>"><%= padId %></a>, is stored on <a href="http://<%= host %>"><%= host %></a>. Please click the link below to access this pad.</p>
-
-  <a style="size: 200%; text-align: center;" href="http://<%= host %>/<%= padId %>">http://<%= host %>/<%= padId %></a>
-
-</div>
\ No newline at end of file
diff --git a/trunk/etherpad/src/templates/pad/pad_iphone_body.ejs b/trunk/etherpad/src/templates/pad/pad_iphone_body.ejs
deleted file mode 100644
index 96279ce..0000000
--- a/trunk/etherpad/src/templates/pad/pad_iphone_body.ejs
+++ /dev/null
@@ -1,29 +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. */ %>
-<div style="font-size: 4em; font-family: sans-serif; text-align: center;">
-
-  <p>EtherPad is not yet fully-functional on the iPhone.</p>
-
-  <a style="display: block; padding: 1em; border: 3px solid #333; background: #ddd; margin: 1em; -webkit-border-radius: 1em;"
-     href="/ep/pad/view/<%= padId %>/latest">
-    View Read-Only
-  </a>
-
-  <a style="display: block; padding: 1em; border: 3px solid #333; background: #ddd; margin: 1em; -webkit-border-radius: 1em;"
-     href="/<%= padId %>?skipIphoneCheck=1">
-    Proceed to Editor<br/>
-    <span style="font-size: .6em;">(may not be fully-functional)</span>
-  </a>
-
-</div>
diff --git a/trunk/etherpad/src/templates/pad/padslider_body.ejs b/trunk/etherpad/src/templates/pad/padslider_body.ejs
deleted file mode 100644
index 51a9e84..0000000
--- a/trunk/etherpad/src/templates/pad/padslider_body.ejs
+++ /dev/null
@@ -1,41 +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.setHtmlTitle(toHTML("Time Slider"));
- helpers.setBodyId("padsliderbody");
- helpers.includeCss("etherpad.css");
- //helpers.includeCss("jqueryui/theme/ui.all.css");
- helpers.setRobotsPolicy({index: false, follow: false});
- helpers.includeJQuery();
- //helpers.includeJs("jquery-ui-slider-1.5.3.js");
- helpers.includeJs("json2.js");
- helpers.includeJs("timeslider.js");
-
- function dfmt(t) {
-   var d = new Date(t);
-   return d.toString();
- }
-%>
-
-<!-- <div id="sliderui"></div> -->
-<p>Powered by <a href="/">EtherPad</a>.</p><br />
-<div id="controls">
-<a href="<%= request.url %>#" class="prev">prev</a> /
-<a href="<%= request.url %>#" class="next">next</a> &nbsp; &nbsp;
-<a href="<%= request.url %>#" class="play">play</a> /
-<a href="<%= request.url %>#" class="stop">stop</a> &nbsp; &nbsp;
-seek to #<input class="entry" type="text" size="6"/>
-<div id="currevdisplay"><span class="min">0</span> --- <span class="cur">0</span> --- <span class="max">0</span></div>
-</div>
-
-<div id="stuff">Loading...</div>
diff --git a/trunk/etherpad/src/templates/pad/padview_body.ejs b/trunk/etherpad/src/templates/pad/padview_body.ejs
deleted file mode 100644
index e18ff12..0000000
--- a/trunk/etherpad/src/templates/pad/padview_body.ejs
+++ /dev/null
@@ -1,141 +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.addBodyClass(bodyClass);
- helpers.setHtmlTitle(toHTML(padId + " / " + rlabel));
- helpers.setBodyId("padviewbody");
- helpers.includeCss("broadcast.css");
- helpers.setRobotsPolicy({index: false, follow: false})
- helpers.includeJQuery();
- helpers.includeCometJs();
- helpers.includeJs("json2.js");
- helpers.includeJs("pad_utils.js");
- helpers.includeJs("broadcast_slider.js");
- helpers.includeJs("broadcast_revisions.js");
- helpers.includeJs("easysync2_client.js");
- helpers.includeJs("domline_client.js");
- helpers.includeJs("linestylefilter_client.js");
- helpers.includeJs("cssmanager_client.js");
- helpers.includeJs("broadcast.js");
- helpers.addToHead('\n<style type="text/css" title="dynamicsyntax"></style>\n');
-
- function dfmt(t) {
-   var d = new Date(t);
-   return d.toString();
- }
-
- function exportOption(type, label, requiresOffice, url, title) {
-   url = url || '/ep/pad/export/'+padId+'/'+revisionId+'?format='+type;
-   var aStart =
-     ['<a',
-      (requiresOffice && ! hasOffice ? ' class="disabledexport"' : ' href="'+url+'"'),
-      '>'].join('');
-   var r = ['<div class="exportlink" id="export', type, '"'];
-   if (title) {
-     r.push(' title="'+title+'"');
-   }
-   r.push('>');
-   r.push('<table cellspacing="0" cellpadding="0" border="0">');
-   r.push('<tr>');
-   r.push('<td class="exportpic" valign="middle">');
-   r.push(aStart, '<img src="/static/img/may09/'+type+'.gif" />', '</a>');
-   r.push('<td class="labelcell" valign="middle">');
-   r.push(aStart, label, '</a>');
-   if (title) {
-     r.push('<sup>?</sup>')
-   }
-   r.push('</td>');
-   r.push('</tr>');
-   r.push('</table>');
-   r.push('</div>');
-   return r.join('');
- }
-%>
-
-<div id="padpage">
-<div id="topbar" style="margin: 7px; margin-top: 0px;">
-  <div id="topbarleft"><!-- --></div>
-  <div id="topbarright"><!-- --></div>
-  <div id="topbarcenter">
-    <a href="/" id="topbaretherpad">EtherPad</a>
-  </div>
-<% if (isProAccountHolder) { %>
-    <div id="accountnav"><%= toHTML(account.email) %>
-      <a href="/ep/account/sign-out">(sign out)</a>
-    </div>
-<% } else if (isPro) { %>
-    <div id="accountnav">
-      <a href="<%= signinUrl %>">sign in</a>
-    </div>
-<% } %>
-</div>
-
-<div id="timeslider-wrapper">
-<div id="error" style="display: none">It looks like you're having connection troubles. <a href="/ep/pad/view/<%= padId %>/latest">Reconnect now</a>.</div>
-<div id="timeslider" unselectable="on" style="display: none">
-  <div id="timeslider-left"></div>
-  <div id="timeslider-right"></div>
-  <div id="timer"><%= dateFormat %></div>
-  <div id="timeslider-slider">
-    <div id="ui-slider-handle">
-
-    </div>
-    <div id="ui-slider-bar">
-
-    </div>
-  </div>
-  <div id="playpause_button">
-    <div id="playpause_button_icon" class=""></div>
-  </div>
-  <div id="steppers">
-    <div class="stepper" id="leftstar"></div>
-    <div class="stepper" id="rightstar"></div>
-    <div class="stepper" id="leftstep"></div>
-    <div class="stepper" id="rightstep"></div>
-  </div>
-</div>
-</div>
-<div id="rightbars">
-<div id="rightbar"><a id="viewlatest" href="/ep/pad/view/<%= padId %>/latest">
-<% if (revisionId != "latest") { %>View latest content<% } else { %>Viewing latest content<% } %></a><br>
-<a class="tlink" href="/ep/pad/view/<%= padId %>/<%= revisionId %>" thref="/ep/pad/view/<%= padId %>/rev.%revision%">Link to this version</a>
-<% if (readOnly === false) { %><br><a class="tlink" href="/ep/pad/view/<%= roPadId %>/<%= revisionId %>" thref="/ep/pad/view/<%= roPadId %>/rev.%revision%">Link to read-only page</a><br><a href="/<%= padId %>">Edit this pad</a><% } %>
-<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>
-
-
-</div>
-<div id="legend">
-<h2>Authors</h2>
-<table id="authorstable" border="0" cellspacing="0" cellpadding="0">
-
-</table>
-</div>
-
-</div>
-<div id="padmain"
-     <% if (request.userAgent.isIPhone()) { %> style="font-size: 3em;" <% } %>
->
-<div id="titlebar"><h1><%= padTitle %></h1><div id="revision"><span id="revision_label"><%= rlabel %></span><br><span id="revision_date">
-Saved
-<%= ["Jan", "Feb", "March", "April", "May", "June", "July", "Aug", "Sept", "Oct", "Nov", "Dec"][new Date(savedWhen).getMonth()] %>
-<%= new Date(savedWhen).getDate() %>,
-<%= new Date(savedWhen).getFullYear() %>
-</span></div></div>
-  <div id="padcontent"
-     <% if (request.userAgent.isIPhone()) { %> style="font-size: 1.3em;" <% } %>
-  >
-<%= padHTML %></div>
-</div>
-</div>
diff --git a/trunk/etherpad/src/templates/pad/total_users_exceeded.ejs b/trunk/etherpad/src/templates/pad/total_users_exceeded.ejs
deleted file mode 100644
index 7ac7e1b..0000000
--- a/trunk/etherpad/src/templates/pad/total_users_exceeded.ejs
+++ /dev/null
@@ -1,29 +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. */ %><div class="fpcontent"
-     style="font-family: Verdana, sans-serif; margin-top: 2em; border: 1px solid #ccc; padding: 1em; background: #eee;">
-
-  <h1>EtherPad Server Is Full</h1>
-
-  <p>Sorry, this EtherPad server is only licensed to service
-    <%= userQuota %> active users
-    within a <%= activeUserWindowHours %>-hour period,
-    and that quota is currently full.</p>
-
-  <p>Please contact your server administrator and ask him or her to
-    purchase a license with additional users.</p>
-
-  <a href="/">&laquo; Home</a>
-
-</div>
-