diff options
Diffstat (limited to 'trunk')
| -rw-r--r-- | trunk/etherpad/etc/etherpad.localdev-default.properties | 1 | ||||
| -rw-r--r-- | trunk/etherpad/src/etherpad/control/tag/tag_control.js | 1 | ||||
| -rw-r--r-- | trunk/etherpad/src/templates/tag/tag_search.ejs | 2 |
3 files changed, 3 insertions, 1 deletions
diff --git a/trunk/etherpad/etc/etherpad.localdev-default.properties b/trunk/etherpad/etc/etherpad.localdev-default.properties index c2a2122..89c9c4f 100644 --- a/trunk/etherpad/etc/etherpad.localdev-default.properties +++ b/trunk/etherpad/etc/etherpad.localdev-default.properties @@ -14,3 +14,4 @@ modulePath = ./src transportPrefix = /comet transportUseWildcardSubdomains = true useVirtualFileRoot = ./src +motdPage = http://localhost:9000/ep/pad/view/ro.7zur9ouBTk9/latest?fullScreen=1&slider=0&sidebar=0 diff --git a/trunk/etherpad/src/etherpad/control/tag/tag_control.js b/trunk/etherpad/src/etherpad/control/tag/tag_control.js index bf9e9b2..32f01e3 100644 --- a/trunk/etherpad/src/etherpad/control/tag/tag_control.js +++ b/trunk/etherpad/src/etherpad/control/tag/tag_control.js @@ -225,6 +225,7 @@ function onRequest() { renderHtml("tag/tag_search.ejs", { + config: appjet.config, tagsToQuery: tagsToQuery, padIdToReadonly: server_utils.padIdToReadonly, tags: tags, diff --git a/trunk/etherpad/src/templates/tag/tag_search.ejs b/trunk/etherpad/src/templates/tag/tag_search.ejs index 9284665..ba00aa2 100644 --- a/trunk/etherpad/src/templates/tag/tag_search.ejs +++ b/trunk/etherpad/src/templates/tag/tag_search.ejs @@ -65,7 +65,7 @@ limitations under the License. */ %> <div id="hdraggie"><!-- --></div> - <div id="padchat">NANANANA</div> + <div id="padchat"><iframe src="<%= config['motdPage'] %>" width="100%" height="100%"></iframe></div> </div> <!-- /padsidebar --> <div id="padeditor"> |