From 174c4af93819c904161c3935523b0aba063635ce Mon Sep 17 00:00:00 2001 From: Rolux Date: Mon, 5 Jul 2010 14:07:54 +0200 Subject: [PATCH 01/14] debugging... --- pandora/static/js/pandora.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pandora/static/js/pandora.js b/pandora/static/js/pandora.js index d35a9677..3fd5068b 100644 --- a/pandora/static/js/pandora.js +++ b/pandora/static/js/pandora.js @@ -1,6 +1,6 @@ $(function(){ - Ox.debug = Ox.print; - Ox.print = function() {}; + //Ox.debug = Ox.print; + //Ox.print = function() {}; Ox.theme("modern"); app = new Ox.App({ From aa41d0966b8f34cc8d1e8fea0f81578e03f1a883 Mon Sep 17 00:00:00 2001 From: Rolux Date: Mon, 5 Jul 2010 14:14:12 +0200 Subject: [PATCH 02/14] debugging... --- pandora/static/js/pandora.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pandora/static/js/pandora.js b/pandora/static/js/pandora.js index 3fd5068b..79f082ce 100644 --- a/pandora/static/js/pandora.js +++ b/pandora/static/js/pandora.js @@ -30,6 +30,8 @@ $(function(){ borderBottom: "1px solid rgb(160, 160, 160)" })*/; + Ox.print("-----"); + //FIXME: how to properly overwrite functions without replacing them var super_launch = app.launch; app.launch = function() { From 7249a819fe7ace1d8129882ff106f259cea12d71 Mon Sep 17 00:00:00 2001 From: Rolux Date: Mon, 5 Jul 2010 14:15:03 +0200 Subject: [PATCH 03/14] debugging... --- pandora/static/js/pandora.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pandora/static/js/pandora.js b/pandora/static/js/pandora.js index 79f082ce..e007ecfa 100644 --- a/pandora/static/js/pandora.js +++ b/pandora/static/js/pandora.js @@ -2,6 +2,8 @@ $(function(){ //Ox.debug = Ox.print; //Ox.print = function() {}; + Ox.print("--------"); + Ox.theme("modern"); app = new Ox.App({ requestURL: "/api/" @@ -30,8 +32,6 @@ $(function(){ borderBottom: "1px solid rgb(160, 160, 160)" })*/; - Ox.print("-----"); - //FIXME: how to properly overwrite functions without replacing them var super_launch = app.launch; app.launch = function() { From 34e520486673a61f3fad9330af7362e56f63699d Mon Sep 17 00:00:00 2001 From: Rolux Date: Mon, 5 Jul 2010 14:16:18 +0200 Subject: [PATCH 04/14] debugging... --- pandora/static/js/pandora.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pandora/static/js/pandora.js b/pandora/static/js/pandora.js index e007ecfa..9468edb9 100644 --- a/pandora/static/js/pandora.js +++ b/pandora/static/js/pandora.js @@ -13,9 +13,9 @@ $(function(){ $toolbars = []; var sidePanel = new Ox.Panel(); - var mainPanel = new Ox.Panel().css({ + var mainPanel = new Ox.Panel()/*.css({ //borderLeft: "1px solid rgb(160, 160, 160)" - }); + })*/; var middleSplitPanel = Ox.SplitPanel({ elements: [ { From bf03ab96d26142f38a7b53992106d49ca5013dd0 Mon Sep 17 00:00:00 2001 From: Rolux Date: Mon, 5 Jul 2010 14:17:07 +0200 Subject: [PATCH 05/14] debugging... --- pandora/static/js/pandora.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pandora/static/js/pandora.js b/pandora/static/js/pandora.js index 9468edb9..ae09827a 100644 --- a/pandora/static/js/pandora.js +++ b/pandora/static/js/pandora.js @@ -2,8 +2,6 @@ $(function(){ //Ox.debug = Ox.print; //Ox.print = function() {}; - Ox.print("--------"); - Ox.theme("modern"); app = new Ox.App({ requestURL: "/api/" @@ -16,6 +14,7 @@ $(function(){ var mainPanel = new Ox.Panel()/*.css({ //borderLeft: "1px solid rgb(160, 160, 160)" })*/; + Ox.print("--------"); var middleSplitPanel = Ox.SplitPanel({ elements: [ { From fb5ef0cef9e3b5e7e7954fc41fda3f543e6b45c3 Mon Sep 17 00:00:00 2001 From: Rolux Date: Mon, 5 Jul 2010 14:19:31 +0200 Subject: [PATCH 06/14] debugging... --- pandora/static/js/pandora.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pandora/static/js/pandora.js b/pandora/static/js/pandora.js index ae09827a..5ab1241b 100644 --- a/pandora/static/js/pandora.js +++ b/pandora/static/js/pandora.js @@ -14,7 +14,6 @@ $(function(){ var mainPanel = new Ox.Panel()/*.css({ //borderLeft: "1px solid rgb(160, 160, 160)" })*/; - Ox.print("--------"); var middleSplitPanel = Ox.SplitPanel({ elements: [ { @@ -180,6 +179,8 @@ $(function(){ size: "large" }); + Ox.print("--------"); + var pageDialog = function(title, page) { Ox.debug(title, page); var $dialog = new Ox.Dialog({ From 94e484702b7f9be43a074e0823f565ea1f1a9e1c Mon Sep 17 00:00:00 2001 From: Rolux Date: Mon, 5 Jul 2010 14:21:02 +0200 Subject: [PATCH 07/14] debugging... --- pandora/static/js/pandora.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pandora/static/js/pandora.js b/pandora/static/js/pandora.js index 5ab1241b..a46557ef 100644 --- a/pandora/static/js/pandora.js +++ b/pandora/static/js/pandora.js @@ -179,8 +179,6 @@ $(function(){ size: "large" }); - Ox.print("--------"); - var pageDialog = function(title, page) { Ox.debug(title, page); var $dialog = new Ox.Dialog({ @@ -353,6 +351,9 @@ $(function(){ }); } + Ox.print("--------"); + + var d = new Ox.Container(); var registerInfo = new Ox.Panel(); From fe09b69163fc79491222cacceb18d244312642bd Mon Sep 17 00:00:00 2001 From: Rolux Date: Mon, 5 Jul 2010 14:22:34 +0200 Subject: [PATCH 08/14] debugging... --- pandora/static/js/pandora.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pandora/static/js/pandora.js b/pandora/static/js/pandora.js index a46557ef..07a60c42 100644 --- a/pandora/static/js/pandora.js +++ b/pandora/static/js/pandora.js @@ -351,9 +351,6 @@ $(function(){ }); } - Ox.print("--------"); - - var d = new Ox.Container(); var registerInfo = new Ox.Panel(); @@ -433,6 +430,9 @@ $(function(){ historyPanel.$content.html("Paris
Matirx
Godard") + Ox.print("--------"); + + /* var tabbar = new Ox.Tabbar({ values: ["Info", "Scenes", "Timeline", "Map", "Admin"], From 2e7a7094f7c0ef8bff846cbe03c8d0e76f9ee71c Mon Sep 17 00:00:00 2001 From: Rolux Date: Mon, 5 Jul 2010 14:25:21 +0200 Subject: [PATCH 09/14] debugging... --- pandora/static/js/pandora.js | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pandora/static/js/pandora.js b/pandora/static/js/pandora.js index 07a60c42..03da7e43 100644 --- a/pandora/static/js/pandora.js +++ b/pandora/static/js/pandora.js @@ -391,6 +391,8 @@ $(function(){ .open(); }); + Ox.print("--------"); + var bottomPanel = Ox.Toolbar({size: "small"}) .css({ zIndex: 2, @@ -430,9 +432,6 @@ $(function(){ historyPanel.$content.html("Paris
Matirx
Godard") - Ox.print("--------"); - - /* var tabbar = new Ox.Tabbar({ values: ["Info", "Scenes", "Timeline", "Map", "Admin"], From fc2379530bf131ce407b211a7f5869d6bcd4ef78 Mon Sep 17 00:00:00 2001 From: Rolux Date: Mon, 5 Jul 2010 14:26:05 +0200 Subject: [PATCH 10/14] debugging... --- pandora/static/js/pandora.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pandora/static/js/pandora.js b/pandora/static/js/pandora.js index 03da7e43..a0b9988d 100644 --- a/pandora/static/js/pandora.js +++ b/pandora/static/js/pandora.js @@ -369,6 +369,7 @@ $(function(){ orientation: "vertical" }).appendTo(d); + Ox.print("--------"); var $dialog = new Ox.Dialog({ title: "Login", @@ -391,8 +392,6 @@ $(function(){ .open(); }); - Ox.print("--------"); - var bottomPanel = Ox.Toolbar({size: "small"}) .css({ zIndex: 2, From 99d09f3f1058e4ad0f1f527d8cd642a05fc68a16 Mon Sep 17 00:00:00 2001 From: Rolux Date: Mon, 5 Jul 2010 14:27:46 +0200 Subject: [PATCH 11/14] debugging... --- pandora/static/js/pandora.js | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pandora/static/js/pandora.js b/pandora/static/js/pandora.js index a0b9988d..6cdbc6d5 100644 --- a/pandora/static/js/pandora.js +++ b/pandora/static/js/pandora.js @@ -354,7 +354,7 @@ $(function(){ var d = new Ox.Container(); var registerInfo = new Ox.Panel(); - registerInfo.append(Ox.Element().css({'margin-left': '4px'}).append('
Forgot your password? Recover Password
Dont have an account? Register Now')); + // registerInfo.append(Ox.Element().css({'margin-left': '4px'}).append('
Forgot your password? Recover Password
Dont have an account? Register Now')); var panel = Ox.SplitPanel({ elements: [ @@ -369,8 +369,6 @@ $(function(){ orientation: "vertical" }).appendTo(d); - Ox.print("--------"); - var $dialog = new Ox.Dialog({ title: "Login", width: inputWidth+24, From d46dc6509ad50f5b576237feae001ceaeec7233a Mon Sep 17 00:00:00 2001 From: Rolux Date: Mon, 5 Jul 2010 14:28:43 +0200 Subject: [PATCH 12/14] debugging... --- pandora/static/js/pandora.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pandora/static/js/pandora.js b/pandora/static/js/pandora.js index 6cdbc6d5..912aa675 100644 --- a/pandora/static/js/pandora.js +++ b/pandora/static/js/pandora.js @@ -354,7 +354,9 @@ $(function(){ var d = new Ox.Container(); var registerInfo = new Ox.Panel(); - // registerInfo.append(Ox.Element().css({'margin-left': '4px'}).append('
Forgot your password? Recover Password
Dont have an account? Register Now')); + registerInfo.append(Ox.Element().css({'margin-left': '4px'}).append('
Forgot your password? Recover Password
Dont have an account? Register Now')); + + /* var panel = Ox.SplitPanel({ elements: [ @@ -369,6 +371,8 @@ $(function(){ orientation: "vertical" }).appendTo(d); + */ + var $dialog = new Ox.Dialog({ title: "Login", width: inputWidth+24, From dbb4d342419eb5cb46e43c0ebe047adc0b0d2c84 Mon Sep 17 00:00:00 2001 From: Rolux Date: Mon, 5 Jul 2010 14:30:09 +0200 Subject: [PATCH 13/14] debugging... --- pandora/static/js/pandora.js | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pandora/static/js/pandora.js b/pandora/static/js/pandora.js index 912aa675..f335e5c5 100644 --- a/pandora/static/js/pandora.js +++ b/pandora/static/js/pandora.js @@ -351,12 +351,16 @@ $(function(){ }); } + Ox.print(0); + var d = new Ox.Container(); var registerInfo = new Ox.Panel(); + Ox.print(1); + registerInfo.append(Ox.Element().css({'margin-left': '4px'}).append('
Forgot your password? Recover Password
Dont have an account? Register Now')); - /* + Ox.print(2); var panel = Ox.SplitPanel({ elements: [ @@ -371,7 +375,7 @@ $(function(){ orientation: "vertical" }).appendTo(d); - */ + Ox.print(3); var $dialog = new Ox.Dialog({ title: "Login", From 010d44ebef57aebd03567b0cdc1d3470b44c1e6b Mon Sep 17 00:00:00 2001 From: Rolux Date: Mon, 5 Jul 2010 14:31:13 +0200 Subject: [PATCH 14/14] debugging... --- pandora/static/js/pandora.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pandora/static/js/pandora.js b/pandora/static/js/pandora.js index f335e5c5..4147116e 100644 --- a/pandora/static/js/pandora.js +++ b/pandora/static/js/pandora.js @@ -337,6 +337,8 @@ $(function(){ 'padding-top': '48px', }); + Ox.print(-1); + var submit = function() { app.request('login', loginForm.values(), function(result) { if(result.status.code == 200) {