From cf42d133f6a81052843e639aec0fa5c414b571ab Mon Sep 17 00:00:00 2001 From: Jonathan Bernard Date: Wed, 1 Jun 2011 06:29:48 -0500 Subject: [PATCH] Added UI for timeline creation. --- db/test/DECISION_TAB.LOG | Bin 156 -> 156 bytes db/test/LATEST.LOG | Bin 332 -> 92 bytes db/test/id_counter.DCD | Bin 130 -> 130 bytes db/test/id_counter.DCL | Bin 248 -> 0 bytes db/test/ts_entry.DCD | Bin 1666 -> 1824 bytes db/test/ts_entry.DCL | Bin 566 -> 748 bytes doc/issues/desktop/0005bn2.rst | 9 --- doc/issues/desktop/0005bs2.rst | 14 ++++ doc/issues/desktop/0008tn2.rst | 10 --- doc/issues/desktop/0008ts2.rst | 15 +++++ doc/issues/desktop/0015tn2.rst | 9 +++ doc/issues/desktop/0016bn5.rst | 7 ++ www/css/ts-screen.css | 116 +++++++++++++++++++++++++++------ www/css/ts-screen.scss | 96 ++++++++++++++++++++++++--- www/index.yaws | 24 +++++-- www/js/ts.js | 41 ++++++++++++ 16 files changed, 289 insertions(+), 52 deletions(-) delete mode 100644 db/test/id_counter.DCL delete mode 100644 doc/issues/desktop/0005bn2.rst create mode 100644 doc/issues/desktop/0005bs2.rst delete mode 100644 doc/issues/desktop/0008tn2.rst create mode 100644 doc/issues/desktop/0008ts2.rst create mode 100644 doc/issues/desktop/0015tn2.rst create mode 100644 doc/issues/desktop/0016bn5.rst diff --git a/db/test/DECISION_TAB.LOG b/db/test/DECISION_TAB.LOG index 11c11882adcc6be3b281979c1b3ee3a39a35beaf..0c590e4891373fc53e23958170c3c0b1a347ad7d 100644 GIT binary patch delta 24 fcmbQkIEQgU2)9%c10Q2?5(B>?+r)TlrrIn3N+Si- delta 24 fcmbQkIEQgU2)ASs1Bdd>BnGCaNfYC(nf$T( diff --git a/db/test/LATEST.LOG b/db/test/LATEST.LOG index 417ff44503daf95203c906e344e5a5487c8ae666..ea2d05beb0e255ac1ce3496d24524e53467b57ed 100644 GIT binary patch delta 17 YcmX@Z6f+@^TPlfxkFhw3fuAJ_04hEM>;M1& literal 332 zcmaiuu};G<7=*8JlO|N{&Q^)JmVi7!J0O-$ER2@TZ`F<)yK-Dr%sd>=z#G6@U=(#> zfPcLI?z@{5Y+B9g2Ea}|@3wEIB3vE9UKlM&M?#aL^n=Kf18e!cL)G$@-`)`xKKMX- zGxKv~)`aRM^u0~LLxklq>fzLDF&er@a1M;VDL%`_i=2_U`t`(%E?cU&qz&7Ni9lYU{6WTi3bW~GcX(K8DulC zndq7585*T9@aE;`<)@@N~Et$eh6hG&3_L sJ~_WMuLNW!cS&)4YF%u81&$yZ29P0`B&DhUKB(bWSgk;{$(DN%4qEzT~< gFHlf6FfcH+QgF+xP$(@Tb)7RKcu*5v;z_KePx?OAIk?_xa; E04{Y6hyVZp diff --git a/db/test/ts_entry.DCL b/db/test/ts_entry.DCL index 0c6b8661d5cec083f197fea995374dca57b4f128..97b12e1630bb90d497df06fc3d81861d2d0eda3b 100644 GIT binary patch literal 748 zcmb`FyG{Z@6o!v17sa4Gg*k~Gngt9dhRRz^Flr^y*pOXjV1`-d;OuNxDhhia#J8~W zHGBzs2Z)BkL^QT1U;gu*e`Y1)WxKbR>i}>b-dr3#iadj2ME#E70po^2fpw#f8z}JV zeoaBX;WzyH9)pr5O^hFE5)@nEg#fv72&MN)2%CjBfR*EUq9-y8R&Ctj+M2QO6s!$c z$c+vRQ;LtSpUiyH>01H}On9U=nkKL#`8Sw|oUJ*Jdnr zA1z@|_7lUA5{rUTw1O|dv7jVk$YeZVfM=34KY literal 566 zcmaiw!EO^V5QZn&rj$i+McgLkKr4k6K|Rq6t%MX+~ZS=qCM2=&Cn z^#ywAYw!d(i&XW7PnQ30zF(ffFx#uXe0%}`7vAJ2A$Po97*d*ohDW+`i}X-K zHZ9)NuzymV6w|jFo_hAI>Ah#eQA}0>j9!#*@ba#N;io?UgWG?`%nUUgNL-MYur*l? zkH71Zf>%M;u(#n*tBD!?pYbDj{`tervl^zCDhi5i2(6&D8a)ektyV%46l3Fk7!7w$ z7xmzLIq#~9VjPc`d4A?1PtcLPN+|7QhOkLLimj>$SL_8hHko{%Bt6Ac6kDgZMV`+n zr0R&uqxH^u!ey0~@p{FfQ6i+VbX_QsSIPcUmIcnZrB&zLHu;pGW3D55TT!x|ljBXV z!<_}Aw{1)EF3&NYwkw^juyQI!oRM>U#ldO()u#`LC`uCegVR15W&P1yg7xdK-%y2h qJbo~+8=7yUP*ZRxMVl~j{^+o`W3L|{9-rP9T=%zY4Wmu4LVp2htFh$( diff --git a/doc/issues/desktop/0005bn2.rst b/doc/issues/desktop/0005bn2.rst deleted file mode 100644 index d60d94f..0000000 --- a/doc/issues/desktop/0005bn2.rst +++ /dev/null @@ -1,9 +0,0 @@ -Fix user menu UI. -================= - -UI for user menu does not work. - -========= ========== -Created: 2011-05-15 -Resolved: YYYY-MM-DD -========= ========== \ No newline at end of file diff --git a/doc/issues/desktop/0005bs2.rst b/doc/issues/desktop/0005bs2.rst new file mode 100644 index 0000000..15cdd0a --- /dev/null +++ b/doc/issues/desktop/0005bs2.rst @@ -0,0 +1,14 @@ +Fix user menu UI. +================= + +UI for user menu does not work. + +Resolution +---------- + +UI menu changed to be displayed to the right of the username, in the empty black space vailable. + +========= ========== +Created: 2011-05-15 +Resolved: 2011-06-01 +========= ========== \ No newline at end of file diff --git a/doc/issues/desktop/0008tn2.rst b/doc/issues/desktop/0008tn2.rst deleted file mode 100644 index 2399e82..0000000 --- a/doc/issues/desktop/0008tn2.rst +++ /dev/null @@ -1,10 +0,0 @@ -Create and implement UI for timeline creation. -============================================== - -There should be a way through the interface for a user to create a new -timeline. - -========= ========== -Created: 2011-05-15 -Resolved: YYYY-MM-DD -========= ========== \ No newline at end of file diff --git a/doc/issues/desktop/0008ts2.rst b/doc/issues/desktop/0008ts2.rst new file mode 100644 index 0000000..9978151 --- /dev/null +++ b/doc/issues/desktop/0008ts2.rst @@ -0,0 +1,15 @@ +Create UI for timeline creation. +================================ + +There should be a way through the interface for a user to create a new +timeline. + +Resolution +---------- + +Abstracted the login dialog CSS to support other dialogs of the same look and feel. Used this to create a dialog for creating new timelines. + +========= ========== +Created: 2011-05-15 +Resolved: 2011-06-01 +========= ========== \ No newline at end of file diff --git a/doc/issues/desktop/0015tn2.rst b/doc/issues/desktop/0015tn2.rst new file mode 100644 index 0000000..4d10b0b --- /dev/null +++ b/doc/issues/desktop/0015tn2.rst @@ -0,0 +1,9 @@ +Create new timeline button in timeline menu. +============================================ + +Need a button to trigger the new timeline dialog. + +========= ========== +Created: 2011-06-01 +Resolved: YYYY-MM-DD +========= ========== \ No newline at end of file diff --git a/doc/issues/desktop/0016bn5.rst b/doc/issues/desktop/0016bn5.rst new file mode 100644 index 0000000..0501d24 --- /dev/null +++ b/doc/issues/desktop/0016bn5.rst @@ -0,0 +1,7 @@ +Duration of next previous entries are not updated when a timestamp is updated. +============================================================================== + +========= ========== +Created: 2011-06-01 +Resolved: YYYY-MM-DD +========= ========== \ No newline at end of file diff --git a/www/css/ts-screen.css b/www/css/ts-screen.css index 106ca04..4b9c4b7 100644 --- a/www/css/ts-screen.css +++ b/www/css/ts-screen.css @@ -77,22 +77,22 @@ input { #timeline .drop-menu .drop-menu-items .timeline-link { font-size: medium; } -#login { +.dialog { background: white; + background: rgba(255, 255, 255, 0.5); color: #eeeeee; margin: 0; padding: 0; - opacity: 1; position: fixed; top: 0px; left: 0px; width: 100%; height: 100em; z-index: 10; } - #login * { + .dialog * { margin: 0; padding: 0; } - #login div.container { + .dialog div.container { background: #222222; border-radius: 10px; font-family: Cantarell; @@ -101,26 +101,96 @@ input { margin-top: 4em; padding: 1em; width: 20em; } - #login div.container h2 { + .dialog div.container h2 { border-bottom: thin solid #eeeeee; font-family: Arvo; padding-bottom: 0.5em; margin-bottom: 0.5em; } - #login div.container label { + .dialog div.container label { display: inline-block; width: 6em; } - #login div.container input { + .dialog div.container input { color: #222222; } - #login div.container #login-button { - text-align: right; + .dialog div.container .button-panel { margin-top: 0.5em; - font-family: Arvo; - font-size: 1.2em; } - #login div.container #login-button .validate-tips { + overflow: hidden; } + .dialog div.container .button-panel .validate-tips { font-size: 1em; } - #login div.container #login-button a { - color: #eeeeee; } + .dialog div.container .button-panel .dialog-button { + float: right; + padding-left: 1em; + font-family: Arvo; + font-size: 1.2em; } + .dialog div.container .button-panel .dialog-button a { + color: #eeeeee; } +#login.dialog { + background: white; + opacity: 1; } + +/*#login { + + background: white; + color: $lightTxt; + margin: 0; + padding: 0; + opacity: 1; + + position: fixed; + top: 0px; + left: 0px; + + width: 100%; + height: 100em; + + z-index: 10; + + * { + margin: 0; + padding: 0; + } + + div.container { + + background: $darkBg; + border-radius: 10px; + font-family: Cantarell; + margin-left: auto; + margin-right: auto; + margin-top: 4em; + padding: 1em; + width: 20em; + + h2 { + border-bottom: thin solid $lightBg; + font-family: Arvo; + padding-bottom: 0.5em; + margin-bottom: 0.5em; + } + + label { + display: inline-block; + width: 6em; + } + + input { + color: $darkTxt; + } + + #login-button { + + text-align: right; + margin-top: 0.5em; + + font-family: Arvo; + font-size: 1.2em; + + .validate-tips { font-size: 1em; } + + a { color: $lightBg; } + } + } +}*/ #user { font-family: "Josefin Sans"; margin-top: -0.3em; @@ -140,14 +210,20 @@ input { display: inline-block; } #user.edit-fullname .fullname { display: none; } - #user .drop-menu { + #user .user-menu { display: inline-block; } - #user .drop-menu .drop-menu-items { - margin-top: -0.5em; - text-align: right; - right: 0; + #user .user-menu .user-menu-items { list-style: none; - width: 10em; } + display: none; } + #user .user-menu .user-menu-items li { + display: inline-block; + padding-left: 0.5em; } + #user .user-menu .user-menu-items a { + text-decoration: none; } + #user .user-menu .user-menu-items a:hover { + text-decoration: underline; } + #user .user-menu:hover .user-menu-items, #user .user-menu-items:hover { + display: inline-block; } #entry-list { margin: 6em 0 0 0; diff --git a/www/css/ts-screen.scss b/www/css/ts-screen.scss index 398280b..a24715b 100644 --- a/www/css/ts-screen.scss +++ b/www/css/ts-screen.scss @@ -107,7 +107,81 @@ input { } } -#login { +.dialog { + + background: white; + background: rgba(255, 255, 255, 0.5); + color: $lightTxt; + margin: 0; + padding: 0; + + position: fixed; + top: 0px; + left: 0px; + + width: 100%; + height: 100em; + + z-index: 10; + + * { + margin: 0; + padding: 0; + } + + div.container { + + background: $darkBg; + border-radius: 10px; + font-family: Cantarell; + margin-left: auto; + margin-right: auto; + margin-top: 4em; + padding: 1em; + width: 20em; + + h2 { + border-bottom: thin solid $lightBg; + font-family: Arvo; + padding-bottom: 0.5em; + margin-bottom: 0.5em; + } + + label { + display: inline-block; + width: 6em; + } + + input { + color: $darkTxt; + } + + .button-panel { + margin-top: 0.5em; + overflow: hidden; + + .validate-tips { font-size: 1em; } + + .dialog-button { + + float: right; + padding-left: 1em; + + font-family: Arvo; + font-size: 1.2em; + + a { color: $lightBg; } + } + } + } +} + +#login.dialog { + background: white; + opacity: 1; +} + +/*#login { background: white; color: $lightTxt; @@ -169,7 +243,7 @@ input { a { color: $lightBg; } } } -} +}*/ #user { @@ -197,16 +271,22 @@ input { .fullname { display: none; } } - .drop-menu { display: inline-block; } + .user-menu { display: inline-block; } - .drop-menu .drop-menu-items { - margin-top: -0.5em; - text-align: right; - right: 0; + .user-menu .user-menu-items { list-style: none; - width: 10em; + display: none; + + li { + display: inline-block; + padding-left: 0.5em; + } + + a { text-decoration: none; } + a:hover { text-decoration: underline; } } + .user-menu:hover .user-menu-items, .user-menu-items:hover { display: inline-block; } } diff --git a/www/index.yaws b/www/index.yaws index a9d096e..dce60b0 100644 --- a/www/index.yaws +++ b/www/index.yaws @@ -61,9 +61,9 @@ out(YArg) ->