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, 69 insertions, 0 deletions

diff --git a/etherpad/src/plugins/twitterStyleTags/templates/tagRss.ejs b/etherpad/src/plugins/twitterStyleTags/templates/tagRss.ejs
new file mode 100644
index 0000000..2d06781
--- /dev/null
+++ b/etherpad/src/plugins/twitterStyleTags/templates/tagRss.ejs
@@ -0,0 +1,69 @@
+<?xml version="1.0"?>
+<%
+ function inArray(item, arr) {
+   for (var i = 0; i < arr.length; i++)
+     if (arr[i] == item)
+       return true;
+   return false;
+ }
+%>
+<rss version="2.0">
+   <channel>
+      <title>
+	 <% if (tags.length == 0 && antiTags.length == 0) { %>
+	   Latest changed pads
+	 <% } else { %>
+	   <% for (i = 0; i < tags.length; i++) { %>
+	     #<%= tags[i] %>
+	   <% } %>
+	   <% for (i = 0; i < antiTags.length; i++) { %>
+	     !#<%= antiTags[i] %>
+	   <% } %>
+	 <% } %>
+      </title>
+      <link>http://liftoff.msfc.nasa.gov/</link>
+      <description>
+         Etherpad pads / changes for the query:
+	 <% if (tags.length == 0 && antiTags.length == 0) { %>
+	   Latest changed pads
+	 <% } else { %>
+	   <% for (i = 0; i < tags.length; i++) { %>
+	     #<%= tags[i] %>
+	   <% } %>
+	   <% for (i = 0; i < antiTags.length; i++) { %>
+	     !#<%= antiTags[i] %>
+	   <% } %>
+	 <% } %>
+      </description>
+      <language>en-us</language>
+      <pubDate>Tue, 10 Jun 2003 04:00:00 GMT</pubDate>
+      <lastBuildDate>Tue, 10 Jun 2003 09:41:01 GMT</lastBuildDate>
+      <docs>http://blogs.law.harvard.edu/tech/rss</docs>
+      <generator>Etherpad</generator>
+      <managingEditor>editor@example.com</managingEditor>
+      <webMaster>webmaster@example.com</webMaster>
+
+      <% for (i = 0; i < matchingPads.length; i++) { %>
+        <%
+	   var matchingPadId = matchingPads[i].ID;
+	   var matchingPadUrl = matchingPadId;
+	   if (!inArray('writable', matchingPads[i].TAGS)) {
+	     matchingPadId = padIdToReadonly(matchingPads[i].ID);
+	     matchingPadUrl = 'ep/pad/view/' + matchingPadId + '/latest';
+	   }
+        %>
+	<item>
+	  <title><%= matchingPadId %></title>
+	  <link>http://<%= request.host %>/<%= matchingPadUrl %></link>
+	  <description>
+	    <% for (j = 0; j < matchingPads[i].TAGS.length; j++) { %>
+	     #<%= matchingPads[i].TAGS[j] %>
+	    <% } %>
+	  </description>
+	  <pubDate><%= matchingPads[i].lastWriteTime %></pubDate>
+	  <guid>http://<%= request.host %>/<%= matchingPadUrl %></guid>
+	</item>
+      <% } %>
+
+   </channel>
+</rss>
\ No newline at end of file