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

diff --git a/etherpad/src/etherpad/control/pne_manual_control.js b/etherpad/src/etherpad/control/pne_manual_control.js
new file mode 100644
index 0000000..0dd65f8
--- /dev/null
+++ b/etherpad/src/etherpad/control/pne_manual_control.js
@@ -0,0 +1,75 @@
+/**
+ * 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.
+ */
+
+import("funhtml.*");
+
+import("etherpad.utils.*");
+import("etherpad.globals.*");
+
+function onRequest() {
+  var p = request.path.split('/')[3];
+  if (!p) {
+    p = "main";
+  }
+  if (_getTitle(p)) {
+    _renderManualPage(p);
+    return true;
+  } else {
+    return false;
+  }
+}
+
+function _getTitle(t) {
+  var titles = {
+    'main': " ",
+    'installation-guide': "Installation Guide",
+    'upgrade-guide': "Upgrade Guide",
+    'configuration-guide': "Configuration Guide",
+    'troubleshooting': "Troubleshooting",
+    'faq': "FAQ",
+    'changelog': "ChangeLog"
+  };
+  return titles[t];
+}
+
+function _renderTopnav(p) {
+  var d = DIV({className: "pne-manual-topnav"});
+  if (p != "main") {
+    d.push(A({href: '/ep/pne-manual/'}, "PNE Manual"),
+           "  >  ",
+           _getTitle(p));
+  }
+  return d;
+}
+
+function _renderManualPage(p, data) {
+  data = (data || {});
+  data.pneVersion = PNE_RELEASE_VERSION;
+
+  function getContent() {
+    return renderTemplateAsString('pne-manual/'+p+'.ejs', data);
+  }
+  renderFramed('pne-manual/manual-template.ejs', {
+    getContent: getContent,
+    renderTopnav: function() { return _renderTopnav(p); },
+    title: _getTitle(p),
+    id: p,
+  });
+  return true;
+}
+
+
+