allpy
changeset 485:e57eb57e6328
blocks3d/wt: fix paths problems
css and javascript file paths should not be absolute (starting with '/')
entry point path should be empty (not '/')
| author | boris <bnagaev@gmail.com> |
|---|---|
| date | Sun, 20 Feb 2011 21:05:03 +0300 |
| parents | c3dc06b7fdcf |
| children | 53fdc62b01e6 |
| files | blocks3d/wt/blocks3d-wt.C blocks3d/wt/config.h blocks3d/wt/work-time.C |
| diffstat | 3 files changed, 3 insertions(+), 5 deletions(-) [+] |
line diff
1.1 --- a/blocks3d/wt/blocks3d-wt.C Fri Feb 18 19:04:43 2011 +0300 1.2 +++ b/blocks3d/wt/blocks3d-wt.C Sun Feb 20 21:05:03 2011 +0300 1.3 @@ -19,7 +19,7 @@ 1.4 { 1.5 messageResourceBundle().use(Wt::WApplication::appRoot() + 1.6 "locales/blocks3d"); 1.7 - useStyleSheet("/css/1.css"); 1.8 + useStyleSheet("css/1.css"); 1.9 blocks3d_widget = new Blocks3DWidget(root()); 1.10 } 1.11 1.12 @@ -33,7 +33,7 @@ 1.13 Wt::WServer server(argv[0]); 1.14 server.setServerConfiguration(argc, argv, WTHTTP_CONFIGURATION); 1.15 1.16 - server.addEntryPoint(Wt::Application, createApplication, Malakite::main_url); 1.17 + server.addEntryPoint(Wt::Application, createApplication); 1.18 1.19 if (server.start()) 1.20 {
2.1 --- a/blocks3d/wt/config.h Fri Feb 18 19:04:43 2011 +0300 2.2 +++ b/blocks3d/wt/config.h Sun Feb 20 21:05:03 2011 +0300 2.3 @@ -11,8 +11,6 @@ 2.4 const char* const temp_path = "/tmp"; 2.5 const char* const temp_mkstemp_path = "/tmp/blocks3d_XXXXXX"; 2.6 2.7 -const char* const main_url = "/"; 2.8 - 2.9 const char* const tempfile_sh = "run.sh"; 2.10 2.11 namespace defaults
3.1 --- a/blocks3d/wt/work-time.C Fri Feb 18 19:04:43 2011 +0300 3.2 +++ b/blocks3d/wt/work-time.C Sun Feb 20 21:05:03 2011 +0300 3.3 @@ -5,7 +5,7 @@ 3.4 Worktime::Worktime(Wt::WContainerWidget* parent) : 3.5 WText(parent), start_at(now()), stop_at(now()), stoped(false) 3.6 { 3.7 - wApp->require("/js/jquery.countdown.pack.js"); 3.8 + wApp->require("js/jquery.countdown.pack.js"); 3.9 render(); 3.10 } 3.11