removed duplicate trunk directory

--HG--
rename : trunk/trunk/COPYING => trunk/COPYING
rename : trunk/trunk/README => trunk/README
rename : trunk/trunk/etherpad/.gitignore => trunk/etherpad/.gitignore
rename : trunk/trunk/etherpad/bin/.gitignore => trunk/etherpad/bin/.gitignore
rename : trunk/trunk/etherpad/bin/rebuildjar.sh => trunk/etherpad/bin/rebuildjar.sh
rename : trunk/trunk/etherpad/bin/run-local.sh => trunk/etherpad/bin/run-local.sh
rename : trunk/trunk/etherpad/bin/setup-mysql-db.sh => trunk/etherpad/bin/setup-mysql-db.sh
rename : trunk/trunk/etherpad/etc/etherpad.localdev-default.properties => trunk/etherpad/etc/etherpad.localdev-default.properties
rename : trunk/trunk/etherpad/lib/dnsjava-2.0.6.jar => trunk/etherpad/lib/dnsjava-2.0.6.jar
rename : trunk/trunk/etherpad/lib/jbcrypt-0.2.jar => trunk/etherpad/lib/jbcrypt-0.2.jar
rename : trunk/trunk/etherpad/lib/jcommon-1.0.15.jar => trunk/etherpad/lib/jcommon-1.0.15.jar
rename : trunk/trunk/etherpad/lib/jfreechart-1.0.12.jar => trunk/etherpad/lib/jfreechart-1.0.12.jar
rename : trunk/trunk/etherpad/src/etherpad/admin/shell.js => trunk/etherpad/src/etherpad/admin/shell.js
rename : trunk/trunk/etherpad/src/etherpad/billing/billing.js => trunk/etherpad/src/etherpad/billing/billing.js
rename : trunk/trunk/etherpad/src/etherpad/billing/fields.js => trunk/etherpad/src/etherpad/billing/fields.js
rename : trunk/trunk/etherpad/src/etherpad/billing/team_billing.js => trunk/etherpad/src/etherpad/billing/team_billing.js
rename : trunk/trunk/etherpad/src/etherpad/collab/ace/contentcollector.js => trunk/etherpad/src/etherpad/collab/ace/contentcollector.js
rename : trunk/trunk/etherpad/src/etherpad/collab/ace/domline.js => trunk/etherpad/src/etherpad/collab/ace/domline.js
rename : trunk/trunk/etherpad/src/etherpad/collab/ace/easysync1.js => trunk/etherpad/src/etherpad/collab/ace/easysync1.js
rename : trunk/trunk/etherpad/src/etherpad/collab/ace/easysync2.js => trunk/etherpad/src/etherpad/collab/ace/easysync2.js
rename : trunk/trunk/etherpad/src/etherpad/collab/ace/easysync2_tests.js => trunk/etherpad/src/etherpad/collab/ace/easysync2_tests.js
rename : trunk/trunk/etherpad/src/etherpad/collab/ace/linestylefilter.js => trunk/etherpad/src/etherpad/collab/ace/linestylefilter.js
rename : trunk/trunk/etherpad/src/etherpad/collab/collab_server.js => trunk/etherpad/src/etherpad/collab/collab_server.js
rename : trunk/trunk/etherpad/src/etherpad/collab/collabroom_server.js => trunk/etherpad/src/etherpad/collab/collabroom_server.js
rename : trunk/trunk/etherpad/src/etherpad/collab/genimg.js => trunk/etherpad/src/etherpad/collab/genimg.js
rename : trunk/trunk/etherpad/src/etherpad/collab/json_sans_eval.js => trunk/etherpad/src/etherpad/collab/json_sans_eval.js
rename : trunk/trunk/etherpad/src/etherpad/collab/readonly_server.js => trunk/etherpad/src/etherpad/collab/readonly_server.js
rename : trunk/trunk/etherpad/src/etherpad/collab/server_utils.js => trunk/etherpad/src/etherpad/collab/server_utils.js
rename : trunk/trunk/etherpad/src/etherpad/control/aboutcontrol.js => trunk/etherpad/src/etherpad/control/aboutcontrol.js
rename : trunk/trunk/etherpad/src/etherpad/control/admincontrol.js => trunk/etherpad/src/etherpad/control/admincontrol.js
rename : trunk/trunk/etherpad/src/etherpad/control/blogcontrol.js => trunk/etherpad/src/etherpad/control/blogcontrol.js
rename : trunk/trunk/etherpad/src/etherpad/control/connection_diagnostics_control.js => trunk/etherpad/src/etherpad/control/connection_diagnostics_control.js
rename : trunk/trunk/etherpad/src/etherpad/control/global_pro_account_control.js => trunk/etherpad/src/etherpad/control/global_pro_account_control.js
rename : trunk/trunk/etherpad/src/etherpad/control/historycontrol.js => trunk/etherpad/src/etherpad/control/historycontrol.js
rename : trunk/trunk/etherpad/src/etherpad/control/loadtestcontrol.js => trunk/etherpad/src/etherpad/control/loadtestcontrol.js
rename : trunk/trunk/etherpad/src/etherpad/control/maincontrol.js => trunk/etherpad/src/etherpad/control/maincontrol.js
rename : trunk/trunk/etherpad/src/etherpad/control/pad/pad_changeset_control.js => trunk/etherpad/src/etherpad/control/pad/pad_changeset_control.js
rename : trunk/trunk/etherpad/src/etherpad/control/pad/pad_control.js => trunk/etherpad/src/etherpad/control/pad/pad_control.js
rename : trunk/trunk/etherpad/src/etherpad/control/pad/pad_importexport_control.js => trunk/etherpad/src/etherpad/control/pad/pad_importexport_control.js
rename : trunk/trunk/etherpad/src/etherpad/control/pad/pad_view_control.js => trunk/etherpad/src/etherpad/control/pad/pad_view_control.js
rename : trunk/trunk/etherpad/src/etherpad/control/pne_manual_control.js => trunk/etherpad/src/etherpad/control/pne_manual_control.js
rename : trunk/trunk/etherpad/src/etherpad/control/pne_tracker_control.js => trunk/etherpad/src/etherpad/control/pne_tracker_control.js
rename : trunk/trunk/etherpad/src/etherpad/control/pro/account_control.js => trunk/etherpad/src/etherpad/control/pro/account_control.js
rename : trunk/trunk/etherpad/src/etherpad/control/pro/admin/account_manager_control.js => trunk/etherpad/src/etherpad/control/pro/admin/account_manager_control.js
rename : trunk/trunk/etherpad/src/etherpad/control/pro/admin/license_manager_control.js => trunk/etherpad/src/etherpad/control/pro/admin/license_manager_control.js
rename : trunk/trunk/etherpad/src/etherpad/control/pro/admin/pro_admin_control.js => trunk/etherpad/src/etherpad/control/pro/admin/pro_admin_control.js
rename : trunk/trunk/etherpad/src/etherpad/control/pro/admin/pro_config_control.js => trunk/etherpad/src/etherpad/control/pro/admin/pro_config_control.js
rename : trunk/trunk/etherpad/src/etherpad/control/pro/admin/team_billing_control.js => trunk/etherpad/src/etherpad/control/pro/admin/team_billing_control.js
rename : trunk/trunk/etherpad/src/etherpad/control/pro/pro_main_control.js => trunk/etherpad/src/etherpad/control/pro/pro_main_control.js
rename : trunk/trunk/etherpad/src/etherpad/control/pro/pro_padlist_control.js => trunk/etherpad/src/etherpad/control/pro/pro_padlist_control.js
rename : trunk/trunk/etherpad/src/etherpad/control/pro_beta_control.js => trunk/etherpad/src/etherpad/control/pro_beta_control.js
rename : trunk/trunk/etherpad/src/etherpad/control/pro_help_control.js => trunk/etherpad/src/etherpad/control/pro_help_control.js
rename : trunk/trunk/etherpad/src/etherpad/control/pro_signup_control.js => trunk/etherpad/src/etherpad/control/pro_signup_control.js
rename : trunk/trunk/etherpad/src/etherpad/control/scriptcontrol.js => trunk/etherpad/src/etherpad/control/scriptcontrol.js
rename : trunk/trunk/etherpad/src/etherpad/control/static_control.js => trunk/etherpad/src/etherpad/control/static_control.js
rename : trunk/trunk/etherpad/src/etherpad/control/statscontrol.js => trunk/etherpad/src/etherpad/control/statscontrol.js
rename : trunk/trunk/etherpad/src/etherpad/control/store/eepnet_checkout_control.js => trunk/etherpad/src/etherpad/control/store/eepnet_checkout_control.js
rename : trunk/trunk/etherpad/src/etherpad/control/store/storecontrol.js => trunk/etherpad/src/etherpad/control/store/storecontrol.js
rename : trunk/trunk/etherpad/src/etherpad/control/testcontrol.js => trunk/etherpad/src/etherpad/control/testcontrol.js
rename : trunk/trunk/etherpad/src/etherpad/db_migrations/m0000_test.js => trunk/etherpad/src/etherpad/db_migrations/m0000_test.js
rename : trunk/trunk/etherpad/src/etherpad/db_migrations/m0001_eepnet_signups_init.js => trunk/etherpad/src/etherpad/db_migrations/m0001_eepnet_signups_init.js
rename : trunk/trunk/etherpad/src/etherpad/db_migrations/m0002_eepnet_signups_2.js => trunk/etherpad/src/etherpad/db_migrations/m0002_eepnet_signups_2.js
rename : trunk/trunk/etherpad/src/etherpad/db_migrations/m0003_create_tests_table_v2.js => trunk/etherpad/src/etherpad/db_migrations/m0003_create_tests_table_v2.js
rename : trunk/trunk/etherpad/src/etherpad/db_migrations/m0004_convert_all_tables_to_innodb.js => trunk/etherpad/src/etherpad/db_migrations/m0004_convert_all_tables_to_innodb.js
rename : trunk/trunk/etherpad/src/etherpad/db_migrations/m0005_create_billing_tables.js => trunk/etherpad/src/etherpad/db_migrations/m0005_create_billing_tables.js
rename : trunk/trunk/etherpad/src/etherpad/db_migrations/m0006_eepnet_signups_3.js => trunk/etherpad/src/etherpad/db_migrations/m0006_eepnet_signups_3.js
rename : trunk/trunk/etherpad/src/etherpad/db_migrations/m0007_create_pro_tables_v4.js => trunk/etherpad/src/etherpad/db_migrations/m0007_create_pro_tables_v4.js
rename : trunk/trunk/etherpad/src/etherpad/db_migrations/m0008_persistent_vars.js => trunk/etherpad/src/etherpad/db_migrations/m0008_persistent_vars.js
rename : trunk/trunk/etherpad/src/etherpad/db_migrations/m0009_pad_tables.js => trunk/etherpad/src/etherpad/db_migrations/m0009_pad_tables.js
rename : trunk/trunk/etherpad/src/etherpad/db_migrations/m0010_pad_sqlmeta.js => trunk/etherpad/src/etherpad/db_migrations/m0010_pad_sqlmeta.js
rename : trunk/trunk/etherpad/src/etherpad/db_migrations/m0011_pro_users_temppass.js => trunk/etherpad/src/etherpad/db_migrations/m0011_pro_users_temppass.js
rename : trunk/trunk/etherpad/src/etherpad/db_migrations/m0012_pro_users_auto_signin.js => trunk/etherpad/src/etherpad/db_migrations/m0012_pro_users_auto_signin.js
rename : trunk/trunk/etherpad/src/etherpad/db_migrations/m0013_pne_padv2_upgrade.js => trunk/etherpad/src/etherpad/db_migrations/m0013_pne_padv2_upgrade.js
rename : trunk/trunk/etherpad/src/etherpad/db_migrations/m0014_pne_globalpadids.js => trunk/etherpad/src/etherpad/db_migrations/m0014_pne_globalpadids.js
rename : trunk/trunk/etherpad/src/etherpad/db_migrations/m0015_padmeta_passwords.js => trunk/etherpad/src/etherpad/db_migrations/m0015_padmeta_passwords.js
rename : trunk/trunk/etherpad/src/etherpad/db_migrations/m0016_pne_tracking_data.js => trunk/etherpad/src/etherpad/db_migrations/m0016_pne_tracking_data.js
rename : trunk/trunk/etherpad/src/etherpad/db_migrations/m0017_pne_tracking_data_v2.js => trunk/etherpad/src/etherpad/db_migrations/m0017_pne_tracking_data_v2.js
rename : trunk/trunk/etherpad/src/etherpad/db_migrations/m0018_eepnet_checkout_tables.js => trunk/etherpad/src/etherpad/db_migrations/m0018_eepnet_checkout_tables.js
rename : trunk/trunk/etherpad/src/etherpad/db_migrations/m0019_padmeta_deleted.js => trunk/etherpad/src/etherpad/db_migrations/m0019_padmeta_deleted.js
rename : trunk/trunk/etherpad/src/etherpad/db_migrations/m0020_padmeta_archived.js => trunk/etherpad/src/etherpad/db_migrations/m0020_padmeta_archived.js
rename : trunk/trunk/etherpad/src/etherpad/db_migrations/m0021_pro_padmeta_json.js => trunk/etherpad/src/etherpad/db_migrations/m0021_pro_padmeta_json.js
rename : trunk/trunk/etherpad/src/etherpad/db_migrations/m0022_create_userids_table.js => trunk/etherpad/src/etherpad/db_migrations/m0022_create_userids_table.js
rename : trunk/trunk/etherpad/src/etherpad/db_migrations/m0023_create_usagestats_table.js => trunk/etherpad/src/etherpad/db_migrations/m0023_create_usagestats_table.js
rename : trunk/trunk/etherpad/src/etherpad/db_migrations/m0024_statistics_table.js => trunk/etherpad/src/etherpad/db_migrations/m0024_statistics_table.js
rename : trunk/trunk/etherpad/src/etherpad/db_migrations/m0025_rename_pro_users_table.js => trunk/etherpad/src/etherpad/db_migrations/m0025_rename_pro_users_table.js
rename : trunk/trunk/etherpad/src/etherpad/db_migrations/m0026_create_guests_table.js => trunk/etherpad/src/etherpad/db_migrations/m0026_create_guests_table.js
rename : trunk/trunk/etherpad/src/etherpad/db_migrations/m0027_pro_config.js => trunk/etherpad/src/etherpad/db_migrations/m0027_pro_config.js
rename : trunk/trunk/etherpad/src/etherpad/db_migrations/m0028_ondemand_beta_emails.js => trunk/etherpad/src/etherpad/db_migrations/m0028_ondemand_beta_emails.js
rename : trunk/trunk/etherpad/src/etherpad/db_migrations/m0029_lowercase_subdomains.js => trunk/etherpad/src/etherpad/db_migrations/m0029_lowercase_subdomains.js
rename : trunk/trunk/etherpad/src/etherpad/db_migrations/m0030_fix_statistics_values.js => trunk/etherpad/src/etherpad/db_migrations/m0030_fix_statistics_values.js
rename : trunk/trunk/etherpad/src/etherpad/db_migrations/m0031_deleted_pro_users.js => trunk/etherpad/src/etherpad/db_migrations/m0031_deleted_pro_users.js
rename : trunk/trunk/etherpad/src/etherpad/db_migrations/m0032_reduce_topvalues_counts.js => trunk/etherpad/src/etherpad/db_migrations/m0032_reduce_topvalues_counts.js
rename : trunk/trunk/etherpad/src/etherpad/db_migrations/m0033_pro_account_usage.js => trunk/etherpad/src/etherpad/db_migrations/m0033_pro_account_usage.js
rename : trunk/trunk/etherpad/src/etherpad/db_migrations/m0034_create_recurring_billing_table.js => trunk/etherpad/src/etherpad/db_migrations/m0034_create_recurring_billing_table.js
rename : trunk/trunk/etherpad/src/etherpad/db_migrations/m0035_add_email_to_paymentinfo.js => trunk/etherpad/src/etherpad/db_migrations/m0035_add_email_to_paymentinfo.js
rename : trunk/trunk/etherpad/src/etherpad/db_migrations/m0036_create_missing_subscription_records.js => trunk/etherpad/src/etherpad/db_migrations/m0036_create_missing_subscription_records.js
rename : trunk/trunk/etherpad/src/etherpad/db_migrations/m0037_create_pro_referral_table.js => trunk/etherpad/src/etherpad/db_migrations/m0037_create_pro_referral_table.js
rename : trunk/trunk/etherpad/src/etherpad/db_migrations/m0038_pad_coarse_revs.js => trunk/etherpad/src/etherpad/db_migrations/m0038_pad_coarse_revs.js
rename : trunk/trunk/etherpad/src/etherpad/db_migrations/migration_runner.js => trunk/etherpad/src/etherpad/db_migrations/migration_runner.js
rename : trunk/trunk/etherpad/src/etherpad/debug.js => trunk/etherpad/src/etherpad/debug.js
rename : trunk/trunk/etherpad/src/etherpad/globals.js => trunk/etherpad/src/etherpad/globals.js
rename : trunk/trunk/etherpad/src/etherpad/helpers.js => trunk/etherpad/src/etherpad/helpers.js
rename : trunk/trunk/etherpad/src/etherpad/importexport/importexport.js => trunk/etherpad/src/etherpad/importexport/importexport.js
rename : trunk/trunk/etherpad/src/etherpad/legacy_urls.js => trunk/etherpad/src/etherpad/legacy_urls.js
rename : trunk/trunk/etherpad/src/etherpad/licensing.js => trunk/etherpad/src/etherpad/licensing.js
rename : trunk/trunk/etherpad/src/etherpad/log.js => trunk/etherpad/src/etherpad/log.js
rename : trunk/trunk/etherpad/src/etherpad/metrics/metrics.js => trunk/etherpad/src/etherpad/metrics/metrics.js
rename : trunk/trunk/etherpad/src/etherpad/pad/activepads.js => trunk/etherpad/src/etherpad/pad/activepads.js
rename : trunk/trunk/etherpad/src/etherpad/pad/chatarchive.js => trunk/etherpad/src/etherpad/pad/chatarchive.js
rename : trunk/trunk/etherpad/src/etherpad/pad/dbwriter.js => trunk/etherpad/src/etherpad/pad/dbwriter.js
rename : trunk/trunk/etherpad/src/etherpad/pad/easysync2migration.js => trunk/etherpad/src/etherpad/pad/easysync2migration.js
rename : trunk/trunk/etherpad/src/etherpad/pad/exporthtml.js => trunk/etherpad/src/etherpad/pad/exporthtml.js
rename : trunk/trunk/etherpad/src/etherpad/pad/importhtml.js => trunk/etherpad/src/etherpad/pad/importhtml.js
rename : trunk/trunk/etherpad/src/etherpad/pad/model.js => trunk/etherpad/src/etherpad/pad/model.js
rename : trunk/trunk/etherpad/src/etherpad/pad/noprowatcher.js => trunk/etherpad/src/etherpad/pad/noprowatcher.js
rename : trunk/trunk/etherpad/src/etherpad/pad/pad_migrations.js => trunk/etherpad/src/etherpad/pad/pad_migrations.js
rename : trunk/trunk/etherpad/src/etherpad/pad/pad_security.js => trunk/etherpad/src/etherpad/pad/pad_security.js
rename : trunk/trunk/etherpad/src/etherpad/pad/padevents.js => trunk/etherpad/src/etherpad/pad/padevents.js
rename : trunk/trunk/etherpad/src/etherpad/pad/padusers.js => trunk/etherpad/src/etherpad/pad/padusers.js
rename : trunk/trunk/etherpad/src/etherpad/pad/padutils.js => trunk/etherpad/src/etherpad/pad/padutils.js
rename : trunk/trunk/etherpad/src/etherpad/pad/revisions.js => trunk/etherpad/src/etherpad/pad/revisions.js
rename : trunk/trunk/etherpad/src/etherpad/pne/pne_utils.js => trunk/etherpad/src/etherpad/pne/pne_utils.js
rename : trunk/trunk/etherpad/src/etherpad/pro/domains.js => trunk/etherpad/src/etherpad/pro/domains.js
rename : trunk/trunk/etherpad/src/etherpad/pro/pro_account_auto_signin.js => trunk/etherpad/src/etherpad/pro/pro_account_auto_signin.js
rename : trunk/trunk/etherpad/src/etherpad/pro/pro_accounts.js => trunk/etherpad/src/etherpad/pro/pro_accounts.js
rename : trunk/trunk/etherpad/src/etherpad/pro/pro_config.js => trunk/etherpad/src/etherpad/pro/pro_config.js
rename : trunk/trunk/etherpad/src/etherpad/pro/pro_pad_db.js => trunk/etherpad/src/etherpad/pro/pro_pad_db.js
rename : trunk/trunk/etherpad/src/etherpad/pro/pro_pad_editors.js => trunk/etherpad/src/etherpad/pro/pro_pad_editors.js
rename : trunk/trunk/etherpad/src/etherpad/pro/pro_padlist.js => trunk/etherpad/src/etherpad/pro/pro_padlist.js
rename : trunk/trunk/etherpad/src/etherpad/pro/pro_padmeta.js => trunk/etherpad/src/etherpad/pro/pro_padmeta.js
rename : trunk/trunk/etherpad/src/etherpad/pro/pro_quotas.js => trunk/etherpad/src/etherpad/pro/pro_quotas.js
rename : trunk/trunk/etherpad/src/etherpad/pro/pro_utils.js => trunk/etherpad/src/etherpad/pro/pro_utils.js
rename : trunk/trunk/etherpad/src/etherpad/quotas.js => trunk/etherpad/src/etherpad/quotas.js
rename : trunk/trunk/etherpad/src/etherpad/sessions.js => trunk/etherpad/src/etherpad/sessions.js
rename : trunk/trunk/etherpad/src/etherpad/statistics/exceptions.js => trunk/etherpad/src/etherpad/statistics/exceptions.js
rename : trunk/trunk/etherpad/src/etherpad/statistics/statistics.js => trunk/etherpad/src/etherpad/statistics/statistics.js
rename : trunk/trunk/etherpad/src/etherpad/store/checkout.js => trunk/etherpad/src/etherpad/store/checkout.js
rename : trunk/trunk/etherpad/src/etherpad/store/eepnet_checkout.js => trunk/etherpad/src/etherpad/store/eepnet_checkout.js
rename : trunk/trunk/etherpad/src/etherpad/store/eepnet_trial.js => trunk/etherpad/src/etherpad/store/eepnet_trial.js
rename : trunk/trunk/etherpad/src/etherpad/testing/testutils.js => trunk/etherpad/src/etherpad/testing/testutils.js
rename : trunk/trunk/etherpad/src/etherpad/testing/unit_tests/t0000_test.js => trunk/etherpad/src/etherpad/testing/unit_tests/t0000_test.js
rename : trunk/trunk/etherpad/src/etherpad/testing/unit_tests/t0001_sqlbase_transaction_rollback.js => trunk/etherpad/src/etherpad/testing/unit_tests/t0001_sqlbase_transaction_rollback.js
rename : trunk/trunk/etherpad/src/etherpad/testing/unit_tests/t0002_license_generation.js => trunk/etherpad/src/etherpad/testing/unit_tests/t0002_license_generation.js
rename : trunk/trunk/etherpad/src/etherpad/testing/unit_tests/t0003_persistent_vars.js => trunk/etherpad/src/etherpad/testing/unit_tests/t0003_persistent_vars.js
rename : trunk/trunk/etherpad/src/etherpad/testing/unit_tests/t0004_sqlobj.js => trunk/etherpad/src/etherpad/testing/unit_tests/t0004_sqlobj.js
rename : trunk/trunk/etherpad/src/etherpad/testing/unit_tests/t0005_easysync.js => trunk/etherpad/src/etherpad/testing/unit_tests/t0005_easysync.js
rename : trunk/trunk/etherpad/src/etherpad/usage_stats/usage_stats.js => trunk/etherpad/src/etherpad/usage_stats/usage_stats.js
rename : trunk/trunk/etherpad/src/etherpad/utils.js => trunk/etherpad/src/etherpad/utils.js
rename : trunk/trunk/etherpad/src/main.js => trunk/etherpad/src/main.js
rename : trunk/trunk/etherpad/src/static/crossdomain.xml => trunk/etherpad/src/static/crossdomain.xml
rename : trunk/trunk/etherpad/src/static/css/admin/admin-stats.css => trunk/etherpad/src/static/css/admin/admin-stats.css
rename : trunk/trunk/etherpad/src/static/css/beta.css => trunk/etherpad/src/static/css/beta.css
rename : trunk/trunk/etherpad/src/static/css/broadcast.css => trunk/etherpad/src/static/css/broadcast.css
rename : trunk/trunk/etherpad/src/static/css/connection_diagnostics.css => trunk/etherpad/src/static/css/connection_diagnostics.css
rename : trunk/trunk/etherpad/src/static/css/etherpad.css => trunk/etherpad/src/static/css/etherpad.css
rename : trunk/trunk/etherpad/src/static/css/fluxbb.css => trunk/etherpad/src/static/css/fluxbb.css
rename : trunk/trunk/etherpad/src/static/css/framedpage.css => trunk/etherpad/src/static/css/framedpage.css
rename : trunk/trunk/etherpad/src/static/css/global-pro-account.css => trunk/etherpad/src/static/css/global-pro-account.css
rename : trunk/trunk/etherpad/src/static/css/home-opensource.css => trunk/etherpad/src/static/css/home-opensource.css
rename : trunk/trunk/etherpad/src/static/css/home.css => trunk/etherpad/src/static/css/home.css
rename : trunk/trunk/etherpad/src/static/css/lib/jquery.contextmenu.css => trunk/etherpad/src/static/css/lib/jquery.contextmenu.css
rename : trunk/trunk/etherpad/src/static/css/pad.css => trunk/etherpad/src/static/css/pad.css
rename : trunk/trunk/etherpad/src/static/css/pad2_ejs.css => trunk/etherpad/src/static/css/pad2_ejs.css
rename : trunk/trunk/etherpad/src/static/css/pne-manual.css => trunk/etherpad/src/static/css/pne-manual.css
rename : trunk/trunk/etherpad/src/static/css/pricing.css => trunk/etherpad/src/static/css/pricing.css
rename : trunk/trunk/etherpad/src/static/css/pro-help.css => trunk/etherpad/src/static/css/pro-help.css
rename : trunk/trunk/etherpad/src/static/css/pro-signup.css => trunk/etherpad/src/static/css/pro-signup.css
rename : trunk/trunk/etherpad/src/static/css/pro/account.css => trunk/etherpad/src/static/css/pro/account.css
rename : trunk/trunk/etherpad/src/static/css/pro/framedpage-pro.css => trunk/etherpad/src/static/css/pro/framedpage-pro.css
rename : trunk/trunk/etherpad/src/static/css/pro/padlist.css => trunk/etherpad/src/static/css/pro/padlist.css
rename : trunk/trunk/etherpad/src/static/css/pro/payment-required.css => trunk/etherpad/src/static/css/pro/payment-required.css
rename : trunk/trunk/etherpad/src/static/css/pro/pro-admin.css => trunk/etherpad/src/static/css/pro/pro-admin.css
rename : trunk/trunk/etherpad/src/static/css/pro/pro-home.css => trunk/etherpad/src/static/css/pro/pro-home.css
rename : trunk/trunk/etherpad/src/static/css/stats.css => trunk/etherpad/src/static/css/stats.css
rename : trunk/trunk/etherpad/src/static/css/store/eepnet-checkout.css => trunk/etherpad/src/static/css/store/eepnet-checkout.css
rename : trunk/trunk/etherpad/src/static/css/store/ondemand-billing.css => trunk/etherpad/src/static/css/store/ondemand-billing.css
rename : trunk/trunk/etherpad/src/static/css/store/store.css => trunk/etherpad/src/static/css/store/store.css
rename : trunk/trunk/etherpad/src/static/favicon.ico => trunk/etherpad/src/static/favicon.ico
rename : trunk/trunk/etherpad/src/static/img/about/appjet-logo-large.gif => trunk/etherpad/src/static/img/about/appjet-logo-large.gif
rename : trunk/trunk/etherpad/src/static/img/about/appjet-logo-medium.png => trunk/etherpad/src/static/img/about/appjet-logo-medium.png
rename : trunk/trunk/etherpad/src/static/img/about/investors/mitchkapor.jpg => trunk/etherpad/src/static/img/about/investors/mitchkapor.jpg
rename : trunk/trunk/etherpad/src/static/img/about/investors/pb.jpg => trunk/etherpad/src/static/img/about/investors/pb.jpg
rename : trunk/trunk/etherpad/src/static/img/about/investors/pg.jpg => trunk/etherpad/src/static/img/about/investors/pg.jpg
rename : trunk/trunk/etherpad/src/static/img/about/investors/sanjeev.jpg => trunk/etherpad/src/static/img/about/investors/sanjeev.jpg
rename : trunk/trunk/etherpad/src/static/img/about/investors/seth.jpg => trunk/etherpad/src/static/img/about/investors/seth.jpg
rename : trunk/trunk/etherpad/src/static/img/about/people/aaron-david-iphones-thumb.jpg => trunk/etherpad/src/static/img/about/people/aaron-david-iphones-thumb.jpg
rename : trunk/trunk/etherpad/src/static/img/about/people/aaron-david-iphones.jpg => trunk/etherpad/src/static/img/about/people/aaron-david-iphones.jpg
rename : trunk/trunk/etherpad/src/static/img/about/people/aaron-google-air.jpg => trunk/etherpad/src/static/img/about/people/aaron-google-air.jpg
rename : trunk/trunk/etherpad/src/static/img/about/people/aaron-headshot-thumb.jpg => trunk/etherpad/src/static/img/about/people/aaron-headshot-thumb.jpg
rename : trunk/trunk/etherpad/src/static/img/about/people/aaron-headshot.jpg => trunk/etherpad/src/static/img/about/people/aaron-headshot.jpg
rename : trunk/trunk/etherpad/src/static/img/about/people/aaron-headshot2-thumb.jpg => trunk/etherpad/src/static/img/about/people/aaron-headshot2-thumb.jpg
rename : trunk/trunk/etherpad/src/static/img/about/people/aaron-headshot2.jpg => trunk/etherpad/src/static/img/about/people/aaron-headshot2.jpg
rename : trunk/trunk/etherpad/src/static/img/about/people/aaron-headshot3-thumb.jpg => trunk/etherpad/src/static/img/about/people/aaron-headshot3-thumb.jpg
rename : trunk/trunk/etherpad/src/static/img/about/people/aaron-headshot3.jpg => trunk/etherpad/src/static/img/about/people/aaron-headshot3.jpg
rename : trunk/trunk/etherpad/src/static/img/about/people/daniel-headshot-thumb.jpg => trunk/etherpad/src/static/img/about/people/daniel-headshot-thumb.jpg
rename : trunk/trunk/etherpad/src/static/img/about/people/david-headshot-thumb.jpg => trunk/etherpad/src/static/img/about/people/david-headshot-thumb.jpg
rename : trunk/trunk/etherpad/src/static/img/about/people/david-headshot.jpg => trunk/etherpad/src/static/img/about/people/david-headshot.jpg
rename : trunk/trunk/etherpad/src/static/img/about/people/davy-headshot.jpg => trunk/etherpad/src/static/img/about/people/davy-headshot.jpg
rename : trunk/trunk/etherpad/src/static/img/about/people/jd-headshot-thumb.jpg => trunk/etherpad/src/static/img/about/people/jd-headshot-thumb.jpg
rename : trunk/trunk/etherpad/src/static/img/about/people/jd-headshot.jpg => trunk/etherpad/src/static/img/about/people/jd-headshot.jpg
rename : trunk/trunk/etherpad/src/static/img/about/people/rhonda-headshot-thumb.jpg => trunk/etherpad/src/static/img/about/people/rhonda-headshot-thumb.jpg
rename : trunk/trunk/etherpad/src/static/img/about/people/rhonda-headshot.jpg => trunk/etherpad/src/static/img/about/people/rhonda-headshot.jpg
rename : trunk/trunk/etherpad/src/static/img/about/pier38.png => trunk/etherpad/src/static/img/about/pier38.png
rename : trunk/trunk/etherpad/src/static/img/about/quote-close.png => trunk/etherpad/src/static/img/about/quote-close.png
rename : trunk/trunk/etherpad/src/static/img/about/quote-open.png => trunk/etherpad/src/static/img/about/quote-open.png
rename : trunk/trunk/etherpad/src/static/img/about/screencastpreview800x600.jpg => trunk/etherpad/src/static/img/about/screencastpreview800x600.jpg
rename : trunk/trunk/etherpad/src/static/img/account/betawarn.jpg => trunk/etherpad/src/static/img/account/betawarn.jpg
rename : trunk/trunk/etherpad/src/static/img/acecarets/000000.gif => trunk/etherpad/src/static/img/acecarets/000000.gif
rename : trunk/trunk/etherpad/src/static/img/acecarets/666666.gif => trunk/etherpad/src/static/img/acecarets/666666.gif
rename : trunk/trunk/etherpad/src/static/img/acecarets/999999.gif => trunk/etherpad/src/static/img/acecarets/999999.gif
rename : trunk/trunk/etherpad/src/static/img/acecarets/default.gif => trunk/etherpad/src/static/img/acecarets/default.gif
rename : trunk/trunk/etherpad/src/static/img/apr09/backgrad.png => trunk/etherpad/src/static/img/apr09/backgrad.png
rename : trunk/trunk/etherpad/src/static/img/apr09/black35.png => trunk/etherpad/src/static/img/apr09/black35.png
rename : trunk/trunk/etherpad/src/static/img/apr09/blank.gif => trunk/etherpad/src/static/img/apr09/blank.gif
rename : trunk/trunk/etherpad/src/static/img/apr09/modalbar.gif => trunk/etherpad/src/static/img/apr09/modalbar.gif
rename : trunk/trunk/etherpad/src/static/img/apr09/newpadicon.gif => trunk/etherpad/src/static/img/apr09/newpadicon.gif
rename : trunk/trunk/etherpad/src/static/img/apr09/shadbot.png => trunk/etherpad/src/static/img/apr09/shadbot.png
rename : trunk/trunk/etherpad/src/static/img/apr09/shadleft.png => trunk/etherpad/src/static/img/apr09/shadleft.png
rename : trunk/trunk/etherpad/src/static/img/apr09/shadleftbot.png => trunk/etherpad/src/static/img/apr09/shadleftbot.png
rename : trunk/trunk/etherpad/src/static/img/apr09/shadlefttop.png => trunk/etherpad/src/static/img/apr09/shadlefttop.png
rename : trunk/trunk/etherpad/src/static/img/apr09/shadright.png => trunk/etherpad/src/static/img/apr09/shadright.png
rename : trunk/trunk/etherpad/src/static/img/apr09/shadrightbot.png => trunk/etherpad/src/static/img/apr09/shadrightbot.png
rename : trunk/trunk/etherpad/src/static/img/apr09/shadrighttop.png => trunk/etherpad/src/static/img/apr09/shadrighttop.png
rename : trunk/trunk/etherpad/src/static/img/apr09/topbar.gif => trunk/etherpad/src/static/img/apr09/topbar.gif
rename : trunk/trunk/etherpad/src/static/img/apr09/topbarlogo.gif => trunk/etherpad/src/static/img/apr09/topbarlogo.gif
rename : trunk/trunk/etherpad/src/static/img/apr09/widthfull.gif => trunk/etherpad/src/static/img/apr09/widthfull.gif
rename : trunk/trunk/etherpad/src/static/img/apr09/widthfullactive.gif => trunk/etherpad/src/static/img/apr09/widthfullactive.gif
rename : trunk/trunk/etherpad/src/static/img/apr09/widthlim.gif => trunk/etherpad/src/static/img/apr09/widthlim.gif
rename : trunk/trunk/etherpad/src/static/img/apr09/widthlimactive.gif => trunk/etherpad/src/static/img/apr09/widthlimactive.gif
rename : trunk/trunk/etherpad/src/static/img/billing/amex.gif => trunk/etherpad/src/static/img/billing/amex.gif
rename : trunk/trunk/etherpad/src/static/img/billing/creditcard.gif => trunk/etherpad/src/static/img/billing/creditcard.gif
rename : trunk/trunk/etherpad/src/static/img/billing/csc-help.gif => trunk/etherpad/src/static/img/billing/csc-help.gif
rename : trunk/trunk/etherpad/src/static/img/billing/disc.gif => trunk/etherpad/src/static/img/billing/disc.gif
rename : trunk/trunk/etherpad/src/static/img/billing/invoice.gif => trunk/etherpad/src/static/img/billing/invoice.gif
rename : trunk/trunk/etherpad/src/static/img/billing/mc.gif => trunk/etherpad/src/static/img/billing/mc.gif
rename : trunk/trunk/etherpad/src/static/img/billing/paypal.gif => trunk/etherpad/src/static/img/billing/paypal.gif
rename : trunk/trunk/etherpad/src/static/img/billing/visa.gif => trunk/etherpad/src/static/img/billing/visa.gif
rename : trunk/trunk/etherpad/src/static/img/blog/posts/new-features/fullwidth.gif => trunk/etherpad/src/static/img/blog/posts/new-features/fullwidth.gif
rename : trunk/trunk/etherpad/src/static/img/blog/posts/new-features/importexport.gif => trunk/etherpad/src/static/img/blog/posts/new-features/importexport.gif
rename : trunk/trunk/etherpad/src/static/img/blog/posts/new-features/richtext.gif => trunk/etherpad/src/static/img/blog/posts/new-features/richtext.gif
rename : trunk/trunk/etherpad/src/static/img/blog/posts/new-features/viewzoom.gif => trunk/etherpad/src/static/img/blog/posts/new-features/viewzoom.gif
rename : trunk/trunk/etherpad/src/static/img/blog/posts/pricing-survey-results.png => trunk/etherpad/src/static/img/blog/posts/pricing-survey-results.png
rename : trunk/trunk/etherpad/src/static/img/blog/posts/pricing-survey.png => trunk/etherpad/src/static/img/blog/posts/pricing-survey.png
rename : trunk/trunk/etherpad/src/static/img/blog/posts/time-slider-screenshot.gif => trunk/etherpad/src/static/img/blog/posts/time-slider-screenshot.gif
rename : trunk/trunk/etherpad/src/static/img/davy/bg/home-createpad.png => trunk/etherpad/src/static/img/davy/bg/home-createpad.png
rename : trunk/trunk/etherpad/src/static/img/davy/bg/home-features-bottom.gif => trunk/etherpad/src/static/img/davy/bg/home-features-bottom.gif
rename : trunk/trunk/etherpad/src/static/img/davy/bg/home-features-free-bottom.gif => trunk/etherpad/src/static/img/davy/bg/home-features-free-bottom.gif
rename : trunk/trunk/etherpad/src/static/img/davy/bg/home-features-paid-top.gif => trunk/etherpad/src/static/img/davy/bg/home-features-paid-top.gif
rename : trunk/trunk/etherpad/src/static/img/davy/bg/home-features-top.gif => trunk/etherpad/src/static/img/davy/bg/home-features-top.gif
rename : trunk/trunk/etherpad/src/static/img/davy/bg/home-nav-selected.png => trunk/etherpad/src/static/img/davy/bg/home-nav-selected.png
rename : trunk/trunk/etherpad/src/static/img/davy/bg/home-screencast.png => trunk/etherpad/src/static/img/davy/bg/home-screencast.png
rename : trunk/trunk/etherpad/src/static/img/davy/bg/home2.png => trunk/etherpad/src/static/img/davy/bg/home2.png
rename : trunk/trunk/etherpad/src/static/img/davy/bg/product-nav-selected-white.png => trunk/etherpad/src/static/img/davy/bg/product-nav-selected-white.png
rename : trunk/trunk/etherpad/src/static/img/davy/bg/product-nav-selected.png => trunk/etherpad/src/static/img/davy/bg/product-nav-selected.png
rename : trunk/trunk/etherpad/src/static/img/davy/bg/product.png => trunk/etherpad/src/static/img/davy/bg/product.png
rename : trunk/trunk/etherpad/src/static/img/davy/btn/createpad-home.gif => trunk/etherpad/src/static/img/davy/btn/createpad-home.gif
rename : trunk/trunk/etherpad/src/static/img/davy/btn/createpad-large.gif => trunk/etherpad/src/static/img/davy/btn/createpad-large.gif
rename : trunk/trunk/etherpad/src/static/img/davy/btn/createpad-small.gif => trunk/etherpad/src/static/img/davy/btn/createpad-small.gif
rename : trunk/trunk/etherpad/src/static/img/davy/btn/intro-screencast.png => trunk/etherpad/src/static/img/davy/btn/intro-screencast.png
rename : trunk/trunk/etherpad/src/static/img/davy/btn/intro-testimonials.png => trunk/etherpad/src/static/img/davy/btn/intro-testimonials.png
rename : trunk/trunk/etherpad/src/static/img/davy/btn/learnmore.gif => trunk/etherpad/src/static/img/davy/btn/learnmore.gif
rename : trunk/trunk/etherpad/src/static/img/davy/btn/signup-home-2.gif => trunk/etherpad/src/static/img/davy/btn/signup-home-2.gif
rename : trunk/trunk/etherpad/src/static/img/davy/btn/signup-home-3.gif => trunk/etherpad/src/static/img/davy/btn/signup-home-3.gif
rename : trunk/trunk/etherpad/src/static/img/davy/btn/signup-home-4.gif => trunk/etherpad/src/static/img/davy/btn/signup-home-4.gif
rename : trunk/trunk/etherpad/src/static/img/davy/btn/signup-home.gif => trunk/etherpad/src/static/img/davy/btn/signup-home.gif
rename : trunk/trunk/etherpad/src/static/img/davy/btn/uses-more.gif => trunk/etherpad/src/static/img/davy/btn/uses-more.gif
rename : trunk/trunk/etherpad/src/static/img/davy/gfx/32/114.png => trunk/etherpad/src/static/img/davy/gfx/32/114.png
rename : trunk/trunk/etherpad/src/static/img/davy/gfx/32/15.png => trunk/etherpad/src/static/img/davy/gfx/32/15.png
rename : trunk/trunk/etherpad/src/static/img/davy/gfx/32/65.png => trunk/etherpad/src/static/img/davy/gfx/32/65.png
rename : trunk/trunk/etherpad/src/static/img/davy/gfx/32/78.png => trunk/etherpad/src/static/img/davy/gfx/32/78.png
rename : trunk/trunk/etherpad/src/static/img/davy/gfx/bullet.gif => trunk/etherpad/src/static/img/davy/gfx/bullet.gif
rename : trunk/trunk/etherpad/src/static/img/davy/gfx/home-logo2.gif => trunk/etherpad/src/static/img/davy/gfx/home-logo2.gif
rename : trunk/trunk/etherpad/src/static/img/davy/gfx/home-screencast.png => trunk/etherpad/src/static/img/davy/gfx/home-screencast.png
rename : trunk/trunk/etherpad/src/static/img/davy/gfx/plane.gif => trunk/etherpad/src/static/img/davy/gfx/plane.gif
rename : trunk/trunk/etherpad/src/static/img/davy/gfx/product-logo.gif => trunk/etherpad/src/static/img/davy/gfx/product-logo.gif
rename : trunk/trunk/etherpad/src/static/img/davy/gfx/screenshot.gif => trunk/etherpad/src/static/img/davy/gfx/screenshot.gif
rename : trunk/trunk/etherpad/src/static/img/davy/gfx/use-meetings.gif => trunk/etherpad/src/static/img/davy/gfx/use-meetings.gif
rename : trunk/trunk/etherpad/src/static/img/davy/gfx/use-meetings.png => trunk/etherpad/src/static/img/davy/gfx/use-meetings.png
rename : trunk/trunk/etherpad/src/static/img/davy/gfx/use-programming.gif => trunk/etherpad/src/static/img/davy/gfx/use-programming.gif
rename : trunk/trunk/etherpad/src/static/img/davy/gfx/use-programming.png => trunk/etherpad/src/static/img/davy/gfx/use-programming.png
rename : trunk/trunk/etherpad/src/static/img/davy/gfx/use-writing.gif => trunk/etherpad/src/static/img/davy/gfx/use-writing.gif
rename : trunk/trunk/etherpad/src/static/img/davy/gfx/use-writing.png => trunk/etherpad/src/static/img/davy/gfx/use-writing.png
rename : trunk/trunk/etherpad/src/static/img/davy/txt/home-button.gif => trunk/etherpad/src/static/img/davy/txt/home-button.gif
rename : trunk/trunk/etherpad/src/static/img/featuretour/code.gif => trunk/etherpad/src/static/img/featuretour/code.gif
rename : trunk/trunk/etherpad/src/static/img/featuretour/edits.gif => trunk/etherpad/src/static/img/featuretour/edits.gif
rename : trunk/trunk/etherpad/src/static/img/featuretour/editsandusers.gif => trunk/etherpad/src/static/img/featuretour/editsandusers.gif
rename : trunk/trunk/etherpad/src/static/img/featuretour/padlock.png => trunk/etherpad/src/static/img/featuretour/padlock.png
rename : trunk/trunk/etherpad/src/static/img/featuretour/revisions.gif => trunk/etherpad/src/static/img/featuretour/revisions.gif
rename : trunk/trunk/etherpad/src/static/img/featuretour/users.gif => trunk/etherpad/src/static/img/featuretour/users.gif
rename : trunk/trunk/etherpad/src/static/img/feb09/framedheaderback.gif => trunk/etherpad/src/static/img/feb09/framedheaderback.gif
rename : trunk/trunk/etherpad/src/static/img/feb09/framedheaderlogo.gif => trunk/etherpad/src/static/img/feb09/framedheaderlogo.gif
rename : trunk/trunk/etherpad/src/static/img/feb09/home_firstp.gif => trunk/etherpad/src/static/img/feb09/home_firstp.gif
rename : trunk/trunk/etherpad/src/static/img/feb09/home_firstp.png => trunk/etherpad/src/static/img/feb09/home_firstp.png
rename : trunk/trunk/etherpad/src/static/img/feb09/home_firstp2.gif => trunk/etherpad/src/static/img/feb09/home_firstp2.gif
rename : trunk/trunk/etherpad/src/static/img/feb09/home_h1.gif => trunk/etherpad/src/static/img/feb09/home_h1.gif
rename : trunk/trunk/etherpad/src/static/img/feb09/home_h1.png => trunk/etherpad/src/static/img/feb09/home_h1.png
rename : trunk/trunk/etherpad/src/static/img/feb09/home_newpadbutton.gif => trunk/etherpad/src/static/img/feb09/home_newpadbutton.gif
rename : trunk/trunk/etherpad/src/static/img/feb09/home_newpadbutton.png => trunk/etherpad/src/static/img/feb09/home_newpadbutton.png
rename : trunk/trunk/etherpad/src/static/img/feb09/home_newpadbutton2.gif => trunk/etherpad/src/static/img/feb09/home_newpadbutton2.gif
rename : trunk/trunk/etherpad/src/static/img/feb09/home_newpadbutton_eepnet.gif => trunk/etherpad/src/static/img/feb09/home_newpadbutton_eepnet.gif
rename : trunk/trunk/etherpad/src/static/img/feb09/hometop_back.gif => trunk/etherpad/src/static/img/feb09/hometop_back.gif
rename : trunk/trunk/etherpad/src/static/img/feb09/nav1.gif => trunk/etherpad/src/static/img/feb09/nav1.gif
rename : trunk/trunk/etherpad/src/static/img/feb09/nav1_back.gif => trunk/etherpad/src/static/img/feb09/nav1_back.gif
rename : trunk/trunk/etherpad/src/static/img/feb09/nav2.gif => trunk/etherpad/src/static/img/feb09/nav2.gif
rename : trunk/trunk/etherpad/src/static/img/feb09/screencast.gif => trunk/etherpad/src/static/img/feb09/screencast.gif
rename : trunk/trunk/etherpad/src/static/img/home/etherpad-mainheader1.jpg => trunk/etherpad/src/static/img/home/etherpad-mainheader1.jpg
rename : trunk/trunk/etherpad/src/static/img/home/headergradient.gif => trunk/etherpad/src/static/img/home/headergradient.gif
rename : trunk/trunk/etherpad/src/static/img/home/homeheader1.jpg => trunk/etherpad/src/static/img/home/homeheader1.jpg
rename : trunk/trunk/etherpad/src/static/img/home/homeheader2.jpg => trunk/etherpad/src/static/img/home/homeheader2.jpg
rename : trunk/trunk/etherpad/src/static/img/home/leftgrad.gif => trunk/etherpad/src/static/img/home/leftgrad.gif
rename : trunk/trunk/etherpad/src/static/img/home/pencilpaperback.png => trunk/etherpad/src/static/img/home/pencilpaperback.png
rename : trunk/trunk/etherpad/src/static/img/home/screencapture1.gif => trunk/etherpad/src/static/img/home/screencapture1.gif
rename : trunk/trunk/etherpad/src/static/img/home/underdevicon.gif => trunk/etherpad/src/static/img/home/underdevicon.gif
rename : trunk/trunk/etherpad/src/static/img/icon/downarrow.gif => trunk/etherpad/src/static/img/icon/downarrow.gif
rename : trunk/trunk/etherpad/src/static/img/icon/feed.gif => trunk/etherpad/src/static/img/icon/feed.gif
rename : trunk/trunk/etherpad/src/static/img/jun09/pad/backgrad.gif => trunk/etherpad/src/static/img/jun09/pad/backgrad.gif
rename : trunk/trunk/etherpad/src/static/img/jun09/pad/bottomareagfx.gif => trunk/etherpad/src/static/img/jun09/pad/bottomareagfx.gif
rename : trunk/trunk/etherpad/src/static/img/jun09/pad/colorpicker.gif => trunk/etherpad/src/static/img/jun09/pad/colorpicker.gif
rename : trunk/trunk/etherpad/src/static/img/jun09/pad/connectingbar.gif => trunk/etherpad/src/static/img/jun09/pad/connectingbar.gif
rename : trunk/trunk/etherpad/src/static/img/jun09/pad/connectionindicator.gif => trunk/etherpad/src/static/img/jun09/pad/connectionindicator.gif
rename : trunk/trunk/etherpad/src/static/img/jun09/pad/docbarstates.png => trunk/etherpad/src/static/img/jun09/pad/docbarstates.png
rename : trunk/trunk/etherpad/src/static/img/jun09/pad/docbarstates2.png => trunk/etherpad/src/static/img/jun09/pad/docbarstates2.png
rename : trunk/trunk/etherpad/src/static/img/jun09/pad/docbarstates3.png => trunk/etherpad/src/static/img/jun09/pad/docbarstates3.png
rename : trunk/trunk/etherpad/src/static/img/jun09/pad/docpaneledge.png => trunk/etherpad/src/static/img/jun09/pad/docpaneledge.png
rename : trunk/trunk/etherpad/src/static/img/jun09/pad/docpaneledge2.png => trunk/etherpad/src/static/img/jun09/pad/docpaneledge2.png
rename : trunk/trunk/etherpad/src/static/img/jun09/pad/docpanelmiddle.png => trunk/etherpad/src/static/img/jun09/pad/docpanelmiddle.png
rename : trunk/trunk/etherpad/src/static/img/jun09/pad/docpanelmiddle2.png => trunk/etherpad/src/static/img/jun09/pad/docpanelmiddle2.png
rename : trunk/trunk/etherpad/src/static/img/jun09/pad/editbar.gif => trunk/etherpad/src/static/img/jun09/pad/editbar.gif
rename : trunk/trunk/etherpad/src/static/img/jun09/pad/editbar2.gif => trunk/etherpad/src/static/img/jun09/pad/editbar2.gif
rename : trunk/trunk/etherpad/src/static/img/jun09/pad/editbar3.gif => trunk/etherpad/src/static/img/jun09/pad/editbar3.gif
rename : trunk/trunk/etherpad/src/static/img/jun09/pad/editbarback.gif => trunk/etherpad/src/static/img/jun09/pad/editbarback.gif
rename : trunk/trunk/etherpad/src/static/img/jun09/pad/feedbackbox2.gif => trunk/etherpad/src/static/img/jun09/pad/feedbackbox2.gif
rename : trunk/trunk/etherpad/src/static/img/jun09/pad/fileicons.gif => trunk/etherpad/src/static/img/jun09/pad/fileicons.gif
rename : trunk/trunk/etherpad/src/static/img/jun09/pad/hdraggie.gif => trunk/etherpad/src/static/img/jun09/pad/hdraggie.gif
rename : trunk/trunk/etherpad/src/static/img/jun09/pad/inviteshare.gif => trunk/etherpad/src/static/img/jun09/pad/inviteshare.gif
rename : trunk/trunk/etherpad/src/static/img/jun09/pad/inviteshare2.gif => trunk/etherpad/src/static/img/jun09/pad/inviteshare2.gif
rename : trunk/trunk/etherpad/src/static/img/jun09/pad/layoutbuttons.gif => trunk/etherpad/src/static/img/jun09/pad/layoutbuttons.gif
rename : trunk/trunk/etherpad/src/static/img/jun09/pad/overlay.png => trunk/etherpad/src/static/img/jun09/pad/overlay.png
rename : trunk/trunk/etherpad/src/static/img/jun09/pad/overlay2.png => trunk/etherpad/src/static/img/jun09/pad/overlay2.png
rename : trunk/trunk/etherpad/src/static/img/jun09/pad/padtop.gif => trunk/etherpad/src/static/img/jun09/pad/padtop.gif
rename : trunk/trunk/etherpad/src/static/img/jun09/pad/padtop2.gif => trunk/etherpad/src/static/img/jun09/pad/padtop2.gif
rename : trunk/trunk/etherpad/src/static/img/jun09/pad/padtop3.gif => trunk/etherpad/src/static/img/jun09/pad/padtop3.gif
rename : trunk/trunk/etherpad/src/static/img/jun09/pad/padtop4.gif => trunk/etherpad/src/static/img/jun09/pad/padtop4.gif
rename : trunk/trunk/etherpad/src/static/img/jun09/pad/padtop5.gif => trunk/etherpad/src/static/img/jun09/pad/padtop5.gif
rename : trunk/trunk/etherpad/src/static/img/jun09/pad/padtopback.gif => trunk/etherpad/src/static/img/jun09/pad/padtopback.gif
rename : trunk/trunk/etherpad/src/static/img/jun09/pad/padtopback2.gif => trunk/etherpad/src/static/img/jun09/pad/padtopback2.gif
rename : trunk/trunk/etherpad/src/static/img/jun09/pad/protop.gif => trunk/etherpad/src/static/img/jun09/pad/protop.gif
rename : trunk/trunk/etherpad/src/static/img/jun09/pad/public.gif => trunk/etherpad/src/static/img/jun09/pad/public.gif
rename : trunk/trunk/etherpad/src/static/img/jun09/pad/savedrevarrows.gif => trunk/etherpad/src/static/img/jun09/pad/savedrevarrows.gif
rename : trunk/trunk/etherpad/src/static/img/jun09/pad/savedrevsgfx2.gif => trunk/etherpad/src/static/img/jun09/pad/savedrevsgfx2.gif
rename : trunk/trunk/etherpad/src/static/img/jun09/pad/sharebox2.gif => trunk/etherpad/src/static/img/jun09/pad/sharebox2.gif
rename : trunk/trunk/etherpad/src/static/img/jun09/pad/sharebox3.gif => trunk/etherpad/src/static/img/jun09/pad/sharebox3.gif
rename : trunk/trunk/etherpad/src/static/img/jun09/pad/sharebox4.gif => trunk/etherpad/src/static/img/jun09/pad/sharebox4.gif
rename : trunk/trunk/etherpad/src/static/img/jun09/pad/sharedistri.gif => trunk/etherpad/src/static/img/jun09/pad/sharedistri.gif
rename : trunk/trunk/etherpad/src/static/img/jun09/pad/syncdone.gif => trunk/etherpad/src/static/img/jun09/pad/syncdone.gif
rename : trunk/trunk/etherpad/src/static/img/jun09/pad/syncing.gif => trunk/etherpad/src/static/img/jun09/pad/syncing.gif
rename : trunk/trunk/etherpad/src/static/img/jun09/pad/syncing2.gif => trunk/etherpad/src/static/img/jun09/pad/syncing2.gif
rename : trunk/trunk/etherpad/src/static/img/jun09/pad/viewbargfx.gif => trunk/etherpad/src/static/img/jun09/pad/viewbargfx.gif
rename : trunk/trunk/etherpad/src/static/img/lib/jquery.contextmenu.images/cmenu-gloss-cyan-menu-item-hover.gif => trunk/etherpad/src/static/img/lib/jquery.contextmenu.images/cmenu-gloss-cyan-menu-item-hover.gif
rename : trunk/trunk/etherpad/src/static/img/lib/jquery.contextmenu.images/cmenu-gloss-menu-item-hover.gif => trunk/etherpad/src/static/img/lib/jquery.contextmenu.images/cmenu-gloss-menu-item-hover.gif
rename : trunk/trunk/etherpad/src/static/img/lib/jquery.contextmenu.images/cmenu-gloss-semitransparent-menu-item-hover.png => trunk/etherpad/src/static/img/lib/jquery.contextmenu.images/cmenu-gloss-semitransparent-menu-item-hover.png
rename : trunk/trunk/etherpad/src/static/img/lib/jquery.contextmenu.images/cmenu-human-menu-item-hover.gif => trunk/etherpad/src/static/img/lib/jquery.contextmenu.images/cmenu-human-menu-item-hover.gif
rename : trunk/trunk/etherpad/src/static/img/lib/jquery.contextmenu.images/cmenu-osx-menu-item-hover.gif => trunk/etherpad/src/static/img/lib/jquery.contextmenu.images/cmenu-osx-menu-item-hover.gif
rename : trunk/trunk/etherpad/src/static/img/lib/jquery.contextmenu.images/cmenu-vista-bg.gif => trunk/etherpad/src/static/img/lib/jquery.contextmenu.images/cmenu-vista-bg.gif
rename : trunk/trunk/etherpad/src/static/img/lib/jquery.contextmenu.images/cmenu-vista-menu-item-hover.gif => trunk/etherpad/src/static/img/lib/jquery.contextmenu.images/cmenu-vista-menu-item-hover.gif
rename : trunk/trunk/etherpad/src/static/img/lib/jquery.contextmenu.images/cmenu-xp-bg.gif => trunk/etherpad/src/static/img/lib/jquery.contextmenu.images/cmenu-xp-bg.gif
rename : trunk/trunk/etherpad/src/static/img/may09/bold.gif => trunk/etherpad/src/static/img/may09/bold.gif
rename : trunk/trunk/etherpad/src/static/img/may09/doc.gif => trunk/etherpad/src/static/img/may09/doc.gif
rename : trunk/trunk/etherpad/src/static/img/may09/doc.png => trunk/etherpad/src/static/img/may09/doc.png
rename : trunk/trunk/etherpad/src/static/img/may09/html.gif => trunk/etherpad/src/static/img/may09/html.gif
rename : trunk/trunk/etherpad/src/static/img/may09/html.png => trunk/etherpad/src/static/img/may09/html.png
rename : trunk/trunk/etherpad/src/static/img/may09/italic.gif => trunk/etherpad/src/static/img/may09/italic.gif
rename : trunk/trunk/etherpad/src/static/img/may09/leftarrow.gif => trunk/etherpad/src/static/img/may09/leftarrow.gif
rename : trunk/trunk/etherpad/src/static/img/may09/leftarrow2.gif => trunk/etherpad/src/static/img/may09/leftarrow2.gif
rename : trunk/trunk/etherpad/src/static/img/may09/link.gif => trunk/etherpad/src/static/img/may09/link.gif
rename : trunk/trunk/etherpad/src/static/img/may09/link.png => trunk/etherpad/src/static/img/may09/link.png
rename : trunk/trunk/etherpad/src/static/img/may09/odt.gif => trunk/etherpad/src/static/img/may09/odt.gif
rename : trunk/trunk/etherpad/src/static/img/may09/odt.png => trunk/etherpad/src/static/img/may09/odt.png
rename : trunk/trunk/etherpad/src/static/img/may09/padlock.gif => trunk/etherpad/src/static/img/may09/padlock.gif
rename : trunk/trunk/etherpad/src/static/img/may09/padlockopen.gif => trunk/etherpad/src/static/img/may09/padlockopen.gif
rename : trunk/trunk/etherpad/src/static/img/may09/passwordlocked.gif => trunk/etherpad/src/static/img/may09/passwordlocked.gif
rename : trunk/trunk/etherpad/src/static/img/may09/passwordlocked_cropped.gif => trunk/etherpad/src/static/img/may09/passwordlocked_cropped.gif
rename : trunk/trunk/etherpad/src/static/img/may09/passwordnone.gif => trunk/etherpad/src/static/img/may09/passwordnone.gif
rename : trunk/trunk/etherpad/src/static/img/may09/paypal.gif => trunk/etherpad/src/static/img/may09/paypal.gif
rename : trunk/trunk/etherpad/src/static/img/may09/pdf.gif => trunk/etherpad/src/static/img/may09/pdf.gif
rename : trunk/trunk/etherpad/src/static/img/may09/pdf.png => trunk/etherpad/src/static/img/may09/pdf.png
rename : trunk/trunk/etherpad/src/static/img/may09/redo.gif => trunk/etherpad/src/static/img/may09/redo.gif
rename : trunk/trunk/etherpad/src/static/img/may09/txt.gif => trunk/etherpad/src/static/img/may09/txt.gif
rename : trunk/trunk/etherpad/src/static/img/may09/txt.png => trunk/etherpad/src/static/img/may09/txt.png
rename : trunk/trunk/etherpad/src/static/img/may09/underline.gif => trunk/etherpad/src/static/img/may09/underline.gif
rename : trunk/trunk/etherpad/src/static/img/may09/undo.gif => trunk/etherpad/src/static/img/may09/undo.gif
rename : trunk/trunk/etherpad/src/static/img/miniplane.gif => trunk/etherpad/src/static/img/miniplane.gif
rename : trunk/trunk/etherpad/src/static/img/misc/diagnostic-links.gif => trunk/etherpad/src/static/img/misc/diagnostic-links.gif
rename : trunk/trunk/etherpad/src/static/img/misc/status-ball.gif => trunk/etherpad/src/static/img/misc/status-ball.gif
rename : trunk/trunk/etherpad/src/static/img/misc/traclogo.gif => trunk/etherpad/src/static/img/misc/traclogo.gif
rename : trunk/trunk/etherpad/src/static/img/oct/atlonglast.gif => trunk/etherpad/src/static/img/oct/atlonglast.gif
rename : trunk/trunk/etherpad/src/static/img/oct/banner1.jpg => trunk/etherpad/src/static/img/oct/banner1.jpg
rename : trunk/trunk/etherpad/src/static/img/oct/banner2.jpg => trunk/etherpad/src/static/img/oct/banner2.jpg
rename : trunk/trunk/etherpad/src/static/img/oct/banner3.jpg => trunk/etherpad/src/static/img/oct/banner3.jpg
rename : trunk/trunk/etherpad/src/static/img/oct/banner4.jpg => trunk/etherpad/src/static/img/oct/banner4.jpg
rename : trunk/trunk/etherpad/src/static/img/oct/banner5.gif => trunk/etherpad/src/static/img/oct/banner5.gif
rename : trunk/trunk/etherpad/src/static/img/oct/banner6.gif => trunk/etherpad/src/static/img/oct/banner6.gif
rename : trunk/trunk/etherpad/src/static/img/oct/banner7.gif => trunk/etherpad/src/static/img/oct/banner7.gif
rename : trunk/trunk/etherpad/src/static/img/oct/banner8.gif => trunk/etherpad/src/static/img/oct/banner8.gif
rename : trunk/trunk/etherpad/src/static/img/oct/banner9.gif => trunk/etherpad/src/static/img/oct/banner9.gif
rename : trunk/trunk/etherpad/src/static/img/oct/bannerback5.gif => trunk/etherpad/src/static/img/oct/bannerback5.gif
rename : trunk/trunk/etherpad/src/static/img/oct/bannerback6.gif => trunk/etherpad/src/static/img/oct/bannerback6.gif
rename : trunk/trunk/etherpad/src/static/img/oct/bodyback1.gif => trunk/etherpad/src/static/img/oct/bodyback1.gif
rename : trunk/trunk/etherpad/src/static/img/oct/bodyback2.gif => trunk/etherpad/src/static/img/oct/bodyback2.gif
rename : trunk/trunk/etherpad/src/static/img/oct/bodyback3.gif => trunk/etherpad/src/static/img/oct/bodyback3.gif
rename : trunk/trunk/etherpad/src/static/img/oct/bodyback4.gif => trunk/etherpad/src/static/img/oct/bodyback4.gif
rename : trunk/trunk/etherpad/src/static/img/oct/bodyback5.gif => trunk/etherpad/src/static/img/oct/bodyback5.gif
rename : trunk/trunk/etherpad/src/static/img/oct/bodybacktop1.gif => trunk/etherpad/src/static/img/oct/bodybacktop1.gif
rename : trunk/trunk/etherpad/src/static/img/oct/computers.gif => trunk/etherpad/src/static/img/oct/computers.gif
rename : trunk/trunk/etherpad/src/static/img/oct/computers2.gif => trunk/etherpad/src/static/img/oct/computers2.gif
rename : trunk/trunk/etherpad/src/static/img/oct/glossyblue.gif => trunk/etherpad/src/static/img/oct/glossyblue.gif
rename : trunk/trunk/etherpad/src/static/img/oct/glossyblue2.gif => trunk/etherpad/src/static/img/oct/glossyblue2.gif
rename : trunk/trunk/etherpad/src/static/img/oct/glossyblueh.gif => trunk/etherpad/src/static/img/oct/glossyblueh.gif
rename : trunk/trunk/etherpad/src/static/img/oct/insetrect.gif => trunk/etherpad/src/static/img/oct/insetrect.gif
rename : trunk/trunk/etherpad/src/static/img/oct/minilogo1-05e.gif => trunk/etherpad/src/static/img/oct/minilogo1-05e.gif
rename : trunk/trunk/etherpad/src/static/img/oct/minilogo1-07f.gif => trunk/etherpad/src/static/img/oct/minilogo1-07f.gif
rename : trunk/trunk/etherpad/src/static/img/oct/minilogo3.jpg => trunk/etherpad/src/static/img/oct/minilogo3.jpg
rename : trunk/trunk/etherpad/src/static/img/oct/minitopback1.gif => trunk/etherpad/src/static/img/oct/minitopback1.gif
rename : trunk/trunk/etherpad/src/static/img/oct/minitopback2.gif => trunk/etherpad/src/static/img/oct/minitopback2.gif
rename : trunk/trunk/etherpad/src/static/img/oct/minitopbar1-05e.gif => trunk/etherpad/src/static/img/oct/minitopbar1-05e.gif
rename : trunk/trunk/etherpad/src/static/img/oct/minitopbar2-05e.gif => trunk/etherpad/src/static/img/oct/minitopbar2-05e.gif
rename : trunk/trunk/etherpad/src/static/img/oct/minitopbar2-07f.gif => trunk/etherpad/src/static/img/oct/minitopbar2-07f.gif
rename : trunk/trunk/etherpad/src/static/img/oct/minitopbar3.jpg => trunk/etherpad/src/static/img/oct/minitopbar3.jpg
rename : trunk/trunk/etherpad/src/static/img/oct/minitopbar4.gif => trunk/etherpad/src/static/img/oct/minitopbar4.gif
rename : trunk/trunk/etherpad/src/static/img/oct/minitoplogo1.gif => trunk/etherpad/src/static/img/oct/minitoplogo1.gif
rename : trunk/trunk/etherpad/src/static/img/oct/minitoplogo2.gif => trunk/etherpad/src/static/img/oct/minitoplogo2.gif
rename : trunk/trunk/etherpad/src/static/img/oct/newpadmain.gif => trunk/etherpad/src/static/img/oct/newpadmain.gif
rename : trunk/trunk/etherpad/src/static/img/oct/newpadmainback.gif => trunk/etherpad/src/static/img/oct/newpadmainback.gif
rename : trunk/trunk/etherpad/src/static/img/oct/newpadmainbackh.gif => trunk/etherpad/src/static/img/oct/newpadmainbackh.gif
rename : trunk/trunk/etherpad/src/static/img/oct/pageshot.png => trunk/etherpad/src/static/img/oct/pageshot.png
rename : trunk/trunk/etherpad/src/static/img/oct/pageshotmini.png => trunk/etherpad/src/static/img/oct/pageshotmini.png
rename : trunk/trunk/etherpad/src/static/img/oct/sidehead-gradhilite.gif => trunk/etherpad/src/static/img/oct/sidehead-gradhilite.gif
rename : trunk/trunk/etherpad/src/static/img/oct/tinytriangle.gif => trunk/etherpad/src/static/img/oct/tinytriangle.gif
rename : trunk/trunk/etherpad/src/static/img/oct/topnav1.gif => trunk/etherpad/src/static/img/oct/topnav1.gif
rename : trunk/trunk/etherpad/src/static/img/oct/topnav2.gif => trunk/etherpad/src/static/img/oct/topnav2.gif
rename : trunk/trunk/etherpad/src/static/img/oct/topnav3.gif => trunk/etherpad/src/static/img/oct/topnav3.gif
rename : trunk/trunk/etherpad/src/static/img/oct/topnav4.gif => trunk/etherpad/src/static/img/oct/topnav4.gif
rename : trunk/trunk/etherpad/src/static/img/oct/topnav5.gif => trunk/etherpad/src/static/img/oct/topnav5.gif
rename : trunk/trunk/etherpad/src/static/img/oct/topnav6.gif => trunk/etherpad/src/static/img/oct/topnav6.gif
rename : trunk/trunk/etherpad/src/static/img/oct/topnavback1.gif => trunk/etherpad/src/static/img/oct/topnavback1.gif
rename : trunk/trunk/etherpad/src/static/img/oct/topnavback2.gif => trunk/etherpad/src/static/img/oct/topnavback2.gif
rename : trunk/trunk/etherpad/src/static/img/oct/topnavback3.gif => trunk/etherpad/src/static/img/oct/topnavback3.gif
rename : trunk/trunk/etherpad/src/static/img/oct/usecasesnavdown.gif => trunk/etherpad/src/static/img/oct/usecasesnavdown.gif
rename : trunk/trunk/etherpad/src/static/img/oct/usecasesnavdownh.gif => trunk/etherpad/src/static/img/oct/usecasesnavdownh.gif
rename : trunk/trunk/etherpad/src/static/img/oct/usecasesnavup.gif => trunk/etherpad/src/static/img/oct/usecasesnavup.gif
rename : trunk/trunk/etherpad/src/static/img/oct/usecasesnavuph.gif => trunk/etherpad/src/static/img/oct/usecasesnavuph.gif
rename : trunk/trunk/etherpad/src/static/img/oct/watchscreencast.gif => trunk/etherpad/src/static/img/oct/watchscreencast.gif
rename : trunk/trunk/etherpad/src/static/img/pad/animated-orb-orange-12.gif => trunk/etherpad/src/static/img/pad/animated-orb-orange-12.gif
rename : trunk/trunk/etherpad/src/static/img/pad/backgrad.png => trunk/etherpad/src/static/img/pad/backgrad.png
rename : trunk/trunk/etherpad/src/static/img/pad/backshadow/backshadow-940-20-eee-20.gif => trunk/etherpad/src/static/img/pad/backshadow/backshadow-940-20-eee-20.gif
rename : trunk/trunk/etherpad/src/static/img/pad/backshadow/backshadow-940-20-fff-20.gif => trunk/etherpad/src/static/img/pad/backshadow/backshadow-940-20-fff-20.gif
rename : trunk/trunk/etherpad/src/static/img/pad/backshadow/backshadow-940-20-fff-40.gif => trunk/etherpad/src/static/img/pad/backshadow/backshadow-940-20-fff-40.gif
rename : trunk/trunk/etherpad/src/static/img/pad/backshadow/backshadow-940-20-fff-60.gif => trunk/etherpad/src/static/img/pad/backshadow/backshadow-940-20-fff-60.gif
rename : trunk/trunk/etherpad/src/static/img/pad/backshadow/botshadow-940-20-eee-20.gif => trunk/etherpad/src/static/img/pad/backshadow/botshadow-940-20-eee-20.gif
rename : trunk/trunk/etherpad/src/static/img/pad/etherpad-logo-small-grad.gif => trunk/etherpad/src/static/img/pad/etherpad-logo-small-grad.gif
rename : trunk/trunk/etherpad/src/static/img/pad/etherpad-logo-small.gif => trunk/etherpad/src/static/img/pad/etherpad-logo-small.gif
rename : trunk/trunk/etherpad/src/static/img/pad/etherpad-logo-small2.gif => trunk/etherpad/src/static/img/pad/etherpad-logo-small2.gif
rename : trunk/trunk/etherpad/src/static/img/pad/expandy-arrow-down.gif => trunk/etherpad/src/static/img/pad/expandy-arrow-down.gif
rename : trunk/trunk/etherpad/src/static/img/pad/expandy-arrow-right.gif => trunk/etherpad/src/static/img/pad/expandy-arrow-right.gif
rename : trunk/trunk/etherpad/src/static/img/pad/expandy-arrow6-down-active.gif => trunk/etherpad/src/static/img/pad/expandy-arrow6-down-active.gif
rename : trunk/trunk/etherpad/src/static/img/pad/expandy-arrow6-down.gif => trunk/etherpad/src/static/img/pad/expandy-arrow6-down.gif
rename : trunk/trunk/etherpad/src/static/img/pad/expandy-arrow6-right-active.gif => trunk/etherpad/src/static/img/pad/expandy-arrow6-right-active.gif
rename : trunk/trunk/etherpad/src/static/img/pad/expandy-arrow6-right.gif => trunk/etherpad/src/static/img/pad/expandy-arrow6-right.gif
rename : trunk/trunk/etherpad/src/static/img/pad/header-revgrad.gif => trunk/etherpad/src/static/img/pad/header-revgrad.gif
rename : trunk/trunk/etherpad/src/static/img/pad/newpad.gif => trunk/etherpad/src/static/img/pad/newpad.gif
rename : trunk/trunk/etherpad/src/static/img/pad/orb-greenred-12.gif => trunk/etherpad/src/static/img/pad/orb-greenred-12.gif
rename : trunk/trunk/etherpad/src/static/img/pad/padbg1.jpg => trunk/etherpad/src/static/img/pad/padbg1.jpg
rename : trunk/trunk/etherpad/src/static/img/pad/padbg2.jpg => trunk/etherpad/src/static/img/pad/padbg2.jpg
rename : trunk/trunk/etherpad/src/static/img/pad/padbg3.jpg => trunk/etherpad/src/static/img/pad/padbg3.jpg
rename : trunk/trunk/etherpad/src/static/img/pad/padbg4.jpg => trunk/etherpad/src/static/img/pad/padbg4.jpg
rename : trunk/trunk/etherpad/src/static/img/pad/padbg5.jpg => trunk/etherpad/src/static/img/pad/padbg5.jpg
rename : trunk/trunk/etherpad/src/static/img/pad/padhead1.jpg => trunk/etherpad/src/static/img/pad/padhead1.jpg
rename : trunk/trunk/etherpad/src/static/img/pad/padhead2.jpg => trunk/etherpad/src/static/img/pad/padhead2.jpg
rename : trunk/trunk/etherpad/src/static/img/pad/padhead3.jpg => trunk/etherpad/src/static/img/pad/padhead3.jpg
rename : trunk/trunk/etherpad/src/static/img/pad/pencil-icon-small-blue.gif => trunk/etherpad/src/static/img/pad/pencil-icon-small-blue.gif
rename : trunk/trunk/etherpad/src/static/img/pad/sidehead-grad.gif => trunk/etherpad/src/static/img/pad/sidehead-grad.gif
rename : trunk/trunk/etherpad/src/static/img/pad/timeslider/button_depressed.png => trunk/etherpad/src/static/img/pad/timeslider/button_depressed.png
rename : trunk/trunk/etherpad/src/static/img/pad/timeslider/button_undepressed.png => trunk/etherpad/src/static/img/pad/timeslider/button_undepressed.png
rename : trunk/trunk/etherpad/src/static/img/pad/timeslider/crushed_button_depressed.png => trunk/etherpad/src/static/img/pad/timeslider/crushed_button_depressed.png
rename : trunk/trunk/etherpad/src/static/img/pad/timeslider/crushed_button_undepressed.png => trunk/etherpad/src/static/img/pad/timeslider/crushed_button_undepressed.png
rename : trunk/trunk/etherpad/src/static/img/pad/timeslider/crushed_current_location.png => trunk/etherpad/src/static/img/pad/timeslider/crushed_current_location.png
rename : trunk/trunk/etherpad/src/static/img/pad/timeslider/crushed_pause.png => trunk/etherpad/src/static/img/pad/timeslider/crushed_pause.png
rename : trunk/trunk/etherpad/src/static/img/pad/timeslider/crushed_play.png => trunk/etherpad/src/static/img/pad/timeslider/crushed_play.png
rename : trunk/trunk/etherpad/src/static/img/pad/timeslider/crushed_play_button.png => trunk/etherpad/src/static/img/pad/timeslider/crushed_play_button.png
rename : trunk/trunk/etherpad/src/static/img/pad/timeslider/crushed_timeslider_mockup.png => trunk/etherpad/src/static/img/pad/timeslider/crushed_timeslider_mockup.png
rename : trunk/trunk/etherpad/src/static/img/pad/timeslider/current_location.gif => trunk/etherpad/src/static/img/pad/timeslider/current_location.gif
rename : trunk/trunk/etherpad/src/static/img/pad/timeslider/current_location.png => trunk/etherpad/src/static/img/pad/timeslider/current_location.png
rename : trunk/trunk/etherpad/src/static/img/pad/timeslider/pause.gif => trunk/etherpad/src/static/img/pad/timeslider/pause.gif
rename : trunk/trunk/etherpad/src/static/img/pad/timeslider/pause.png => trunk/etherpad/src/static/img/pad/timeslider/pause.png
rename : trunk/trunk/etherpad/src/static/img/pad/timeslider/play.gif => trunk/etherpad/src/static/img/pad/timeslider/play.gif
rename : trunk/trunk/etherpad/src/static/img/pad/timeslider/play.png => trunk/etherpad/src/static/img/pad/timeslider/play.png
rename : trunk/trunk/etherpad/src/static/img/pad/timeslider/play_button.png => trunk/etherpad/src/static/img/pad/timeslider/play_button.png
rename : trunk/trunk/etherpad/src/static/img/pad/timeslider/star.gif => trunk/etherpad/src/static/img/pad/timeslider/star.gif
rename : trunk/trunk/etherpad/src/static/img/pad/timeslider/star.png => trunk/etherpad/src/static/img/pad/timeslider/star.png
rename : trunk/trunk/etherpad/src/static/img/pad/timeslider/star_selected.png => trunk/etherpad/src/static/img/pad/timeslider/star_selected.png
rename : trunk/trunk/etherpad/src/static/img/pad/timeslider/stepper_buttons.png => trunk/etherpad/src/static/img/pad/timeslider/stepper_buttons.png
rename : trunk/trunk/etherpad/src/static/img/pad/timeslider/timeslider_background.png => trunk/etherpad/src/static/img/pad/timeslider/timeslider_background.png
rename : trunk/trunk/etherpad/src/static/img/pad/timeslider/timeslider_left.png => trunk/etherpad/src/static/img/pad/timeslider/timeslider_left.png
rename : trunk/trunk/etherpad/src/static/img/pad/timeslider/timeslider_mockup.png => trunk/etherpad/src/static/img/pad/timeslider/timeslider_mockup.png
rename : trunk/trunk/etherpad/src/static/img/pad/timeslider/timeslider_right.png => trunk/etherpad/src/static/img/pad/timeslider/timeslider_right.png
rename : trunk/trunk/etherpad/src/static/img/pricing/free.gif => trunk/etherpad/src/static/img/pricing/free.gif
rename : trunk/trunk/etherpad/src/static/img/pricing/group.gif => trunk/etherpad/src/static/img/pricing/group.gif
rename : trunk/trunk/etherpad/src/static/img/pricing/on-demand.gif => trunk/etherpad/src/static/img/pricing/on-demand.gif
rename : trunk/trunk/etherpad/src/static/img/pricing/private-network.gif => trunk/etherpad/src/static/img/pricing/private-network.gif
rename : trunk/trunk/etherpad/src/static/img/pricing/support.gif => trunk/etherpad/src/static/img/pricing/support.gif
rename : trunk/trunk/etherpad/src/static/img/pro/billing/cards-button.gif => trunk/etherpad/src/static/img/pro/billing/cards-button.gif
rename : trunk/trunk/etherpad/src/static/img/pro/box/blue-boxtop.gif => trunk/etherpad/src/static/img/pro/box/blue-boxtop.gif
rename : trunk/trunk/etherpad/src/static/img/pro/buttons/bluebutton120.gif => trunk/etherpad/src/static/img/pro/buttons/bluebutton120.gif
rename : trunk/trunk/etherpad/src/static/img/pro/header/pro-header-back.gif => trunk/etherpad/src/static/img/pro/header/pro-header-back.gif
rename : trunk/trunk/etherpad/src/static/img/pro/header/pro-header-logo.png => trunk/etherpad/src/static/img/pro/header/pro-header-logo.png
rename : trunk/trunk/etherpad/src/static/img/pro/header/pro-header-plustopnav-back.gif => trunk/etherpad/src/static/img/pro/header/pro-header-plustopnav-back.gif
rename : trunk/trunk/etherpad/src/static/img/pro/padlist/gear-drop.gif => trunk/etherpad/src/static/img/pro/padlist/gear-drop.gif
rename : trunk/trunk/etherpad/src/static/img/pro/padlist/paper-icon.gif => trunk/etherpad/src/static/img/pro/padlist/paper-icon.gif
rename : trunk/trunk/etherpad/src/static/img/pro/padlist/trash-icon.gif => trunk/etherpad/src/static/img/pro/padlist/trash-icon.gif
rename : trunk/trunk/etherpad/src/static/img/pro/topnav/pro-topnav-back.gif => trunk/etherpad/src/static/img/pro/topnav/pro-topnav-back.gif
rename : trunk/trunk/etherpad/src/static/img/pro/topnav/pro-topnav-notch.gif => trunk/etherpad/src/static/img/pro/topnav/pro-topnav-notch.gif
rename : trunk/trunk/etherpad/src/static/img/tinyplane.gif => trunk/etherpad/src/static/img/tinyplane.gif
rename : trunk/trunk/etherpad/src/static/img/wavejet.jpg => trunk/etherpad/src/static/img/wavejet.jpg
rename : trunk/trunk/etherpad/src/static/js/ace.js => trunk/etherpad/src/static/js/ace.js
rename : trunk/trunk/etherpad/src/static/js/billing.js => trunk/etherpad/src/static/js/billing.js
rename : trunk/trunk/etherpad/src/static/js/billing_shared.js => trunk/etherpad/src/static/js/billing_shared.js
rename : trunk/trunk/etherpad/src/static/js/broadcast.js => trunk/etherpad/src/static/js/broadcast.js
rename : trunk/trunk/etherpad/src/static/js/broadcast_revisions.js => trunk/etherpad/src/static/js/broadcast_revisions.js
rename : trunk/trunk/etherpad/src/static/js/broadcast_slider.js => trunk/etherpad/src/static/js/broadcast_slider.js
rename : trunk/trunk/etherpad/src/static/js/collab_client.js => trunk/etherpad/src/static/js/collab_client.js
rename : trunk/trunk/etherpad/src/static/js/colorutils.js => trunk/etherpad/src/static/js/colorutils.js
rename : trunk/trunk/etherpad/src/static/js/confirmation.js => trunk/etherpad/src/static/js/confirmation.js
rename : trunk/trunk/etherpad/src/static/js/connection_diagnostics.js => trunk/etherpad/src/static/js/connection_diagnostics.js
rename : trunk/trunk/etherpad/src/static/js/cssmanager_client.js => trunk/etherpad/src/static/js/cssmanager_client.js
rename : trunk/trunk/etherpad/src/static/js/domline_client.js => trunk/etherpad/src/static/js/domline_client.js
rename : trunk/trunk/etherpad/src/static/js/draggable.js => trunk/etherpad/src/static/js/draggable.js
rename : trunk/trunk/etherpad/src/static/js/easysync2_client.js => trunk/etherpad/src/static/js/easysync2_client.js
rename : trunk/trunk/etherpad/src/static/js/etherpad.js => trunk/etherpad/src/static/js/etherpad.js
rename : trunk/trunk/etherpad/src/static/js/jquery-1.2.6.js => trunk/etherpad/src/static/js/jquery-1.2.6.js
rename : trunk/trunk/etherpad/src/static/js/jquery-1.3.2.js => trunk/etherpad/src/static/js/jquery-1.3.2.js
rename : trunk/trunk/etherpad/src/static/js/json2.js => trunk/etherpad/src/static/js/json2.js
rename : trunk/trunk/etherpad/src/static/js/lib/jquery.contextmenu.js => trunk/etherpad/src/static/js/lib/jquery.contextmenu.js
rename : trunk/trunk/etherpad/src/static/js/linestylefilter_client.js => trunk/etherpad/src/static/js/linestylefilter_client.js
rename : trunk/trunk/etherpad/src/static/js/pad.js.old => trunk/etherpad/src/static/js/pad.js.old
rename : trunk/trunk/etherpad/src/static/js/pad2.js => trunk/etherpad/src/static/js/pad2.js
rename : trunk/trunk/etherpad/src/static/js/pad_chat.js => trunk/etherpad/src/static/js/pad_chat.js
rename : trunk/trunk/etherpad/src/static/js/pad_connectionstatus.js => trunk/etherpad/src/static/js/pad_connectionstatus.js
rename : trunk/trunk/etherpad/src/static/js/pad_cookie.js => trunk/etherpad/src/static/js/pad_cookie.js
rename : trunk/trunk/etherpad/src/static/js/pad_docbar.js => trunk/etherpad/src/static/js/pad_docbar.js
rename : trunk/trunk/etherpad/src/static/js/pad_editbar.js => trunk/etherpad/src/static/js/pad_editbar.js
rename : trunk/trunk/etherpad/src/static/js/pad_editor.js => trunk/etherpad/src/static/js/pad_editor.js
rename : trunk/trunk/etherpad/src/static/js/pad_impexp.js => trunk/etherpad/src/static/js/pad_impexp.js
rename : trunk/trunk/etherpad/src/static/js/pad_modals.js => trunk/etherpad/src/static/js/pad_modals.js
rename : trunk/trunk/etherpad/src/static/js/pad_savedrevs.js => trunk/etherpad/src/static/js/pad_savedrevs.js
rename : trunk/trunk/etherpad/src/static/js/pad_userlist.js => trunk/etherpad/src/static/js/pad_userlist.js
rename : trunk/trunk/etherpad/src/static/js/pad_utils.js => trunk/etherpad/src/static/js/pad_utils.js
rename : trunk/trunk/etherpad/src/static/js/pricing.js => trunk/etherpad/src/static/js/pricing.js
rename : trunk/trunk/etherpad/src/static/js/pro/guest-knock-client.js => trunk/etherpad/src/static/js/pro/guest-knock-client.js
rename : trunk/trunk/etherpad/src/static/js/pro/pro-padlist-client.js => trunk/etherpad/src/static/js/pro/pro-padlist-client.js
rename : trunk/trunk/etherpad/src/static/js/pro/signin-client.js => trunk/etherpad/src/static/js/pro/signin-client.js
rename : trunk/trunk/etherpad/src/static/js/pulse.jquery.js => trunk/etherpad/src/static/js/pulse.jquery.js
rename : trunk/trunk/etherpad/src/static/js/statpage.js => trunk/etherpad/src/static/js/statpage.js
rename : trunk/trunk/etherpad/src/static/js/store.js => trunk/etherpad/src/static/js/store.js
rename : trunk/trunk/etherpad/src/static/js/swfobject.js => trunk/etherpad/src/static/js/swfobject.js
rename : trunk/trunk/etherpad/src/static/js/timeslider.js => trunk/etherpad/src/static/js/timeslider.js
rename : trunk/trunk/etherpad/src/static/js/undo-xpopup.js => trunk/etherpad/src/static/js/undo-xpopup.js
rename : trunk/trunk/etherpad/src/static/swf/vidplayer.swf => trunk/etherpad/src/static/swf/vidplayer.swf
rename : trunk/trunk/etherpad/src/templates/500_body.ejs => trunk/etherpad/src/templates/500_body.ejs
rename : trunk/trunk/etherpad/src/templates/beta/signup.ejs => trunk/etherpad/src/templates/beta/signup.ejs
rename : trunk/trunk/etherpad/src/templates/email/eepnet_license_info.ejs => trunk/etherpad/src/templates/email/eepnet_license_info.ejs
rename : trunk/trunk/etherpad/src/templates/email/eepnet_purchase_receipt.ejs => trunk/etherpad/src/templates/email/eepnet_purchase_receipt.ejs
rename : trunk/trunk/etherpad/src/templates/email/padinvite.ejs => trunk/etherpad/src/templates/email/padinvite.ejs
rename : trunk/trunk/etherpad/src/templates/email/pro_beta_invite.ejs => trunk/etherpad/src/templates/email/pro_beta_invite.ejs
rename : trunk/trunk/etherpad/src/templates/email/pro_payment_failure.ejs => trunk/etherpad/src/templates/email/pro_payment_failure.ejs
rename : trunk/trunk/etherpad/src/templates/email/pro_payment_receipt.ejs => trunk/etherpad/src/templates/email/pro_payment_receipt.ejs
rename : trunk/trunk/etherpad/src/templates/framed/framedfooter.ejs => trunk/etherpad/src/templates/framed/framedfooter.ejs
rename : trunk/trunk/etherpad/src/templates/framed/framedheader-pro.ejs => trunk/etherpad/src/templates/framed/framedheader-pro.ejs
rename : trunk/trunk/etherpad/src/templates/framed/framedheader.ejs => trunk/etherpad/src/templates/framed/framedheader.ejs
rename : trunk/trunk/etherpad/src/templates/framed/framedpage-pro.ejs => trunk/etherpad/src/templates/framed/framedpage-pro.ejs
rename : trunk/trunk/etherpad/src/templates/framed/framedpage.ejs => trunk/etherpad/src/templates/framed/framedpage.ejs
rename : trunk/trunk/etherpad/src/templates/html.ejs => trunk/etherpad/src/templates/html.ejs
rename : trunk/trunk/etherpad/src/templates/main/home.ejs => trunk/etherpad/src/templates/main/home.ejs
rename : trunk/trunk/etherpad/src/templates/main/pro_signup_body.ejs => trunk/etherpad/src/templates/main/pro_signup_body.ejs
rename : trunk/trunk/etherpad/src/templates/misc/pad_default.ejs => trunk/etherpad/src/templates/misc/pad_default.ejs
rename : trunk/trunk/etherpad/src/templates/notice.ejs => trunk/etherpad/src/templates/notice.ejs
rename : trunk/trunk/etherpad/src/templates/pad/create_body.ejs => trunk/etherpad/src/templates/pad/create_body.ejs
rename : trunk/trunk/etherpad/src/templates/pad/create_body_rafter.ejs => trunk/etherpad/src/templates/pad/create_body_rafter.ejs
rename : trunk/trunk/etherpad/src/templates/pad/exporthtml.ejs => trunk/etherpad/src/templates/pad/exporthtml.ejs
rename : trunk/trunk/etherpad/src/templates/pad/pad_body.ejs => trunk/etherpad/src/templates/pad/pad_body.ejs
rename : trunk/trunk/etherpad/src/templates/pad/pad_body2.ejs => trunk/etherpad/src/templates/pad/pad_body2.ejs
rename : trunk/trunk/etherpad/src/templates/pad/pad_content.ejs => trunk/etherpad/src/templates/pad/pad_content.ejs
rename : trunk/trunk/etherpad/src/templates/pad/pad_download_link.ejs => trunk/etherpad/src/templates/pad/pad_download_link.ejs
rename : trunk/trunk/etherpad/src/templates/pad/pad_iphone_body.ejs => trunk/etherpad/src/templates/pad/pad_iphone_body.ejs
rename : trunk/trunk/etherpad/src/templates/pad/padfull_body.ejs => trunk/etherpad/src/templates/pad/padfull_body.ejs
rename : trunk/trunk/etherpad/src/templates/pad/padslider_body.ejs => trunk/etherpad/src/templates/pad/padslider_body.ejs
rename : trunk/trunk/etherpad/src/templates/pad/padview_body.ejs => trunk/etherpad/src/templates/pad/padview_body.ejs
rename : trunk/trunk/etherpad/src/templates/pad/total_users_exceeded.ejs => trunk/etherpad/src/templates/pad/total_users_exceeded.ejs
rename : trunk/trunk/etherpad/src/templates/pro-account/recover.ejs => trunk/etherpad/src/templates/pro-account/recover.ejs
rename : trunk/trunk/etherpad/src/templates/pro-account/sign-in.ejs => trunk/etherpad/src/templates/pro-account/sign-in.ejs
rename : trunk/trunk/etherpad/src/templates/pro-help/billing.ejs => trunk/etherpad/src/templates/pro-help/billing.ejs
rename : trunk/trunk/etherpad/src/templates/pro-help/essentials.ejs => trunk/etherpad/src/templates/pro-help/essentials.ejs
rename : trunk/trunk/etherpad/src/templates/pro-help/main.ejs => trunk/etherpad/src/templates/pro-help/main.ejs
rename : trunk/trunk/etherpad/src/templates/pro-help/pro-help-template.ejs => trunk/etherpad/src/templates/pro-help/pro-help-template.ejs
rename : trunk/trunk/etherpad/src/templates/pro/account/account-welcome-email.ejs => trunk/etherpad/src/templates/pro/account/account-welcome-email.ejs
rename : trunk/trunk/etherpad/src/templates/pro/account/create-admin-account.ejs => trunk/etherpad/src/templates/pro/account/create-admin-account.ejs
rename : trunk/trunk/etherpad/src/templates/pro/account/forgot-password-email.ejs => trunk/etherpad/src/templates/pro/account/forgot-password-email.ejs
rename : trunk/trunk/etherpad/src/templates/pro/account/forgot-password.ejs => trunk/etherpad/src/templates/pro/account/forgot-password.ejs
rename : trunk/trunk/etherpad/src/templates/pro/account/global-multi-domain-recover-email.ejs => trunk/etherpad/src/templates/pro/account/global-multi-domain-recover-email.ejs
rename : trunk/trunk/etherpad/src/templates/pro/account/guest-knock.ejs => trunk/etherpad/src/templates/pro/account/guest-knock.ejs
rename : trunk/trunk/etherpad/src/templates/pro/account/my-account.ejs => trunk/etherpad/src/templates/pro/account/my-account.ejs
rename : trunk/trunk/etherpad/src/templates/pro/account/signin-guest.ejs => trunk/etherpad/src/templates/pro/account/signin-guest.ejs
rename : trunk/trunk/etherpad/src/templates/pro/account/signin.ejs => trunk/etherpad/src/templates/pro/account/signin.ejs
rename : trunk/trunk/etherpad/src/templates/pro/admin/account-manager.ejs => trunk/etherpad/src/templates/pro/admin/account-manager.ejs
rename : trunk/trunk/etherpad/src/templates/pro/admin/admin-template.ejs => trunk/etherpad/src/templates/pro/admin/admin-template.ejs
rename : trunk/trunk/etherpad/src/templates/pro/admin/admin.ejs => trunk/etherpad/src/templates/pro/admin/admin.ejs
rename : trunk/trunk/etherpad/src/templates/pro/admin/billing-invoices.ejs => trunk/etherpad/src/templates/pro/admin/billing-invoices.ejs
rename : trunk/trunk/etherpad/src/templates/pro/admin/delete-account.ejs => trunk/etherpad/src/templates/pro/admin/delete-account.ejs
rename : trunk/trunk/etherpad/src/templates/pro/admin/manage-account.ejs => trunk/etherpad/src/templates/pro/admin/manage-account.ejs
rename : trunk/trunk/etherpad/src/templates/pro/admin/manage-billing.ejs => trunk/etherpad/src/templates/pro/admin/manage-billing.ejs
rename : trunk/trunk/etherpad/src/templates/pro/admin/new-account.ejs => trunk/etherpad/src/templates/pro/admin/new-account.ejs
rename : trunk/trunk/etherpad/src/templates/pro/admin/pne-config.ejs => trunk/etherpad/src/templates/pro/admin/pne-config.ejs
rename : trunk/trunk/etherpad/src/templates/pro/admin/pne-dashboard.ejs => trunk/etherpad/src/templates/pro/admin/pne-dashboard.ejs
rename : trunk/trunk/etherpad/src/templates/pro/admin/pne-license-manager.ejs => trunk/etherpad/src/templates/pro/admin/pne-license-manager.ejs
rename : trunk/trunk/etherpad/src/templates/pro/admin/pne-shell.ejs => trunk/etherpad/src/templates/pro/admin/pne-shell.ejs
rename : trunk/trunk/etherpad/src/templates/pro/admin/pro-config.ejs => trunk/etherpad/src/templates/pro/admin/pro-config.ejs
rename : trunk/trunk/etherpad/src/templates/pro/admin/single-invoice.ejs => trunk/etherpad/src/templates/pro/admin/single-invoice.ejs
rename : trunk/trunk/etherpad/src/templates/pro/padlist/pro-padlist.ejs => trunk/etherpad/src/templates/pro/padlist/pro-padlist.ejs
rename : trunk/trunk/etherpad/src/templates/pro/pro-payment-required.ejs => trunk/etherpad/src/templates/pro/pro-payment-required.ejs
rename : trunk/trunk/etherpad/src/templates/pro/pro_home.ejs => trunk/etherpad/src/templates/pro/pro_home.ejs
rename : trunk/trunk/etherpad/src/templates/statistics/stat_page.ejs => trunk/etherpad/src/templates/statistics/stat_page.ejs
rename : trunk/trunk/etherpad/src/templates/store/csc-help.ejs => trunk/etherpad/src/templates/store/csc-help.ejs
rename : trunk/trunk/etherpad/src/templates/store/eepnet-checkout/billing-info.ejs => trunk/etherpad/src/templates/store/eepnet-checkout/billing-info.ejs
rename : trunk/trunk/etherpad/src/templates/store/eepnet-checkout/cart.ejs => trunk/etherpad/src/templates/store/eepnet-checkout/cart.ejs
rename : trunk/trunk/etherpad/src/templates/store/eepnet-checkout/checkout-template.ejs => trunk/etherpad/src/templates/store/eepnet-checkout/checkout-template.ejs
rename : trunk/trunk/etherpad/src/templates/store/eepnet-checkout/confirmation.ejs => trunk/etherpad/src/templates/store/eepnet-checkout/confirmation.ejs
rename : trunk/trunk/etherpad/src/templates/store/eepnet-checkout/license-info.ejs => trunk/etherpad/src/templates/store/eepnet-checkout/license-info.ejs
rename : trunk/trunk/etherpad/src/templates/store/eepnet-checkout/purchase.ejs => trunk/etherpad/src/templates/store/eepnet-checkout/purchase.ejs
rename : trunk/trunk/etherpad/src/templates/store/eepnet-checkout/receipt.ejs => trunk/etherpad/src/templates/store/eepnet-checkout/receipt.ejs
rename : trunk/trunk/etherpad/src/templates/store/eepnet-checkout/summary.ejs => trunk/etherpad/src/templates/store/eepnet-checkout/summary.ejs
rename : trunk/trunk/etherpad/src/templates/store/eepnet-checkout/support-contract.ejs => trunk/etherpad/src/templates/store/eepnet-checkout/support-contract.ejs
rename : trunk/trunk/etherpad/src/templates/store/eepnet_download.ejs => trunk/etherpad/src/templates/store/eepnet_download.ejs
rename : trunk/trunk/etherpad/src/templates/store/eepnet_eval_nextsteps.ejs => trunk/etherpad/src/templates/store/eepnet_eval_nextsteps.ejs
rename : trunk/trunk/etherpad/src/templates/store/eepnet_eval_signup.ejs => trunk/etherpad/src/templates/store/eepnet_eval_signup.ejs
rename : trunk/trunk/infrastructure/.gitignore => trunk/infrastructure/.gitignore
rename : trunk/trunk/infrastructure/ace/.gitignore => trunk/infrastructure/ace/.gitignore
rename : trunk/trunk/infrastructure/ace/bin/backup.sh => trunk/infrastructure/ace/bin/backup.sh
rename : trunk/trunk/infrastructure/ace/bin/jsmin.py => trunk/infrastructure/ace/bin/jsmin.py
rename : trunk/trunk/infrastructure/ace/bin/make => trunk/infrastructure/ace/bin/make
rename : trunk/trunk/infrastructure/ace/bin/publish.sh => trunk/infrastructure/ace/bin/publish.sh
rename : trunk/trunk/infrastructure/ace/bin/serve => trunk/infrastructure/ace/bin/serve
rename : trunk/trunk/infrastructure/ace/blog.txt => trunk/infrastructure/ace/blog.txt
rename : trunk/trunk/infrastructure/ace/build/.gitignore => trunk/infrastructure/ace/build/.gitignore
rename : trunk/trunk/infrastructure/ace/build/index.html => trunk/infrastructure/ace/build/index.html
rename : trunk/trunk/infrastructure/ace/build/jquery-1.2.1.js => trunk/infrastructure/ace/build/jquery-1.2.1.js
rename : trunk/trunk/infrastructure/ace/build/testcode.js => trunk/infrastructure/ace/build/testcode.js
rename : trunk/trunk/infrastructure/ace/easysync-notes.txt => trunk/infrastructure/ace/easysync-notes.txt
rename : trunk/trunk/infrastructure/ace/lib/rhino-js-1.7r1.jar => trunk/infrastructure/ace/lib/rhino-js-1.7r1.jar
rename : trunk/trunk/infrastructure/ace/lib/yuicompressor-2.4-appjet.jar => trunk/infrastructure/ace/lib/yuicompressor-2.4-appjet.jar
rename : trunk/trunk/infrastructure/ace/notes.txt => trunk/infrastructure/ace/notes.txt
rename : trunk/trunk/infrastructure/ace/www/ace2_common.js => trunk/infrastructure/ace/www/ace2_common.js
rename : trunk/trunk/infrastructure/ace/www/ace2_common_dev.js => trunk/infrastructure/ace/www/ace2_common_dev.js
rename : trunk/trunk/infrastructure/ace/www/ace2_inner.js => trunk/infrastructure/ace/www/ace2_inner.js
rename : trunk/trunk/infrastructure/ace/www/ace2_outer.js => trunk/infrastructure/ace/www/ace2_outer.js
rename : trunk/trunk/infrastructure/ace/www/ace2_wrapper.js => trunk/infrastructure/ace/www/ace2_wrapper.js
rename : trunk/trunk/infrastructure/ace/www/bbtree.js => trunk/infrastructure/ace/www/bbtree.js
rename : trunk/trunk/infrastructure/ace/www/changesettracker.js => trunk/infrastructure/ace/www/changesettracker.js
rename : trunk/trunk/infrastructure/ace/www/colorutils.js => trunk/infrastructure/ace/www/colorutils.js
rename : trunk/trunk/infrastructure/ace/www/contentcollector.js => trunk/infrastructure/ace/www/contentcollector.js
rename : trunk/trunk/infrastructure/ace/www/cssmanager.js => trunk/infrastructure/ace/www/cssmanager.js
rename : trunk/trunk/infrastructure/ace/www/dev.html => trunk/infrastructure/ace/www/dev.html
rename : trunk/trunk/infrastructure/ace/www/domline.js => trunk/infrastructure/ace/www/domline.js
rename : trunk/trunk/infrastructure/ace/www/easy_sync.js => trunk/infrastructure/ace/www/easy_sync.js
rename : trunk/trunk/infrastructure/ace/www/easysync2.js => trunk/infrastructure/ace/www/easysync2.js
rename : trunk/trunk/infrastructure/ace/www/easysync2_tests.js => trunk/infrastructure/ace/www/easysync2_tests.js
rename : trunk/trunk/infrastructure/ace/www/editor.css => trunk/infrastructure/ace/www/editor.css
rename : trunk/trunk/infrastructure/ace/www/firebug/errorIcon.png => trunk/infrastructure/ace/www/firebug/errorIcon.png
rename : trunk/trunk/infrastructure/ace/www/firebug/firebug.css => trunk/infrastructure/ace/www/firebug/firebug.css
rename : trunk/trunk/infrastructure/ace/www/firebug/firebug.html => trunk/infrastructure/ace/www/firebug/firebug.html
rename : trunk/trunk/infrastructure/ace/www/firebug/firebug.js => trunk/infrastructure/ace/www/firebug/firebug.js
rename : trunk/trunk/infrastructure/ace/www/firebug/firebugx.js => trunk/infrastructure/ace/www/firebug/firebugx.js
rename : trunk/trunk/infrastructure/ace/www/firebug/infoIcon.png => trunk/infrastructure/ace/www/firebug/infoIcon.png
rename : trunk/trunk/infrastructure/ace/www/firebug/warningIcon.png => trunk/infrastructure/ace/www/firebug/warningIcon.png
rename : trunk/trunk/infrastructure/ace/www/index.html => trunk/infrastructure/ace/www/index.html
rename : trunk/trunk/infrastructure/ace/www/inner.css => trunk/infrastructure/ace/www/inner.css
rename : trunk/trunk/infrastructure/ace/www/jquery-1.2.1.js => trunk/infrastructure/ace/www/jquery-1.2.1.js
rename : trunk/trunk/infrastructure/ace/www/lang_html.js => trunk/infrastructure/ace/www/lang_html.js
rename : trunk/trunk/infrastructure/ace/www/lang_js.js => trunk/infrastructure/ace/www/lang_js.js
rename : trunk/trunk/infrastructure/ace/www/lexer_support.js => trunk/infrastructure/ace/www/lexer_support.js
rename : trunk/trunk/infrastructure/ace/www/linestylefilter.js => trunk/infrastructure/ace/www/linestylefilter.js
rename : trunk/trunk/infrastructure/ace/www/magicdom.js => trunk/infrastructure/ace/www/magicdom.js
rename : trunk/trunk/infrastructure/ace/www/multilang_lexer.js => trunk/infrastructure/ace/www/multilang_lexer.js
rename : trunk/trunk/infrastructure/ace/www/processing.js => trunk/infrastructure/ace/www/processing.js
rename : trunk/trunk/infrastructure/ace/www/profiler.js => trunk/infrastructure/ace/www/profiler.js
rename : trunk/trunk/infrastructure/ace/www/skiplist.js => trunk/infrastructure/ace/www/skiplist.js
rename : trunk/trunk/infrastructure/ace/www/spanlist.js => trunk/infrastructure/ace/www/spanlist.js
rename : trunk/trunk/infrastructure/ace/www/syntax-new.css => trunk/infrastructure/ace/www/syntax-new.css
rename : trunk/trunk/infrastructure/ace/www/syntax.css => trunk/infrastructure/ace/www/syntax.css
rename : trunk/trunk/infrastructure/ace/www/test.html => trunk/infrastructure/ace/www/test.html
rename : trunk/trunk/infrastructure/ace/www/testcode.js => trunk/infrastructure/ace/www/testcode.js
rename : trunk/trunk/infrastructure/ace/www/toSource.js => trunk/infrastructure/ace/www/toSource.js
rename : trunk/trunk/infrastructure/ace/www/undomodule.js => trunk/infrastructure/ace/www/undomodule.js
rename : trunk/trunk/infrastructure/ace/www/virtual_lines.js => trunk/infrastructure/ace/www/virtual_lines.js
rename : trunk/trunk/infrastructure/bin/classpath.sh => trunk/infrastructure/bin/classpath.sh
rename : trunk/trunk/infrastructure/bin/comp.sh => trunk/infrastructure/bin/comp.sh
rename : trunk/trunk/infrastructure/bin/compilecache.sh => trunk/infrastructure/bin/compilecache.sh
rename : trunk/trunk/infrastructure/bin/jscomp.sh => trunk/infrastructure/bin/jscomp.sh
rename : trunk/trunk/infrastructure/bin/makejar.sh => trunk/infrastructure/bin/makejar.sh
rename : trunk/trunk/infrastructure/bin/makesars.sh => trunk/infrastructure/bin/makesars.sh
rename : trunk/trunk/infrastructure/bin/run.sh => trunk/infrastructure/bin/run.sh
rename : trunk/trunk/infrastructure/com.etherpad.openofficeservice/importexport.scala => trunk/infrastructure/com.etherpad.openofficeservice/importexport.scala
rename : trunk/trunk/infrastructure/com.etherpad/easysync2support.scala => trunk/infrastructure/com.etherpad/easysync2support.scala
rename : trunk/trunk/infrastructure/com.etherpad/licensing.scala => trunk/infrastructure/com.etherpad/licensing.scala
rename : trunk/trunk/infrastructure/com.etherpad/main.scala => trunk/infrastructure/com.etherpad/main.scala
rename : trunk/trunk/infrastructure/framework-src/modules/atomfeed.js => trunk/infrastructure/framework-src/modules/atomfeed.js
rename : trunk/trunk/infrastructure/framework-src/modules/blob.js => trunk/infrastructure/framework-src/modules/blob.js
rename : trunk/trunk/infrastructure/framework-src/modules/cache_utils.js => trunk/infrastructure/framework-src/modules/cache_utils.js
rename : trunk/trunk/infrastructure/framework-src/modules/comet.js => trunk/infrastructure/framework-src/modules/comet.js
rename : trunk/trunk/infrastructure/framework-src/modules/dateutils.js => trunk/infrastructure/framework-src/modules/dateutils.js
rename : trunk/trunk/infrastructure/framework-src/modules/dispatch.js => trunk/infrastructure/framework-src/modules/dispatch.js
rename : trunk/trunk/infrastructure/framework-src/modules/ejs.js => trunk/infrastructure/framework-src/modules/ejs.js
rename : trunk/trunk/infrastructure/framework-src/modules/email.js => trunk/infrastructure/framework-src/modules/email.js
rename : trunk/trunk/infrastructure/framework-src/modules/exceptionutils.js => trunk/infrastructure/framework-src/modules/exceptionutils.js
rename : trunk/trunk/infrastructure/framework-src/modules/execution.js => trunk/infrastructure/framework-src/modules/execution.js
rename : trunk/trunk/infrastructure/framework-src/modules/fastJSON.js => trunk/infrastructure/framework-src/modules/fastJSON.js
rename : trunk/trunk/infrastructure/framework-src/modules/faststatic.js => trunk/infrastructure/framework-src/modules/faststatic.js
rename : trunk/trunk/infrastructure/framework-src/modules/fileutils.js => trunk/infrastructure/framework-src/modules/fileutils.js
rename : trunk/trunk/infrastructure/framework-src/modules/funhtml.js => trunk/infrastructure/framework-src/modules/funhtml.js
rename : trunk/trunk/infrastructure/framework-src/modules/global/appjet.js => trunk/infrastructure/framework-src/modules/global/appjet.js
rename : trunk/trunk/infrastructure/framework-src/modules/global/request.js => trunk/infrastructure/framework-src/modules/global/request.js
rename : trunk/trunk/infrastructure/framework-src/modules/global/response.js => trunk/infrastructure/framework-src/modules/global/response.js
rename : trunk/trunk/infrastructure/framework-src/modules/image.js => trunk/infrastructure/framework-src/modules/image.js
rename : trunk/trunk/infrastructure/framework-src/modules/jsmin.js => trunk/infrastructure/framework-src/modules/jsmin.js
rename : trunk/trunk/infrastructure/framework-src/modules/jsutils.js => trunk/infrastructure/framework-src/modules/jsutils.js
rename : trunk/trunk/infrastructure/framework-src/modules/netutils.js => trunk/infrastructure/framework-src/modules/netutils.js
rename : trunk/trunk/infrastructure/framework-src/modules/profiler.js => trunk/infrastructure/framework-src/modules/profiler.js
rename : trunk/trunk/infrastructure/framework-src/modules/sessions.js => trunk/infrastructure/framework-src/modules/sessions.js
rename : trunk/trunk/infrastructure/framework-src/modules/sqlbase/persistent_vars.js => trunk/infrastructure/framework-src/modules/sqlbase/persistent_vars.js
rename : trunk/trunk/infrastructure/framework-src/modules/sqlbase/sqlbase.js => trunk/infrastructure/framework-src/modules/sqlbase/sqlbase.js
rename : trunk/trunk/infrastructure/framework-src/modules/sqlbase/sqlcommon.js => trunk/infrastructure/framework-src/modules/sqlbase/sqlcommon.js
rename : trunk/trunk/infrastructure/framework-src/modules/sqlbase/sqlobj.js => trunk/infrastructure/framework-src/modules/sqlbase/sqlobj.js
rename : trunk/trunk/infrastructure/framework-src/modules/stringutils.js => trunk/infrastructure/framework-src/modules/stringutils.js
rename : trunk/trunk/infrastructure/framework-src/modules/sync.js => trunk/infrastructure/framework-src/modules/sync.js
rename : trunk/trunk/infrastructure/framework-src/modules/timer.js => trunk/infrastructure/framework-src/modules/timer.js
rename : trunk/trunk/infrastructure/framework-src/modules/varz.js => trunk/infrastructure/framework-src/modules/varz.js
rename : trunk/trunk/infrastructure/framework-src/modules/yuicompressor.js => trunk/infrastructure/framework-src/modules/yuicompressor.js
rename : trunk/trunk/infrastructure/framework-src/oncomet.js => trunk/infrastructure/framework-src/oncomet.js
rename : trunk/trunk/infrastructure/framework-src/onerror.js => trunk/infrastructure/framework-src/onerror.js
rename : trunk/trunk/infrastructure/framework-src/onprint.js => trunk/infrastructure/framework-src/onprint.js
rename : trunk/trunk/infrastructure/framework-src/onrequest.js => trunk/infrastructure/framework-src/onrequest.js
rename : trunk/trunk/infrastructure/framework-src/onreset.js => trunk/infrastructure/framework-src/onreset.js
rename : trunk/trunk/infrastructure/framework-src/onsars.js => trunk/infrastructure/framework-src/onsars.js
rename : trunk/trunk/infrastructure/framework-src/onscheduledtask.js => trunk/infrastructure/framework-src/onscheduledtask.js
rename : trunk/trunk/infrastructure/framework-src/onshutdown.js => trunk/infrastructure/framework-src/onshutdown.js
rename : trunk/trunk/infrastructure/framework-src/onstartup.js => trunk/infrastructure/framework-src/onstartup.js
rename : trunk/trunk/infrastructure/framework-src/onsyntaxerror.js => trunk/infrastructure/framework-src/onsyntaxerror.js
rename : trunk/trunk/infrastructure/framework-src/postamble.js => trunk/infrastructure/framework-src/postamble.js
rename : trunk/trunk/infrastructure/framework-src/preamble.js => trunk/infrastructure/framework-src/preamble.js
rename : trunk/trunk/infrastructure/framework-src/syntaxerror.js => trunk/infrastructure/framework-src/syntaxerror.js
rename : trunk/trunk/infrastructure/lib/activation.jar => trunk/infrastructure/lib/activation.jar
rename : trunk/trunk/infrastructure/lib/c3p0-0.9.1.2.jar => trunk/infrastructure/lib/c3p0-0.9.1.2.jar
rename : trunk/trunk/infrastructure/lib/commons-lang-2.4.jar => trunk/infrastructure/lib/commons-lang-2.4.jar
rename : trunk/trunk/infrastructure/lib/derby-10.5.1.1.jar => trunk/infrastructure/lib/derby-10.5.1.1.jar
rename : trunk/trunk/infrastructure/lib/derbytools.jar => trunk/infrastructure/lib/derbytools.jar
rename : trunk/trunk/infrastructure/lib/dnsjava-2.0.6.jar => trunk/infrastructure/lib/dnsjava-2.0.6.jar
rename : trunk/trunk/infrastructure/lib/jetty-6.1.20.jar => trunk/infrastructure/lib/jetty-6.1.20.jar
rename : trunk/trunk/infrastructure/lib/jetty-sslengine-6.1.20.jar => trunk/infrastructure/lib/jetty-sslengine-6.1.20.jar
rename : trunk/trunk/infrastructure/lib/jetty-util-6.1.20.jar => trunk/infrastructure/lib/jetty-util-6.1.20.jar
rename : trunk/trunk/infrastructure/lib/json.jar => trunk/infrastructure/lib/json.jar
rename : trunk/trunk/infrastructure/lib/mail.jar => trunk/infrastructure/lib/mail.jar
rename : trunk/trunk/infrastructure/lib/manifest => trunk/infrastructure/lib/manifest
rename : trunk/trunk/infrastructure/lib/rhino-js-1.7r1.jar => trunk/infrastructure/lib/rhino-js-1.7r1.jar
rename : trunk/trunk/infrastructure/lib/sanselan-0.94aj.jar => trunk/infrastructure/lib/sanselan-0.94aj.jar
rename : trunk/trunk/infrastructure/lib/servlet-api-2.5-20081211.jar => trunk/infrastructure/lib/servlet-api-2.5-20081211.jar
rename : trunk/trunk/infrastructure/lib/tagsoup-1.2.jar => trunk/infrastructure/lib/tagsoup-1.2.jar
rename : trunk/trunk/infrastructure/lib/yuicompressor-2.4-appjet.jar => trunk/infrastructure/lib/yuicompressor-2.4-appjet.jar
rename : trunk/trunk/infrastructure/net.appjet.ajstdlib/ajstdlib.scala => trunk/infrastructure/net.appjet.ajstdlib/ajstdlib.scala
rename : trunk/trunk/infrastructure/net.appjet.ajstdlib/sqlbase.scala => trunk/infrastructure/net.appjet.ajstdlib/sqlbase.scala
rename : trunk/trunk/infrastructure/net.appjet.ajstdlib/streaming-client.js => trunk/infrastructure/net.appjet.ajstdlib/streaming-client.js
rename : trunk/trunk/infrastructure/net.appjet.ajstdlib/streaming-iframe.html => trunk/infrastructure/net.appjet.ajstdlib/streaming-iframe.html
rename : trunk/trunk/infrastructure/net.appjet.ajstdlib/streaming.scala => trunk/infrastructure/net.appjet.ajstdlib/streaming.scala
rename : trunk/trunk/infrastructure/net.appjet.ajstdlib/timer.scala => trunk/infrastructure/net.appjet.ajstdlib/timer.scala
rename : trunk/trunk/infrastructure/net.appjet.bodylock/bodylock.scala => trunk/infrastructure/net.appjet.bodylock/bodylock.scala
rename : trunk/trunk/infrastructure/net.appjet.bodylock/compressor.scala => trunk/infrastructure/net.appjet.bodylock/compressor.scala
rename : trunk/trunk/infrastructure/net.appjet.common.cli/cli.scala => trunk/infrastructure/net.appjet.common.cli/cli.scala
rename : trunk/trunk/infrastructure/net.appjet.common.sars/sars.scala => trunk/infrastructure/net.appjet.common.sars/sars.scala
rename : trunk/trunk/infrastructure/net.appjet.common.sars/sha1.scala => trunk/infrastructure/net.appjet.common.sars/sha1.scala
rename : trunk/trunk/infrastructure/net.appjet.common/rhino/rhinospect.scala => trunk/infrastructure/net.appjet.common/rhino/rhinospect.scala
rename : trunk/trunk/infrastructure/net.appjet.common/util/BCrypt.java => trunk/infrastructure/net.appjet.common/util/BCrypt.java
rename : trunk/trunk/infrastructure/net.appjet.common/util/BetterFile.java => trunk/infrastructure/net.appjet.common/util/BetterFile.java
rename : trunk/trunk/infrastructure/net.appjet.common/util/ClassReload.java => trunk/infrastructure/net.appjet.common/util/ClassReload.java
rename : trunk/trunk/infrastructure/net.appjet.common/util/ExpiringMapping.java => trunk/infrastructure/net.appjet.common/util/ExpiringMapping.java
rename : trunk/trunk/infrastructure/net.appjet.common/util/HttpServletRequestFactory.java => trunk/infrastructure/net.appjet.common/util/HttpServletRequestFactory.java
rename : trunk/trunk/infrastructure/net.appjet.common/util/LenientFormatter.java => trunk/infrastructure/net.appjet.common/util/LenientFormatter.java
rename : trunk/trunk/infrastructure/net.appjet.common/util/LimitedSizeMapping.java => trunk/infrastructure/net.appjet.common/util/LimitedSizeMapping.java
rename : trunk/trunk/infrastructure/net.appjet.oui/ConfigParam.java => trunk/infrastructure/net.appjet.oui/ConfigParam.java
rename : trunk/trunk/infrastructure/net.appjet.oui/FastJSON.scala => trunk/infrastructure/net.appjet.oui/FastJSON.scala
rename : trunk/trunk/infrastructure/net.appjet.oui/GeneratedConfigParam.java => trunk/infrastructure/net.appjet.oui/GeneratedConfigParam.java
rename : trunk/trunk/infrastructure/net.appjet.oui/config.scala => trunk/infrastructure/net.appjet.oui/config.scala
rename : trunk/trunk/infrastructure/net.appjet.oui/dynamicvar.scala => trunk/infrastructure/net.appjet.oui/dynamicvar.scala
rename : trunk/trunk/infrastructure/net.appjet.oui/encryption.scala => trunk/infrastructure/net.appjet.oui/encryption.scala
rename : trunk/trunk/infrastructure/net.appjet.oui/execution.scala => trunk/infrastructure/net.appjet.oui/execution.scala
rename : trunk/trunk/infrastructure/net.appjet.oui/files.scala => trunk/infrastructure/net.appjet.oui/files.scala
rename : trunk/trunk/infrastructure/net.appjet.oui/logging.scala => trunk/infrastructure/net.appjet.oui/logging.scala
rename : trunk/trunk/infrastructure/net.appjet.oui/main.scala => trunk/infrastructure/net.appjet.oui/main.scala
rename : trunk/trunk/infrastructure/net.appjet.oui/monitoring.scala => trunk/infrastructure/net.appjet.oui/monitoring.scala
rename : trunk/trunk/infrastructure/net.appjet.oui/network.scala => trunk/infrastructure/net.appjet.oui/network.scala
rename : trunk/trunk/infrastructure/net.appjet.oui/servermodel.scala => trunk/infrastructure/net.appjet.oui/servermodel.scala
rename : trunk/trunk/infrastructure/net.appjet.oui/stats.scala => trunk/infrastructure/net.appjet.oui/stats.scala
rename : trunk/trunk/infrastructure/net.appjet.oui/synchronizer.scala => trunk/infrastructure/net.appjet.oui/synchronizer.scala
rename : trunk/trunk/infrastructure/net.appjet.oui/util.scala => trunk/infrastructure/net.appjet.oui/util.scala
rename : trunk/trunk/infrastructure/rhino1_7R1/apiClasses.properties => trunk/infrastructure/rhino1_7R1/apiClasses.properties
rename : trunk/trunk/infrastructure/rhino1_7R1/build-date => trunk/infrastructure/rhino1_7R1/build-date
rename : trunk/trunk/infrastructure/rhino1_7R1/build.properties => trunk/infrastructure/rhino1_7R1/build.properties
rename : trunk/trunk/infrastructure/rhino1_7R1/build.xml => trunk/infrastructure/rhino1_7R1/build.xml
rename : trunk/trunk/infrastructure/rhino1_7R1/deprecatedsrc/build.xml => trunk/infrastructure/rhino1_7R1/deprecatedsrc/build.xml
rename : trunk/trunk/infrastructure/rhino1_7R1/deprecatedsrc/org/mozilla/javascript/ClassDefinitionException.java => trunk/infrastructure/rhino1_7R1/deprecatedsrc/org/mozilla/javascript/ClassDefinitionException.java
rename : trunk/trunk/infrastructure/rhino1_7R1/deprecatedsrc/org/mozilla/javascript/NotAFunctionException.java => trunk/infrastructure/rhino1_7R1/deprecatedsrc/org/mozilla/javascript/NotAFunctionException.java
rename : trunk/trunk/infrastructure/rhino1_7R1/deprecatedsrc/org/mozilla/javascript/PropertyException.java => trunk/infrastructure/rhino1_7R1/deprecatedsrc/org/mozilla/javascript/PropertyException.java
rename : trunk/trunk/infrastructure/rhino1_7R1/deprecatedsrc/org/mozilla/javascript/xml/impl/xmlbeans/LogicalEquality.java => trunk/infrastructure/rhino1_7R1/deprecatedsrc/org/mozilla/javascript/xml/impl/xmlbeans/LogicalEquality.java
rename : trunk/trunk/infrastructure/rhino1_7R1/deprecatedsrc/org/mozilla/javascript/xml/impl/xmlbeans/Namespace.java => trunk/infrastructure/rhino1_7R1/deprecatedsrc/org/mozilla/javascript/xml/impl/xmlbeans/Namespace.java
rename : trunk/trunk/infrastructure/rhino1_7R1/deprecatedsrc/org/mozilla/javascript/xml/impl/xmlbeans/NamespaceHelper.java => trunk/infrastructure/rhino1_7R1/deprecatedsrc/org/mozilla/javascript/xml/impl/xmlbeans/NamespaceHelper.java
rename : trunk/trunk/infrastructure/rhino1_7R1/deprecatedsrc/org/mozilla/javascript/xml/impl/xmlbeans/QName.java => trunk/infrastructure/rhino1_7R1/deprecatedsrc/org/mozilla/javascript/xml/impl/xmlbeans/QName.java
rename : trunk/trunk/infrastructure/rhino1_7R1/deprecatedsrc/org/mozilla/javascript/xml/impl/xmlbeans/XML.java => trunk/infrastructure/rhino1_7R1/deprecatedsrc/org/mozilla/javascript/xml/impl/xmlbeans/XML.java
rename : trunk/trunk/infrastructure/rhino1_7R1/deprecatedsrc/org/mozilla/javascript/xml/impl/xmlbeans/XMLCtor.java => trunk/infrastructure/rhino1_7R1/deprecatedsrc/org/mozilla/javascript/xml/impl/xmlbeans/XMLCtor.java
rename : trunk/trunk/infrastructure/rhino1_7R1/deprecatedsrc/org/mozilla/javascript/xml/impl/xmlbeans/XMLLibImpl.java => trunk/infrastructure/rhino1_7R1/deprecatedsrc/org/mozilla/javascript/xml/impl/xmlbeans/XMLLibImpl.java
rename : trunk/trunk/infrastructure/rhino1_7R1/deprecatedsrc/org/mozilla/javascript/xml/impl/xmlbeans/XMLList.java => trunk/infrastructure/rhino1_7R1/deprecatedsrc/org/mozilla/javascript/xml/impl/xmlbeans/XMLList.java
rename : trunk/trunk/infrastructure/rhino1_7R1/deprecatedsrc/org/mozilla/javascript/xml/impl/xmlbeans/XMLName.java => trunk/infrastructure/rhino1_7R1/deprecatedsrc/org/mozilla/javascript/xml/impl/xmlbeans/XMLName.java
rename : trunk/trunk/infrastructure/rhino1_7R1/deprecatedsrc/org/mozilla/javascript/xml/impl/xmlbeans/XMLObjectImpl.java => trunk/infrastructure/rhino1_7R1/deprecatedsrc/org/mozilla/javascript/xml/impl/xmlbeans/XMLObjectImpl.java
rename : trunk/trunk/infrastructure/rhino1_7R1/deprecatedsrc/org/mozilla/javascript/xml/impl/xmlbeans/XMLWithScope.java => trunk/infrastructure/rhino1_7R1/deprecatedsrc/org/mozilla/javascript/xml/impl/xmlbeans/XMLWithScope.java
rename : trunk/trunk/infrastructure/rhino1_7R1/examples/Control.java => trunk/infrastructure/rhino1_7R1/examples/Control.java
rename : trunk/trunk/infrastructure/rhino1_7R1/examples/Counter.java => trunk/infrastructure/rhino1_7R1/examples/Counter.java
rename : trunk/trunk/infrastructure/rhino1_7R1/examples/CounterTest.java => trunk/infrastructure/rhino1_7R1/examples/CounterTest.java
rename : trunk/trunk/infrastructure/rhino1_7R1/examples/DynamicScopes.java => trunk/infrastructure/rhino1_7R1/examples/DynamicScopes.java
rename : trunk/trunk/infrastructure/rhino1_7R1/examples/E4X/e4x_example.js => trunk/infrastructure/rhino1_7R1/examples/E4X/e4x_example.js
rename : trunk/trunk/infrastructure/rhino1_7R1/examples/File.java => trunk/infrastructure/rhino1_7R1/examples/File.java
rename : trunk/trunk/infrastructure/rhino1_7R1/examples/Foo.java => trunk/infrastructure/rhino1_7R1/examples/Foo.java
rename : trunk/trunk/infrastructure/rhino1_7R1/examples/Matrix.java => trunk/infrastructure/rhino1_7R1/examples/Matrix.java
rename : trunk/trunk/infrastructure/rhino1_7R1/examples/NervousText.html => trunk/infrastructure/rhino1_7R1/examples/NervousText.html
rename : trunk/trunk/infrastructure/rhino1_7R1/examples/NervousText.js => trunk/infrastructure/rhino1_7R1/examples/NervousText.js
rename : trunk/trunk/infrastructure/rhino1_7R1/examples/PrimitiveWrapFactory.java => trunk/infrastructure/rhino1_7R1/examples/PrimitiveWrapFactory.java
rename : trunk/trunk/infrastructure/rhino1_7R1/examples/RunScript.java => trunk/infrastructure/rhino1_7R1/examples/RunScript.java
rename : trunk/trunk/infrastructure/rhino1_7R1/examples/RunScript2.java => trunk/infrastructure/rhino1_7R1/examples/RunScript2.java
rename : trunk/trunk/infrastructure/rhino1_7R1/examples/RunScript3.java => trunk/infrastructure/rhino1_7R1/examples/RunScript3.java
rename : trunk/trunk/infrastructure/rhino1_7R1/examples/RunScript4.java => trunk/infrastructure/rhino1_7R1/examples/RunScript4.java
rename : trunk/trunk/infrastructure/rhino1_7R1/examples/Shell.java => trunk/infrastructure/rhino1_7R1/examples/Shell.java
rename : trunk/trunk/infrastructure/rhino1_7R1/examples/SwingApplication.js => trunk/infrastructure/rhino1_7R1/examples/SwingApplication.js
rename : trunk/trunk/infrastructure/rhino1_7R1/examples/checkParam.js => trunk/infrastructure/rhino1_7R1/examples/checkParam.js
rename : trunk/trunk/infrastructure/rhino1_7R1/examples/enum.js => trunk/infrastructure/rhino1_7R1/examples/enum.js
rename : trunk/trunk/infrastructure/rhino1_7R1/examples/jsdoc.js => trunk/infrastructure/rhino1_7R1/examples/jsdoc.js
rename : trunk/trunk/infrastructure/rhino1_7R1/examples/liveConnect.js => trunk/infrastructure/rhino1_7R1/examples/liveConnect.js
rename : trunk/trunk/infrastructure/rhino1_7R1/examples/unique.js => trunk/infrastructure/rhino1_7R1/examples/unique.js
rename : trunk/trunk/infrastructure/rhino1_7R1/javadoc/allclasses-frame.html => trunk/infrastructure/rhino1_7R1/javadoc/allclasses-frame.html
rename : trunk/trunk/infrastructure/rhino1_7R1/javadoc/allclasses-noframe.html => trunk/infrastructure/rhino1_7R1/javadoc/allclasses-noframe.html
rename : trunk/trunk/infrastructure/rhino1_7R1/javadoc/constant-values.html => trunk/infrastructure/rhino1_7R1/javadoc/constant-values.html
rename : trunk/trunk/infrastructure/rhino1_7R1/javadoc/deprecated-list.html => trunk/infrastructure/rhino1_7R1/javadoc/deprecated-list.html
rename : trunk/trunk/infrastructure/rhino1_7R1/javadoc/help-doc.html => trunk/infrastructure/rhino1_7R1/javadoc/help-doc.html
rename : trunk/trunk/infrastructure/rhino1_7R1/javadoc/index-all.html => trunk/infrastructure/rhino1_7R1/javadoc/index-all.html
rename : trunk/trunk/infrastructure/rhino1_7R1/javadoc/index.html => trunk/infrastructure/rhino1_7R1/javadoc/index.html
rename : trunk/trunk/infrastructure/rhino1_7R1/javadoc/org/mozilla/javascript/Callable.html => trunk/infrastructure/rhino1_7R1/javadoc/org/mozilla/javascript/Callable.html
rename : trunk/trunk/infrastructure/rhino1_7R1/javadoc/org/mozilla/javascript/ClassCache.html => trunk/infrastructure/rhino1_7R1/javadoc/org/mozilla/javascript/ClassCache.html
rename : trunk/trunk/infrastructure/rhino1_7R1/javadoc/org/mozilla/javascript/ClassShutter.html => trunk/infrastructure/rhino1_7R1/javadoc/org/mozilla/javascript/ClassShutter.html
rename : trunk/trunk/infrastructure/rhino1_7R1/javadoc/org/mozilla/javascript/CompilerEnvirons.html => trunk/infrastructure/rhino1_7R1/javadoc/org/mozilla/javascript/CompilerEnvirons.html
rename : trunk/trunk/infrastructure/rhino1_7R1/javadoc/org/mozilla/javascript/Context.html => trunk/infrastructure/rhino1_7R1/javadoc/org/mozilla/javascript/Context.html
rename : trunk/trunk/infrastructure/rhino1_7R1/javadoc/org/mozilla/javascript/ContextAction.html => trunk/infrastructure/rhino1_7R1/javadoc/org/mozilla/javascript/ContextAction.html
rename : trunk/trunk/infrastructure/rhino1_7R1/javadoc/org/mozilla/javascript/ContextFactory.Listener.html => trunk/infrastructure/rhino1_7R1/javadoc/org/mozilla/javascript/ContextFactory.Listener.html
rename : trunk/trunk/infrastructure/rhino1_7R1/javadoc/org/mozilla/javascript/ContextFactory.html => trunk/infrastructure/rhino1_7R1/javadoc/org/mozilla/javascript/ContextFactory.html
rename : trunk/trunk/infrastructure/rhino1_7R1/javadoc/org/mozilla/javascript/EcmaError.html => trunk/infrastructure/rhino1_7R1/javadoc/org/mozilla/javascript/EcmaError.html
rename : trunk/trunk/infrastructure/rhino1_7R1/javadoc/org/mozilla/javascript/ErrorReporter.html => trunk/infrastructure/rhino1_7R1/javadoc/org/mozilla/javascript/ErrorReporter.html
rename : trunk/trunk/infrastructure/rhino1_7R1/javadoc/org/mozilla/javascript/EvaluatorException.html => trunk/infrastructure/rhino1_7R1/javadoc/org/mozilla/javascript/EvaluatorException.html
rename : trunk/trunk/infrastructure/rhino1_7R1/javadoc/org/mozilla/javascript/Function.html => trunk/infrastructure/rhino1_7R1/javadoc/org/mozilla/javascript/Function.html
rename : trunk/trunk/infrastructure/rhino1_7R1/javadoc/org/mozilla/javascript/FunctionObject.html => trunk/infrastructure/rhino1_7R1/javadoc/org/mozilla/javascript/FunctionObject.html
rename : trunk/trunk/infrastructure/rhino1_7R1/javadoc/org/mozilla/javascript/GeneratedClassLoader.html => trunk/infrastructure/rhino1_7R1/javadoc/org/mozilla/javascript/GeneratedClassLoader.html
rename : trunk/trunk/infrastructure/rhino1_7R1/javadoc/org/mozilla/javascript/ImporterTopLevel.html => trunk/infrastructure/rhino1_7R1/javadoc/org/mozilla/javascript/ImporterTopLevel.html
rename : trunk/trunk/infrastructure/rhino1_7R1/javadoc/org/mozilla/javascript/JavaScriptException.html => trunk/infrastructure/rhino1_7R1/javadoc/org/mozilla/javascript/JavaScriptException.html
rename : trunk/trunk/infrastructure/rhino1_7R1/javadoc/org/mozilla/javascript/RefCallable.html => trunk/infrastructure/rhino1_7R1/javadoc/org/mozilla/javascript/RefCallable.html
rename : trunk/trunk/infrastructure/rhino1_7R1/javadoc/org/mozilla/javascript/RhinoException.html => trunk/infrastructure/rhino1_7R1/javadoc/org/mozilla/javascript/RhinoException.html
rename : trunk/trunk/infrastructure/rhino1_7R1/javadoc/org/mozilla/javascript/Script.html => trunk/infrastructure/rhino1_7R1/javadoc/org/mozilla/javascript/Script.html
rename : trunk/trunk/infrastructure/rhino1_7R1/javadoc/org/mozilla/javascript/Scriptable.html => trunk/infrastructure/rhino1_7R1/javadoc/org/mozilla/javascript/Scriptable.html
rename : trunk/trunk/infrastructure/rhino1_7R1/javadoc/org/mozilla/javascript/ScriptableObject.html => trunk/infrastructure/rhino1_7R1/javadoc/org/mozilla/javascript/ScriptableObject.html
rename : trunk/trunk/infrastructure/rhino1_7R1/javadoc/org/mozilla/javascript/SecurityController.html => trunk/infrastructure/rhino1_7R1/javadoc/org/mozilla/javascript/SecurityController.html
rename : trunk/trunk/infrastructure/rhino1_7R1/javadoc/org/mozilla/javascript/Synchronizer.html => trunk/infrastructure/rhino1_7R1/javadoc/org/mozilla/javascript/Synchronizer.html
rename : trunk/trunk/infrastructure/rhino1_7R1/javadoc/org/mozilla/javascript/WrapFactory.html => trunk/infrastructure/rhino1_7R1/javadoc/org/mozilla/javascript/WrapFactory.html
rename : trunk/trunk/infrastructure/rhino1_7R1/javadoc/org/mozilla/javascript/WrappedException.html => trunk/infrastructure/rhino1_7R1/javadoc/org/mozilla/javascript/WrappedException.html
rename : trunk/trunk/infrastructure/rhino1_7R1/javadoc/org/mozilla/javascript/Wrapper.html => trunk/infrastructure/rhino1_7R1/javadoc/org/mozilla/javascript/Wrapper.html
rename : trunk/trunk/infrastructure/rhino1_7R1/javadoc/org/mozilla/javascript/debug/DebuggableScript.html => trunk/infrastructure/rhino1_7R1/javadoc/org/mozilla/javascript/debug/DebuggableScript.html
rename : trunk/trunk/infrastructure/rhino1_7R1/javadoc/org/mozilla/javascript/debug/package-frame.html => trunk/infrastructure/rhino1_7R1/javadoc/org/mozilla/javascript/debug/package-frame.html
rename : trunk/trunk/infrastructure/rhino1_7R1/javadoc/org/mozilla/javascript/debug/package-summary.html => trunk/infrastructure/rhino1_7R1/javadoc/org/mozilla/javascript/debug/package-summary.html
rename : trunk/trunk/infrastructure/rhino1_7R1/javadoc/org/mozilla/javascript/debug/package-tree.html => trunk/infrastructure/rhino1_7R1/javadoc/org/mozilla/javascript/debug/package-tree.html
rename : trunk/trunk/infrastructure/rhino1_7R1/javadoc/org/mozilla/javascript/optimizer/ClassCompiler.html => trunk/infrastructure/rhino1_7R1/javadoc/org/mozilla/javascript/optimizer/ClassCompiler.html
rename : trunk/trunk/infrastructure/rhino1_7R1/javadoc/org/mozilla/javascript/optimizer/package-frame.html => trunk/infrastructure/rhino1_7R1/javadoc/org/mozilla/javascript/optimizer/package-frame.html
rename : trunk/trunk/infrastructure/rhino1_7R1/javadoc/org/mozilla/javascript/optimizer/package-summary.html => trunk/infrastructure/rhino1_7R1/javadoc/org/mozilla/javascript/optimizer/package-summary.html
rename : trunk/trunk/infrastructure/rhino1_7R1/javadoc/org/mozilla/javascript/optimizer/package-tree.html => trunk/infrastructure/rhino1_7R1/javadoc/org/mozilla/javascript/optimizer/package-tree.html
rename : trunk/trunk/infrastructure/rhino1_7R1/javadoc/org/mozilla/javascript/package-frame.html => trunk/infrastructure/rhino1_7R1/javadoc/org/mozilla/javascript/package-frame.html
rename : trunk/trunk/infrastructure/rhino1_7R1/javadoc/org/mozilla/javascript/package-summary.html => trunk/infrastructure/rhino1_7R1/javadoc/org/mozilla/javascript/package-summary.html
rename : trunk/trunk/infrastructure/rhino1_7R1/javadoc/org/mozilla/javascript/package-tree.html => trunk/infrastructure/rhino1_7R1/javadoc/org/mozilla/javascript/package-tree.html
rename : trunk/trunk/infrastructure/rhino1_7R1/javadoc/org/mozilla/javascript/serialize/ScriptableInputStream.html => trunk/infrastructure/rhino1_7R1/javadoc/org/mozilla/javascript/serialize/ScriptableInputStream.html
rename : trunk/trunk/infrastructure/rhino1_7R1/javadoc/org/mozilla/javascript/serialize/ScriptableOutputStream.html => trunk/infrastructure/rhino1_7R1/javadoc/org/mozilla/javascript/serialize/ScriptableOutputStream.html
rename : trunk/trunk/infrastructure/rhino1_7R1/javadoc/org/mozilla/javascript/serialize/package-frame.html => trunk/infrastructure/rhino1_7R1/javadoc/org/mozilla/javascript/serialize/package-frame.html
rename : trunk/trunk/infrastructure/rhino1_7R1/javadoc/org/mozilla/javascript/serialize/package-summary.html => trunk/infrastructure/rhino1_7R1/javadoc/org/mozilla/javascript/serialize/package-summary.html
rename : trunk/trunk/infrastructure/rhino1_7R1/javadoc/org/mozilla/javascript/serialize/package-tree.html => trunk/infrastructure/rhino1_7R1/javadoc/org/mozilla/javascript/serialize/package-tree.html
rename : trunk/trunk/infrastructure/rhino1_7R1/javadoc/overview-frame.html => trunk/infrastructure/rhino1_7R1/javadoc/overview-frame.html
rename : trunk/trunk/infrastructure/rhino1_7R1/javadoc/overview-summary.html => trunk/infrastructure/rhino1_7R1/javadoc/overview-summary.html
rename : trunk/trunk/infrastructure/rhino1_7R1/javadoc/overview-tree.html => trunk/infrastructure/rhino1_7R1/javadoc/overview-tree.html
rename : trunk/trunk/infrastructure/rhino1_7R1/javadoc/package-list => trunk/infrastructure/rhino1_7R1/javadoc/package-list
rename : trunk/trunk/infrastructure/rhino1_7R1/javadoc/resources/inherit.gif => trunk/infrastructure/rhino1_7R1/javadoc/resources/inherit.gif
rename : trunk/trunk/infrastructure/rhino1_7R1/javadoc/serialized-form.html => trunk/infrastructure/rhino1_7R1/javadoc/serialized-form.html
rename : trunk/trunk/infrastructure/rhino1_7R1/javadoc/stylesheet.css => trunk/infrastructure/rhino1_7R1/javadoc/stylesheet.css
rename : trunk/trunk/infrastructure/rhino1_7R1/lib/jsr173_1.0_api.jar => trunk/infrastructure/rhino1_7R1/lib/jsr173_1.0_api.jar
rename : trunk/trunk/infrastructure/rhino1_7R1/lib/xbean.jar => trunk/infrastructure/rhino1_7R1/lib/xbean.jar
rename : trunk/trunk/infrastructure/rhino1_7R1/src/build.xml => trunk/infrastructure/rhino1_7R1/src/build.xml
rename : trunk/trunk/infrastructure/rhino1_7R1/src/manifest => trunk/infrastructure/rhino1_7R1/src/manifest
rename : trunk/trunk/infrastructure/rhino1_7R1/src/org/mozilla/classfile/ByteCode.java => trunk/infrastructure/rhino1_7R1/src/org/mozilla/classfile/ByteCode.java
rename : trunk/trunk/infrastructure/rhino1_7R1/src/org/mozilla/classfile/ClassFileWriter.java => trunk/infrastructure/rhino1_7R1/src/org/mozilla/classfile/ClassFileWriter.java
rename : trunk/trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/Arguments.java => trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/Arguments.java
rename : trunk/trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/BaseFunction.java => trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/BaseFunction.java
rename : trunk/trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/Callable.java => trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/Callable.java
rename : trunk/trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/ClassCache.java => trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/ClassCache.java
rename : trunk/trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/ClassShutter.java => trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/ClassShutter.java
rename : trunk/trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/CompilerEnvirons.java => trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/CompilerEnvirons.java
rename : trunk/trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/ConstProperties.java => trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/ConstProperties.java
rename : trunk/trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/Context.java => trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/Context.java
rename : trunk/trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/ContextAction.java => trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/ContextAction.java
rename : trunk/trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/ContextFactory.java => trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/ContextFactory.java
rename : trunk/trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/ContextListener.java => trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/ContextListener.java
rename : trunk/trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/DToA.java => trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/DToA.java
rename : trunk/trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/Decompiler.java => trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/Decompiler.java
rename : trunk/trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/DefaultErrorReporter.java => trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/DefaultErrorReporter.java
rename : trunk/trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/DefiningClassLoader.java => trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/DefiningClassLoader.java
rename : trunk/trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/Delegator.java => trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/Delegator.java
rename : trunk/trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/EcmaError.java => trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/EcmaError.java
rename : trunk/trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/ErrorReporter.java => trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/ErrorReporter.java
rename : trunk/trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/Evaluator.java => trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/Evaluator.java
rename : trunk/trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/EvaluatorException.java => trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/EvaluatorException.java
rename : trunk/trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/Function.java => trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/Function.java
rename : trunk/trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/FunctionNode.java => trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/FunctionNode.java
rename : trunk/trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/FunctionObject.java => trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/FunctionObject.java
rename : trunk/trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/GeneratedClassLoader.java => trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/GeneratedClassLoader.java
rename : trunk/trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/IRFactory.java => trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/IRFactory.java
rename : trunk/trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/IdFunctionCall.java => trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/IdFunctionCall.java
rename : trunk/trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/IdFunctionObject.java => trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/IdFunctionObject.java
rename : trunk/trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/IdScriptableObject.java => trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/IdScriptableObject.java
rename : trunk/trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/ImporterTopLevel.java => trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/ImporterTopLevel.java
rename : trunk/trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/InformativeParser.java => trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/InformativeParser.java
rename : trunk/trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/InterfaceAdapter.java => trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/InterfaceAdapter.java
rename : trunk/trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/InterpretedFunction.java => trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/InterpretedFunction.java
rename : trunk/trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/Interpreter.java => trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/Interpreter.java
rename : trunk/trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/InterpreterData.java => trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/InterpreterData.java
rename : trunk/trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/JavaAdapter.java => trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/JavaAdapter.java
rename : trunk/trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/JavaMembers.java => trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/JavaMembers.java
rename : trunk/trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/JavaScriptException.java => trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/JavaScriptException.java
rename : trunk/trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/Kit.java => trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/Kit.java
rename : trunk/trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/LazilyLoadedCtor.java => trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/LazilyLoadedCtor.java
rename : trunk/trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/MemberBox.java => trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/MemberBox.java
rename : trunk/trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/NativeArray.java => trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/NativeArray.java
rename : trunk/trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/NativeBoolean.java => trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/NativeBoolean.java
rename : trunk/trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/NativeCall.java => trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/NativeCall.java
rename : trunk/trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/NativeDate.java => trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/NativeDate.java
rename : trunk/trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/NativeError.java => trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/NativeError.java
rename : trunk/trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/NativeFunction.java => trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/NativeFunction.java
rename : trunk/trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/NativeGenerator.java => trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/NativeGenerator.java
rename : trunk/trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/NativeGlobal.java => trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/NativeGlobal.java
rename : trunk/trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/NativeIterator.java => trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/NativeIterator.java
rename : trunk/trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/NativeJavaArray.java => trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/NativeJavaArray.java
rename : trunk/trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/NativeJavaClass.java => trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/NativeJavaClass.java
rename : trunk/trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/NativeJavaConstructor.java => trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/NativeJavaConstructor.java
rename : trunk/trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/NativeJavaMethod.java => trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/NativeJavaMethod.java
rename : trunk/trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/NativeJavaObject.java => trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/NativeJavaObject.java
rename : trunk/trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/NativeJavaPackage.java => trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/NativeJavaPackage.java
rename : trunk/trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/NativeJavaTopPackage.java => trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/NativeJavaTopPackage.java
rename : trunk/trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/NativeMath.java => trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/NativeMath.java
rename : trunk/trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/NativeNumber.java => trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/NativeNumber.java
rename : trunk/trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/NativeObject.java => trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/NativeObject.java
rename : trunk/trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/NativeScript.java => trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/NativeScript.java
rename : trunk/trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/NativeString.java => trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/NativeString.java
rename : trunk/trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/NativeWith.java => trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/NativeWith.java
rename : trunk/trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/Node.java => trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/Node.java
rename : trunk/trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/NodeTransformer.java => trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/NodeTransformer.java
rename : trunk/trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/ObjArray.java => trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/ObjArray.java
rename : trunk/trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/ObjToIntMap.java => trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/ObjToIntMap.java
rename : trunk/trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/Parser.java => trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/Parser.java
rename : trunk/trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/PolicySecurityController.java => trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/PolicySecurityController.java
rename : trunk/trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/Ref.java => trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/Ref.java
rename : trunk/trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/RefCallable.java => trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/RefCallable.java
rename : trunk/trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/RegExpProxy.java => trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/RegExpProxy.java
rename : trunk/trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/RhinoException.java => trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/RhinoException.java
rename : trunk/trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/Script.java => trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/Script.java
rename : trunk/trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/ScriptOrFnNode.java => trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/ScriptOrFnNode.java
rename : trunk/trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/ScriptRuntime.java => trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/ScriptRuntime.java
rename : trunk/trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/Scriptable.java => trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/Scriptable.java
rename : trunk/trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/ScriptableObject.java => trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/ScriptableObject.java
rename : trunk/trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/SecureCaller.java => trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/SecureCaller.java
rename : trunk/trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/SecurityController.java => trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/SecurityController.java
rename : trunk/trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/SecurityUtilities.java => trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/SecurityUtilities.java
rename : trunk/trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/SpecialRef.java => trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/SpecialRef.java
rename : trunk/trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/Synchronizer.java => trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/Synchronizer.java
rename : trunk/trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/Token.java => trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/Token.java
rename : trunk/trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/TokenStream.java => trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/TokenStream.java
rename : trunk/trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/UintMap.java => trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/UintMap.java
rename : trunk/trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/Undefined.java => trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/Undefined.java
rename : trunk/trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/UniqueTag.java => trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/UniqueTag.java
rename : trunk/trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/VMBridge.java => trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/VMBridge.java
rename : trunk/trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/WrapFactory.java => trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/WrapFactory.java
rename : trunk/trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/WrappedException.java => trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/WrappedException.java
rename : trunk/trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/Wrapper.java => trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/Wrapper.java
rename : trunk/trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/continuations/Continuation.java => trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/continuations/Continuation.java
rename : trunk/trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/debug/DebugFrame.java => trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/debug/DebugFrame.java
rename : trunk/trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/debug/DebuggableObject.java => trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/debug/DebuggableObject.java
rename : trunk/trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/debug/DebuggableScript.java => trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/debug/DebuggableScript.java
rename : trunk/trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/debug/Debugger.java => trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/debug/Debugger.java
rename : trunk/trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/jdk11/VMBridge_jdk11.java => trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/jdk11/VMBridge_jdk11.java
rename : trunk/trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/jdk13/VMBridge_jdk13.java => trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/jdk13/VMBridge_jdk13.java
rename : trunk/trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/jdk15/VMBridge_jdk15.java => trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/jdk15/VMBridge_jdk15.java
rename : trunk/trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/optimizer/Block.java => trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/optimizer/Block.java
rename : trunk/trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/optimizer/ClassCompiler.java => trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/optimizer/ClassCompiler.java
rename : trunk/trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/optimizer/Codegen.java => trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/optimizer/Codegen.java
rename : trunk/trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/optimizer/DataFlowBitSet.java => trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/optimizer/DataFlowBitSet.java
rename : trunk/trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/optimizer/OptFunctionNode.java => trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/optimizer/OptFunctionNode.java
rename : trunk/trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/optimizer/OptRuntime.java => trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/optimizer/OptRuntime.java
rename : trunk/trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/optimizer/OptTransformer.java => trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/optimizer/OptTransformer.java
rename : trunk/trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/optimizer/Optimizer.java => trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/optimizer/Optimizer.java
rename : trunk/trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/regexp/NativeRegExp.java => trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/regexp/NativeRegExp.java
rename : trunk/trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/regexp/NativeRegExpCtor.java => trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/regexp/NativeRegExpCtor.java
rename : trunk/trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/regexp/RegExpImpl.java => trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/regexp/RegExpImpl.java
rename : trunk/trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/regexp/SubString.java => trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/regexp/SubString.java
rename : trunk/trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/resources/Messages.properties => trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/resources/Messages.properties
rename : trunk/trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/resources/Messages_fr.properties => trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/resources/Messages_fr.properties
rename : trunk/trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/serialize/ScriptableInputStream.java => trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/serialize/ScriptableInputStream.java
rename : trunk/trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/serialize/ScriptableOutputStream.java => trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/serialize/ScriptableOutputStream.java
rename : trunk/trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/xml/XMLLib.java => trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/xml/XMLLib.java
rename : trunk/trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/xml/XMLObject.java => trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/xml/XMLObject.java
rename : trunk/trunk/infrastructure/rhino1_7R1/testsrc/base.skip => trunk/infrastructure/rhino1_7R1/testsrc/base.skip
rename : trunk/trunk/infrastructure/rhino1_7R1/testsrc/build.xml => trunk/infrastructure/rhino1_7R1/testsrc/build.xml
rename : trunk/trunk/infrastructure/rhino1_7R1/testsrc/opt1.skip => trunk/infrastructure/rhino1_7R1/testsrc/opt1.skip
rename : trunk/trunk/infrastructure/rhino1_7R1/testsrc/org/mozilla/javascript/drivers/JsDriver.java => trunk/infrastructure/rhino1_7R1/testsrc/org/mozilla/javascript/drivers/JsDriver.java
rename : trunk/trunk/infrastructure/rhino1_7R1/testsrc/org/mozilla/javascript/drivers/ShellTest.java => trunk/infrastructure/rhino1_7R1/testsrc/org/mozilla/javascript/drivers/ShellTest.java
rename : trunk/trunk/infrastructure/rhino1_7R1/testsrc/org/mozilla/javascript/drivers/StandardTests.java => trunk/infrastructure/rhino1_7R1/testsrc/org/mozilla/javascript/drivers/StandardTests.java
rename : trunk/trunk/infrastructure/rhino1_7R1/testsrc/org/mozilla/javascript/drivers/results.html => trunk/infrastructure/rhino1_7R1/testsrc/org/mozilla/javascript/drivers/results.html
rename : trunk/trunk/infrastructure/rhino1_7R1/testsrc/org/mozilla/javascript/tests/Bug409702Test.java => trunk/infrastructure/rhino1_7R1/testsrc/org/mozilla/javascript/tests/Bug409702Test.java
rename : trunk/trunk/infrastructure/rhino1_7R1/testsrc/org/mozilla/javascript/tests/JavaAcessibilityTest.java => trunk/infrastructure/rhino1_7R1/testsrc/org/mozilla/javascript/tests/JavaAcessibilityTest.java
rename : trunk/trunk/infrastructure/rhino1_7R1/testsrc/org/mozilla/javascript/tests/PrivateAccessClass.java => trunk/infrastructure/rhino1_7R1/testsrc/org/mozilla/javascript/tests/PrivateAccessClass.java
rename : trunk/trunk/infrastructure/rhino1_7R1/toolsrc/build.xml => trunk/infrastructure/rhino1_7R1/toolsrc/build.xml
rename : trunk/trunk/infrastructure/rhino1_7R1/toolsrc/org/mozilla/javascript/tools/ToolErrorReporter.java => trunk/infrastructure/rhino1_7R1/toolsrc/org/mozilla/javascript/tools/ToolErrorReporter.java
rename : trunk/trunk/infrastructure/rhino1_7R1/toolsrc/org/mozilla/javascript/tools/debugger/Dim.java => trunk/infrastructure/rhino1_7R1/toolsrc/org/mozilla/javascript/tools/debugger/Dim.java
rename : trunk/trunk/infrastructure/rhino1_7R1/toolsrc/org/mozilla/javascript/tools/debugger/GuiCallback.java => trunk/infrastructure/rhino1_7R1/toolsrc/org/mozilla/javascript/tools/debugger/GuiCallback.java
rename : trunk/trunk/infrastructure/rhino1_7R1/toolsrc/org/mozilla/javascript/tools/debugger/Main.java => trunk/infrastructure/rhino1_7R1/toolsrc/org/mozilla/javascript/tools/debugger/Main.java
rename : trunk/trunk/infrastructure/rhino1_7R1/toolsrc/org/mozilla/javascript/tools/debugger/ScopeProvider.java => trunk/infrastructure/rhino1_7R1/toolsrc/org/mozilla/javascript/tools/debugger/ScopeProvider.java
rename : trunk/trunk/infrastructure/rhino1_7R1/toolsrc/org/mozilla/javascript/tools/debugger/SwingGui.java => trunk/infrastructure/rhino1_7R1/toolsrc/org/mozilla/javascript/tools/debugger/SwingGui.java
rename : trunk/trunk/infrastructure/rhino1_7R1/toolsrc/org/mozilla/javascript/tools/debugger/build.xml => trunk/infrastructure/rhino1_7R1/toolsrc/org/mozilla/javascript/tools/debugger/build.xml
rename : trunk/trunk/infrastructure/rhino1_7R1/toolsrc/org/mozilla/javascript/tools/idswitch/CodePrinter.java => trunk/infrastructure/rhino1_7R1/toolsrc/org/mozilla/javascript/tools/idswitch/CodePrinter.java
rename : trunk/trunk/infrastructure/rhino1_7R1/toolsrc/org/mozilla/javascript/tools/idswitch/FileBody.java => trunk/infrastructure/rhino1_7R1/toolsrc/org/mozilla/javascript/tools/idswitch/FileBody.java
rename : trunk/trunk/infrastructure/rhino1_7R1/toolsrc/org/mozilla/javascript/tools/idswitch/IdValuePair.java => trunk/infrastructure/rhino1_7R1/toolsrc/org/mozilla/javascript/tools/idswitch/IdValuePair.java
rename : trunk/trunk/infrastructure/rhino1_7R1/toolsrc/org/mozilla/javascript/tools/idswitch/Main.java => trunk/infrastructure/rhino1_7R1/toolsrc/org/mozilla/javascript/tools/idswitch/Main.java
rename : trunk/trunk/infrastructure/rhino1_7R1/toolsrc/org/mozilla/javascript/tools/idswitch/SwitchGenerator.java => trunk/infrastructure/rhino1_7R1/toolsrc/org/mozilla/javascript/tools/idswitch/SwitchGenerator.java
rename : trunk/trunk/infrastructure/rhino1_7R1/toolsrc/org/mozilla/javascript/tools/jsc/Main.java => trunk/infrastructure/rhino1_7R1/toolsrc/org/mozilla/javascript/tools/jsc/Main.java
rename : trunk/trunk/infrastructure/rhino1_7R1/toolsrc/org/mozilla/javascript/tools/resources/Messages.properties => trunk/infrastructure/rhino1_7R1/toolsrc/org/mozilla/javascript/tools/resources/Messages.properties
rename : trunk/trunk/infrastructure/rhino1_7R1/toolsrc/org/mozilla/javascript/tools/shell/ConsoleTextArea.java => trunk/infrastructure/rhino1_7R1/toolsrc/org/mozilla/javascript/tools/shell/ConsoleTextArea.java
rename : trunk/trunk/infrastructure/rhino1_7R1/toolsrc/org/mozilla/javascript/tools/shell/Environment.java => trunk/infrastructure/rhino1_7R1/toolsrc/org/mozilla/javascript/tools/shell/Environment.java
rename : trunk/trunk/infrastructure/rhino1_7R1/toolsrc/org/mozilla/javascript/tools/shell/Global.java => trunk/infrastructure/rhino1_7R1/toolsrc/org/mozilla/javascript/tools/shell/Global.java
rename : trunk/trunk/infrastructure/rhino1_7R1/toolsrc/org/mozilla/javascript/tools/shell/JSConsole.java => trunk/infrastructure/rhino1_7R1/toolsrc/org/mozilla/javascript/tools/shell/JSConsole.java
rename : trunk/trunk/infrastructure/rhino1_7R1/toolsrc/org/mozilla/javascript/tools/shell/JavaPolicySecurity.java => trunk/infrastructure/rhino1_7R1/toolsrc/org/mozilla/javascript/tools/shell/JavaPolicySecurity.java
rename : trunk/trunk/infrastructure/rhino1_7R1/toolsrc/org/mozilla/javascript/tools/shell/Main.java => trunk/infrastructure/rhino1_7R1/toolsrc/org/mozilla/javascript/tools/shell/Main.java
rename : trunk/trunk/infrastructure/rhino1_7R1/toolsrc/org/mozilla/javascript/tools/shell/QuitAction.java => trunk/infrastructure/rhino1_7R1/toolsrc/org/mozilla/javascript/tools/shell/QuitAction.java
rename : trunk/trunk/infrastructure/rhino1_7R1/toolsrc/org/mozilla/javascript/tools/shell/SecurityProxy.java => trunk/infrastructure/rhino1_7R1/toolsrc/org/mozilla/javascript/tools/shell/SecurityProxy.java
rename : trunk/trunk/infrastructure/rhino1_7R1/toolsrc/org/mozilla/javascript/tools/shell/ShellContextFactory.java => trunk/infrastructure/rhino1_7R1/toolsrc/org/mozilla/javascript/tools/shell/ShellContextFactory.java
rename : trunk/trunk/infrastructure/rhino1_7R1/xmlimplsrc/build.xml => trunk/infrastructure/rhino1_7R1/xmlimplsrc/build.xml
rename : trunk/trunk/infrastructure/rhino1_7R1/xmlimplsrc/org/mozilla/javascript/xmlimpl/Namespace.java => trunk/infrastructure/rhino1_7R1/xmlimplsrc/org/mozilla/javascript/xmlimpl/Namespace.java
rename : trunk/trunk/infrastructure/rhino1_7R1/xmlimplsrc/org/mozilla/javascript/xmlimpl/QName.java => trunk/infrastructure/rhino1_7R1/xmlimplsrc/org/mozilla/javascript/xmlimpl/QName.java
rename : trunk/trunk/infrastructure/rhino1_7R1/xmlimplsrc/org/mozilla/javascript/xmlimpl/XML.java => trunk/infrastructure/rhino1_7R1/xmlimplsrc/org/mozilla/javascript/xmlimpl/XML.java
rename : trunk/trunk/infrastructure/rhino1_7R1/xmlimplsrc/org/mozilla/javascript/xmlimpl/XMLCtor.java => trunk/infrastructure/rhino1_7R1/xmlimplsrc/org/mozilla/javascript/xmlimpl/XMLCtor.java
rename : trunk/trunk/infrastructure/rhino1_7R1/xmlimplsrc/org/mozilla/javascript/xmlimpl/XMLLibImpl.java => trunk/infrastructure/rhino1_7R1/xmlimplsrc/org/mozilla/javascript/xmlimpl/XMLLibImpl.java
rename : trunk/trunk/infrastructure/rhino1_7R1/xmlimplsrc/org/mozilla/javascript/xmlimpl/XMLList.java => trunk/infrastructure/rhino1_7R1/xmlimplsrc/org/mozilla/javascript/xmlimpl/XMLList.java
rename : trunk/trunk/infrastructure/rhino1_7R1/xmlimplsrc/org/mozilla/javascript/xmlimpl/XMLName.java => trunk/infrastructure/rhino1_7R1/xmlimplsrc/org/mozilla/javascript/xmlimpl/XMLName.java
rename : trunk/trunk/infrastructure/rhino1_7R1/xmlimplsrc/org/mozilla/javascript/xmlimpl/XMLObjectImpl.java => trunk/infrastructure/rhino1_7R1/xmlimplsrc/org/mozilla/javascript/xmlimpl/XMLObjectImpl.java
rename : trunk/trunk/infrastructure/rhino1_7R1/xmlimplsrc/org/mozilla/javascript/xmlimpl/XMLWithScope.java => trunk/infrastructure/rhino1_7R1/xmlimplsrc/org/mozilla/javascript/xmlimpl/XMLWithScope.java
rename : trunk/trunk/infrastructure/rhino1_7R1/xmlimplsrc/org/mozilla/javascript/xmlimpl/XmlNode.java => trunk/infrastructure/rhino1_7R1/xmlimplsrc/org/mozilla/javascript/xmlimpl/XmlNode.java
rename : trunk/trunk/infrastructure/rhino1_7R1/xmlimplsrc/org/mozilla/javascript/xmlimpl/XmlProcessor.java => trunk/infrastructure/rhino1_7R1/xmlimplsrc/org/mozilla/javascript/xmlimpl/XmlProcessor.java
rename : trunk/trunk/infrastructure/yuicompressor/lib/jargs-1.0.jar => trunk/infrastructure/yuicompressor/lib/jargs-1.0.jar
rename : trunk/trunk/infrastructure/yuicompressor/lib/rhino-yuicompressor.jar => trunk/infrastructure/yuicompressor/lib/rhino-yuicompressor.jar
rename : trunk/trunk/infrastructure/yuicompressor/make.sh => trunk/infrastructure/yuicompressor/make.sh
rename : trunk/trunk/infrastructure/yuicompressor/src/com/yahoo/platform/yui/compressor/Bootstrap.java => trunk/infrastructure/yuicompressor/src/com/yahoo/platform/yui/compressor/Bootstrap.java
rename : trunk/trunk/infrastructure/yuicompressor/src/com/yahoo/platform/yui/compressor/CssCompressor.java => trunk/infrastructure/yuicompressor/src/com/yahoo/platform/yui/compressor/CssCompressor.java
rename : trunk/trunk/infrastructure/yuicompressor/src/com/yahoo/platform/yui/compressor/JarClassLoader.java => trunk/infrastructure/yuicompressor/src/com/yahoo/platform/yui/compressor/JarClassLoader.java
rename : trunk/trunk/infrastructure/yuicompressor/src/com/yahoo/platform/yui/compressor/JavaScriptCompressor.java => trunk/infrastructure/yuicompressor/src/com/yahoo/platform/yui/compressor/JavaScriptCompressor.java
rename : trunk/trunk/infrastructure/yuicompressor/src/com/yahoo/platform/yui/compressor/JavaScriptIdentifier.java => trunk/infrastructure/yuicompressor/src/com/yahoo/platform/yui/compressor/JavaScriptIdentifier.java
rename : trunk/trunk/infrastructure/yuicompressor/src/com/yahoo/platform/yui/compressor/JavaScriptToken.java => trunk/infrastructure/yuicompressor/src/com/yahoo/platform/yui/compressor/JavaScriptToken.java
rename : trunk/trunk/infrastructure/yuicompressor/src/com/yahoo/platform/yui/compressor/ScriptOrFnScope.java => trunk/infrastructure/yuicompressor/src/com/yahoo/platform/yui/compressor/ScriptOrFnScope.java
rename : trunk/trunk/infrastructure/yuicompressor/src/com/yahoo/platform/yui/compressor/YUICompressor.java => trunk/infrastructure/yuicompressor/src/com/yahoo/platform/yui/compressor/YUICompressor.java
rename : trunk/trunk/infrastructure/yuicompressor/src/yuicompressor/org/mozilla/javascript/Decompiler.java => trunk/infrastructure/yuicompressor/src/yuicompressor/org/mozilla/javascript/Decompiler.java
rename : trunk/trunk/infrastructure/yuicompressor/src/yuicompressor/org/mozilla/javascript/Decompiler.java.orig => trunk/infrastructure/yuicompressor/src/yuicompressor/org/mozilla/javascript/Decompiler.java.orig
rename : trunk/trunk/infrastructure/yuicompressor/src/yuicompressor/org/mozilla/javascript/Parser.java => trunk/infrastructure/yuicompressor/src/yuicompressor/org/mozilla/javascript/Parser.java
rename : trunk/trunk/infrastructure/yuicompressor/src/yuicompressor/org/mozilla/javascript/Parser.java.orig => trunk/infrastructure/yuicompressor/src/yuicompressor/org/mozilla/javascript/Parser.java.orig
rename : trunk/trunk/infrastructure/yuicompressor/src/yuicompressor/org/mozilla/javascript/Token.java => trunk/infrastructure/yuicompressor/src/yuicompressor/org/mozilla/javascript/Token.java
rename : trunk/trunk/infrastructure/yuicompressor/src/yuicompressor/org/mozilla/javascript/Token.java.orig => trunk/infrastructure/yuicompressor/src/yuicompressor/org/mozilla/javascript/Token.java.orig
rename : trunk/trunk/infrastructure/yuicompressor/src/yuicompressor/org/mozilla/javascript/TokenStream.java => trunk/infrastructure/yuicompressor/src/yuicompressor/org/mozilla/javascript/TokenStream.java
rename : trunk/trunk/infrastructure/yuicompressor/src/yuicompressor/org/mozilla/javascript/TokenStream.java.orig => trunk/infrastructure/yuicompressor/src/yuicompressor/org/mozilla/javascript/TokenStream.java.orig

76 files changed, 4470 insertions, 0 deletions

diff --git a/trunk/etherpad/src/templates/500_body.ejs b/trunk/etherpad/src/templates/500_body.ejs
new file mode 100644
index 0000000..291e0fd
--- /dev/null
+++ b/trunk/etherpad/src/templates/500_body.ejs
@@ -0,0 +1,26 @@
+<% /* 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 Internal Server Error"); %>
+
+<% if (trace) { %>
+  <pre style="background: #fff; font-family: monospace; padding: 1em; border: 1px solid red;
+  margin: 1em; font-size: 1.25em;"><%= trace %></pre>
+<% } else { %>
+  <div id="errorpage" class="fpcontent">
+    <div class="error500">
+      <p>Oops!  A server error occured.  It's been logged.</p>
+      <p>Please email &lt;support@etherpad.com&gt; if this persists.</p>
+    </div>
+  </div>
+<% } %>
+
diff --git a/trunk/etherpad/src/templates/beta/signup.ejs b/trunk/etherpad/src/templates/beta/signup.ejs
new file mode 100644
index 0000000..5268a29
--- /dev/null
+++ b/trunk/etherpad/src/templates/beta/signup.ejs
@@ -0,0 +1,63 @@
+<% /* 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.includeJQuery() %>
+<% helpers.includeJs("etherpad.js") %>
+<% helpers.includeCss("beta.css") %>
+
+<div class="fpcontent">
+  <div class="beta-signup">
+
+    <h1 style="border: 0;">EtherPad Professional Edition</h1>
+
+    <div class="right">
+      <br/>
+
+      <p>Want an account to keep track of all your team's pads?
+      EtherPad Professional Edition 
+      gives you your own site to keep track
+      of pads and control who gets to access what.</p>
+
+
+      <form id="beta-signup-form" action="/ep/beta-account/signup"
+            method="post">
+
+        <% if (errorMsg) { %>
+          <div id="error-msg">
+            <%= errorMsg %>
+          </div>
+        <% } %>
+
+        <p>Your Email:</p>
+        <input type="text" name="email" id="email" />
+        <br/>
+        <button type="submit">Submit</button>
+
+      </form>
+
+      <p>Email <%= helpers.oemail("support") %> with questions or
+      concerns.</p>
+    </div>
+
+    <div class="left">
+      
+      <img src="/static/img/account/betawarn.jpg"
+      />
+
+    </div>
+
+    <%= helpers.clearFloats() %>
+
+  </div>
+</div>
+
+
diff --git a/trunk/etherpad/src/templates/email/eepnet_license_info.ejs b/trunk/etherpad/src/templates/email/eepnet_license_info.ejs
new file mode 100644
index 0000000..ea431de
--- /dev/null
+++ b/trunk/etherpad/src/templates/email/eepnet_license_info.ejs
@@ -0,0 +1,72 @@
+<% /* 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 parts = licenseKey.split(":");
+   var name = parts[0];
+   var org = parts[1];
+   var key = parts[2];
+
+   if ((key.length % 2) != 0) {
+     key = key + "+";
+   }
+   var keyLine1 = key.substr(0, key.length/2);
+   var keyLine2 = key.substr(key.length/2, key.length);
+%>
+Dear <%= userName %>,
+
+Thank you for downloading EtherPad Private Network Edition.
+This is an automated email containing your license information.
+
+<% if (isEvaluation) { %>
+NOTE: This is an EVALUATION license, which will expire on
+<%= expiresDate.toString() %>.
+<% } %>
+
+****************************************
+NAME:
+
+  <%= name %>
+
+****************************************
+ORGANIZATION: 
+
+  <%= org %>
+
+****************************************
+LICENSE KEY:
+
+  <%= keyLine1 %>
+  <%= keyLine2 %>
+
+****************************************
+INSTRUCTIONS:
+
+  http://<%= request.host %>/ep/pne-manual
+
+****************************************
+DOWNLOAD LINK:
+
+  http://<%= request.host %><%= isEvaluation ? "/ep/store/eepnet-download" : "/ep/store/eepnet-download-nextsteps" %>
+
+<% if (isEvaluation) { %>
+--
+
+This email was sent automatically from etherpad.com because you signed
+up for EtherPad PNE.  If you did not sign up for
+this, then you can safely just ignore this email.
+
+<% } else { %>
+--
+
+Thanks for buying EtherPad!
+<% } %>
\ No newline at end of file
diff --git a/trunk/etherpad/src/templates/email/eepnet_purchase_receipt.ejs b/trunk/etherpad/src/templates/email/eepnet_purchase_receipt.ejs
new file mode 100644
index 0000000..a83cd58
--- /dev/null
+++ b/trunk/etherpad/src/templates/email/eepnet_purchase_receipt.ejs
@@ -0,0 +1,93 @@
+<% /* 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. */ %>Dear <%= cart.ownerName %>,
+
+Thank you for your purchase of EtherPad Private Network Edition. This is your receipt. Please keep this email for your records.
+
+-- The EtherPad Staff
+
+<%
+function row(key, value) {
+%><%= key %>:
+    <%= String(value).split("\n").join("\n    ") %>
+<%
+}
+
+function $(cost) {
+  return "US $"+dollars(cost);
+}
+%>
+
+License Information:
+
+<% 
+row("Administrator Name", cart.ownerName)
+row("Organization Name", cart.orgName)
+row("Total Users", cart.userCount)
+%>
+
+Billing Information:
+
+<%
+var isUs = cart.billingCountry == "US";
+switch(cart.billingPurchaseType) {
+	case "creditcard":
+    row("Credit Card Number", obfuscateCC(cart.billingCCNumber));
+    row("Expiration Date", cart.billingExpirationMonth+" / 20"+cart.billingExpirationYear);
+    // falling through here intentional.
+  case "invoice":
+    row("Purchaser Name", cart.billingFirstName + " " + cart.billingLastName);
+    row("Purchaser Address", cart.billingAddressLine1 + "\n" +
+      (cart.billingAddressLine2 ? cart.billingAddressLine2 + "\n" : "") +
+      cart.billingCity + ", " + 
+      (isUs?cart.billingState:cart.billingProvince) + "\n" +
+      (isUs?cart.billingZipCode:cart.billingPostalCode)+
+      (isUs?'':', '+cart.billingCountry));
+    row("Invoice Number", cart.invoiceId);
+	  break;
+	case "paypal":
+    row("Paid Using", "PayPal");
+    row("Invoice Number", cart.invoiceId);
+} 
+%>
+
+Summary of Charges:
+
+<%
+row("Etherpad Private Network, "+cart.numUsers+" users", $(cart.baseCost));
+if (cart.couponProductPctDiscount) {
+  row("Referral - "+cart.couponProductPctDiscount+"% savings",
+       "-"+$(cart.productReferralDiscount));
+}
+if (cart.supportCost) {
+  row("Support Contract, 1 year", $(cart.supportCost));
+  if (cart.couponSupportPctDiscount) {
+    row("Referral - "+cart.couponSupportPctDiscount+"% savings",
+         "-"+$(cart.supportReferralDiscount));
+  }
+}
+if (cart.freeUserCount) {
+  row("Referral Bonus - "+cart.freeUserCount+" free user"+(cart.freeUserCount == 1 ? '' : "s"),
+       "US$0.00");
+}
+%>-------------------------------------------------------------------------------
+<%
+var pctDiscount = cart.couponTotalPctDiscount;
+var hasSubtotal = pctDiscount > 0;
+
+if (hasSubtotal) {
+  row("Subtotal", $(cart.subTotal));
+  row("Referral - "+pctDiscount+"% savings", "-"+$(cart.totalReferralDiscount));
+}
+row("Total", $(cart.total));
+%>
\ No newline at end of file
diff --git a/trunk/etherpad/src/templates/email/padinvite.ejs b/trunk/etherpad/src/templates/email/padinvite.ejs
new file mode 100644
index 0000000..c6467b8
--- /dev/null
+++ b/trunk/etherpad/src/templates/email/padinvite.ejs
@@ -0,0 +1,18 @@
+<% /* 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. */ %><%= body %>
+
+--
+Sent by <%= request.host %> at the request of an EtherPad user.
+Do not reply to this email.
+Report abuse to: support@etherpad.com
diff --git a/trunk/etherpad/src/templates/email/pro_beta_invite.ejs b/trunk/etherpad/src/templates/email/pro_beta_invite.ejs
new file mode 100644
index 0000000..162b443
--- /dev/null
+++ b/trunk/etherpad/src/templates/email/pro_beta_invite.ejs
@@ -0,0 +1,23 @@
+<% /* 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. */ %>Dear <%= toAddr.split('@')[0] %>,
+
+<%= signupAgo %> you signed up for the EtherPad Beta.  Now here's a link to activate your account immediately:
+
+<%= activationUrl %>
+
+Any problems or questions? Just respond to this email for help.
+
+Happy Collaborating!
+
+The EtherPad Team
diff --git a/trunk/etherpad/src/templates/email/pro_payment_failure.ejs b/trunk/etherpad/src/templates/email/pro_payment_failure.ejs
new file mode 100644
index 0000000..248a3dd
--- /dev/null
+++ b/trunk/etherpad/src/templates/email/pro_payment_failure.ejs
@@ -0,0 +1,26 @@
+<% /* 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. */ %>Dear <%= fullName %>,
+
+Thank you for using EtherPad Professional. Your monthly billing cycle has ended, but we were unsuccessful in charging your account on file.
+
+<% if (billingError && billingError.length > 0) { %>
+  The following error occurred:
+
+  <%= billingError %>
+  
+<% } %>If you do not update your payment information and pay the remaining balance of <%= balance %>, your account will be suspended on <%= suspensionDate %>.
+
+You may update your payment information here: <%= billingAdminLink %>
+
+-- The EtherPad Staff
diff --git a/trunk/etherpad/src/templates/email/pro_payment_receipt.ejs b/trunk/etherpad/src/templates/email/pro_payment_receipt.ejs
new file mode 100644
index 0000000..175b06a
--- /dev/null
+++ b/trunk/etherpad/src/templates/email/pro_payment_receipt.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. */ %>Dear <%= fullName %>,
+
+Thank you for using EtherPad Professional. Your monthly billing cycle has ended, and your account has been charged; this is your receipt. Please keep this email for your records.
+
+-- The EtherPad Staff
+
+<%
+function row(key, value) {
+%><%= key %>:
+    <%= String(value).split("\n").join("\n    ") %>
+<%
+}
+
+function $(cost) {
+  return "US $"+dollars(cost);
+}
+%>
+
+Billing Information:
+
+<%
+row("Name", fullName);
+row("Paid Using", paymentSummary);
+row("Expiration", expiration);
+row("Invoice Number", invoiceNumber);
+%>
+
+Summary of Charges:
+
+<%
+row("EtherPad Professional, "+numUsers+" users", $(cost));
+if (coupon) { 
+  var discount = [];
+  if (coupon.pctDiscount) {
+    discount.push(coupon.pctDiscount+"% savings");
+  }
+  if (coupon.freeUsers) {
+    discount.push((coupon.freeUsers)+" free users");
+  }
+  discount = discount.join(" and ");
+  %>
+This charge reflects your referral bonus of <%= discount %>.
+<% } %>
\ No newline at end of file
diff --git a/trunk/etherpad/src/templates/framed/framedfooter.ejs b/trunk/etherpad/src/templates/framed/framedfooter.ejs
new file mode 100644
index 0000000..7994e38
--- /dev/null
+++ b/trunk/etherpad/src/templates/framed/framedfooter.ejs
@@ -0,0 +1,13 @@
+<% /* 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. */ %>
diff --git a/trunk/etherpad/src/templates/framed/framedheader-pro.ejs b/trunk/etherpad/src/templates/framed/framedheader-pro.ejs
new file mode 100644
index 0000000..857fa3e
--- /dev/null
+++ b/trunk/etherpad/src/templates/framed/framedheader-pro.ejs
@@ -0,0 +1,79 @@
+<% /* 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("pro-withtopbar"); %>
+
+<div id="pro-topbar">
+
+  <div id="pro-topbar-inner">
+
+    <% if (account) { %>
+      <div id="accountnav">
+        <%= toHTML(account.email) %>
+        <a href="/ep/account/sign-out">(sign out)</a>
+      </div>
+    <% } else { %>
+      <% // TODO: eventually have sign-in link here. %>
+    <% } %>
+
+    <div id="org-name">
+      <a href="/">
+        <%= proDomainOrgName %>
+      </a>
+
+      <% if (isAnEtherpadAdmin) { %>
+        <span style="color: #ff0; padding-left: 2em; font-weight: bold;">INVISIBLE ADMIN MODE</span>
+      <% } %>
+    </div>
+
+    <div style="clear: both;"><!-- --></div>
+
+  </div>
+</div>
+
+<% function renderProTopNav() {
+    var links = [
+      ['/', 'Home', 'home'],
+      ['/ep/padlist/', 'Pads', 'padlist'],
+      ['/ep/account/', 'My Account', 'account'],
+      ['/ep/pro-help/', 'Help', 'help']
+    ];
+    if (account && account.isAdmin) {
+      links.push(['/ep/admin/', 'Admin', 'admin']);
+    }
+    var ul = UL();
+    links.forEach(function(l) {
+      var c = l[2];
+      var selc = (request.path == l[0] || navSelection == c) ? " selected" : "";
+      ul.push(LI({className: 'topnav_'+c+selc},
+                 A({href: request.scheme + '://'+request.host+l[0]}, l[1])));
+    });
+    return ul;
+} %>
+
+  <%= pneTrackerHtml %>
+
+<div id="pro-topnav">
+  <div id="pro-topnav-inner">
+    <% if (validLicense && account) { %>
+      <%= renderProTopNav() %>
+      <%= helpers.clearFloats() %>
+    <% } %>
+  </div>
+</div>
+
+<!--
+<div id="shuttingdown">
+  <strong style="color:red">Note: EtherPad.com is shutting down March 31, 2010.</strong>
+  <a href="http://<%= fullSuperdomain %>/ep/blog/posts/google-acquires-appjet">(more info)</a>
+</div>
+-->
diff --git a/trunk/etherpad/src/templates/framed/framedheader.ejs b/trunk/etherpad/src/templates/framed/framedheader.ejs
new file mode 100644
index 0000000..d6c25cb
--- /dev/null
+++ b/trunk/etherpad/src/templates/framed/framedheader.ejs
@@ -0,0 +1,13 @@
+<% /* 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. */ %>
\ No newline at end of file
diff --git a/trunk/etherpad/src/templates/framed/framedpage-pro.ejs b/trunk/etherpad/src/templates/framed/framedpage-pro.ejs
new file mode 100644
index 0000000..b3acb07
--- /dev/null
+++ b/trunk/etherpad/src/templates/framed/framedpage-pro.ejs
@@ -0,0 +1,31 @@
+<% /* 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.setBodyId("framedpagebody");
+ helpers.includeCss("etherpad.css");
+ helpers.includeCss("pro/framedpage-pro.css");
+ helpers.addBodyClass("pro-body");
+%>
+
+<div id="container">
+
+<% if (helpers.isHeaderVisible()) { %>
+  <%= renderHeader() %>
+<% } %>
+
+<%= renderGlobalProNotice() %>
+
+<%= getContentHtml() %>
+
+</div>
+
diff --git a/trunk/etherpad/src/templates/framed/framedpage.ejs b/trunk/etherpad/src/templates/framed/framedpage.ejs
new file mode 100644
index 0000000..b1590f8
--- /dev/null
+++ b/trunk/etherpad/src/templates/framed/framedpage.ejs
@@ -0,0 +1,37 @@
+<% /* 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.setBodyId("framedpagebody");
+ helpers.includeCss("etherpad.css");
+ helpers.includeCss("framedpage.css");
+
+ if (isProDomainRequest) {
+   helpers.includeCss("pro/pro-page.css");
+ }
+
+ if (request.path != "/") {
+   helpers.addBodyClass("nothome");
+ }
+%>
+
+<div id="container">
+
+<% if (helpers.isHeaderVisible()) { %>
+  <%= renderHeader() %>
+<% } %>
+
+<%= getContentHtml() %>
+
+<%= renderFooter() %>
+
+</div>
diff --git a/trunk/etherpad/src/templates/html.ejs b/trunk/etherpad/src/templates/html.ejs
new file mode 100644
index 0000000..056d7a7
--- /dev/null
+++ b/trunk/etherpad/src/templates/html.ejs
@@ -0,0 +1,43 @@
+<% /* 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 XHTML 1.0 Transitional//EN"
+	  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
+  <head>
+    <meta http-equiv="Content-type" content="text/html; charset=utf-8" />
+    <meta http-equiv="Content-Language" content="en-us" />
+    <%= helpers.robotsMeta() %>
+    <title><%= helpers.htmlTitle() %></title>
+    <base href="<%= helpers.baseHref() %>" />
+
+    <!-- CSS -->
+    <%= helpers.cssIncludes() %>
+
+    <%= helpers.headExtra() %>
+
+  </head>
+
+  <body id="<%= helpers.bodyId() %>" class="<%= helpers.bodyClasses() %>">
+
+    <%= bodyHtml %>
+
+<!-- javascript -->
+
+<%= helpers.clientVarsScript() %>
+<%= helpers.jsIncludes() %>
+<%= helpers.googleAnalytics() %>
+
+  </body>
+</html>
diff --git a/trunk/etherpad/src/templates/main/home.ejs b/trunk/etherpad/src/templates/main/home.ejs
new file mode 100644
index 0000000..3fc0484
--- /dev/null
+++ b/trunk/etherpad/src/templates/main/home.ejs
@@ -0,0 +1,34 @@
+<% /* 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: Open-Sourced!"); %>
+
+<% helpers.includeCss("home-opensource.css"); %>
+
+<div id="home">
+  <div id="title">
+    EtherPad: Open-Sourced!
+  </div>
+
+  <div>
+    <a id="home-newpad" href="/ep/pad/newpad">
+      Create new pad
+    </a>
+    <!--
+    <a id="home-newsite" href="ep/pro-signup/">
+      Create team site
+    </a>
+    -->
+  </div>
+</div>
+
+
diff --git a/trunk/etherpad/src/templates/main/pro_signup_body.ejs b/trunk/etherpad/src/templates/main/pro_signup_body.ejs
new file mode 100644
index 0000000..e984878
--- /dev/null
+++ b/trunk/etherpad/src/templates/main/pro_signup_body.ejs
@@ -0,0 +1,70 @@
+<% /* 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.includeCss('pro-signup.css') %>
+
+<div class="fpcontent">
+  <div class="pro-signup">
+
+    <h1>EtherPad Professional for Teams</h1>
+
+      <div id="about">
+
+        <p>Create a team site in order to keep track of pads and share
+        them privately within your team.</p>
+
+      </div>
+
+    <form id="pro-act-form"
+          method="post" action="<%= request.path %>">
+
+      <%= errorDiv() %>
+
+      <div>
+        <div class="inputdiv">
+          <h3>Your team site will live at:</h3>
+
+          <%= input("subdomain") %>.<%= request.host %>/
+        </div>
+        <div class="inputhelp">
+          This is where you and members of your team will sign
+          in.
+        </div>
+        <%= helpers.clearFloats() %>
+      </div>
+
+      <br/><br/>
+
+      <div>
+        <div class="inputdiv">
+          <h3>Administrator account</h3>
+          <%= inf("fullName", "Full Name") %>
+          <%= inf("email", "Email") %>
+        </div>
+        <div class="inputhelp">
+          Instructions for choosing a password and signing in will
+          be emailed here.
+        </div>
+        <%= helpers.clearFloats() %>
+      </div>
+      
+      <br/>
+
+      <p><button type="submit" id="createbutton">Create team site now</button></p>
+
+    </form>
+
+    <p style="font-size: 80%;">Existing users: <a href="/ep/pro-account/sign-in">sign in
+    here</a></p>
+  </div>
+</div>
+
diff --git a/trunk/etherpad/src/templates/misc/pad_default.ejs b/trunk/etherpad/src/templates/misc/pad_default.ejs
new file mode 100644
index 0000000..96b7e25
--- /dev/null
+++ b/trunk/etherpad/src/templates/misc/pad_default.ejs
@@ -0,0 +1,16 @@
+<% /* 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. */ %>
+Welcome to EtherPad!
+
+This pad text is synchronized as you type, so that everyone viewing this page sees the same text.  This allows you to collaborate seamlessly on documents!
diff --git a/trunk/etherpad/src/templates/notice.ejs b/trunk/etherpad/src/templates/notice.ejs
new file mode 100644
index 0000000..311694f
--- /dev/null
+++ b/trunk/etherpad/src/templates/notice.ejs
@@ -0,0 +1,16 @@
+<% /* 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 id="notice" class="fpcontent">
+  <%= content %>
+</div>
diff --git a/trunk/etherpad/src/templates/pad/create_body.ejs b/trunk/etherpad/src/templates/pad/create_body.ejs
new file mode 100644
index 0000000..5fec49a
--- /dev/null
+++ b/trunk/etherpad/src/templates/pad/create_body.ejs
@@ -0,0 +1,26 @@
+<% /* 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">
+  <form action="<%= request.path %>" method="post">
+
+    <p><tt id="padurl">http://<%= request.host %>/<%= toHTML(padId) %></tt></p>
+
+    <br/>
+    <p>There is no EtherPad 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
new file mode 100644
index 0000000..28252c7
--- /dev/null
+++ b/trunk/etherpad/src/templates/pad/create_body_rafter.ejs
@@ -0,0 +1,23 @@
+<% /* 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
new file mode 100644
index 0000000..288a595
--- /dev/null
+++ b/trunk/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/trunk/etherpad/src/templates/pad/pad_body.ejs b/trunk/etherpad/src/templates/pad/pad_body.ejs
new file mode 100644
index 0000000..d932cd6
--- /dev/null
+++ b/trunk/etherpad/src/templates/pad/pad_body.ejs
@@ -0,0 +1,69 @@
+<% /* 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_body2.ejs b/trunk/etherpad/src/templates/pad/pad_body2.ejs
new file mode 100644
index 0000000..a49f453
--- /dev/null
+++ b/trunk/etherpad/src/templates/pad/pad_body2.ejs
@@ -0,0 +1,495 @@
+<% /* 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: "+pageTitle); %>
+<% helpers.setBodyId("padbody") %>
+<% helpers.addBodyClass(bodyClass) %>
+<% helpers.includeCss("pad2_ejs.css") %>
+<% helpers.includeJs("undo-xpopup.js") %>
+<% helpers.includeCometJs() %>
+<% helpers.includeJQuery(); %>
+<% helpers.includeJs("json2.js") %>
+<% helpers.includeJs("colorutils.js") %>
+<% helpers.includeJs("ace.js") %>
+<% helpers.includeJs("collab_client.js") %>
+<% helpers.includeJs("draggable.js") %>
+<% helpers.includeJs("pad_utils.js") %>
+<% helpers.includeJs("pad_cookie.js") %>
+<% helpers.includeJs("pad_editor.js") %>
+<% helpers.includeJs("pad_userlist.js") %>
+<% helpers.includeJs("pad_editbar.js") %>
+<% helpers.includeJs("pad_chat.js") %>
+<% helpers.includeJs("pad_docbar.js") %>
+<% helpers.includeJs("pad_impexp.js") %>
+<% helpers.includeJs("pad_savedrevs.js") %>
+<% helpers.includeJs("pad_connectionstatus.js") %>
+<% helpers.includeJs("pad_modals.js") %>
+<% helpers.includeJs("pad2.js") %>
+<% helpers.suppressGA() %>
+<% helpers.setRobotsPolicy({index: false, follow: false}) %>
+<%
+  var padUrlAttrValue = request.url.split("?", 1)[0].replace(/\"/g, '&quot;'); //"
+%>
+
+<%
+   function exportLink(type, n, label, requiresOffice, url, title) {
+     url = url || '/ep/pad/export/'+localPadId+'/latest?format='+type;
+     var classes = ["exportlink", "exporthref"+type, "n"+n];
+     if (requiresOffice && !hasOffice) {
+       classes.push("disabledexport");
+     }
+     else {
+       classes.push("requiresoffice");
+     }
+     var pieces = ['<a'];
+     pieces.push(' class="', classes.join(' '), '"');
+     pieces.push(' target="_blank"');
+     pieces.push(' href="', url, '"');
+     if (title) {
+       pieces.push(' title="', title.replace(/\"/g, "&quot;"), '"'); //"
+     }
+     pieces.push('>', label);
+     /*     if (title) {
+       pieces.push('<sup>?</sup>');
+     }*/
+     pieces.push('</a>');
+     return pieces.join('');
+   }
+%>
+
+<div id="padpage">
+
+<div id="padtop">
+  <div id="topbar">
+    <% /* floated left */ %>
+    <div id="topbarleft"><!-- --></div>
+    <% /* <a href="#" id="topbarnewpad">New Pad</a> */ %>
+    <% /* floated right */ %>
+    <div id="topbarright"><!-- --></div>
+    <% /* <a href="#" id="topbarfullwidth">Toggle Width</a> */ %>
+    <% /* non-floated */ %>
+    <div id="topbarcenter">
+      <a href="/" id="topbaretherpad">EtherPad</a>
+    </div>
+<% if (isProAccountHolder) { %>          
+    <a id="backtoprosite" href="/ep/padlist/">Return to pad list</a>
+    <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 id="specialkeyarea"><!-- --></div>
+  </div>
+<!--
+  <div id="shuttingdown">
+    <strong style="color:red">Note: EtherPad.com is shutting down March 31, 2010.</strong>
+    <a href="http://<%= fullSuperdomain %>/ep/blog/posts/google-acquires-appjet">(more info)</a>
+  </div>
+  -->
+  <div id="alertbar">
+    <div id="servermsg">
+      <h3>Server Notice<span id="servermsgdate"><!-- --></span>:</h3>
+      <a id="hidetopmsg" href="javascript: void pad.hideServerMessage()">hide</a>
+      <p id="servermsgtext"><!-- --></p>
+    </div>
+  </div>
+
+  <div id="docbar">
+    <div id="docbarleft"><!-- --></div>
+    <div id="docbarpadtitle"><span><%= initialTitle %></span></div>
+<% if (isProAccountHolder) { %>          
+    <div id="docbarsecurity-outer"><a href="javascript:void(0)" id="docbarsecurity">Security</a></div>
+<% } /* isProAccountHolder */ %>
+    <div id="docbaroptions-outer"><a href="javascript:void(0)" id="docbaroptions">Pad Options</a></div>
+    <div id="docbarsavedrevs-outer"><a href="javascript:void(0)" id="docbarsavedrevs">Saved revisions</a></div>
+    <div id="docbarimpexp-outer"><a href="javascript:void(0)" id="docbarimpexp">Import/Export</a></div>
+    <div id="docbarslider-outer"><a target="_blank" href="/ep/pad/view/<%= localPadId %>/latest" id="docbarslider">Time Slider</a></div>
+<% if (isProAccountHolder) { %>          
+    <div id="docbarrenamelink">
+      <a href="javascript:void(0)">(rename)</a>
+    </div>
+<% } /* isProAccountHolder */ %>
+    <input type="text" id="padtitleedit"/>
+    <div id="padtitlebuttons">
+      <a id="padtitlesave" href="javascript:void(0)">Save</a>
+      <a id="padtitlecancel" href="javascript:void(0)">Cancel</a>
+    </div>
+    <div id="impexp-wrapper" class="dbpanel-wrapper">
+      <div id="impexp-panel" class="dbpanel-panel">
+        <div class="dbpanel-leftedge"><!-- --></div>
+        <div class="dbpanel-rightedge"><!-- --></div>
+        <div class="dbpanel-botleftcorner"><!-- --></div>
+        <div class="dbpanel-botrightcorner"><!-- --></div>
+        <div class="dbpanel-middle">
+          <div class="dbpanel-inner">
+            <div class="dbpanel-top"><!-- --></div>
+          </div>
+          <div class="dbpanel-bottom"><!-- --></div>
+          <div id="importexport">
+            <div id="impexp-import">
+              <div id="impexp-importlabel"><b>Import</b> from text file, HTML, Word, or RTF:</div>
+ 	      <form id="importform" method="post" action="/ep/pad/impexp/import"
+                    target="importiframe" enctype="multipart/form-data">
+	        <div class="importformdiv" id="importformfilediv">
+		  <input type="file" name="file" size="20" id="importfileinput" />
+		  <div class="importmessage" id="importmessagefail"></div>
+	        </div>
+	        <div class="importmessage" id="importmessagesuccess">Successful!</div>
+	        <div class="importformdiv" id="importformsubmitdiv">
+ 		  <input type="hidden" name="padId" value="<%= encodeURIComponent(localPadId) %>" />
+ 		  <span class="nowrap">
+		    <input type="submit" name="submit" value="Import Now" disabled="disabled" id="importsubmitinput" />
+		    <img alt="" id="importstatusball" src="/static/img/misc/status-ball.gif" align="top" />
+		    <img alt="" id="importarrow" src="/static/img/may09/leftarrow2.gif" align="top" />
+		  </span>
+	        </div>
+ 	      </form>
+            </div><!-- /impexp-import -->
+            <div id="impexp-export">
+              <div id="impexp-exportlabel"><b>Export</b> current pad as:</div>
+              <div id="exportlinks">
+                <%= exportLink('html', 1, 'HTML', false) %>
+                <%= exportLink('txt', 2, 'Plain text', false) %>
+                <%= exportLink('link', 3, 'Bookmark file', false, '/ep/pad/linkfile?padId='+localPadId, 'This will save a file that, when opened, takes you to this pad.') %>
+                <%= exportLink('doc', 4, 'Microsoft Word', true) %>
+                <%= exportLink('pdf', 5, 'PDF', true) %>
+                <%= exportLink('odt', 6, 'OpenDocument', true) %>
+              </div>
+            </div><!-- /impexp-export -->
+            <div id="impexp-divider"><!-- --></div>
+            <div id="impexp-disabled-clickcatcher"><!-- --></div>
+            <a id="impexp-close" href="javascript:void(0)">Hide</a>
+          </div><!-- /importexport -->
+        </div>
+      </div>
+    </div>
+    <div id="savedrevs-wrapper" class="dbpanel-wrapper">
+      <div id="savedrevs-panel" class="dbpanel-panel">
+        <div class="dbpanel-leftedge"><!-- --></div>
+        <div class="dbpanel-rightedge"><!-- --></div>
+        <div class="dbpanel-botleftcorner"><!-- --></div>
+        <div class="dbpanel-botrightcorner"><!-- --></div>
+        <div class="dbpanel-middle">
+          <div class="dbpanel-inner">
+            <div class="dbpanel-top"><!-- --></div>
+          </div>
+          <div class="dbpanel-bottom"><!-- --></div>
+        </div>
+        <div id="savedrevisions">
+          <a href="javascript:void(0)" id="savedrevs-savenow">
+            Save Now
+          </a>
+          <div id="savedrevs-scrolly">
+            <div id="savedrevs-scrollleft" class="disabledscrollleft"><!-- --></div>
+            <div id="savedrevs-scrollright" class="disabledscrollright"><!-- --></div>
+            <div id="savedrevs-scrollouter">
+              <div id="savedrevs-scrollinner">
+                <!-- -->
+              </div>
+            </div>
+          </div>
+          <a id="savedrevs-close" href="javascript:void(0)">Hide</a>
+        </div><!-- /savedrevs close -->
+      </div>
+    </div><!-- /savedrevs-wrapper -->
+    <div id="revision-notifier"><span class="label">Saved:</span> <span class="name">Revision 1</span></div>
+    <div id="options-wrapper" class="dbpanel-wrapper">
+      <div id="options-panel" class="dbpanel-panel">
+        <div class="dbpanel-leftedge"><!-- --></div>
+        <div class="dbpanel-rightedge"><!-- --></div>
+        <div class="dbpanel-botleftcorner"><!-- --></div>
+        <div class="dbpanel-botrightcorner"><!-- --></div>
+        <div class="dbpanel-middle">
+          <div class="dbpanel-inner">
+            <div class="dbpanel-top"><!-- --></div>
+          </div>
+          <div class="dbpanel-bottom"><!-- --></div>
+        </div>
+        <div id="padoptions">
+          <div id="options-viewhead">Shared view options:</div>
+          <input type="checkbox" id="options-colorscheck" />
+          <label for="options-colorscheck" id="options-colorslabel">Authorship colors</label>
+          <input type="checkbox" id="options-linenoscheck" />
+          <label for="options-linenoscheck" id="options-linenoslabel">Line numbers</label>
+          <div id="options-fontlabel">Display font:</div>
+          <select id="viewfontmenu"><option value="normal">Normal</option><option value="monospace">Monospaced</option></select>
+          <div id="options-viewexplain">These options affect everyone's view of the pad.</div>
+          <a id="options-close" href="javascript:void(0)">Hide</a>
+        </div>
+      </div>
+    </div><!-- /options-wrapper -->
+<% if (isProAccountHolder) { %>          
+    <div id="security-wrapper" class="dbpanel-wrapper">
+      <div id="security-panel" class="dbpanel-panel">
+        <div class="dbpanel-leftedge"><!-- --></div>
+        <div class="dbpanel-rightedge"><!-- --></div>
+        <div class="dbpanel-botleftcorner"><!-- --></div>
+        <div class="dbpanel-botrightcorner"><!-- --></div>
+        <div class="dbpanel-middle">
+          <div class="dbpanel-inner">
+            <div class="dbpanel-top"><!-- --></div>
+          </div>
+          <div class="dbpanel-bottom"><!-- --></div>
+        </div>
+        <div id="padsecurity">
+          <div id="security-access">
+            <div id="security-accesshead">Pad Access:</div>
+            <input type="radio" name="padaccess" id="access-private" value="deny"/>
+            <label for="access-private" id="access-private-label"><strong>Private</strong> (Team account-holders only)</label>
+            <input type="radio" name="padaccess" id="access-public" value="allow"/>
+            <label for="access-public" id="access-public-label"><strong>Public</strong> (Allow Internet guests)</label>
+          </div>
+          <div id="security-password">
+            <div id="security-passhead">Password:</div>
+            <div id="security-passbody">
+              <div class="nopassword" id="password-nonedit">
+                <div id="password-display">None</div>
+                <a href="javascript:void(0)" id="password-setlink">Set...</a>
+                <a href="javascript:void(0)" id="password-clearlink">Clear</a>
+                </div>
+              <div id="password-inedit">
+                <a href="javascript:void(0)" id="password-savelink">Save</a>
+                <a href="javascript:void(0)" id="password-cancellink">Cancel</a>
+                <input type="text" id="security-passwordedit" maxlength="31" />
+              </div>
+            </div>
+          </div>
+          <a id="security-close" href="javascript:void(0)">Hide</a>
+        </div>
+      </div>
+    </div><!-- /security-wrapper -->
+<% } /* isProAccountHolder */ %>
+  </div><!-- /docbar -->
+</div>
+
+<div id="padmain">
+  <div id="padsidebar">
+    <div id="padusers">
+      <div id="connectionbox" class="cboxconnecting">
+        <div id="connectionboxinner">
+          <div class="connecting">
+            Connecting...
+          </div>
+          <div class="reconnecting">
+            Reestablishing connection...
+          </div>
+          <div class="disconnected">
+            <h2 class="h2_disconnect">Disconnected.</h2>
+            <h2 class="h2_userdup">Opened in another window.</h2>
+            <h2 class="h2_unauth">No Authorization.</h2>
+  	    <div id="disconnected_looping">
+	      <p><b>We're having trouble talking to the EtherPad synchronization server.</b>
+		You may be connecting through an incompatible firewall or proxy server.</p>
+	    </div>
+            <div id="disconnected_initsocketfail">
+              <p><b>We were unable to connect to the EtherPad synchronization server.</b>
+                This may be due to an incompatibility with your web
+                browser or internet connection.</p>
+            </div>
+	    <div id="disconnected_userdup">
+	      <p><b>You seem to have opened this pad in another browser window.</b>
+		If you'd like to use this window instead, you can reconnect.</p>
+	    </div>
+	    <div id="disconnected_unknown">
+	      <p><b>Lost connection with the EtherPad synchronization
+		  server.</b>  This may be due to a loss of network connectivity.</p>
+	    </div>
+	    <div id="disconnected_slowcommit">
+	      <p><b>Server not responding.</b>  This may be due to network connectivity issues or high load on the server.</p>
+	    </div>
+	    <div id="disconnected_unauth">
+	      <p>Your browser's credentials or permissions have changed while viewing this pad.  Try reconnecting.</p>
+	    </div>
+            <div id="reconnect_advise">
+              <p>If this continues to happen, please <a target="_blank" href="/ep/support">let us know</a>
+                (opens in new window).</p>
+            </div>
+            <div id="reconnect_form">
+              <button id="forcereconnect">Reconnect Now</button>
+            </div>
+          </div>
+        </div>
+      </div>
+
+      <div id="connectionstatus">
+        <!-- -->
+      </div>
+      
+      <div id="myuser">
+        <div id="mycolorpicker">
+          <div class="pickerswatchouter n1"><div class="pickerswatch"><!-- --></div></div>
+          <div class="pickerswatchouter n2"><div class="pickerswatch"><!-- --></div></div>
+          <div class="pickerswatchouter n3"><div class="pickerswatch"><!-- --></div></div>
+          <div class="pickerswatchouter n4"><div class="pickerswatch"><!-- --></div></div>
+          <div class="pickerswatchouter n5"><div class="pickerswatch"><!-- --></div></div>
+          <div class="pickerswatchouter n6"><div class="pickerswatch"><!-- --></div></div>
+          <div class="pickerswatchouter n7"><div class="pickerswatch"><!-- --></div></div>
+          <div class="pickerswatchouter n8"><div class="pickerswatch"><!-- --></div></div>
+          <div id="mycolorpickersave">Save</div>
+          <div id="mycolorpickercancel">Cancel</div>
+        </div>
+        <div id="myswatchbox"><div id="myswatch"><!-- --></div></div>
+        <div id="myusernameform"><input type="text" id="myusernameedit" disabled="disabled" /></div>
+        <div id="mystatusform"><input type="text" id="mystatusedit" disabled="disabled" /></div>
+      </div>
+      <div id="otherusers">
+        <div id="guestprompts"><!-- --></div>
+        <table id="otheruserstable" cellspacing="0" cellpadding="0" border="0">
+          <tr><td></td></tr>
+        </table>
+        <div id="nootherusers"><a href="javascript:void(0)">Invite</a> other users and they will show up here.</div>
+      </div>
+      <div id="userlistbuttonarea">
+        <a href="javascript:void(0)" id="sharebutton">Share</a>
+      </div>
+    </div> <!-- /padusers -->
+
+    <div id="hdraggie"><!-- --></div>
+
+    <div id="padchat">
+<!--      <div id="chattop"><a href="#">View chat logs...</a></div> -->
+      <div id="chatlines">
+        <a href="javascript:void(0)" id="chatloadmore">Load more history...</a>
+        <div id="chatloadingmore">Loading history...</div>
+      </div>
+      <div id="chatbottom">
+        <div id="chatprompt">Chat:</div>
+        <div id="chatentryform"><input type="text" id="chatentrybox"/></div>
+      </div>
+    </div>
+  </div> <!-- /padsidebar -->
+  
+  <div id="padeditor">
+    <div id="editbar" class="disabledtoolbar">
+      <% /* floated left */ %>
+      <div id="editbarleft"><!-- --></div>
+      <% /* floated right */ %>
+      <div id="editbarright"><!-- --></div>      
+      <% /* non-floated */ %>
+      <div id="editbarinner">
+        <a href="javascript:void (window.pad&&pad.editbarClick('bold'));" class="editbarbutton bold" title="Bold (ctrl-B)">&nbsp;</a>
+        <a href="javascript:void (window.pad&&pad.editbarClick('italic'));" class="editbarbutton italic" title="Italics (ctrl-I)">&nbsp;</a>
+        <a href="javascript:void (window.pad&&pad.editbarClick('underline'));" class="editbarbutton underline" title="Underline (ctrl-U)">&nbsp;</a>
+        <a href="javascript:void (window.pad&&pad.editbarClick('strikethrough'));" class="editbarbutton strikethrough" title="Strikethrough">&nbsp;</a>
+        <a href="javascript:void (window.pad&&pad.editbarClick('clearauthorship'));" class="editbarbutton clearauthorship" title="Clear Authorship Colors">&nbsp;</a>
+        <a href="javascript:void (window.pad&&pad.editbarClick('undo'));" class="editbarbutton undo" title="Undo (ctrl-Z)">&nbsp;</a>
+        <a href="javascript:void (window.pad&&pad.editbarClick('redo'));" class="editbarbutton redo" title="Redo (ctrl-Y)">&nbsp;</a>
+        <a href="javascript:void (window.pad&&pad.editbarClick('insertunorderedlist'));" class="editbarbutton insertunorderedlist" title="Toggle Bullet List">&nbsp;</a>
+        <a href="javascript:void (window.pad&&pad.editbarClick('indent'));" class="editbarbutton indent" title="Indent List">&nbsp;</a>
+        <a href="javascript:void (window.pad&&pad.editbarClick('outdent'));" class="editbarbutton outdent" title="Unindent List">&nbsp;</a>
+        <div id="syncstatussyncing" title="Syncing..."><!-- --></div>
+        <div id="syncstatusdone" title="Synced."><!-- --></div>
+        <a href="javascript:void (window.pad&&pad.editbarClick('save'));" class="editbarbutton save" title="Save Revision">&nbsp;</a>
+      </div>
+    </div>
+    <div id="editorcontainerbox">
+      <div id="editorloadingbox">Loading...</div>
+      <div id="editorcontainer"><!-- --></div>
+    </div>
+  </div><!-- /padeditor -->
+
+  <div id="bottomarea">
+    <div id="viewbarcontents">
+      <div id="viewzoomtitle">Zoom:</div>
+      <select id="viewzoommenu"><option value="z85">85%</option><option value="z100">100%</option><option value="z115">115%</option><option value="z150">150%</option><option value="z200">200%</option><option value="z300">300%</option></select>
+    </div>
+    
+    <div id="widthprefcheck"
+         class="<%= (prefs.isFullWidth?'widthprefchecked':'widthprefunchecked') %>"
+         ><!-- --></div>
+    <div id="sidebarcheck"
+         class="<%= (prefs.hideSidebar?'sidebarunchecked':'sidebarchecked') %>"
+         ><!-- --></div>
+  </div>
+  
+</div><!-- /padmain -->
+
+</div><!-- /padpage -->
+
+<div id="modaloverlay"><div id="modaloverlay-inner"><!-- --></div></div>
+<div id="mainmodals">
+  <div id="feedbackbox">
+    <div id="feedbackbox-tl"><!-- --></div>
+    <div id="feedbackbox-tr"><!-- --></div>
+    <div id="feedbackbox-bl"><!-- --></div>
+    <div id="feedbackbox-br"><!-- --></div>
+    <div id="feedbackbox-back"><!-- --></div>
+<%/*    <a href="javascript:void(0)" id="feedbackbox-send"><!-- --></a>
+    <input type="text" id="feedbackbox-email" class="modalfield" />
+    <textarea id="feedbackbox-message" rows="6" cols="40" class="modalfield"></textarea>
+    <div id="feedbackbox-response"><!-- --></div>*/%>
+    <div id="feedbackbox-contents">
+      <div id="feedbackbox-contentsinner">
+        <p><strong>Great, we love feedback!  What kind?</strong></p>
+        <ul id="uservoicelinks">
+          <li><a href="http://uservoice.etherpad.com/pages/17280-feature-requests" target="_blank">Feature Request</a></li>
+          <li><a href="http://uservoice.etherpad.com/pages/17285-bugs-and-problems" target="_blank">Bug Report</a></li>
+          <li><a href="http://uservoice.etherpad.com/pages/22732-how-are-you-using-etherpad-" target="_blank">How I'm Using It</a></li>
+          <li><a href="http://uservoice.etherpad.com/pages/22751-general-questions" target="_blank">Other Question</a></li>
+          <li><a href="http://uservoice.etherpad.com/pages/22733-general-feedback" target="_blank">Other Feedback</a></li>
+        </ul>
+        <p>These links will open UserVoice in a new window.</p>
+        <p id="feedbackemails">You can also send email to <a href="feedback"><tt>feedback</tt></a>, <a href="support"><tt>support</tt></a>, or <a href="bugs"><tt>bugs</tt></a> at <tt>etherpad.com</tt>.</p>
+      </div>
+    </div>
+    <a href="javascript:void(0)" id="feedbackbox-hide"><!-- --></a>
+  </div>
+  <div id="sharebox">
+    <div id="sharebox-inner">
+      <a href="javascript:void(0)" id="sharebox-hide"><!-- --></a>
+      <div id="sharebox-stripe" class="sharebox-stripe-private">
+        <div class="public">
+          <strong>Public Pad:</strong> This pad is accessible to anyone who
+          visits its URL. To make it private, <a href="javascript:void(0)" class="setsecurity">change security settings</a>.
+        </div>
+        <div class="private">
+          <strong>Private Pad:</strong> This pad is only accessible to team account-holders.  To allow anyone to access it, <a href="javascript:void(0)" class="setsecurity">change security settings</a>.
+        </div>
+      </div>
+      <div id="sharebox-forms">
+        <div id="sharebox-pastelink">Paste link over email or IM:</div>
+        <div id="sharebox-orsend">or send an email invitation...</div>
+        <a href="javascript:void(0)" id="sharebox-send"><!-- --></a>
+        <input id="sharebox-url" type="text" readonly="readonly" value="<%=padUrlAttrValue%>"/>
+        <input type="text" id="sharebox-to" class="modalfield" />
+        <input type="text" id="sharebox-subject" class="modalfield" />
+        <textarea id="sharebox-message" rows="6" cols="40" class="modalfield"></textarea>
+        <div id="sharebox-fieldname-to">To</div>
+        <div id="sharebox-fieldname-subject">Subject</div>
+        <div id="sharebox-fieldname-message">Message</div>
+        <div id="sharebox-dislink"><!-- --></div>
+      </div>
+      <div id="sharebox-shownwhenexpanded">
+        <div id="sharebox-response"><!-- --></div>
+      </div>
+    </div>
+  </div>
+</div>
+  
+<% if (request.params.djs) { %>
+  <div id="djs"><!-- --></div>
+<% } %>
+
+<form id="reconnectform"
+      method="post"
+      action="/ep/pad/reconnect"
+      accept-charset="UTF-8"
+      style="display: none;">
+  <input type="hidden" class="padId" name="padId" />
+  <input type="hidden" class="diagnosticInfo"
+	 name="diagnosticInfo" />
+  <input type="hidden" class="missedChanges" name="missedChanges" />
+</form>
diff --git a/trunk/etherpad/src/templates/pad/pad_content.ejs b/trunk/etherpad/src/templates/pad/pad_content.ejs
new file mode 100644
index 0000000..dbbd9bd
--- /dev/null
+++ b/trunk/etherpad/src/templates/pad/pad_content.ejs
@@ -0,0 +1,300 @@
+<% /* 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. */ %><%
+ function checkboxPref(name, label) {
+   var r = ['<div class="prefcheckbox" id="checkpref', name, '">'];
+   r.push('<table cellspacing="0" cellpadding="0" border="0">');
+   r.push('<tr>');
+   r.push('<td class="checkboxcell" valign="middle"><input type="checkbox" /></td>');
+   r.push('<td class="labelcell" valign="middle">', label, '</td>');
+   r.push('</tr>');
+   r.push('</table>');
+   r.push('</div>');
+   return r.join('');
+ }
+
+ function exportOption(type, label, requiresOffice, url, title) {
+ 	 url = url || '/ep/pad/export/'+padId+'/latest?format='+type;
+	 var classes = [ "exportlink", "exporthref"+type ];
+	 if (requiresOffice && !hasOffice) {
+	   classes.push("disabledexport");
+	 } else if (requiresOffice) {
+	   classes.push("requiresoffice");
+	 }
+   var aStartArr = ['<a '];
+   if (classes.length > 0) {
+     aStartArr.push(' class="'+classes.join(' ')+'"');
+   }
+	 aStartArr.push(' target="_blank" href="', url, '">');
+	 var aStart = aStartArr.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 alt="" src="/static/img/may09/'+type+'.gif" />', '</a>');
+   r.push('</td>');
+   r.push('<td class="labelcell" valign="middle">');
+   r.push(aStart, label, '</a>');
+	 if (title) {
+		 r.push('<sup>?</sup>')
+	 }
+   r.push('</td>');
+   if (requiresOffice) {
+     r.push('<td class="exportspinner" ');
+     r.push('id="exportspinner', type, '"');
+     r.push(' valign="middle"><img alt="" src="/static/img/misc/status-ball.gif" /></td>');
+   }	 
+   r.push('</tr>');
+   r.push('</table>');
+   r.push('</div>');
+   return r.join('');
+ }
+%>
+
+<div id="servermsg" class="topmsg hidden">
+  <p><b>Server Notice (<span id="servermsgdate"></span>)</b></p>
+  <br/>
+  <a id="hidetopmsg" href="javascript: void pad.hideTopMsg('server')">hide</a>
+  <p id="servermsgtext"></p>
+</div>
+
+<div id="bigtoperror_wrap" class="topmsg hidden">
+
+  <div class="bigtoperror" id="disconnected_looping">
+    <p><b>We're having trouble establishing a connection with an
+    EtherPad synchronization server.</b>  You may be connecting through an incompatible firewall or
+    proxy server.</p>
+  </div>
+
+  <div class="bigtoperror" id="disconnected_userdup">
+    <p><b>You seem to have opened this pad in another browser
+    window.</b>  If you'd like to use this window
+    instead, you can reconnect.</p>
+  </div>
+
+  <div class="bigtoperror" id="disconnected_slowcommit">
+    <p><b>We're having difficulties talking to the EtherPad
+    synchronization server.</b>  This may be due to network connectivity issues or high load on the server.</p>
+  </div>
+
+  <div class="bigtoperror" id="disconnected_initsocketfail">
+    <p><b>We were unable to establish the initial connection with
+    the EtherPad synchronization server.</b>  This may be due to an incompatibility with your web
+    browser or internet connection.</p>
+  </div>
+
+  <div class="bigtoperror" id="disconnected_unknown">
+    <p><b>Lost connection with the EtherPad synchronization
+    server.</b>  This may be due to a loss of network connectivity.</p>
+  </div>
+
+  <div class="bigtoperror" id="reconnect_advise">
+    <p>If this continues to happen, please <a target="_blank" href="/ep/support">let us know</a>
+      (opens in new window).</p>
+  </div>
+
+  <div id="reconnect_form">
+    <p><button class="forcereconnect">Reconnect
+	Now</button></p>
+  </div>
+
+</div>
+
+<div id="padtablediv">
+<table id="padtable"
+       border="0" cellspacing="0" cellpadding="0">
+  <tr>
+    <td id="topbar">
+      <div id="connectionstatus"
+	   class="connecting">Connecting...</div>
+      <div id="topbarmsg">&nbsp;</div>
+      <a class="showhide" id="showsidebar" href="javascript:void pad.showSideBar();">
+	&laquo; show side bar
+      </a>
+    </td>
+    <td id="sidebartop">
+      <a class="showhide" id="hidesidebar" href="javascript:void pad.hideSideBar();">
+	hide &raquo;
+      </a>
+    </td>
+  </tr>
+
+  <tr id="sizedcontent">
+    <td id="editorcell" class="editorcell_loading" width="100%" valign="top">
+      <div id="editorcellinner">
+        <div id="loadingbox">
+          Loading...
+        </div>
+        <div id="toptoolbar" class="disabledtoolbar">
+          <a href="javascript:void pad.toolbarClick('bold');" class="toptoolbarbutton bold" title="Bold (ctrl-B)">&nbsp;</a>
+          <a href="javascript:void pad.toolbarClick('italic');" class="toptoolbarbutton italic" title="Italics (ctrl-I)">&nbsp;</a>
+          <a href="javascript:void pad.toolbarClick('underline');" class="toptoolbarbutton underline" title="Underline (ctrl-U)">&nbsp;</a>
+          <a href="javascript:void pad.toolbarClick('undo');" class="toptoolbarbutton undo" title="Undo (ctrl-Z)">&nbsp;</a>
+          <a href="javascript:void pad.toolbarClick('redo');" class="toptoolbarbutton redo" title="Redo (ctrl-Y)">&nbsp;</a>
+          <form id="padtitle" action="/"><input type="text" id="padtitleedit"/><span class="padtitlepad">Pad:</span> <span id="padtitletitle">&nbsp;</span> &nbsp;<span class="editlink">(<a href="javascript:void pad.editTitle();">rename</a>)</span><span class="oklink"><a href="javascript:void pad.submitTitle(true);">OK</a></span></form>
+          <a href="javascript:void pad.passwordClick();" id="passwordlock" title="" class="passwordhidden">&nbsp;</a>
+        </div>
+        <div id="editorcontainer"><!-- --></div>
+	<div id="bottoolbar" class="disabledtoolbar">
+          <div id="viewzoom">View Zoom: <select id="viewzoommenu"><option value="z85">85%</option><option value="z100">100%</option><option value="z115">115%</option><option value="z150">150%</option><option value="z200">200%</option><option value="z300">300%</option></select></div>
+          <div id="viewfont">View Font: <select id="viewfontmenu"><option value="normal">Normal</option><option value="code">Code</option></select></div>
+	</div>
+      </div>
+    </td>
+    <td id="sidebarcell" valign="top">
+      <div id="sidebar" class="sidebar_loading">
+	<div id="headuserlistwrap" class="sideheadwrap sh_uncollapsed"><p class="sidehead">Connected Users</p></div>
+	<div id="userlistwrap" class="sidebox">
+	  <div id="userlist"><!-- setbyjs --></div>
+	  <div id="invitemore">
+	    <a class="small_link" id="invitemorelink" href="javascript:void pad.invitemoreShow();">invite more people...</a>
+	    <div id="inviteinstructions" style="display:none;">
+	      <p>To invite someone to this pad, just copy and paste them the URL to this page.</p>
+	      <p id="emailinviteleadin">Or we can send them an invitation for you:</p>
+	      <p>
+		Email:&nbsp;<input id="invite_email" type="text" name="email" value="" />
+		<input type="submit" id="invite_email_submit" value="Send" />
+	      </p>
+	      <p id="invite_email_status"><!-- --></p>
+	      <p id="hideinstructions"><a class="small_link" href="javascript:void pad.invitemoreHide();">hide</a></p>
+	    </div>
+	  </div>
+	</div>
+	<div id="headchatbox" class="sideheadwrap sh_collapsed"><p id="chatheadname" class="sidehead">Chat</p></div>
+	<div class="sidebox hidden" id="chatbox">
+	  <div id="chatmessages"><!-- --></div>
+	  <div>
+	    <table id="chatsaytable" border="0" cellspacing="0" cellpadding="0">
+	      <tr>
+		<td width="5" valign="middle">Say:</td>
+		<td><input type="text" id="chatinput" /></td>
+	      </tr>
+	    </table>
+	  </div>
+	</div>
+	<div id="headimportexport" class="sideheadwrap sh_collapsed"><p class="sidehead">Import/Export</p></div>
+	<div class="sidebox hidden" id="importexport">
+		<div id="exportsection">
+		  <p id="headexport"><strong>Download</strong> as:</p>
+      <table>
+				<tr>
+					<td class="firsttd"><%= exportOption('html', 'HTML', false) %></td>
+      		<td class="secondtd"><%= exportOption('doc', 'Microsoft Word', true) %></td>
+				</tr>
+				<tr>
+					<td class="firsttd"><%= exportOption('txt', 'Plain text', false) %></td>
+      		<td class="secondtd"><%= exportOption('pdf', 'PDF', true) %></td>
+				</tr>
+				<tr>
+					<td class="firsttd"><%= exportOption('link', 'Bookmark file', false,
+																							 '/ep/pad/linkfile?padId='+padId,
+						'This will save a file that, when opened, takes you to this pad.') %></td>
+					<td class="secondtd"><%= exportOption('odt', 'OpenDocument', true) %></td>
+				</tr>
+			</table>
+			<div id="exportmessage"></div>
+		</div>
+		<div id="importsection">
+  	  <p id="headimport"><strong>Import</strong> text from file:</p>
+ 	  	<form id="importform" method="post" action="/ep/pad/impexp/import" target="importiframe" enctype="multipart/form-data">
+				<div class="importformdiv" id="importformfilediv">
+					<input type="file" name="file" size="20" id="importfileinput" />
+					<div class="importmessage" id="importmessagefail"></div>
+				</div>
+				<div class="importmessage" id="importmessagesuccess"></div>
+				<div class="importformdiv" id="importformsubmitdiv">
+ 					<input type="hidden" name="padId" value="<%= encodeURIComponent(padId) %>" />
+ 					<span class="nowrap">
+						<input type="submit" name="submit" value="Import Now" disabled="disabled" id="importsubmitinput" />
+						<img alt="" id="importstatusball" src="/static/img/misc/status-ball.gif" align="bottom" />
+						<img alt="" id="importarrow" src="/static/img/may09/leftarrow.gif" align="bottom" />
+					</span>
+				</div>
+ 	  	</form>
+		</div>
+	</div>
+	<div id="headrevisions" class="sideheadwrap sh_collapsed"><p class="sidehead">Saved Revisions</p></div>
+	<div class="sidebox hidden" id="revisions">
+	  <div id="nosaveprivs">
+	    Sorry, you have exceeded the maximum allowable
+	    number of saved revisions.
+	  </div>
+	  <input id="savenow" type="submit" value="Save Now" />
+	  <div id="revisionlist">
+	  </div>
+	</div>
+	<div id="headprefs" class="sideheadwrap sh_collapsed"><p class="sidehead">Options</p></div>
+	<div class="sidebox hidden" id="prefs">
+	  <%= checkboxPref("showcolors", "Highlight who typed what.") %>
+	  <%= checkboxPref("wrap", "Wrap long lines.") %>
+	  <%= checkboxPref("linenums", "Show line numbers.") %>
+	  <%= checkboxPref("fullwidth", "Use full window width.") %>
+	  <%= checkboxPref("jshighlight", "Highlight JavaScript syntax.") %>
+	</div>
+	<div id="headfeedback" class="sideheadwrap sh_collapsed"><p class="sidehead">Feedback</p></div>
+	<div class="sidebox hidden sidebox_last" id="feedback">
+	  <div id="feedbackbox">
+	    <p style="text-align: center;">Tell us what you
+	    think of EtherPad!<br/>(Include your email if you want a response)</p>
+	    <div id="formbox">
+	      <textarea rows="5" cols="10" id="feedbackarea" name="feedbackarea"></textarea>
+	      <input id="feedbacksubmit" type="submit"
+		     value="Send to EtherPad Team" />
+	    </div>
+	  </div>
+	  <div id="feedbackresult">
+	    <p>Thanks for the feedback!  Keep it coming.</p>
+	    <p>You can also send feedback by email to
+	    <span id="feedbackemail"
+		  style="white-space: nowrap;">feedback@e***rp**d.com</span> to receive a personal
+	      response.</p>
+	  </div>
+	</div>
+      </div>
+    </td>
+  </tr>
+</table>
+</div><!-- #padtablediv -->
+
+<div style="clear: both;"><!-- --></div>
+
+<% if (request.params.djs) { %>
+  <div id="djs">&nbsp;</div>
+<% } %>
+
+<div id="appjetfooter">
+  Powered by <a target="_blank" href="/ep/about/appjet">AppJet</a>
+  <img id="plane" src="/static/img/tinyplane.gif" alt="AppJet" />
+</div><!-- /appjetfooter -->
+
+<form id="reconnect"
+      method="post"
+      action="/ep/pad/reconnect"
+      accept-charset="UTF-8"
+      style="display: none;">
+  <input type="hidden" id="padId" name="padId" />
+  <input type="hidden" id="diagnosticInfo"
+	 name="diagnosticInfo" />
+  <input type="hidden" id="missedChanges" name="missedChanges" />
+</form>
+
+<form id="newpad"
+      name="newpad"
+      action="/ep/pad/newpad"
+      target="_blank"
+      style="display: none;">
+</form>
diff --git a/trunk/etherpad/src/templates/pad/pad_download_link.ejs b/trunk/etherpad/src/templates/pad/pad_download_link.ejs
new file mode 100644
index 0000000..e05d7d0
--- /dev/null
+++ b/trunk/etherpad/src/templates/pad/pad_download_link.ejs
@@ -0,0 +1,27 @@
+<% /* 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
new file mode 100644
index 0000000..96279ce
--- /dev/null
+++ b/trunk/etherpad/src/templates/pad/pad_iphone_body.ejs
@@ -0,0 +1,29 @@
+<% /* 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/padfull_body.ejs b/trunk/etherpad/src/templates/pad/padfull_body.ejs
new file mode 100644
index 0000000..41a100c
--- /dev/null
+++ b/trunk/etherpad/src/templates/pad/padfull_body.ejs
@@ -0,0 +1,32 @@
+<% /* 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 id="padfullpage" class="fpcontent">
+
+<h1>Pad is Full!</h1>
+
+<div id="msg">
+
+<div id="padurlwrap">
+<p><tt id="padurl">http://<%= request.host %>/<%= padId %></tt></p>
+</div>
+
+<p>Sorry, only <%= maxUsersPerPad %> people are allowed to edit a
+single pad at the same time in the free version of EtherPad.</p>
+
+<p>Please see our <a href="http://etherpad.com/ep/about/pricing">pricing plans</a> for
+information about having more than <%= maxUsersPerPad %>
+collaborators.</p>
+
+</div>
+
+</div>
diff --git a/trunk/etherpad/src/templates/pad/padslider_body.ejs b/trunk/etherpad/src/templates/pad/padslider_body.ejs
new file mode 100644
index 0000000..51a9e84
--- /dev/null
+++ b/trunk/etherpad/src/templates/pad/padslider_body.ejs
@@ -0,0 +1,41 @@
+<% /* 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
new file mode 100644
index 0000000..75c38fe
--- /dev/null
+++ b/trunk/etherpad/src/templates/pad/padview_body.ejs
@@ -0,0 +1,143 @@
+<% /* 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>
+<img src="/static/img/may09/doc.gif" ><a class="tlink" href="/ep/pad/export/<%= padId %>/<%= revisionId %>?format=html" thref="/ep/pad/export/<%= padId %>/rev.%revision%?format=doc" >Microsoft Word</a><br>
+<img src="/static/img/may09/pdf.gif" ><a class="tlink" href="/ep/pad/export/<%= padId %>/<%= revisionId %>?format=html" thref="/ep/pad/export/<%= padId %>/rev.%revision%?format=pdf" >PDF</a>
+
+
+</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
new file mode 100644
index 0000000..7ac7e1b
--- /dev/null
+++ b/trunk/etherpad/src/templates/pad/total_users_exceeded.ejs
@@ -0,0 +1,29 @@
+<% /* 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>
+
diff --git a/trunk/etherpad/src/templates/pro-account/recover.ejs b/trunk/etherpad/src/templates/pro-account/recover.ejs
new file mode 100644
index 0000000..686fe3b
--- /dev/null
+++ b/trunk/etherpad/src/templates/pro-account/recover.ejs
@@ -0,0 +1,48 @@
+<% /* 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.includeCss("global-pro-account.css") %>
+
+<div class="fpcontent">
+  <div class="global-pro-account">
+
+  <h1>Recover Lost Account</h1>
+
+  <%= errorDiv() %>
+
+  <p>Enter your email address to recover your
+  account information</p>
+
+  <form id="global-sign-in" 
+        action="<%= request.path %>" method="post">
+    <label for="email">Email Address:</label>
+    <input type="text" name="email" id="email" size="30" 
+      <% if (oldData.email) { %>value="<%= oldData.email %>"<% } %>
+    />
+
+    <br/>
+    <button type="submit">Send account info</button>
+
+  </form>
+
+  <p><a href="/ep/pro-account/sign-in">&laquo;  Back to sign
+  in</a></p>
+
+  <hr>
+
+  <p>New users: <a href="/ep/pro-signup/">create an account
+  instantly</a>.</p>
+
+  </div>
+</div>
+
+
diff --git a/trunk/etherpad/src/templates/pro-account/sign-in.ejs b/trunk/etherpad/src/templates/pro-account/sign-in.ejs
new file mode 100644
index 0000000..470bbc4
--- /dev/null
+++ b/trunk/etherpad/src/templates/pro-account/sign-in.ejs
@@ -0,0 +1,57 @@
+<% /* 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.includeCss("global-pro-account.css") %>
+
+<div class="fpcontent">
+  <div class="global-pro-account">
+
+  <h1>EtherPad Professional Sign In</h1>
+
+  <%= errorDiv() %>
+
+  <form id="global-sign-in" 
+        action="<%= request.path %>" method="post">
+    <label for="email">Email Address:</label>
+    <input type="text" name="email" id="email" size="30" 
+      <% if (oldData.email) { %>value="<%= oldData.email %>"<% } %>
+    />
+
+    <label for="password">Password:</label>
+    <input type="password" name="password" id="password" size="30" />
+
+    <label for="subDomain">Site Address:</label>
+    <input type="text" name="subDomain" id="subDomain" size="30"
+      <% if (oldData.subDomain) { %>value="<%= oldData.subDomain %>"<% } %>
+        />.<%= request.host %>/
+    <br/>
+    <button type="submit">Sign In</button>
+
+    <div class="tip">
+      <b>Tip:</b> you can also sign in by going directly to your site
+      address.
+    </div>
+
+  </form>
+
+  <p><a href="/ep/pro-account/recover">Recover lost password or
+  site address</a></p>
+
+  <hr/>
+
+  <p>New users: <a href="/ep/pro-signup/">create an account
+  instantly</a>.</p>
+
+  </div>
+</div>
+
+
diff --git a/trunk/etherpad/src/templates/pro-help/billing.ejs b/trunk/etherpad/src/templates/pro-help/billing.ejs
new file mode 100644
index 0000000..269d37b
--- /dev/null
+++ b/trunk/etherpad/src/templates/pro-help/billing.ejs
@@ -0,0 +1,45 @@
+<% /* 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. */ %>
+<h1>Account Quotas and Billing</h1>
+
+<p>
+EtherPad Professional Edition allows you to create accounts for members
+of your team.  Account-holders may sign in at
+<tt>your-domain.etherpad.com</tt>.
+</p>
+
+<p>You may have up to <%= numFreeAccounts %> accounts for free.  Once you
+try to add more accounts, you will be prompted to enter payment
+information.  Above <%= numFreeAccounts %> accounts, you will be charged
+$<%= pricePerAccount %> per account per month.  For example, to have <%=
+numFreeAccounts+1 %> accounts will cost a total of $<%= pricePerAccount *
+(numFreeAccounts+1) %> per month.</p>
+
+<p>You are billed at the end of your monthly billing cycle, so if you
+start on January 1st, you will not be billed until February 1st.  To
+compute the total amount charged at the end of the month, we use the
+<b>maximum number of accounts that existed throughout the month</b>.  So
+if you create 10 accounts, but then delete 3 before the end of the month,
+  you will still be charged for 10 at the end of the month.  Likewise, if
+  you create 10 accounts, delete them all, and create 10 new accounts,
+  you will be charged for 10 accounts.</p>
+
+<p>EtherPad lets you to collaborate with <b>guests</b> in
+addition to account-holders.  Guests are users who do not have accounts
+but join you in public pads on your site.  You can always have unlimited
+guest collaborators, and you are not ever charged for guests.  You are
+only charged for account-holders.</p>
+
+
+
diff --git a/trunk/etherpad/src/templates/pro-help/essentials.ejs b/trunk/etherpad/src/templates/pro-help/essentials.ejs
new file mode 100644
index 0000000..a1bcc87
--- /dev/null
+++ b/trunk/etherpad/src/templates/pro-help/essentials.ejs
@@ -0,0 +1,18 @@
+<% /* 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. */ %>
+<h1>EtherPad Professional Essentials</h1>
+
+
+
+  
diff --git a/trunk/etherpad/src/templates/pro-help/main.ejs b/trunk/etherpad/src/templates/pro-help/main.ejs
new file mode 100644
index 0000000..428d7f7
--- /dev/null
+++ b/trunk/etherpad/src/templates/pro-help/main.ejs
@@ -0,0 +1,35 @@
+<% /* 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. */ %>
+<h1>EtherPad Professional Edition Help</h1>
+
+<p>These pages are evolving.  If you have any questions, or find
+parts of EtherPad confusing, please write in to our Helpdesk by
+emailing <%= helpers.oemail("support") %>.</p>
+
+<p>Please report bugs to <%= helpers.oemail("bugs") %>.</p>
+
+<p>Also note that you can also get help from other users in the <a
+href="http://etherpad.com/ep/about/forums">UserVoice Community
+Forums</a>.</p>
+
+<h2>Help Topics:</h2>
+
+<ul>
+<% helpTopics.forEach(function(t) { %>
+  <li><%= A({href: "/ep/pro-help/"+t[0]}, t[1]) %></li>
+<% }); %>
+</ul>
+
+
+
diff --git a/trunk/etherpad/src/templates/pro-help/pro-help-template.ejs b/trunk/etherpad/src/templates/pro-help/pro-help-template.ejs
new file mode 100644
index 0000000..9cc8205
--- /dev/null
+++ b/trunk/etherpad/src/templates/pro-help/pro-help-template.ejs
@@ -0,0 +1,24 @@
+<% /* 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.includeJQuery() %>
+<% helpers.includeJs("etherpad.js") %>
+<% helpers.includeCss("pro-help.css") %>
+
+<div class="fpcontent">
+  <div class="pro-help">
+    <%= renderContent() %>
+  </div>
+</div>
+
+
+
diff --git a/trunk/etherpad/src/templates/pro/account/account-welcome-email.ejs b/trunk/etherpad/src/templates/pro/account/account-welcome-email.ejs
new file mode 100644
index 0000000..25af6f8
--- /dev/null
+++ b/trunk/etherpad/src/templates/pro/account/account-welcome-email.ejs
@@ -0,0 +1,32 @@
+<% /* 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. */ %>
+Dear <%= account.fullName %>,
+
+<% if (adminAccount) { %>
+<%= adminAccount.fullName %> has created an EtherPad account for you on <%=
+request.host %> (<%= siteName %>).  You can sign in by clicking on the following link:
+<% } else { %>
+Thank you for signing up for EtherPad Professional Edition.  You can sign in by clicking on the following link:
+<% } %>
+
+<%= signinLink %>
+
+For help signing in, or general support issues, please email support@etherpad.com.
+
+--
+This email was sent to <%= toEmail %> from an EtherPad user.
+If you received it in error, you may safely ignore it.
+<%/* EtherPad's offices are located at Pier 38, The Embarcadero,
+San Francisco, CA 94107 */%>
+
diff --git a/trunk/etherpad/src/templates/pro/account/create-admin-account.ejs b/trunk/etherpad/src/templates/pro/account/create-admin-account.ejs
new file mode 100644
index 0000000..2a6c9f8
--- /dev/null
+++ b/trunk/etherpad/src/templates/pro/account/create-admin-account.ejs
@@ -0,0 +1,37 @@
+<% /* 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.includeCss("pro/account.css") %>
+
+<div class="fpcontent">
+  <div class="account-container">
+
+  <h3>Welcome to your own EtherPad server!</h3>
+
+  <p>To get started, please create an administrator account.  This
+  account will also be the primary admin contact for this
+  system.</p>
+
+  <%= errorDiv() %>
+
+  <%= renderAccountForm('create-admin-account', [
+    {title: "Create Admin Account"},
+    {text: "fullName", label: "Full Name:"},
+    {text: "email", label: "Email:"},
+    {password: "password", label: "Password:"},
+    {password: "passwordConfirm", label: "Confirm Password:"},
+    {submit: "Create Account"}
+  ]) %>
+
+  </div>
+</div>
+
diff --git a/trunk/etherpad/src/templates/pro/account/forgot-password-email.ejs b/trunk/etherpad/src/templates/pro/account/forgot-password-email.ejs
new file mode 100644
index 0000000..4595cee
--- /dev/null
+++ b/trunk/etherpad/src/templates/pro/account/forgot-password-email.ejs
@@ -0,0 +1,22 @@
+<% /* 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. */ %>
+Dear <%= account.fullName %>,
+
+We received a request to reset your EtherPad password.  To proceed, click the following link:
+
+<%= recoverUrl %>
+
+If you did not request a password reset, simply ignore this email.
+
+
diff --git a/trunk/etherpad/src/templates/pro/account/forgot-password.ejs b/trunk/etherpad/src/templates/pro/account/forgot-password.ejs
new file mode 100644
index 0000000..bbc78dd
--- /dev/null
+++ b/trunk/etherpad/src/templates/pro/account/forgot-password.ejs
@@ -0,0 +1,66 @@
+<% /* 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.includeCss("pro/account.css") %>
+<% helpers.setHtmlTitle("EtherPad: Forgot Password") %>
+
+<div class="fpcontent">
+  <div class="account-container forgotpass-container">
+
+    <% var md = messageDiv(); %>
+    <% if (md) { %>
+        <%= md %>
+    <% } else { %>
+
+      <form action="<%= request.path + '?' + request.query %>"
+            method="post">
+
+        <div class="bb bb-forgotpass">
+          <div class="bb-top">
+            <div class="bb-topleft"><!-- --></div>
+            <div class="bb-topright"><!-- --></div>
+            <div class="bb-title">Recover Lost Password</div>
+          </div>
+          <div class="bb-in">
+
+            <%= errorDiv() %>
+
+            <div id="instructions">
+              Enter your email address and we will send you a link
+              to reset your password.
+            </div>
+
+            <div>
+              <label for="email" id="email-label">Email</label>
+              <input class="textin" type="text" name="email" id="email" value="<%= email
+              %>" />
+              <%= helpers.clearFloats() %>
+            </div>
+
+            <div>
+              <button type="submit" class="bluebutton
+              bluebutton120">
+                Send Email
+              </button>
+              <%= helpers.clearFloats() %>
+            </div>
+
+          </div>
+        </div>
+      </form>
+    <% } %>
+
+    <p><a href="/ep/account/sign-in">&laquo; Back to sign-in</a></p>
+
+  </div>
+</div>
+
diff --git a/trunk/etherpad/src/templates/pro/account/global-multi-domain-recover-email.ejs b/trunk/etherpad/src/templates/pro/account/global-multi-domain-recover-email.ejs
new file mode 100644
index 0000000..d2eb4de
--- /dev/null
+++ b/trunk/etherpad/src/templates/pro/account/global-multi-domain-recover-email.ejs
@@ -0,0 +1,27 @@
+<% /* 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. */ %>
+Dear <%= accountList[0].fullName %>,
+
+We received a request to recover the EtherPad password for "<%=
+email %>.  We found multiple accounts linked to this email address.
+Please choose one of the following URLs to proceed with recovering the
+password for that EtherPad site:
+
+<% for (var i = 0; i < accountList.length; i++) { %>
+<%= recoverLink(accountList[i], domainList[i]) %>
+<% } %>
+
+--
+If you did not request a password reset, simply ignore this email.
+
diff --git a/trunk/etherpad/src/templates/pro/account/guest-knock.ejs b/trunk/etherpad/src/templates/pro/account/guest-knock.ejs
new file mode 100644
index 0000000..44c69c0
--- /dev/null
+++ b/trunk/etherpad/src/templates/pro/account/guest-knock.ejs
@@ -0,0 +1,27 @@
+<% /* 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.includeJQuery() %>
+<% helpers.includeJs("pro/guest-knock-client.js") %>
+<% helpers.includeCss("pro/account.css") %>
+
+<div id="guest-knock-box">
+  <p>
+    <img src="/static/img/misc/status-ball.gif">
+    Waiting for approval...
+  </p>
+</div>
+
+<div id="guest-knock-denied">
+  Access Denied.
+</div>
+
diff --git a/trunk/etherpad/src/templates/pro/account/my-account.ejs b/trunk/etherpad/src/templates/pro/account/my-account.ejs
new file mode 100644
index 0000000..9634285
--- /dev/null
+++ b/trunk/etherpad/src/templates/pro/account/my-account.ejs
@@ -0,0 +1,67 @@
+<% /* 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.includeCss("pro/account.css") %>
+<% helpers.setHtmlTitle("EtherPad: My Account") %>
+
+<div class="fpcontent">
+<div class="my-account">
+  <%= messageDiv() %>
+  <%= errorDiv() %>
+
+<% if (!changePass) { %>
+  <h2>My Info</h2>
+
+  <form method="post" action="/ep/account/update-info">
+  <table>
+    <tr>
+      <th>Full Name:</th>
+      <td class="ti"><%= INPUT({type: 'text', name: 'fullName',
+      value: account.fullName}) %></td>
+    </tr>
+    <tr>
+      <th>Email:</th>
+      <td class="ti"><%= INPUT({type: 'text', name: 'email', value:
+      account.email}) %></td>
+    </tr>
+    <tr>
+      <td colspan="2" style="text-align: right;">
+        <input type="submit" value="Update Info" />
+      </td>
+    </tr>
+  </table>
+  </form>
+<% } %>
+
+<h2>Password</h2>
+
+<form method="post" action="/ep/account/update-password">
+<table>
+  <tr>
+    <th>New Password:</th>
+    <td class="ti"><%= INPUT({type: 'password', name: 'password', value: ''}) %></td>
+  </tr>
+  <tr>
+    <th>Confirm Password:</th>
+    <td class="ti"><%= INPUT({type: 'password', name: 'passwordConfirm', value: ''}) %></td>
+  </tr>
+  <tr>
+    <td colspan="2" style="text-align: right;">
+      <input type="submit" id="passwordSubmit" value="Update Password" />
+    </td>
+  </tr>
+</table>
+</form>
+
+</div>
+</div>
+
diff --git a/trunk/etherpad/src/templates/pro/account/signin-guest.ejs b/trunk/etherpad/src/templates/pro/account/signin-guest.ejs
new file mode 100644
index 0000000..621c381
--- /dev/null
+++ b/trunk/etherpad/src/templates/pro/account/signin-guest.ejs
@@ -0,0 +1,51 @@
+<% /* 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.includeCss("pro/account.css") %>
+<% helpers.includeJQuery() %>
+<% helpers.includeJs("pro/signin-client.js") %>
+<% helpers.setHtmlTitle("EtherPad: Sign In") %>
+
+<div class="fpcontent">
+  <div class="account-container">
+
+    <form id="guest-signin-form"
+          action="<%= request.path + '?' + request.query %>" method="post"
+          style="border: 1px solid #5a5; background: #efe; padding: 1em;">
+
+      <div style="font-weight: bold;">Guest Sign In:</div>
+
+      <% if (errorMessage) { %>
+        <div style="margin: 1em 0; padding: 1em; border: 1px solid red; background: #fee;">
+          <%= errorMessage %>
+        </div>
+      <% } %>
+
+      <p>Enter your name to be displayed to other users:</p>
+      <input id="guestDisplayName" type="text" name="guestDisplayName" value="<%= guestName
+      %>" />
+      <input type="hidden" name="localPadId" value="<%= localPadId %>" />
+
+      <input type="submit" value="Request Access" />
+
+    </form>
+
+    <form id="account-signin-choice"
+          method="get"
+          action="/ep/account/sign-in">
+      <input type="hidden" name="guest" value="1" />
+      <input type="hidden" name="padId" value="<%= toHTML(localPadId) %>" />
+      Account holders: <button>Sign in</button>
+    </form>
+  </div>
+</div>
+
diff --git a/trunk/etherpad/src/templates/pro/account/signin.ejs b/trunk/etherpad/src/templates/pro/account/signin.ejs
new file mode 100644
index 0000000..c67bea6
--- /dev/null
+++ b/trunk/etherpad/src/templates/pro/account/signin.ejs
@@ -0,0 +1,81 @@
+<% /* 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.includeJQuery() %>
+<% helpers.includeJs("pro/signin-client.js") %>
+<% helpers.includeCss("pro/account.css") %>
+<% helpers.setHtmlTitle("EtherPad: Sign In") %>
+
+<div class="fpcontent">
+  <div class="account-container">
+
+  <%= signinNotice() %>
+
+  <form id="signin-form" action="<%= request.path + '?' + request.query %>" method="post">
+  <div class="bb bb-signin">
+    <div class="bb-top">
+      <div class="bb-topleft"><!-- --></div>
+      <div class="bb-topright"><!-- --></div>
+      <div class="bb-title">Sign In to <%= siteName %> EtherPad</div>
+    </div>
+    <div class="bb-in">
+      <%= errorDiv() %>
+      <div>
+        <label for="email" id="email-label">Email</label>
+        <input class="textin" type="text" name="email" id="email" value="<%= email
+        %>" />
+        <%= helpers.clearFloats() %>
+      </div>
+
+      <div>
+        <label for="password" id="password-label">Password</label>
+        <input class="passin" type="password" name="password"
+        id="password"
+        value="<%= password
+        %>" />
+        <%= helpers.clearFloats() %>
+      </div>
+
+      <div>
+        <input type="checkbox" id="rememberMe" name="rememberMe"
+          <%= (rememberMe ? 'checked="on"' : '') %> />
+        <label for="rememberMe" id="rememberMe-label">Remember me on this
+        computer</label>
+
+        <button type="submit" class="bluebutton bluebutton120" id="signInButton">
+          Sign In
+        </button>
+        <%= helpers.clearFloats() %>
+      </div>
+
+    </div>
+  </div>
+  </form>
+
+  <% if (showGuestBox) { %>
+    <form action="/ep/account/guest-sign-in"
+          id="guest-signin-choice"
+          method="get">
+      <input type="hidden" name="padId" value="<%= toHTML(localPadId) %>" />
+      Guests: <button type="submit">Request Guest Access</button>
+    </form>
+  <% } %>
+
+  <div id="bottom-text">
+      <a
+      href="/ep/account/forgot-password">Recover lost
+      password</a>
+  </div>
+
+  </div>
+</div>
+
diff --git a/trunk/etherpad/src/templates/pro/admin/account-manager.ejs b/trunk/etherpad/src/templates/pro/admin/account-manager.ejs
new file mode 100644
index 0000000..f1b443f
--- /dev/null
+++ b/trunk/etherpad/src/templates/pro/admin/account-manager.ejs
@@ -0,0 +1,59 @@
+<% /* 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. */ %>
+<% function fmtdate(d) { 
+  if (!d) {
+    return "Never";
+  } else {
+    return d.toString().split(' ').slice(0,5).join(' ');
+  }
+} %>
+
+<h3 class="top">Accounts</h3>
+
+<div class="manage-accounts">
+
+  <%= messageDiv() %>
+  <%= warningDiv() %>
+
+  <p><a href="<%= request.path %>new">Create new account</a></p>
+
+  <% function renderAccountRow(u) {
+     var name = u.fullName;
+     return TR(TD(name),
+               TD(u.email),
+               TD(u.isAdmin ? 'Admin' : ''),
+               TD(fmtdate(u.lastLoginDate)),
+               TD(A({href: request.path + "account/"+u.id}, "Manage")))
+    }
+  %>
+
+  <table id="accountlist">
+    <tr>
+      <th width="99%">Name</th>
+      <th>Email</th>
+      <th>Role</th>
+      <th>Last Signed In</th>
+      <th>&nbsp;</th>
+    </tr>
+
+    <% accountList.forEach(function(u) { %>
+      <%= renderAccountRow(u) %>
+    <% }); %>
+
+  </table>
+
+  <p class="account-tally"><%= accountList.length %> account<%= accountList.length == 1 ? "" : "s" %>.</p>
+
+</div>
+
diff --git a/trunk/etherpad/src/templates/pro/admin/admin-template.ejs b/trunk/etherpad/src/templates/pro/admin/admin-template.ejs
new file mode 100644
index 0000000..e1a7736
--- /dev/null
+++ b/trunk/etherpad/src/templates/pro/admin/admin-template.ejs
@@ -0,0 +1,33 @@
+<% /* 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 Administration") %>
+<% helpers.includeCss("pro/pro-admin.css") %>
+
+<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>
+    </tr>
+  </table>
+
+</div>
+
+
+
diff --git a/trunk/etherpad/src/templates/pro/admin/admin.ejs b/trunk/etherpad/src/templates/pro/admin/admin.ejs
new file mode 100644
index 0000000..f8e1562
--- /dev/null
+++ b/trunk/etherpad/src/templates/pro/admin/admin.ejs
@@ -0,0 +1,15 @@
+<% /* 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. */ %>
+Please select an option from the left.
+
diff --git a/trunk/etherpad/src/templates/pro/admin/billing-invoices.ejs b/trunk/etherpad/src/templates/pro/admin/billing-invoices.ejs
new file mode 100644
index 0000000..a3a17d8
--- /dev/null
+++ b/trunk/etherpad/src/templates/pro/admin/billing-invoices.ejs
@@ -0,0 +1,45 @@
+<% /* 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.includeCss('store/ondemand-billing.css');
+%>
+
+<% 
+function displayInvoice(invoice) { %> 
+  <tr>
+    <td><%= formatDate(invoice.time) %></td>
+    <td><%= invoice.id %></td>
+    <td><%= invoice.status == 'paid' ? "Paid" : (invoice.status == 'pending' ? "<strong>Pending</strong>" : (invoice.status == 'refunded' ? "<em>Refunded</em>" : invoice.status)) %></td>
+    <td><%= invoice.users %></td>
+    <td>US $<%= dollars(centsToDollars(invoice.amt)) %></td>
+    <td><a href="<%= request.path %>?id=<%= invoice.id %>">View</a></td>
+  </tr>
+<% } %>
+
+<h3 class="top">Past Invoices</h3>
+
+<% if (invoices.length == 0) { %>
+  <p class="informational">No old invoices.</p>
+<% } else { %> 
+  <table class="invoicelist">
+    <tr>
+      <th>Date</th>
+      <th>Invoice Number</th>
+      <th>Status</th>
+      <th>Number of users</th>
+      <th>Cost</th>
+      <th>&nbsp;</th>
+    </tr>
+    <% invoices.forEach(displayInvoice); %>
+  </table>
+<% } %>
\ No newline at end of file
diff --git a/trunk/etherpad/src/templates/pro/admin/delete-account.ejs b/trunk/etherpad/src/templates/pro/admin/delete-account.ejs
new file mode 100644
index 0000000..3de2122
--- /dev/null
+++ b/trunk/etherpad/src/templates/pro/admin/delete-account.ejs
@@ -0,0 +1,35 @@
+<% /* 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 id="delete-account-page">
+
+  <h3 class="top">Delete Account</h3>
+
+  <%= errorDiv() %>
+
+  <div class="confirm">Do you really want to delete this account?</div>
+
+  <div class="account-info"><%= account.fullName %> (<%= account.email %>)</div>
+
+  <form method="post" action="<%= request.path %>">
+    <input type="submit" name="delete" value="Delete" />
+    &nbsp;&nbsp;&nbsp;&nbsp;
+    <input type="submit" name="cancel" value="Cancel" />
+  </form>
+
+  <div class="note">When an account is deleted, some references to it may remain on the
+  site.  For example, edits to pads by the deleted account will remain in the
+  pad's history.  However, the deleted account will no longer be able to
+  sign in, and will not be counted toward your monthly quota.</div>
+
+</div>
+
diff --git a/trunk/etherpad/src/templates/pro/admin/manage-account.ejs b/trunk/etherpad/src/templates/pro/admin/manage-account.ejs
new file mode 100644
index 0000000..72529b4
--- /dev/null
+++ b/trunk/etherpad/src/templates/pro/admin/manage-account.ejs
@@ -0,0 +1,64 @@
+<% /* 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">Manage Account</h3>
+
+<div class="manage-accounts">
+
+  <%= errorDiv() %>
+
+  <form method="post" action="<%= request.path %>">
+
+
+    <table id="manage-account">
+      <tr>
+        <th>Email:</th>
+        <td><input type="text" name="newEmail" id="newEmail" value="<%=
+        account.email %>" /></td>
+      </tr>
+
+      <tr>
+        <th>Full Name:</th>
+        <td><input type="text" name="newFullName" id="newFullName" value="<%=
+        account.fullName %>" /></td>
+      </tr>
+
+      <tr>
+        <th><label for="newIsAdmin">Administrator?</label></th>
+        <td>
+          <input type="checkbox" name="newIsAdmin" id="newIsAdmin"
+            <%= (account.isAdmin ? "checked='true'" : '') %>
+          />
+        </td>
+      </tr>
+
+      <tr>
+        <td colspan="2" style="text-align: right;">
+          <a href="/ep/admin/account-manager/delete-account/<%=
+          account.id %>">Delete Account</a>
+        </td>
+      </tr>
+
+    </table>
+
+  <div style="padding: 1em;">
+    <input class="submit" type="submit" name="btn" value="Save" />
+    <input class="submit" type="submit" name="cancel" value="Cancel" />
+  </div>
+
+  </form>
+
+</div>
+
+
+
diff --git a/trunk/etherpad/src/templates/pro/admin/manage-billing.ejs b/trunk/etherpad/src/templates/pro/admin/manage-billing.ejs
new file mode 100644
index 0000000..8a7bd51
--- /dev/null
+++ b/trunk/etherpad/src/templates/pro/admin/manage-billing.ejs
@@ -0,0 +1,35 @@
+<% /* 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.includeCss('store/ondemand-billing.css');
+%>
+
+<% function fmtdate(d) { 
+  if (!d) {
+    return "Never";
+  } else {
+    return d.toString().split(' ').slice(0,5).join(' ');
+  }
+} 
+
+function plural(amt) {
+  return (amt == 1 ? "" : "s");
+}
+
+%>
+
+<h3 class="top">Payment Information</h3>
+
+<p>EtherPad Professional will be discontinued on <%= helpers.rafterTerminationDate() %>. No further payments will be collected.</p>
+<p><a href="http://etherpad.com<%= helpers.rafterBlogUrl() %>">Read more</a>.</p>
diff --git a/trunk/etherpad/src/templates/pro/admin/new-account.ejs b/trunk/etherpad/src/templates/pro/admin/new-account.ejs
new file mode 100644
index 0000000..2f2cccf
--- /dev/null
+++ b/trunk/etherpad/src/templates/pro/admin/new-account.ejs
@@ -0,0 +1,86 @@
+<% /* 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. */ %><% function formField(id, label, type) {
+    if (!type) { type = "text"; }
+    var val = (oldData[id] || "");
+
+    var d = DIV({className: "formfield"});
+
+    if (type == "checkbox") {
+      d.push(INPUT({type: type, 
+                    id: id, 
+                    name: id,
+                    className: type+"input",
+                    checked: (oldData[id] ? true : undefined)}),
+             LABEL({htmlFor: id, className: type+"label"}, label));
+      d.push(html('<div style="clear: both;"><!-- --></div>'));
+    } else if (type == "text") {
+      d.push(LABEL({className: type+"label", htmlFor: id}, label),
+             INPUT({className: type+"input",
+                    type: type,
+                    id: id, 
+                    name: id, 
+                    maxlength: 80, 
+                    value: val}));
+    } else if (type == "temppass") {
+      if (!val) {
+        val = stringutils.randomString(6).toUpperCase();
+      }
+      d.push(LABEL({className: type+"label", htmlFor: id}, label),
+            INPUT({className: type+"input",
+                  type: "text",
+                  id: id,
+                  name: id,
+                  maxlength: 80,
+                  value: val
+            }));
+    }
+
+    return d;
+} %>
+
+<h3 class="top">Add new account</h3>
+
+<div class="manage-accounts newaccount">
+
+  <%= errorDiv() %>
+
+  <form method="post" action="<%= request.path %>">
+    
+    <div class="new-account-form">
+     
+      <div class="forminner">
+        <%= formField('email', 'Email:', 'text') %>
+        <%= formField('fullName', 'Full Name:', 'text') %>
+        <%= formField('tempPass', 'Temporary Password:', 'temppass') %>
+        <%= formField('makeAdmin', 'Make this account an administrator?', 'checkbox') %>
+      </div>
+
+    </div>
+    <br/><br/>
+    <div class="buttons-wrap">
+      <input class="submit" type="submit" name="btn" value="Create Account" />
+      <input class="submit" type="submit" name="cancel" value="Cancel" />
+    </div>
+
+  </form>
+
+  <p id="bottom-note">An email will be sent to this account with a link to sign in.
+    They will be prompted to change their password the first time they sign in.</p>
+  </p>
+  
+</div>
+
+<script>document.getElementById('email').focus()</script>
+
+
diff --git a/trunk/etherpad/src/templates/pro/admin/pne-config.ejs b/trunk/etherpad/src/templates/pro/admin/pne-config.ejs
new file mode 100644
index 0000000..56fe68d
--- /dev/null
+++ b/trunk/etherpad/src/templates/pro/admin/pne-config.ejs
@@ -0,0 +1,33 @@
+<% /* 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">Private Server Configuration</h3>
+
+<p>Your private EtherPad server can be configured using either command-line arguments (of the
+form --<i>argName</i>=<i>value</i>), or by adding the options to the file
+<tt>data/etherpad.properties</tt>.</p>
+
+<p>Learn more about server options in the <a href="/ep/pne-server-manual/">PNE Server Manual</a>.</p>
+
+<h3>Current Config Values</h3>
+
+<table id="pne-config">
+<tr><th with="1%">Option Name</th><th width="99%">Current Value</th></tr>
+<% propKeys.forEach(function(k) { %>
+<tr><td class="key"><%= k %></td><td class="val"><%= appjetConfig[k] %></td></tr>
+<% }) %>
+</table>
+
+
+
+
+
diff --git a/trunk/etherpad/src/templates/pro/admin/pne-dashboard.ejs b/trunk/etherpad/src/templates/pro/admin/pne-dashboard.ejs
new file mode 100644
index 0000000..6b9b456
--- /dev/null
+++ b/trunk/etherpad/src/templates/pro/admin/pne-dashboard.ejs
@@ -0,0 +1,40 @@
+<% /* 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 Private Server Dashboard") %>
+
+<h3 class="top">User Quota</h3>
+
+<p>Your maximum daily unique user quota is: <b><%= userQuota %></b></p>
+<p>So far today, there have been <b><%= todayActiveUsers %></b> applied against this quota.</p>
+
+<h3>Uptime</h3>
+
+This server has been running for <b><%= renderUptime() %></b>.
+
+<h3>HTTP Response Codes</h3>
+
+<%= renderResponseCodes() %>
+
+<h3>Current Realtime Pad Connections</h3>
+
+<%= renderPadConnections() %>
+
+<h3>Realtime Transport Performance</h3>
+
+<%= renderTransportStats() %>
+
+<div style="font-size: 12px; text-align: right;">
+  <a style="color: #ccc;" href="/ep/admin/pne-advanced">*</a>
+</div>
+
+
diff --git a/trunk/etherpad/src/templates/pro/admin/pne-license-manager.ejs b/trunk/etherpad/src/templates/pro/admin/pne-license-manager.ejs
new file mode 100644
index 0000000..f160be0
--- /dev/null
+++ b/trunk/etherpad/src/templates/pro/admin/pne-license-manager.ejs
@@ -0,0 +1,132 @@
+<% /* 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 PNE License Manager"); %>
+<% helpers.includeJQuery() %>
+<% helpers.includeJs("etherpad.js") %>
+
+<div id="lm">
+
+  <% if (isExpired) { %>
+
+    <div class="lm-error-msg">
+      <p>Your evaluation license has expired!</p>
+      <p>Please contact <%= helpers.oemail("sales") %> or visit the <a
+      href="http://etherpad.com/ep/about/pricing-eepnet">pricing page on etherpad.com</a>
+      to purchase a license key.</p>
+    </div>
+
+  <% } %>
+
+  <% if (isTooOld) { %>
+
+    <div class="lm-notice-msg">
+      <p>The version of EtherPad you are running (<%= runningVersionString %>) is too old.
+      Please update to version <%= licenseVersionString %> or newer by <a
+      href="http://etherpad.com/ep/store/eepnet-download">downloading the latest version on
+      etherpad.com</a>.</p>
+    </div>
+
+  <% } %>
+
+  <% if (errorMessage) { %>
+    <div class="lm-error-msg">
+      <p><%= errorMessage %></p>
+    </div>
+  <% } %>
+
+  <% if (licenseInfo && !edit) { %>
+  
+    <h3 class="top">License Info:</h3>
+
+    <div id="lm-status">
+      <table>
+        <tr>
+          <td width="1%" align="right">Licensed To: </td>
+          <td width="99%"><b><%= licenseInfo.personName %></b></td>
+        </tr>
+
+        <tr>
+          <td align="right">Organization: </td>
+          <td><b><%= licenseInfo.organizationName %></b></td>
+        </tr>
+
+        <tr>
+          <td align="right">Software Edition: </td>
+          <td><b><%= licenseInfo.editionName %></b></td>
+        </tr>
+
+        <tr>
+          <td align="right">Maximum Users: </td>
+          <td><b><%= licenseInfo.userQuota %></b></td>
+        </tr>
+<!--
+        <tr>
+          <td align="right">Licensed PNE Version: </td>
+          <td><b><%= licenseVersionString %>+</b></td>
+        </tr>
+-->
+        <tr>
+          <td align="right">Expires: </td>
+          <td><b><%= licenseInfo.expiresDate ? licenseInfo.expiresDate.toString() : "never" %></b></td>
+        </tr>
+      </table>
+
+    </div>
+
+    <div id="lm-edit-button-wrap">
+      <form action="<%= request.path %>edit" method="get">
+        <input type="submit" name="btn" value="Edit License Info" />
+      </form>
+    </div>
+
+  <% } %>
+
+  <% if (isExpired || !licenseInfo || edit) { %>
+
+    <h3 class="top">Enter New License Info:</h3>
+
+    <% if (isUnlicensed) { %>
+      <p>Before you can use this copy of EtherPad Private Network Edition, you must first
+        enter a valid license.  Free trial licenses can be obtained <a
+        target="_blank"
+        href="https://etherpad.com/ep/store/eepnet-eval-signup">obtained here</a>.
+      </p>
+    <% } %>
+
+    <form action="<%= request.path %>" method="post">
+      <div id="lm-edit">
+
+        <p><b>Name:</b></p>
+        <input style="width: 100%;" type="text" name="personName" 
+                value="<%= toHTML(oldData.personName || "") %>" />
+
+        <p><b>Organization:</b></p>
+        <input style="width: 100%;" type="text" name="orgName" 
+               value="<%= toHTML(oldData.orgName || "") %>" />
+
+        <p><b>License Key:</b></p>
+        <textarea style="width: 100%; height: 60px;" 
+                  name="licenseString"><%= toHTML(oldData.licenseString || "") %></textarea>
+
+      </div>
+
+      <div id="lm-edit-submit-wrap">
+        <input type="submit" name="submit" value="Submit" />
+        <input type="submit" name="cancel" value="Cancel" />
+      </div>
+    </form>
+  
+  <% } %>
+
+</div><!-- /lm -->
+
diff --git a/trunk/etherpad/src/templates/pro/admin/pne-shell.ejs b/trunk/etherpad/src/templates/pro/admin/pne-shell.ejs
new file mode 100644
index 0000000..f398b15
--- /dev/null
+++ b/trunk/etherpad/src/templates/pro/admin/pne-shell.ejs
@@ -0,0 +1,33 @@
+<% /* 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("Shell") %>
+
+<p style="margin-top: 0; color: red;">Warning!  Be careful with this page.</p>
+
+<h3 class="top">Shell</h3>
+
+<p>Enter command:</p>
+
+<form action="<%= request.path %>" method="post">
+  <textarea name="cmd" style="width: 100%; height: 140px;"><%= oldCmd %></textarea>
+  <input type="submit" value="Run" />
+</form>
+
+<% if (result) { %>
+  <h3>Result</h3>
+  <div style="font-family: monospace; border: 1px solid #66f; padding: 1em;">
+    <%= result %>
+  </div>
+  <p style="color: #888; font-family: monospace; font-size: .7em;">Computed in <%= elapsedMs %>ms.</p>
+<% } %>
+
diff --git a/trunk/etherpad/src/templates/pro/admin/pro-config.ejs b/trunk/etherpad/src/templates/pro/admin/pro-config.ejs
new file mode 100644
index 0000000..32cb610
--- /dev/null
+++ b/trunk/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/trunk/etherpad/src/templates/pro/admin/single-invoice.ejs b/trunk/etherpad/src/templates/pro/admin/single-invoice.ejs
new file mode 100644
index 0000000..aeab184
--- /dev/null
+++ b/trunk/etherpad/src/templates/pro/admin/single-invoice.ejs
@@ -0,0 +1,47 @@
+<% /* 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.includeCss('store/ondemand-billing.css');
+%>
+
+<h3 class="top">Past Invoices</h3>
+
+<p>Invoice #<%= invoice.id %>, dated <%= formatDate(invoice.time) %>.</p>
+
+<table class="billingsummary">
+  <tr>
+    <th>Invoice status</th>
+    <td><%= invoice.status == 'paid' ? "Paid" : (invoice.status == 'pending' ? "<strong>Pending</strong>" : (invoice.status == 'refunded' ? "<em>Refunded</em>" : invoice.status)) %></td>
+  </tr>
+  <tr>
+    <th>Number of users</th>
+    <td><%= invoice.users %></td>
+  </tr>
+  <tr>
+    <th>Cost</th>
+    <td>US $<%= dollars(centsToDollars(invoice.amt)) %></td>
+  </tr>
+  <% if (transaction) { %>
+    <tr>
+      <th>Paid on</th>
+      <td><%= formatDate(transaction.time) %></td>
+    </tr>
+    <tr>
+      <th>Paid using</th>
+      <td><%= transaction.payInfo %></td>
+    </tr>
+  <% } %>
+</table>
+
+<p class="returnlink"><a href="<%= request.path %>">&laquo; back to invoice list</a></p>
+
diff --git a/trunk/etherpad/src/templates/pro/padlist/pro-padlist.ejs b/trunk/etherpad/src/templates/pro/padlist/pro-padlist.ejs
new file mode 100644
index 0000000..b762679
--- /dev/null
+++ b/trunk/etherpad/src/templates/pro/padlist/pro-padlist.ejs
@@ -0,0 +1,49 @@
+<% /* 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.includeCss("lib/jquery.contextmenu.css") %>
+<% helpers.includeCss("pro/padlist.css") %>
+
+<% helpers.includeJQuery() %>
+<% helpers.includeJs("lib/jquery.contextmenu.js") %>
+<% helpers.includeJs("pro/pro-padlist-client.js") %>
+
+<% helpers.setHtmlTitle("Pad List - " + orgName + " - EtherPad") %> 
+
+<div class="fpcontent">
+
+  <%= renderPadNav() %>
+  <%= renderNotice() %>
+  <%= renderShowingDesc(padList.length) %>
+
+  <% if (padList.length > 0) { %>
+    <%= renderPadList() %>
+    <p style="font-size: .8em;"><i><%= padList.length %> pad<% if (padList.length > 1) { %>s<% } %></i> <% if (isAdmin) { %>(<a href="/ep/padlist/all-pads.zip">Download all pads as a ZIP archive</a>.) <% } %>
+</p>
+
+  <% } else { %>
+     <p>No pads in this list.</p>
+  <% } %>
+
+</div>
+
+<form action="/ep/padlist/delete" method="post" id="delete-pad" style="display: none;">
+  <input type="hidden" name="returnPath" value="<%= request.url %>" />
+  <input id="padIdToDelete" name="padIdToDelete" type="hidden" value="-" />
+</form>
+
+<form action="/ep/padlist/toggle-archive" method="post" id="toggle-archive-pad" style="display: none;">
+  <input type="hidden" name="returnPath" value="<%= request.url %>" />
+  <input id="padIdToToggleArchive" name="padIdToToggleArchive" type="hidden" value="-" />
+</form>
+
+
diff --git a/trunk/etherpad/src/templates/pro/pro-payment-required.ejs b/trunk/etherpad/src/templates/pro/pro-payment-required.ejs
new file mode 100644
index 0000000..3649990
--- /dev/null
+++ b/trunk/etherpad/src/templates/pro/pro-payment-required.ejs
@@ -0,0 +1,51 @@
+<% /* 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.includeJQuery() %>
+<% helpers.includeJs("etherpad.js") %>
+<% helpers.includeCss("pro/payment-required.css") %>
+
+<div class="fpcontent payment-required">
+
+
+<div id="outside">
+<div id="inside">
+
+  <h1>Payment Required</h1>
+
+  <div id="message"><%= message %></div>
+  <br/>
+
+  <% if (isAdmin) { %>
+    <a class="manage-billing-button" href="/ep/admin/billing/">
+      Manage Billing Info
+    </a>
+  <% } else { %>
+    <p>Please contact one of the following site administrator to
+      set up a billing profile on <%= request.domain %>:</p>
+
+    <ul>
+      <% adminList.forEach(function(a) { %>
+        <li><%= a.fullName %>&nbsp;&nbsp;&lt;<%= TT(a.email)
+        %>&gt;</li>
+      <% }); %>
+    </ul>
+
+  <% } %>
+
+  <br/><br/>
+  <p>Questions? Contact <%= helpers.oemail("support") %>.</p>
+
+</div>
+</div>
+
+
diff --git a/trunk/etherpad/src/templates/pro/pro_home.ejs b/trunk/etherpad/src/templates/pro/pro_home.ejs
new file mode 100644
index 0000000..8d92139
--- /dev/null
+++ b/trunk/etherpad/src/templates/pro/pro_home.ejs
@@ -0,0 +1,110 @@
+<% /* 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(orgName + " - EtherPad"); %>
+<% helpers.includeJQuery() %>
+<% helpers.includeJs("etherpad.js") %>
+<% helpers.includeCss("pro/pro-home.css"); %>
+<% helpers.includeCss("pro/padlist.css"); %>
+
+<div class="fpcontent">
+
+  <div id="welcome-msg">
+    Welcome <%= account.fullName %>
+    <% if (account.isAdmin) { %>(Administrator)<% } %>
+    <br/>
+    <br/>
+  </div>
+
+
+  <div id="homeright">
+    <a href="/ep/pad/newpad">
+      <img src="/static/img/davy/btn/createpad-small.gif" alt="Create new pad" />
+    </a>
+
+    <% if (livePads.length > 0) { %>
+      <div id="live-pads">
+        <h3>Live Pads (currently being edited)</h3>
+        <div id="listwrap">
+          <%= renderLivePads() %>
+        </div>
+      </div>
+    <% } %>
+
+    <% if (recentPads.length > 0) { %>
+      <div id="recent-pads">
+        <h3>Your Recent Pads:</h3>
+        <div id="listwrap">
+          <%= renderRecentPads() %>
+        </div>
+        <a id="viewall" href="/ep/padlist/">View all pads...</a>
+        <div style="clear:both"><!-- --></div>
+      </div>
+    <% } %>
+
+  </div>
+
+  <div id="homeleft">
+    <div id="homeleft-title">
+      Latest News
+    </div>
+
+    <div class="news-time-sep">
+      <div class="date">
+        June 17th, 2009
+      </div>
+      <div class="line"><!-- --></div>
+    </div>
+
+    <div class="news-item">
+      <p>Welcome to your EtherPad Beta Account!  Please report bugs by
+      sending email to <%= helpers.oemail("bugs") %>. You can also give us
+      feedback and feature suggestions via <a target="_blank"
+      href="http://uservoice.etherpad.com/">UserVoice</a>.</p>
+
+      <p>If you have any questions, just email <%=
+      helpers.oemail("support") %> and
+      we will respond to your inquiries.</p>
+
+      <p>We hope you enjoy EtherPad!</p>
+
+      <p>Sincerely,</p>
+
+      <p>Aaron Iba<br/>
+      CEO, AppJet Inc.
+      </p>
+    </div>
+
+  </div>
+
+
+  </div><!-- /homeleft -->
+
+  <%= helpers.clearFloats() %>
+
+  <% if (isPNE) { %>
+    <div id="version-info"
+     style="margin-top: 2em; font-size: 76%; color: #444; text-align: right;">
+     <br/>
+      EtherPad Private Network Edition (PNE)
+      Version <%= pneVersion %><br/>
+
+      <% if (isEvaluation && evalExpDate) { %>
+        <br/>
+        <span style="color: #c22;">EVALUATION EDITION: Expires <%= evalExpDate.toString()
+        %>.<br/>
+      <% } %>
+    </div>
+  <% } %>
+
+</div>
+
diff --git a/trunk/etherpad/src/templates/statistics/stat_page.ejs b/trunk/etherpad/src/templates/statistics/stat_page.ejs
new file mode 100644
index 0000000..22277b3
--- /dev/null
+++ b/trunk/etherpad/src/templates/statistics/stat_page.ejs
@@ -0,0 +1,89 @@
+<% /* 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.includeCss('admin/admin-stats.css');
+helpers.includeJQuery();
+helpers.includeJs('statpage.js');
+
+%>
+
+<a id="backtoadmin" href="/ep/admin/">&laquo; back to admin</a>
+
+<div id="topnav">
+  <ul>
+  <% statCategoryNames.forEach(function(catName) {
+    %> <li>
+         <a class="navlink" id="link<%= catName %>" href="<%= request.path %>#<%= catName %>"><%= catName %></a>
+       </li> <%
+  }); %>
+  </ul>
+</div>
+
+<div>&nbsp;</div>
+
+<%= helpers.clearFloats() %>
+
+<%= optionsForm %>
+
+<% function formatLatest(latest) {
+  if (typeof(latest) == 'string') {
+    return latest;
+  } else {
+    return '<table class="latesttable" border="0" cellpadding="0" cellspacing="0">'+
+      latest.map(function(x) { return "<tr><td>"+x.value+"</td><td>"+x.description+"</td></tr>"; }).join("\n")+
+      "</table>";
+  }
+}
+%>
+
+<%
+function displayStat(statObject) {
+  %>
+  <div class="statentry <%= statObject.specialState %>" id="<%= statObject.id %>">
+    <h2 class="title"><%= statObject.name %></h2>
+    <div class="statbody">
+      <h3><%= statObject.displayName %></h3>
+      <table>
+        <tr>
+          <td class="graph">
+            <%= statObject.graph %>
+            <% if (statObject.dataLinks) { %>
+              <div class="datalinks">(data for <%= statObject.dataLinks.join(", ") %>)</div>
+            <% } %>
+          </td>
+          <td class="latest">
+            <h4>Latest values:</h4>
+            <%= formatLatest(statObject.latest) %>            
+          </td>
+        </tr>
+      </table>
+    </div>
+  </div>
+  <%
+}
+
+function displayCategory(categoryName) {
+  %>
+  <div class="categorywrapper" id="box<%= categoryName %>">
+    <%
+      categoriesToStats[categoryName].forEach(displayStat);
+    %>
+  </div>
+  <%
+}
+
+statCategoryNames.forEach(displayCategory);
+
+%>
+
diff --git a/trunk/etherpad/src/templates/store/csc-help.ejs b/trunk/etherpad/src/templates/store/csc-help.ejs
new file mode 100644
index 0000000..3623fac
--- /dev/null
+++ b/trunk/etherpad/src/templates/store/csc-help.ejs
@@ -0,0 +1,23 @@
+<% /* 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. */ %><html>
+<body>
+
+<p>The CSC (or CVC) is the 3-digit number printed on the back of your card.
+For American Express, it's the 4-digit number on the front.</p>
+
+<img src="/static/img/billing/csc-help.gif" alt="cc back" />
+
+</body>
+</html>
+
diff --git a/trunk/etherpad/src/templates/store/eepnet-checkout/billing-info.ejs b/trunk/etherpad/src/templates/store/eepnet-checkout/billing-info.ejs
new file mode 100644
index 0000000..69e0ead
--- /dev/null
+++ b/trunk/etherpad/src/templates/store/eepnet-checkout/billing-info.ejs
@@ -0,0 +1,183 @@
+<% /* 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. */ %><% 
+  if (!cart.billingCountry) {
+     cart.billingCountry = "US";
+  }
+  helpers.includeJQuery();
+  helpers.includeJs("billing_shared.js");
+  helpers.includeJs("billing.js");
+  
+  function classesPlusError(classes, id) {
+    return (classes || []).concat(errorIfInvalid(id) || []).join(' ');
+  }
+%>
+
+<% function textRow(id, label, classes, notBillingField) {
+   var val = (cart[id] || "");
+   var maxlen=60;
+	 var border;
+   if (id == "billingCCNumber") {
+	   if (billing.validateCcNumber(val)) {
+			 border = "greenborder";
+     } else if (billing.validateCcLength(val)) {
+			 border = "redborder";
+     }
+     val = obfuscateCC(val);
+     maxlen = 16;
+   }
+   var classString = classesPlusError((notBillingField?[]:['billingfield']).concat(classes), id);
+   return TR({className: classString},
+         TD({className: 'pcell'},
+            LABEL({htmlFor: id}, label+(label.length > 0 ? ":" : ''))),
+         TD({className: 'tcell'}, 
+            INPUT({type: 'text', name: id, size:35, maxlength:maxlen, 
+                   value: val,
+                   className: border})));
+   } %>
+
+<h4>Your name:</h4>
+<table class="billingtable">
+  <%= textRow("billingFirstName", "First Name", [], true) %>
+  <%= textRow("billingLastName", "Last Name", [], true) %>
+</table>
+
+<h4>Payment information:</h4>
+
+<% if (request.scheme == 'https') { %>
+  <div class='secure'>
+    <p>Your payment information will be sent securely.</p>
+  </div>
+<% } %>
+
+<%
+	function purchaseType(id, title) {
+		var sel; 
+		if (! cart.billingPurchaseType) {
+			sel = (id == 'creditcard');
+		} else {
+			sel = (cart.billingPurchaseType == id);
+		}
+		%>
+    <span class="paymentbutton">
+			<input type="radio" value="<%= id %>" name="billingPurchaseType" id="purchase<%= id %>" <%= sel ? 'checked="checked"' : "" %> style="display: inline-block; vertical-align: middle;"/>
+			<label for="purchase<%= id %>">
+			  <img src="/static/img/billing/<%= id %>.gif" style="display: inline-block; vertical-align: middle;" /> <span style="display: inline-block; vertical-align: middle;"><%= title %></span>
+			</label>
+		</span>
+		<%
+	}
+%>
+
+<div id="billingselect">
+<p class="<%= errorIfInvalid("billingPurchaseType") %>">Pay using:
+<% purchaseType('creditcard', 'Credit Card'); %>
+<% purchaseType('invoice', 'Invoice'); %>
+<% purchaseType('paypal', 'PayPal'); %>
+</p>
+</div>
+
+<table class="billingtable">
+  <%= textRow("billingCCNumber", "Credit Card Number", ['creditcardreq']) %>
+
+<% function cardInput(cctype) {
+	  var classes = [];
+		if (cart.billingCCNumber) {
+			if (cctype == billing.getCcType(cart.billingCCNumber)) {
+				classes.push("ccimageselected");
+			}
+		}
+		classes.push("ccimage");
+	  var img = IMG({
+			src: "/static/img/billing/"+cctype+".gif", 
+			alt: cctype,
+			className: classes.join(" "),
+			style: "vertical-align: middle",
+			id: "img"+cctype});
+		return img;
+  } %>
+
+  <tr class="billingfield creditcardreq">
+    <td class="pcell">&nbsp;</td>
+    <td valign="center">
+			<div id="ccimages">
+	      <% ["visa", "mc", "disc", "amex"].forEach(function(t) { %>
+	        <%= cardInput(t) %>
+	      <% }); %>
+			</div>
+    </td>
+  </tr>
+
+  <tr class="billingfield creditcardreq <%= errorIfInvalid("billingMeta") %>">
+    <td class="pcell">Expiration (MM/YY):</td>
+    <td>
+  	  <input type="text" name="billingExpirationMonth" size="2" maxlength="2"
+            value="<%= (cart.billingExpirationMonth || '') %>" />
+  	  /
+  	  <input type="text" name="billingExpirationYear" size="2" maxlength="2" 
+            value="<%= (cart.billingExpirationYear || '') %>" />
+  	  &nbsp;&nbsp;&nbsp;&nbsp;CSC/CVC:
+  	  <input type="text" name="billingCSC" size="4" maxlength="4" 
+					  value="<%= (cart.billingCSC || '') %>"/>
+      <a target="_blank" href="//<%= getFullSuperdomainHost() %>/ep/store/csc-help" id="cschelp">what's this?</a>
+	  </td>
+  </tr>
+
+  <tr class="billingfield creditcardreq">
+    <td colspan=2 style="text-align: center; font-weight: normal;">(Be sure to enter your <strong>credit card billing address</strong> below.)</td>
+  </tr>
+
+  <tr class="<%= classesPlusError(['billingfield', 'creditcardreq', 'invoicereq'], 'billingCountry') %>">
+	  <td class="pcell">Country:</td>
+  	<td>
+  	  <select id="billingCountry" name="billingCountry">
+        <% countryList.forEach(function(c) { %>
+          <%= ((c[0] == cart.billingCountry) ?
+               OPTION({value: c[0], selected: true}, c[1]) :
+               OPTION({value: c[0]}, c[1])) %>
+        <% }); %>
+  	  </select>
+  	</td>
+  </tr>
+
+  <%= textRow("billingAddressLine1", "Address", ['creditcardreq', 'invoicereq']) %>
+  <%= textRow("billingAddressLine2", "", ['creditcardreq', 'invoicereq']) %>
+  <%= textRow("billingCity", "City", ['creditcardreq', 'invoicereq']) %>
+      
+  <tr class="<%= classesPlusError(['billingfield', 'creditcardreq', 'invoicereq', 'usonly'], 'billingState') %>">
+    <td class="pcell">State:</td>
+    <td>
+      <select id="billingState" name="billingState">
+      <% usaStateList.forEach(function(s) { %>
+        <%= ((s == cart.billingState) ?
+             OPTION({value: s, selected: true}, s) :
+             OPTION({value: s}, s)) %>
+      <% }); %>
+      </select>
+    </td>
+  </tr>
+  <%= textRow("billingProvince", "Province", ['creditcardreq', 'invoicereq', 'intonly'])%>
+  <%= textRow("billingZipCode", "Zip Code", ['creditcardreq', 'invoicereq', 'usonly']) %>
+  <%= textRow("billingPostalCode", "Postal Code", ['creditcardreq', 'invoicereq', 'intonly'])%>
+	<tr class="billingfield paypalreq"><td colspan=2 class="firstcell">Click "<%= billingButtonName %>" below to continue with PayPal.</td></tr>
+</table>
+
+<% if (showCouponCode) { %>
+  <h4>Optional information:</h4>
+  <table class="billingtable">
+    <%= textRow("billingReferralCode", "Referral Code", [], true) %>
+  </table>
+<% } %>
+
+
+<%= billingFinalPhrase %>
\ No newline at end of file
diff --git a/trunk/etherpad/src/templates/store/eepnet-checkout/cart.ejs b/trunk/etherpad/src/templates/store/eepnet-checkout/cart.ejs
new file mode 100644
index 0000000..147ff1b
--- /dev/null
+++ b/trunk/etherpad/src/templates/store/eepnet-checkout/cart.ejs
@@ -0,0 +1,119 @@
+<% /* 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 id="<%= shoppingcartid %>" class="shoppingcart">
+  <table cellspacing="0" cellpadding="0">
+    <tr>
+      <th>Item</th>
+      <th class="pcell">Cost</th>
+    </tr>
+
+    <% if (! ('baseCost' in cart) && ! ('supportCost' in cart)) { %>
+      <tr>
+        <td colspan="2" class="noitems">
+          <em>Nothing selected.</em>
+        </td>
+      </tr>
+    <% } %>
+    
+    <% if (cart.baseCost) { %>
+      <tr class="base">
+        <td>
+          <span class="item">Etherpad Private Network</span><br />
+          <span class="desc"><%= cart.numUsers %> users 
+            <% if (editable) { %> 
+              <span class="editlink">(<a href="<%= pathTo("purchase") %>">edit</a>)</span> 
+            <% } %>
+          </span>
+        </td>
+        <td class="pcell">US$<%= dollars(cart.baseCost) %></td>
+      </tr>
+      <% if (cart.couponProductPctDiscount) { %>
+        <tr class="basediscount refer">
+          <td>
+            <span class="desc">Referral - <%= cart.couponProductPctDiscount %>% savings</span>
+          </td>
+          <td class="pcell">-US$<%= dollars(cart.productReferralDiscount) %></td>
+        </tr>
+      <% } %>
+    <% } %>
+    
+    <% if (cart.supportCost) { %>
+      <tr class="support">
+        <td>
+          <span class="item">Support Contract
+            <% if (editable) { %> 
+              <span class="editlink">(<a href="<%= pathTo("support-contract") %>">edit</a>)</span>
+            <% } %>
+          </span>
+          <br />
+          <span class="desc">1 year</span>
+        </td>
+        <td class="pcell">US$<%= dollars(cart.supportCost) %></td>
+      </tr>
+      <% if (cart.couponSupportPctDiscount) { %>
+        <tr class="supportdiscount refer">
+          <td>
+            <span class="desc">Referral - <%= cart.couponSupportPctDiscount %>% savings</span>
+          </td>
+          <td class="pcell">-US$<%= dollars(cart.supportReferralDiscount) %></td>
+        </tr>
+      <% } %>
+    <% } else if (cart.baseCost) { %>
+      <tr class="support">
+        <td>
+          <span class="item">No Support Contract
+            <% if (editable) { %> 
+              <span class="editlink">(<a href="<%= pathTo("support-contract") %>">edit</a>)</span>
+            <% } %>
+          </span>
+        </td>
+        <td class="pcell">US$0.00</td>
+      </tr>
+    <% } %>
+    
+    <% if (cart.freeUserCount) { %>
+      <tr class="referralbonus refer">
+        <td>
+          <span class="item">Bonus Users</span><br />
+          <span class="desc">
+            Referral - <%= cart.freeUserCount %> free 
+            user<%= (cart.freeUserCount == 1 ? '' : "s") %>
+          </span>
+        </td>
+        <td class="pcell">US$0.00</td>
+      </tr>
+    <% } %>
+
+    <tr class="spacer"><td>&nbsp;</td></tr>
+
+    <% 
+      var pctDiscount = cart.couponTotalPctDiscount;
+      var hasSubtotal = pctDiscount > 0;
+    %>
+    <% if (hasSubtotal) { %>
+      <tr class="subtotal">
+        <td>Subtotal</td>
+        <td class="pcell">US$<%= dollars(cart.subTotal) %></td>
+      </tr>
+      <tr class="referraldiscount refer">
+        <td>Referral - <%= pctDiscount %>% savings</td>
+        <td class="pcell">-US$<%= dollars(cart.totalReferralDiscount) %></td>
+      </tr>
+    <% } %>
+    <tr class="total<%= (hasSubtotal ? '' : ' withoutsubtotal') %>">
+      <td>Total</td>
+      <td class="pcell">US$<%= dollars(cart.total) %></td>
+    </tr>
+  </table>
+</div>
\ No newline at end of file
diff --git a/trunk/etherpad/src/templates/store/eepnet-checkout/checkout-template.ejs b/trunk/etherpad/src/templates/store/eepnet-checkout/checkout-template.ejs
new file mode 100644
index 0000000..817f0eb
--- /dev/null
+++ b/trunk/etherpad/src/templates/store/eepnet-checkout/checkout-template.ejs
@@ -0,0 +1,38 @@
+<% /* 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.includeCss("store/eepnet-checkout.css"); %>
+<% helpers.includeJQuery() %>
+<% helpers.includeJs("etherpad.js") %>
+<% helpers.setHtmlTitle(title); %>
+
+<%
+var selectCount = 0;
+function select(id, title) {
+  var className = 'poslabel';
+  if (pageId == id) {
+    className += ' current';
+  }
+  selectCount++;
+  return SPAN({className: className}, selectCount+". "+title);
+}
+%>
+
+<div class="fpcontent">
+<div id="<%= pageId %>">
+
+  <h2>Private Network Edition: Purchase Online</h2>
+
+      <%= helpers.rafterNote() %>
+
+</div><!-- /pageId -->
+</div><!-- /fpcontent -->
diff --git a/trunk/etherpad/src/templates/store/eepnet-checkout/confirmation.ejs b/trunk/etherpad/src/templates/store/eepnet-checkout/confirmation.ejs
new file mode 100644
index 0000000..3b38775
--- /dev/null
+++ b/trunk/etherpad/src/templates/store/eepnet-checkout/confirmation.ejs
@@ -0,0 +1,33 @@
+<% /* 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.includeJs('confirmation.js');
+%>
+
+<% if (request.params.frompaypal) {
+  handlePayPalRedirect();
+} %>
+
+<%= displaySummary(true) %>
+
+<% switch(cart.billingPurchaseType) { 
+	case 'creditcard': case 'paypal': %>
+		<p>If this looks good, click "Purchase" below to complete your purchase.</p>
+	<% break;
+	case 'invoice': %>
+		<p>If this looks good, print this page and mail it along with a check or other 
+			prearranged payment to:</p><p><strong>AppJet, Inc.<br>Pier 38 - Suite 210<br>The Embarcadero<br>San Francisco, CA 94107</strong></p>
+	<% break;
+}
+	%>
+
diff --git a/trunk/etherpad/src/templates/store/eepnet-checkout/license-info.ejs b/trunk/etherpad/src/templates/store/eepnet-checkout/license-info.ejs
new file mode 100644
index 0000000..4d710f2
--- /dev/null
+++ b/trunk/etherpad/src/templates/store/eepnet-checkout/license-info.ejs
@@ -0,0 +1,40 @@
+<% /* 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. */ %><p>Your license key will be issued to a particular individual at your organization, and will be delivered to the email address you specify below.</p>
+
+<table border="1">
+  <tr class="<%= errorIfInvalid('email') %>">
+    <td>Email address to receive license key:</td>
+    <td><input name="email" type="text"
+		     value="<%= cart.email %>" /></td>
+  </tr>
+
+  <tr class="<%= errorIfInvalid('ownerName') %>">
+    <td>Name of license owner (your name):</td>
+    <td><input name="ownerName" type="text"
+         value="<%= cart.ownerName %>" /></td>
+  </tr>
+
+  <tr class="<%= errorIfInvalid('orgName') %>">
+    <td>Organization or company name:</td>
+    <td><input name="orgName" type="text"
+         value="<%= cart.orgName %>" /></td>
+  </tr>
+
+  <tr class="<%= errorIfInvalid('licenseAgreement') %> center">
+    <td colspan=2>
+      <input id="c1" type="checkbox" name="licenseAgreement" <%= (cart.licenseAgreement ? 'checked="checked"' : '') %> /> 
+      <label for="c1">I agree to the <a target="_blank" href="/static/html/eepnet/eepnet-license.html">License</a>.</label>
+    </td>
+  </tr>
+</table>
\ No newline at end of file
diff --git a/trunk/etherpad/src/templates/store/eepnet-checkout/purchase.ejs b/trunk/etherpad/src/templates/store/eepnet-checkout/purchase.ejs
new file mode 100644
index 0000000..49cb3bb
--- /dev/null
+++ b/trunk/etherpad/src/templates/store/eepnet-checkout/purchase.ejs
@@ -0,0 +1,33 @@
+<% /* 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. */ %><p>Thank you for choosing to purchase <strong>Enterprise EtherPad Private Network Edition.</strong></p>
+
+<p>A license allows a certain number of concurrent users, at a one-time cost of US $<%= dollars(costPerUser) %> per user with no recurring costs. <a target="_blank" href="/ep/about/pricing-eepnet-users">Learn more about how we count users</a>.</p>
+
+<p>How many users should your license support?</p>
+
+<table>
+  <tr class="<%= errorIfInvalid('numUsers') %>">
+    <td class="pcell">Number of Users at US $<%= dollars(costPerUser) %>/user:</td>
+    <td class="tcell"><input name="numUsers" type="text"
+         value="<%= cart.numUsers %>" /></td>
+  </tr>
+</table>
+
+<table>
+  <tr class="<%= errorIfInvalid('couponCode') %>">
+    <td colspan="2" class="pcell">Referral Code (optional):</td>
+    <td class="tcell"><input id="couponCode" name="couponCode" type="text"
+     maxlength="8" value="<%= cart.couponCode %>" /></td>
+  </tr>
+</table>
diff --git a/trunk/etherpad/src/templates/store/eepnet-checkout/receipt.ejs b/trunk/etherpad/src/templates/store/eepnet-checkout/receipt.ejs
new file mode 100644
index 0000000..8d3a2a5
--- /dev/null
+++ b/trunk/etherpad/src/templates/store/eepnet-checkout/receipt.ejs
@@ -0,0 +1,43 @@
+<% /* 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. */ %><% if (cart.showStartOverMessage) { %>
+  <div class="innererrormsg">
+    Your purchase is complete! To purchase another item, please return to the <a href="<%= pathTo('purchase') %>?clearcart=1">purchase page</a>.
+  </div> 
+<% }
+
+switch(cart.status) {
+	case 'success':
+		%><p><strong>Thank you for your purchase!</strong> This page serves as your receipt. Please print it for your records. You will receive a copy of this receipt and license key by email shortly.</p><%
+		break;
+	case 'pending':
+		%><p>Your purchase is pending approval by PayPal. Once it clears, 
+			usually in 2-5 business days, you will receive a copy of this receipt and
+			your license key by email.</p><%
+		break;
+} %>
+
+<%
+  var instructions = "/ep/pne-manual";
+  var download = "/ep/store/eepnet-download-nextsteps";
+%>
+
+<p>To install EtherPad Private Network Edition:</p>
+<ul>
+  <li><a href="<%= download %>">Download Etherpad: Private Network Edition</a>.</li>
+  <li>Read the <a href="<%= instructions %>">EtherPad: Private Network Edition installation instructions</a>.</li>
+</ul>
+
+<p><strong></strong></p>
+
+<%= displaySummary() %>
diff --git a/trunk/etherpad/src/templates/store/eepnet-checkout/summary.ejs b/trunk/etherpad/src/templates/store/eepnet-checkout/summary.ejs
new file mode 100644
index 0000000..753873c
--- /dev/null
+++ b/trunk/etherpad/src/templates/store/eepnet-checkout/summary.ejs
@@ -0,0 +1,91 @@
+<% /* 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. */ %><%
+function textRow(tcell, pcell) {
+	%><tr>
+			<td class="tcell"><%= tcell %></td>
+			<td class="pcell"><%= pcell %></td>
+		</tr>
+	<%
+}
+var keyData = {
+  ownerName: cart.ownerName,
+  orgName: cart.orgName
+}
+if (cart.licenseKey) {
+  var parts = cart.licenseKey.split(":");
+  keyData.ownerName = parts[0];
+  keyData.orgName = parts[1];
+  keyData.key = parts[2];
+
+  keyData.keyLine1 = keyData.key.substring(0, keyData.key.length/3);
+  keyData.keyLine2 = keyData.key.substring(keyData.key.length/3, 2*keyData.key.length/3);
+  keyData.keyLine3 = keyData.key.substring(2*keyData.key.length/3, keyData.key.length);
+}
+
+function makeRows(arr) {
+	arr.forEach(function(arr) { textRow(arr[0], arr[1]); });
+}
+%>
+
+<h4>License Information <% if (editable) { %><span class="editlink">(<a href="<%= pathTo("license-info") %>">edit</a>)</span><% } %></h4>
+
+<table>
+	<% 
+	  makeRows([
+		  [ "Administrator name:", keyData.ownerName ],
+	    [ "Organization/Company:", keyData.orgName ],
+	    [ "Email address for delivery:", cart.email ],
+			[ "Total users:", cart.userCount ]
+		]);
+		if (keyData.key) {
+		  textRow("License key:", keyData.keyLine1+"<BR>"+keyData.keyLine2+"<BR>"+keyData.keyLine3);
+		  %><!-- key: <%= keyData.key %> --><%
+		}
+	%>
+</table>
+
+<h4>Payment Information <% if (editable) { %><span class="editlink">(<a href="<%= pathTo("billing-info") %>">edit</a>)</span><% } %></h4>
+
+<table>
+	<%
+	  var isUs = cart.billingCountry == "US";
+	  switch(cart.billingPurchaseType) {
+		case 'creditcard':
+			makeRows([
+			  [ "Credit card number:", obfuscateCC(cart.billingCCNumber) ],
+			  [ "Expiration date:", cart.billingExpirationMonth+" / 20"+cart.billingExpirationYear ]
+			]);
+		// falling through intentional.
+		case 'invoice':
+			makeRows([
+				[ "Purchaser name:", cart.billingFirstName + " " + cart.billingLastName ],
+				[ "Purchaser address: ", cart.billingAddressLine1 + "<br>" +
+					             (cart.billingAddressLine2 ? cart.billingAddressLine2 + "<br>" : "") +
+											 cart.billingCity + ", " +
+											 (isUs?cart.billingState:cart.billingProvince) + "<br>" +
+											 (isUs?cart.billingZipCode:cart.billingPostalCode) +
+											 (isUs?'':', '+cart.billingCountry) ],
+				[ "Invoice number: ", cart.invoiceId ]
+			]);
+			break;
+		case 'paypal':
+      textRow("Paid using:", "PayPal");
+	    textRow("InvoiceNumber:", cart.invoiceId);
+	}
+	%>
+</table>
+
+<h4>Summary of Charges</h4>
+
+<%= displayCart("shoppingconfirmation", editable) %>
diff --git a/trunk/etherpad/src/templates/store/eepnet-checkout/support-contract.ejs b/trunk/etherpad/src/templates/store/eepnet-checkout/support-contract.ejs
new file mode 100644
index 0000000..ff33fda
--- /dev/null
+++ b/trunk/etherpad/src/templates/store/eepnet-checkout/support-contract.ejs
@@ -0,0 +1,41 @@
+<% /* 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. */ %><p>A support contract gives you free upgrades and help directly from the engineers who developed EtherPad. Support contracts cost US $<%= dollars(costPerUser * supportCostPct/100) %> per user per year, with a US $<%= dollars(supportMinCost) %> per year minimum. <a target="_blank" href="/ep/about/pricing-eepnet-support">Learn more about support contracts</a>.</p>
+  
+<p>For the <%= cart.numUsers %>-user license you've selected, a support contract costs US $<%= discountedSupportCost() !== undefined ? dollars(discountedSupportCost()) : dollars(supportCost()) %>.
+
+<p>Do you want a support contract?</p>
+  
+<table>
+  <tr>
+    <td>
+      <input id="r1" type="radio" name="supportContract" value="true"
+        <%= (cart.supportContract == "true") ? "checked" : "" %> />
+    </td>
+    <td>
+      <label for="r1">Yes, I want to purchase a support contract.</label>
+    </td>
+  </tr>
+
+  <tr>
+    <td>
+      <input id="r2" type="radio" name="supportContract" value="false"
+        <%= (cart.supportContract != "true")? "checked" : "" %> />
+    </td>
+    <td>
+      <label for="r2">
+        No thanks, I just want the software license.
+      </label>
+    </td>
+  </tr>
+</table>
\ No newline at end of file
diff --git a/trunk/etherpad/src/templates/store/eepnet_download.ejs b/trunk/etherpad/src/templates/store/eepnet_download.ejs
new file mode 100644
index 0000000..42c89ee
--- /dev/null
+++ b/trunk/etherpad/src/templates/store/eepnet_download.ejs
@@ -0,0 +1,43 @@
+<% /* 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.includeCss("store/store.css") %>
+<% helpers.includeJQuery() %>
+<% helpers.includeJs("store.js") %>
+
+<div class="fpcontent storepage" id="downloadpage">
+
+  <% if (message) { %>
+    <div id="topmsg">
+      <%= message %>
+    </div>
+  <% } %>
+
+  <h2>Download EtherPad Private Network Edition:</h2>
+
+  <br/><br/>
+  <center>
+    <input id="license_agree" type="checkbox" />
+    <label id="license_agree_label"
+	   for="license_agree" style="font-size: 1.2em;">
+      Agree to the <a target="_blank" href="/static/html/eepnet/eepnet-eval-license.html">License</a>
+    </label>
+
+    <a class="downloadbutton_disabled" href="javascript:store.mustAgree();">
+      Download Now
+    </a>
+    <h3>Version: <%= versionString %></h3><br/>
+
+  </center>
+
+  
+</div>
diff --git a/trunk/etherpad/src/templates/store/eepnet_eval_nextsteps.ejs b/trunk/etherpad/src/templates/store/eepnet_eval_nextsteps.ejs
new file mode 100644
index 0000000..4c4cec4
--- /dev/null
+++ b/trunk/etherpad/src/templates/store/eepnet_eval_nextsteps.ejs
@@ -0,0 +1,40 @@
+<% /* 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">
+  <h2>Downloading...</h2>
+
+  <p>Your download should begin automatically.  If it does not, you
+  can click this link:</p>
+
+  <ul>
+    <li><a href="/ep/store/eepnet-download-zip">Download Now</a>
+      </li>
+  </ul>
+
+  <h2>Next Steps</h2>
+
+  <ul>
+    <li>Read the
+      <a href="/ep/pne-manual/">PNE System Administrator's
+      Manual</a>.</li>
+
+    <li>A license key was sent to you by email, which you will need to
+    run EtherPad PNE.</li>
+
+  </ul>
+
+</div>
+
+<iframe style="display: none;" width="0" height="0"
+	src="/ep/store/eepnet-download-zip"></iframe>
+
diff --git a/trunk/etherpad/src/templates/store/eepnet_eval_signup.ejs b/trunk/etherpad/src/templates/store/eepnet_eval_signup.ejs
new file mode 100644
index 0000000..5a1edf4
--- /dev/null
+++ b/trunk/etherpad/src/templates/store/eepnet_eval_signup.ejs
@@ -0,0 +1,125 @@
+<% /* 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("Sign up for EtherPad PNE Free Trial"); %>
+<% helpers.includeJQuery() %>
+<% helpers.includeJs("etherpad.js") %>
+<% helpers.includeJs("store.js") %>
+<% helpers.includeCss("store/store.css") %>
+
+<% function renderField(maxlen, id, title) {
+     var oldValue = (oldData[id] || "");
+     return DIV(P(LABEL({htmlFor: id}, title),
+                  INPUT({maxlength: maxlen,
+                         type: "text",
+                         className: "signupData",
+                         name: id,
+                         id: id,
+                         value: oldValue})));
+  }
+
+   function renderWebLeadField(name) {
+     return INPUT({type: 'hidden', name: name, id: "wl_"+name, value: ""});
+   }
+%>
+
+<div class="fpcontent storepage" id="eepnet_trial_signup_page">
+
+  <h2 id="toph2">Private Network Edition: <%= trialDays %>-Day Free Trial</h2>
+
+  <p>Enter your information here to download a free <%= trialDays
+  %>-day trial of EtherPad Private Network Edition.</p>
+
+  <div style="display: none;" id="errormsg">&nbsp;</div>
+
+  <div style="display: none;" id="processingmsg">
+    <img src="/static/img/misc/status-ball.gif" alt="" />
+    Processing, please wait...
+  </div>
+
+  <div id="dlsignup">
+    
+    <form id="signupForm" method="post" action="<%= request.path %>">
+
+      <% /* note: these fields should match exactly the eepnet-pricingcontact
+                  form in pricing_eepnet.ejs */ %>
+       
+      <%= renderField(40, "firstName", "First Name:") %>
+      <%= renderField(80, "lastName", "Last Name:") %>
+      <%= renderField(80, "email", "Your Email (license key will be sent here):") %>
+      <%= renderField(40, "orgName", "Company/Organization:") %>
+
+      <p>
+        <label for="industry">Industry</label>
+        <select id="industry" name="industry">
+          <% sfIndustryList.forEach(function(i) { %>
+             <%= ((i == oldData.industry) ? 
+                 OPTION({value: toHTML(i), selected: true}, i) :
+                 OPTION({value: toHTML(i)}, i)) %>
+          <% }); %>
+        </select>
+      </p>
+
+      <%= renderField(40, "jobTitle", "Your Title:") %>
+      <%= renderField(40, "phone", "Phone Number:") %>
+      <%= renderField(160, "estUsers", "Estimated number of users:") %>
+
+    </form>
+
+    <p><button id="submit" onclick="javascript: void store.eepnetTrial.submit();">Go To Download --&gt;</button></p>
+
+  </div>
+
+  <p>If you already have a license, you
+  can <a href="/ep/store/eepnet-download">skip directly to download</a>.</p>
+
+  <p>You can also <a href="/ep/store/eepnet-recover-license">recover a
+  lost license key</a>.</p>
+  
+  <p>Questions?  Email <%= helpers.oemail("sales") %>.</p>
+
+</div>
+
+<form id="wlform"
+      method="post"
+      target="wltarget"
+      action="<%= request.scheme %>://www.salesforce.com/servlet/servlet.WebToLead?encoding=UTF-8"
+>
+
+  <input type="hidden" name="retURL" value="<%= request.scheme %>://<%= request.host %>/ep/store/salesforce-web2lead-ok" />
+
+  <% [
+    "oid",
+    "first_name",
+    "last_name",
+    "email",
+    "company",
+    "title",
+    "phone",
+    "00N80000003FYtG",
+    "00N80000003FYto",
+    "00N80000003FYuI",
+    "lead_source",
+    "industry"
+   ].forEach(function(f) { %>
+
+     <%= renderWebLeadField(f) %>
+
+  <% }); %>
+
+</form>
+
+<iframe style="width: 1px; height: 1px; border: 0;"
+	name="wltarget"
+	id="wltarget"
+	src="about:blank"></iframe>
+