diff --git a/.tmp_index.html.63539~ b/.tmp_index.html.63539~ new file mode 100644 index 0000000..fc92d54 --- /dev/null +++ b/.tmp_index.html.63539~ @@ -0,0 +1,433 @@ + + +fluidIA: stage + + + + + + + + + + + + + + +
+ + +
+
text
+
+
+ +
+
+
+ + + + + +
+
+ + + + +
+
+
+ +
+ +
+ +
+ +
+
+
+
+ +
+
+
+
+
+ +
+ +
+
+
Pages
+
+
+
+
+ +
+
+
+ + + + + + + +
+ + + + + +
+
form tool
+
+
+ Input Field + Checkbox + Radio Button + Text Area + Pulldown + Button +
+
+
+ +
+
states
+
+
+ + + + + + + + + +
+
Selected State: +
+ Starting State: +
+ 		State Name 1
+
+
+ +
+
+ +
+
+
+ + +
+
+
+ +
+
+ save as
+ a web link:
+
+ + fluidia.org/ +
taken:(
+
+
+ or as a local file:
+ +
+
+
+
+ +
+
+ load
+ a recent web link:
+ +
+ or from a local file:
+ +
+
+
+
+ +
+
+ login
+
+
+ +
+ or register
+
+
+
+
+ + +
+
ideas
+
+
+
Best Idea:
+
Idea: 1


+
+
+ + +
+
+
+
+ + +
+
set action
+
+
+ + + + + + + +
+ + +
clearMouse:
+ + 		+ + +
clearKeyboard:
+ +


+ Close +
+ +
+
+
+
+ + +
+
+ experience thread
+
+
+
Title:
+
+
User Intent or Story: (optional)
+
+ Close +
+
+
+
+ + +
+
clipboard
+
+ +
+
Contains:
+ +
+
+
Text
+
+ +
+
+
Form Element
+
+ +
+
+
Page
+
+ +
+
+
+
+ +
+
quite empty in here :(
+
+
+
CTRL C
to copy
+
CTRL V
to paste
+
+ +
+
+
+ +
+
paste as master
+
+ +
+ + +
All States of Instance 3
+
+ +
or PRESS CTRL+V again
+
+
+
+
+ +
+
+ + + + \ No newline at end of file diff --git a/engine/css/base.css b/engine/css/base.css index 217cf9a..39410b2 100644 --- a/engine/css/base.css +++ b/engine/css/base.css @@ -41,15 +41,16 @@ div#footer{background: #f3f3f3; color: #dfdfdf; padding:0px; clear:left; width:1 right: 0; top: 0; } -#hSave div, #hSave a { - padding: 0px; - margin: 0px; +#hSave > div, #hSave > a { float: left; } #hLoggedOut { + } #hLoggedIn { - width: 120px; + text-align: right; + padding: 5px 10px 0 0; + width: 160px; height: 15px; display: none; } @@ -78,6 +79,10 @@ div#footer{background: #f3f3f3; color: #dfdfdf; padding:0px; clear:left; width:1 .fTI { font-style: italic; } +.fTB { + font-weight: bold; +} + .fTDim { color: #999999; diff --git a/engine/js/base_jquery.js b/engine/js/base_jquery.js index 8c0227a..914dae4 100644 --- a/engine/js/base_jquery.js +++ b/engine/js/base_jquery.js @@ -41,21 +41,17 @@ $(document).ready(function(){ //init listeners $(window).bind("resize",resized); // window resizing listener - hotkeysEnable(); //enable hotkey listening + + //enable hotkey listening + hotkeysEnable(); $("#setwidth").bind("keyup",updateWidth); $("#setheight").bind("keyup",updateHeight); $("#xpos").bind("keyup",updateXpos); $("#ypos").bind("keyup",updateYpos); - - $("#setwidth").bind("focus",hotkeysDisable) - $("#setheight").bind("focus",hotkeysDisable); - $("#xpos").bind("focus",hotkeysDisable); - $("#ypos").bind("focus",hotkeysDisable); - $("#setwidth").bind("blur",hotkeysEnable) - $("#setheight").bind("blur",hotkeysEnable); - $("#xpos").bind("blur",hotkeysEnable); - $("#ypos").bind("blur",hotkeysEnable); + $(".fNoHotKey").bind("focus",hotkeysDisable); + $(".fNoHotKey").bind("blur",hotkeysEnable); + $(document).bind("mousemove",fGM.capture); //global mouse with page coordinates //first tool @@ -4024,12 +4020,14 @@ var fSaveLoadManager = { $("#fSave, #fLoad, #fLogin").bind("click",fSaveLoadManager.show); $("#fSaveLoadManager").bind("mouseleave",fSaveLoadManager.hide); $("#fSaveLoadManager").bind("mouseenter",function() {$("#fSaveLoadManager").stop(true).fadeTo("",1);}); - $("#fSaveAsUrlName").bind("focus",hotkeysDisable); - $("#fSaveAsUrlName").bind("blur",hotkeysEnable); $("#fSaveAsUrlName").bind("keypress",fSaveLoadManager.taken); //bind clears $("#fInLogin, #fInPassword").bind("mousedown",fSaveLoadManager.clearField); + + //bind buttons + $("#fBLogin").bind("click",fSaveLoadManager.login); + $("#fBLogout").bind("click",fSaveLoadManager.logout); }, show : function(event) { var clickedOn = $(event.target).attr("id"); @@ -4079,6 +4077,18 @@ var fSaveLoadManager = { taken : function () { //display taken text $("#fTaken").hide().stop(true).show(); + }, + login : function () { + $("#hLoggedOut").hide(); + $("#hLoggedIn").show(); + fSaveLoadManager.hide(); + + //set username + $(".fUsername").html($("#fInLogin").val()); + }, + logout : function () { + $("#hLoggedIn").hide(); + $("#hLoggedOut").show(); } } diff --git a/index.html b/index.html index fc92d54..ccd44c5 100644 --- a/index.html +++ b/index.html @@ -23,7 +23,9 @@
-
Logged In
+
Logged In:
+ Logout +
@@ -116,18 +118,18 @@
Size
W:
-
+
H:
-
+
Position
X:
-
+
Y:
-
+
@@ -261,7 +263,7 @@ a web link:
- fluidia.org/ + fluidia.org/
taken:(

@@ -291,9 +293,9 @@
login
-
-
- +
+
+
or register