diff options
Diffstat (limited to 'etherpad')
-rw-r--r-- | etherpad/src/etherpad/control/pro/admin/pro_admin_control.js | 6 | ||||
-rw-r--r-- | etherpad/src/etherpad/pne/pne_utils.js | 41 | ||||
-rw-r--r-- | etherpad/src/static/css/pad2_ejs.css | 4 | ||||
-rw-r--r-- | etherpad/src/static/js/broadcast_slider.js | 2 | ||||
-rw-r--r-- | etherpad/src/templates/pad/exporthtml.ejs | 28 | ||||
-rw-r--r-- | etherpad/src/templates/pro/admin/pro-config.ejs | 55 | ||||
-rw-r--r-- | etherpad/src/themes/default/templates/pro/admin/admin-template.ejs | 2 |
7 files changed, 89 insertions, 49 deletions
diff --git a/etherpad/src/etherpad/control/pro/admin/pro_admin_control.js b/etherpad/src/etherpad/control/pro/admin/pro_admin_control.js index 6d482ce..1364176 100644 --- a/etherpad/src/etherpad/control/pro/admin/pro_admin_control.js +++ b/etherpad/src/etherpad/control/pro/admin/pro_admin_control.js @@ -48,17 +48,11 @@ function _getLeftnavItems() { _PRO, [ [_PRO, null, "Admin"], [_PNE_ONLY, "pne-dashboard", "Server Dashboard"], - [_PNE_ONLY, "pne-license-manager/", "Manage License"], [_PRO, "account-manager/", "Manage Accounts"], [_PRO, "recover-padtext", "Recover Pad Text"], [_PRO, null, "Configuration"], [_PRO, [[_PNE_ONLY, "pne-config", "Private Server Configuration"], [_PRO, "pro-config", "Application Configuration"]]], - [_PNE_ONLY, null, "Documentation"], - [_PNE_ONLY, "/ep/pne-manual/", "Administrator's Manual"], - [_ONDEMAND_ONLY, null, "Billing"], - [_ONDEMAND_ONLY, "billing/", "Payment Information"], - [_ONDEMAND_ONLY, "billing/invoices", "Past Invoices"], ] ]; return nav; diff --git a/etherpad/src/etherpad/pne/pne_utils.js b/etherpad/src/etherpad/pne/pne_utils.js index bc105bd..073ad2a 100644 --- a/etherpad/src/etherpad/pne/pne_utils.js +++ b/etherpad/src/etherpad/pne/pne_utils.js @@ -117,6 +117,7 @@ function saveDbVersion() { var _eepneAllowedConfigVars = [ 'configFile', + 'etherpad.soffice', 'etherpad.useMySQL', 'etherpad.SQL_JDBC_DRIVER', 'etherpad.SQL_JDBC_URL', @@ -134,54 +135,14 @@ var _eepneAllowedConfigVars = [ ]; function isServerLicensed() { - var licenseInfo = licensing.getLicense(); - if (!licenseInfo) { - return false; - } - if (licensing.isVersionTooOld()) { - return false; - } - if (licensing.isExpired()) { - return false; - } return true; } function enableTrackingAgain() { - delete appjet.cache.noMorePneTracking; } function pneTrackerHtml() { - if (!isPNE()) { - return ""; - } - if (appjet.cache.noMorePneTracking) { - return ""; - } - - var div = DIV({style: "height: 1px; width: 1px; overflow: hidden;"}); - - var licenseInfo = licensing.getLicense(); - var key = null; - if (licenseInfo) { - key = md5(licenseInfo.key).substr(0, 16); - } - - function trackData(name, value) { - var imgurl = "http://etherpad.com/ep/tpne/t?"; - if (key) { - imgurl += ("k="+key+"&"); - } - imgurl += (encodeURIComponent(name) + "=" + encodeURIComponent(value)); - div.push(IMG({src: imgurl})); - } - - trackData("ping", "1"); - trackData("dbdriver", appjet.config['etherpad.SQL_JDBC_DRIVER']); - trackData("request.url", request.url); - appjet.cache.noMorePneTracking = true; - return div; } diff --git a/etherpad/src/static/css/pad2_ejs.css b/etherpad/src/static/css/pad2_ejs.css index 08e95d2..df367c4 100644 --- a/etherpad/src/static/css/pad2_ejs.css +++ b/etherpad/src/static/css/pad2_ejs.css @@ -166,9 +166,9 @@ a#hidetopmsg { position: absolute; right: 5px; bottom: 5px; } { position:absolute; top: 6px; - left: 570px; + right: 7px; height: 24px; - width:15px; + width:23px; } #editbarsavetable td, #editbartable td diff --git a/etherpad/src/static/js/broadcast_slider.js b/etherpad/src/static/js/broadcast_slider.js index 255d7f2..8977e3d 100644 --- a/etherpad/src/static/js/broadcast_slider.js +++ b/etherpad/src/static/js/broadcast_slider.js @@ -138,7 +138,7 @@ var global = this; swatchtd.append(swatch); tr.append(swatchtd); var nametd = $('<td></td>'); - nametd.html(author.name || "unnamed"); + nametd.text(author.name || "unnamed"); tr.append(nametd); $("#authorstable").append(tr); } else { diff --git a/etherpad/src/templates/pad/exporthtml.ejs b/etherpad/src/templates/pad/exporthtml.ejs new file mode 100644 index 0000000..288a595 --- /dev/null +++ b/etherpad/src/templates/pad/exporthtml.ejs @@ -0,0 +1,28 @@ +<% /* 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/etherpad/src/templates/pro/admin/pro-config.ejs b/etherpad/src/templates/pro/admin/pro-config.ejs new file mode 100644 index 0000000..32cb610 --- /dev/null +++ b/etherpad/src/templates/pro/admin/pro-config.ejs @@ -0,0 +1,55 @@ +<% /* 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. */ %> +<h3 class="top">Application Configuration</h3> + +<%= messageDiv() %> + +<form action="<%= request.path %>" method="post"> + +<table id="t-pro-config"> + <tr> + <th width="50%" valign="top">Site Name (appears in + the header of all pages):</th> + <td width="50%" valign="top"> + <input type="text" name="siteName" value="<%= + config.siteName %>" id="siteName" /> + </td> + </tr> + + <tr> + <th valign="top">Always require all users on this domain to use secure + (HTTPS) connections?</th> + <td valign="top"> + <input type="checkbox" id="alwaysHttps" name="alwaysHttps" + <%= config.alwaysHttps ? 'checked="on"' : '' %> /> + </td> + </tr> + + <tr> + <th valign="top">Default pad text:</th> + <td valign="top"> + <textarea name="defaultPadText" id="defaultPadText"><%= + config.defaultPadText %></textarea> + </td> + </tr> + + <tr> + <td colspan="2" style="text-align: right;"> + <input type="submit" name="save" value="Apply" /> + </td> + </tr> +</table> + +</form> + diff --git a/etherpad/src/themes/default/templates/pro/admin/admin-template.ejs b/etherpad/src/themes/default/templates/pro/admin/admin-template.ejs index 0964e33..e1a7736 100644 --- a/etherpad/src/themes/default/templates/pro/admin/admin-template.ejs +++ b/etherpad/src/themes/default/templates/pro/admin/admin-template.ejs @@ -16,9 +16,11 @@ limitations under the License. */ %><% helpers.setHtmlTitle("Etherpad Administra <div class="fpcontent"> <table id="admin-layout-table"> <tr> + <% if (validLicense) { %> <td width="1%" id="admin-leftnav"> <%= renderAdminLeftNav() %> </td> + <% } %> <td width="99%" id="admin-right"> <%= getAdminContent() %> </td> |