From 2d2e7bbf5406b5ce6373b5b5e1f50264e6f5aa3a Mon Sep 17 00:00:00 2001 From: Zachary Kain Date: Tue, 5 Mar 2013 09:13:14 -0500 Subject: [PATCH 01/57] reposition Todo options, use proper icon --- views/app/tasks.html | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/views/app/tasks.html b/views/app/tasks.html index f0ff20c787..9b983cbd5f 100644 --- a/views/app/tasks.html +++ b/views/app/tasks.html @@ -13,6 +13,13 @@
+ + {#if _user.history.todos} + + {/} +   + +

Todos

@@ -24,13 +31,6 @@ Clear Completed

 

- - {#if _user.history.todos} - - {/} -  iCal - -
- + {#if _user.history.todos} - + {/} - +

Todos

@@ -124,9 +124,10 @@
- - + +
+
@@ -152,19 +153,22 @@
{#if equal(:task.type, 'habit')} - {#if :task.up}{/} - {#if :task.down}{/} + {#if :task.up}＋{/} + {#if :task.down}−{/} {else if equal(:task.type, 'reward')} - {:task.value} + {:task.value} {else} - + + + + {/}
-
{:task.text}
+

{:task.text}

From 1a308da495aab91bfd718596fd94aaf2e9ff0e9a Mon Sep 17 00:00:00 2001 From: Zachary Kain Date: Tue, 5 Mar 2013 15:01:52 -0500 Subject: [PATCH 04/57] better responsive breakpoints, more robust custom grid --- styles/app/index.styl | 8 ++++-- styles/app/responsive.styl | 28 +++++++++++++++++++ views/app/index.html | 4 +-- views/app/tasks.html | 55 +++++++++++++++++++++++--------------- 4 files changed, 69 insertions(+), 26 deletions(-) create mode 100644 styles/app/responsive.styl diff --git a/styles/app/index.styl b/styles/app/index.styl index fcec0af9e1..40204aaba0 100644 --- a/styles/app/index.styl +++ b/styles/app/index.styl @@ -8,6 +8,10 @@ @import "./items.styl"; @import "./alerts.styl"; @import "./helpers.styl"; +@import "./responsive.styl"; + +// where's the actual bootstrap include? +// @import "../bootstrap-responsive.styl"; @import "../../public/vendor/bootstrap-datepicker/css/datepicker.css"; @@ -35,7 +39,7 @@ html,body,p,h1,ul,li,table,tr,th,td box-sizing: border-box z-index: 1000 -@media (max-width: 480px) { +@media (max-width: 600px) { #head { position: static; } @@ -132,7 +136,7 @@ html,body,p,h1,ul,li,table,tr,th,td /*overflow:auto;*/ padding-bottom: 250px; /* don't know why this works, sticky footers are weird */ -@media (max-width: 480px) { +@media (max-width: 600px) { #wrap { margin-top: 0 } diff --git a/styles/app/responsive.styl b/styles/app/responsive.styl new file mode 100644 index 0000000000..4047c3bbfd --- /dev/null +++ b/styles/app/responsive.styl @@ -0,0 +1,28 @@ +.grid + padding: 0 1.5em 1.5em 0 + letter-spacing: -4px + +.module + display: inline-block + letter-spacing: normal + vertical-align: top + width: 25% + padding: 0 0 1.5em 1.5em + -moz-box-sizing: border-box + box-sizing: border-box + +// at 960px when 4 columns really starts to break +@media (max-width: 60em) + .module + width: 50% + .task-column + max-height: 18em + overflow-y: scroll + +// at 600px when 2col starts breaking +@media (max-width: 37.5em) + .module + width: 100% + .task-column + max-height: none + overflow: visible \ No newline at end of file diff --git a/views/app/index.html b/views/app/index.html index 69ce9f1db5..e16e6fd1eb 100644 --- a/views/app/index.html +++ b/views/app/index.html @@ -28,9 +28,9 @@
-
+
-
+
diff --git a/views/app/tasks.html b/views/app/tasks.html index a02fd393a5..e8930c33da 100644 --- a/views/app/tasks.html +++ b/views/app/tasks.html @@ -1,18 +1,27 @@ - -
+ + + +
+

Habits

    {#each _habitList as :task}{/}
+
-
+ +
+

Daily

    {#each _dailyList as :task}{/}
+
-
+ +
+
{#if _user.history.todos} @@ -36,11 +45,12 @@
  • Remaining
  • Complete
    • -
    +
    -
    - + +
    +

    Rewards

    @@ -60,68 +70,69 @@
    - + {#if _user.flags.petsEnabled}
    - +
    - +
    {#with _view.items.pets as :pets} - +
    {#with :pets[0]}{/} {#with :pets[1]}{/} {#with :pets[2]}{/} {#with :pets[3]}{/}
    - +
    {#with :pets[4]}{/} {#with :pets[5]}{/} {#with :pets[6]}{/} {#with :pets[7]}{/}
    - +
    {#with :pets[8]}{/} {#with :pets[9]}{/} {#with :pets[10]}{/} {#with :pets[11]}{/}
    - +
    {#with :pets[12]}{/} {#with :pets[13]}{/} {#with :pets[14]}{/} {#with :pets[15]}{/}
    - +
    {#with :pets[16]}{/}
    - - + + {/}
    - - + +
    - {else} + {else} - {/} -
    + {/}
    +
    +
    From 5fb3ba67f61f50b62146624061df5b0f8dee5106 Mon Sep 17 00:00:00 2001 From: Zachary Kain Date: Tue, 5 Mar 2013 15:13:59 -0500 Subject: [PATCH 05/57] circle icon for uncompleted tasks, and rollin with square edges for now --- styles/app/tasks.styl | 33 ++++++++++++++++++++++----------- 1 file changed, 22 insertions(+), 11 deletions(-) diff --git a/styles/app/tasks.styl b/styles/app/tasks.styl index 1299bd5f00..c454ca3cce 100644 --- a/styles/app/tasks.styl +++ b/styles/app/tasks.styl @@ -167,10 +167,11 @@ li:hover .task-meta-controls .hover-show min-height: 2.5em line-height: 2.5 margin-bottom: 0.75em - // border: 1px solid rgba(0,0,0,0.2) - // -webkit-background-clip: padding-box + outline: 1px solid rgba(0,0,0,0.1) + outline-offset: -1px + -webkit-background-clip: padding-box border-radius: 0.25em - overflow: hidden + // overflow: hidden &:last-child margin-bottom: 0 @@ -191,21 +192,31 @@ li:hover .task-meta-controls .hover-show cursor: pointer // border-radius: 0.25em 0 0 0.25em &:after - content: '¬' - transform: rotate(135deg) + content: '○' display: block - line-height: 1.1 - text-align: left - opacity: 0.1 + opacity: 0.2 + line-height: 0.8 + text-align: center color: black font-size: 3em - &:hover:after, - &:focus:after + &:hover:before, + &:focus:before + content: '¬' + display: block + font-size: 3em + color: black + transform: rotate(135deg) + line-height: 1.1 + text-align: left opacity: 0.5 !important - &:active:after + &:active:before opacity: 0.75 !important & input[type=checkbox]:checked + label:after + content: '¬' + transform: rotate(135deg) + line-height: 1.1 + text-align: left opacity: 1 input[type=checkbox] From fbc4345d05a0b4ea714a5a2b15c91419369f3e0b Mon Sep 17 00:00:00 2001 From: Zachary Kain Date: Tue, 5 Mar 2013 19:47:08 -0500 Subject: [PATCH 06/57] further refactoring of tasks code. Last commit before merge in the revert --- styles/app/tasks.styl | 125 ++++++++++++++---------------------------- 1 file changed, 41 insertions(+), 84 deletions(-) diff --git a/styles/app/tasks.styl b/styles/app/tasks.styl index c454ca3cce..9327eec73d 100644 --- a/styles/app/tasks.styl +++ b/styles/app/tasks.styl @@ -1,77 +1,42 @@ -// color variables -$color-worst = rgb(230, 184, 175) -$color-worse = rgb(244, 204, 204) -$color-bad = rgb(252, 229, 205) -$color-neutral = rgb(255, 242, 204) -$color-good = rgb(217, 234, 211) -$color-better = rgb(208, 224, 227) -$color-best = rgb(201, 218, 248) -$color-completed = rgb(217, 217, 217) +// 1. Set up color classes +// ======================== -.color-worst - background-color: $color-worst - .task-checker label - background-color: darken($color-worst, 30%) - .action-plus - background-color: darken($color-worst, 30%) - .action-minus - background-color: darken($color-worst, 30%) -.color-worse - background-color: $color-worse - .task-checker label - background-color: darken($color-worse, 30%) - .action-plus - background-color: darken($color-worse, 30%) - .action-minus - background-color: darken($color-worse, 30%) -.color-bad - background-color: $color-bad - .task-checker label - background-color: darken($color-bad, 30%) - .action-plus - background-color: darken($color-bad, 30%) - .action-minus - background-color: darken($color-bad, 30%) -.color-neutral - background-color: $color-neutral - .task-checker label - background-color: darken($color-neutral, 30%) - .action-plus - background-color: darken($color-neutral, 30%) - .action-minus - background-color: darken($color-neutral, 30%) -.color-good - background-color: $color-good - .task-checker label - background-color: darken($color-good, 30%) - .action-plus - background-color: darken($color-good, 30%) - .action-minus - background-color: darken($color-good, 30%) -.color-better - background-color: $color-better - .task-checker label - background-color: darken($color-better, 30%) - .action-plus - background-color: darken($color-better, 30%) - .action-minus - background-color: darken($color-better, 30%) -.color-best - background-color: $color-best - .task-checker label - background-color: darken($color-best, 30%) - .action-plus - background-color: darken($color-best, 30%) - .action-minus - background-color: darken($color-best, 30%) +// color variables +$worst = rgb(230, 184, 175) +$worse = rgb(244, 204, 204) +$bad = rgb(252, 229, 205) +$neutral = rgb(255, 242, 204) +$good = rgb(217, 234, 211) +$better = rgb(208, 224, 227) +$best = rgb(201, 218, 248) +$completed = rgb(217, 217, 217) + +// array of keywords and their associated color vars +$stages = (worst $worst) (worse $worse) (bad $bad) (neutral $neutral) (good $good) (better $better) (best $best) + +// for each color stage, generate a named class w/ the appropriate color +for $stage in $stages + .color-{$stage[0]} + background-color: $stage[1] + .task-checker label, + .action-plus, + .action-minus + background-color: darken($stage[1], 30%) + +// completed has to be outside the loop to override the color class .completed - background-color: $color-completed + background-color: $completed + color: #999 .task-checker label - background-color: darken($color-completed, 30%) - color: rgb(153, 153, 153) + background-color: darken($completed, 30%) + .reward background-color: white + +// 2. Task Options +// ================ + label.checkbox.inline{ width: 40px } @@ -120,13 +85,6 @@ li:hover .task-meta-controls .hover-show i margin-left:5px - // .task-controls,.task-text - // // display:inline - // // margin: 0 10px 0 0 - - // input - // margin-top: 0 - .task-meta-controls .hover-show display: none; @@ -190,17 +148,16 @@ li:hover .task-meta-controls .hover-show margin: 0 vertical-align: top cursor: pointer - // border-radius: 0.25em 0 0 0.25em &:after content: '○' display: block opacity: 0.2 - line-height: 0.8 + line-height: 0.76 text-align: center color: black font-size: 3em - &:hover:before, - &:focus:before + &:hover:after, + &:focus:after content: '¬' display: block font-size: 3em @@ -209,7 +166,7 @@ li:hover .task-meta-controls .hover-show line-height: 1.1 text-align: left opacity: 0.5 !important - &:active:before + &:active:after opacity: 0.75 !important & input[type=checkbox]:checked + label:after @@ -243,7 +200,7 @@ li:hover .task-meta-controls .hover-show padding: 0 0 0 0.5em width: 100% &:focus - box-shadow: inset 0 0 3px darken($color-best, 20%) + box-shadow: inset 0 0 3px darken($best, 20%) .addtask-btn display: inline-block width: 1.51515em @@ -253,14 +210,14 @@ li:hover .task-meta-controls .hover-show line-height: 1.55 outline: 0 border: 0 - background-color: darken($color-best, 20%) + background-color: darken($best, 20%) opacity: 0.5 &:hover, &:focus opacity: 0.75 - background-color: darken($color-best, 20%) + background-color: darken($best, 20%) &:active - background-color: darken($color-best, 30%) + background-color: darken($best, 30%) opacity: 1 .task-action-btn From 3f33261792ac31b9b997987db7d01c05fd85d81d Mon Sep 17 00:00:00 2001 From: Tyler Renelle Date: Tue, 5 Mar 2013 20:08:31 -0500 Subject: [PATCH 07/57] proper derby tabbing --- views/app/tasks.html | 324 +++++++++++++++++++++---------------------- 1 file changed, 162 insertions(+), 162 deletions(-) diff --git a/views/app/tasks.html b/views/app/tasks.html index e8930c33da..13f4d6cd52 100644 --- a/views/app/tasks.html +++ b/views/app/tasks.html @@ -1,136 +1,136 @@ - + - -
    -
    -

    Habits

    - -
      {#each _habitList as :task}{/}
    -
    -
    - - -
    -
    -

    Daily

    - -
      {#each _dailyList as :task}{/}
    -
    -
    - - -
    -
    - - {#if _user.history.todos} - - {/} - - - -

    Todos

    -
    - + +
    +
    +

    Habits

    + +
      {#each _habitList as :task}{/}
    -
      - {#each _todoList as :task}{/} -
    -
    - Clear Completed -

     

    -
    - -
    -
    - -
    -
    - -
    -

    Rewards

    -
    - {#unless _view.activeTabPets} - - - - - - -
    {gold(_user.stats.gp)}
    		{silver(_user.stats.gp)}
    - {else} - + +
    +
    +

    Daily

    + +
      {#each _dailyList as :task}{/}
    +
    +
    + + +
    +
    + + {#if _user.history.todos} + {/} + + + +

    Todos

    +
    +
    -
    - - - {#if _user.flags.petsEnabled} -
    - -
    -
    - -
    - -
    - {#with _view.items.pets as :pets} - -
    - {#with :pets[0]}{/} - {#with :pets[1]}{/} - {#with :pets[2]}{/} - {#with :pets[3]}{/} -
    - -
    - {#with :pets[4]}{/} - {#with :pets[5]}{/} - {#with :pets[6]}{/} - {#with :pets[7]}{/} -
    - -
    - {#with :pets[8]}{/} - {#with :pets[9]}{/} - {#with :pets[10]}{/} - {#with :pets[11]}{/} -
    - -
    - {#with :pets[12]}{/} - {#with :pets[13]}{/} - {#with :pets[14]}{/} - {#with :pets[15]}{/} -
    - -
    - {#with :pets[16]}{/} -
    - - - {/} -
    - +
      + {#each _todoList as :task}{/} +
    +
    + Clear Completed +

     

    - - -
    - {else} - - {/}
    -
    +
    + + +
    +
    + +
    +

    Rewards

    +
    + {#unless _view.activeTabPets} + + + + + + +
    {gold(_user.stats.gp)}
    		{silver(_user.stats.gp)}
    + {else} + + {/} +
    +
    + + + {#if _user.flags.petsEnabled} +
    + +
    +
    + +
    + +
    + {#with _view.items.pets as :pets} + +
    + {#with :pets[0]}{/} + {#with :pets[1]}{/} + {#with :pets[2]}{/} + {#with :pets[3]}{/} +
    + +
    + {#with :pets[4]}{/} + {#with :pets[5]}{/} + {#with :pets[6]}{/} + {#with :pets[7]}{/} +
    + +
    + {#with :pets[8]}{/} + {#with :pets[9]}{/} + {#with :pets[10]}{/} + {#with :pets[11]}{/} +
    + +
    + {#with :pets[12]}{/} + {#with :pets[13]}{/} + {#with :pets[14]}{/} + {#with :pets[15]}{/} +
    + +
    + {#with :pets[16]}{/} +
    + + + {/} +
    + +
    + + + +
    + {else} + + {/}
    +
    @@ -140,50 +140,50 @@
    - - -
  • - -
    -
    - - - {#if :task.history} - - - - {/} -
    - - {#if :task.notes} - + + +
  • + +
    +
    + + + {#if :task.history} + + + {/}
    - -
    - - {#if equal(:task.type, 'habit')} - {#if :task.up}＋{/} - {#if :task.down}−{/} - - {else if equal(:task.type, 'reward')} - {:task.value} - - {else} - - - - - {/} -
    + {#if :task.notes} + + {/} +
    - -

    {:task.text}

    + +
    + + {#if equal(:task.type, 'habit')} + {#if :task.up}＋{/} + {#if :task.down}−{/} + + {else if equal(:task.type, 'reward')} + {:task.value} + + {else} + + + + + {/} +
    - - -
    • + +

    {:task.text}

    + + + + - {#if _user.flags.petsEnabled} -
    + {#if equal(_user.flags.petsEnabled,true)} +
    -
    -
    - +
    +
    + +
    + +
    + {#with _view.items.pets as :pets} + +
    + {#with :pets[0]}{/} + {#with :pets[1]}{/} + {#with :pets[2]}{/} + {#with :pets[3]}{/} +
    + +
    + {#with :pets[4]}{/} + {#with :pets[5]}{/} + {#with :pets[6]}{/} + {#with :pets[7]}{/} +
    + +
    + {#with :pets[8]}{/} + {#with :pets[9]}{/} + {#with :pets[10]}{/} + {#with :pets[11]}{/} +
    + +
    + {#with :pets[12]}{/} + {#with :pets[13]}{/} + {#with :pets[14]}{/} + {#with :pets[15]}{/} +
    + +
    + {#with :pets[16]}{/} +
    + + + {/} +
    +
    -
    - {#with _view.items.pets as :pets} -
    - {#with :pets[0]}{/} - {#with :pets[1]}{/} - {#with :pets[2]}{/} - {#with :pets[3]}{/} -
    - -
    - {#with :pets[4]}{/} - {#with :pets[5]}{/} - {#with :pets[6]}{/} - {#with :pets[7]}{/} -
    - -
    - {#with :pets[8]}{/} - {#with :pets[9]}{/} - {#with :pets[10]}{/} - {#with :pets[11]}{/} -
    - -
    - {#with :pets[12]}{/} - {#with :pets[13]}{/} - {#with :pets[14]}{/} - {#with :pets[15]}{/} -
    - -
    - {#with :pets[16]}{/} -
    - - - {/} -
    - +
    - - - -
    {else} - + {/}
    From 4bb0207564415b74809690d2ce858226fa8898e7 Mon Sep 17 00:00:00 2001 From: Tyler Renelle Date: Tue, 5 Mar 2013 18:07:22 -0500 Subject: [PATCH 09/57] rename priority multiplier to "Difficulty" -> easy, medium, hard (people keep getting confused) and putting it back into "advanced" section --- views/app/tasks.html | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/views/app/tasks.html b/views/app/tasks.html index 235f5b1447..7b96fac499 100644 --- a/views/app/tasks.html +++ b/views/app/tasks.html @@ -231,18 +231,21 @@
    {/} +
    {#unless equal(:task.type, 'reward')} -
    -
    - - - - + Advanced +
    +
    + + + + +
    +
    {/} -
    From 4f6a78c0ae912854698b45676a9a6def9c785d18 Mon Sep 17 00:00:00 2001 From: Tyler Renelle Date: Tue, 5 Mar 2013 18:58:15 -0500 Subject: [PATCH 10/57] add help popover to difficulty --- views/app/tasks.html | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/views/app/tasks.html b/views/app/tasks.html index 7b96fac499..0826a1f742 100644 --- a/views/app/tasks.html +++ b/views/app/tasks.html @@ -236,8 +236,9 @@
    Advanced
    + +
    - From 16bba9461cf562615ad2e75f2ee82f9a5b747685 Mon Sep 17 00:00:00 2001 From: Zachary Kain Date: Tue, 5 Mar 2013 20:21:17 -0500 Subject: [PATCH 11/57] add the bootstrap update --- public/vendor/bootstrap | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/vendor/bootstrap b/public/vendor/bootstrap index eb24718add..8c7f9c66a7 160000 --- a/public/vendor/bootstrap +++ b/public/vendor/bootstrap @@ -1 +1 @@ -Subproject commit eb24718add4dd36fe92fdbdb79e6ff4ce5919300 +Subproject commit 8c7f9c66a7d12f47f50618ef420868fe836d0c33 From 7e304afc544273855fa1d7af8bfbab851b9c6908 Mon Sep 17 00:00:00 2001 From: Tyler Renelle Date: Tue, 5 Mar 2013 20:23:31 -0500 Subject: [PATCH 12/57] upgrade bootstrap --- public/vendor/bootstrap | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/vendor/bootstrap b/public/vendor/bootstrap index 8c7f9c66a7..eb24718add 160000 --- a/public/vendor/bootstrap +++ b/public/vendor/bootstrap @@ -1 +1 @@ -Subproject commit 8c7f9c66a7d12f47f50618ef420868fe836d0c33 +Subproject commit eb24718add4dd36fe92fdbdb79e6ff4ce5919300 From a002932210525a6d16df3cca04b528db5baa8047 Mon Sep 17 00:00:00 2001 From: Zachary Kain Date: Tue, 5 Mar 2013 20:29:20 -0500 Subject: [PATCH 13/57] re-add Lato webfont --- views/app/index.html | 2 ++ 1 file changed, 2 insertions(+) diff --git a/views/app/index.html b/views/app/index.html index a9cb2bbc43..e16e6fd1eb 100644 --- a/views/app/index.html +++ b/views/app/index.html @@ -14,6 +14,8 @@ + + From 44714bcc5bb457489ea5ab031e6fa35e586cd3a5 Mon Sep 17 00:00:00 2001 From: Tyler Renelle Date: Tue, 5 Mar 2013 20:35:13 -0500 Subject: [PATCH 14/57] comment out webkit-devtools-agent - only for my pesronal use, really --- package.json | 3 +-- server.js | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index a80458cca0..6f65508171 100644 --- a/package.json +++ b/package.json @@ -26,8 +26,7 @@ "superagent": "~0.12.4", "resolve": "~0.2.3", "browserify": "1.17.3", - "expect.js": "~0.2.0", - "webkit-devtools-agent": "*" + "expect.js": "~0.2.0" }, "private": true, "subdomain": "habitrpg", diff --git a/server.js b/server.js index 51db9480cf..6412b78225 100644 --- a/server.js +++ b/server.js @@ -22,7 +22,7 @@ process.env.SMTP_SERVICE = conf.get("SMTP_SERVICE"); process.env.STRIPE_API_KEY = conf.get("STRIPE_API_KEY"); process.env.STRIPE_PUB_KEY = conf.get("STRIPE_PUB_KEY"); -var agent; +/*var agent; if (process.env.NODE_ENV === 'development') { // Follow these instructions for profiling / debugging leaks // * https://developers.google.com/chrome-developer-tools/docs/heap-profiling @@ -31,7 +31,7 @@ if (process.env.NODE_ENV === 'development') { console.log("To debug memory leaks:" + "\n\t(1) Run `kill -SIGUSR2 " + process.pid + "`" + "\n\t(2) open http://c4milo.github.com/node-webkit-agent/21.0.1180.57/inspector.html?host=localhost:1337&page=0"); -} +}*/ process.on('uncaughtException', function (error) { From ce19fed852b6e4f770b9b6186c4d91f357781949 Mon Sep 17 00:00:00 2001 From: Zachary Kain Date: Tue, 5 Mar 2013 20:35:13 -0500 Subject: [PATCH 15/57] remove responsive from bootstrap includes. Rolling our own! --- src/app/index.coffee | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/index.coffee b/src/app/index.coffee index eabdfbde0e..d7445536a0 100644 --- a/src/app/index.coffee +++ b/src/app/index.coffee @@ -1,7 +1,7 @@ derby = require 'derby' app = derby.createApp module {get, view, ready} = app -derby.use require('derby-ui-boot'), {styles: ['bootstrap', 'responsive']} +derby.use require('derby-ui-boot'), {styles: ['bootstrap']} derby.use require '../../ui' derby.use require 'derby-auth/components' From fd216719c364c5b3875c1bfed0b8c03b3795b763 Mon Sep 17 00:00:00 2001 From: Zachary Kain Date: Tue, 5 Mar 2013 21:03:35 -0500 Subject: [PATCH 16/57] allow task text to word-wrap and be padded from element edge --- styles/app/tasks.styl | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/styles/app/tasks.styl b/styles/app/tasks.styl index 9327eec73d..9dc1b45b94 100644 --- a/styles/app/tasks.styl +++ b/styles/app/tasks.styl @@ -100,8 +100,7 @@ li:hover .task-meta-controls .hover-show .task-column padding: 1.5em background: #f5f5f5 - border: 1px solid #bbb - border-radius: 0.25em + border: 1px solid #ccc font-family: 'Lato', sans-serif h2 margin: 0 0 0.5em @@ -121,7 +120,7 @@ li:hover .task-meta-controls .hover-show .task list-style: none clear: both - padding: 0 0.5em 0 0 + padding: 0 0.5em 0 0.5em min-height: 2.5em line-height: 2.5 margin-bottom: 0.75em @@ -135,9 +134,10 @@ li:hover .task-meta-controls .hover-show .task-controls display: inline + margin-left: -0.5em + margin-right: 0.5em .task-text - display: inline-block - text-indent: 0.5em + display: inline .task-checker label @@ -174,7 +174,7 @@ li:hover .task-meta-controls .hover-show transform: rotate(135deg) line-height: 1.1 text-align: left - opacity: 1 + opacity: 0.75 input[type=checkbox] margin: 0 @@ -183,19 +183,16 @@ li:hover .task-meta-controls .hover-show .addtask-form margin-bottom: 0.75em - border-radius: 0.25em - overflow: hidden .addtask-field display: inline-block width: 80% // fallback for Safari 5.1 - // width: calc(unquote('100% - 3em')) + width: calc(unquote('100% - 3em')) input font-family: 'Lato', sans-serif outline: 0 border: 0 box-shadow: none background-color: white - border-radius 0 0.25em 0.25em 0 height: 2.5em padding: 0 0 0 0.5em width: 100% From 174c7a8b9f14da4e39df6a32a3ab593cc03f0745 Mon Sep 17 00:00:00 2001 From: Zachary Kain Date: Tue, 5 Mar 2013 22:06:45 -0500 Subject: [PATCH 17/57] tweaks, most notably DISABLE CHART BUTAN --- styles/app/tasks.styl | 269 ++++++++++++++++++++---------------------- views/app/tasks.html | 29 +++-- 2 files changed, 139 insertions(+), 159 deletions(-) diff --git a/styles/app/tasks.styl b/styles/app/tasks.styl index 9dc1b45b94..ce121649f4 100644 --- a/styles/app/tasks.styl +++ b/styles/app/tasks.styl @@ -34,89 +34,75 @@ for $stage in $stages background-color: white -// 2. Task Options -// ================ -label.checkbox.inline{ - width: 40px -} - -.todos - .nav-pills > .active > a, .nav-pills > .active > a:hover - color: #005580 - background-color: #DEE5F2 - -.dailys - .repeat-days > .btn:not(.active) - background-color: #aaa; - background-image: -moz-linear-gradient(top, #eee, #aaa); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#eee), to(#aaa)); - background-image: -webkit-linear-gradient(top, #eee, #aaa); - background-image: -o-linear-gradient(top, #eee, #aaa); - background-image: linear-gradient(to bottom, #eee, #aaa); - background-repeat: repeat-x; - -.context-enabled - .display-context-dependant, - .task-list li - display: none - - &.context-completed - .show-for-completed, .completed - display: block - - &.context-uncompleted - .show-for-uncompleted, .uncompleted - display: block - -.help-icon - float:right; - -.task:hover - cursor: move - -li:hover .task-meta-controls .hover-show - display: inline - -.task - - .task-meta-controls - float:right - i - margin-left:5px - - .task-meta-controls .hover-show - display: none; - -.vote-up, .vote-down - text-decoration:none; - -.new-task-form - margin-bottom:5px; - - -// begin rewrite css 2013-03-04 +// 2. Columns & Tasks +// =================== +// main columns +// ------------ .task-column padding: 1.5em background: #f5f5f5 border: 1px solid #ccc font-family: 'Lato', sans-serif - h2 + + .task-column_title margin: 0 0 0.5em padding: 0 - - .nav-tabs - margin-top: 0.75em - .option-box - .option-action - margin-left: 0.25em + hr + border: 0 + border-bottom: 1px solid #ddd - -.rewards +// add new task form +// ----------------- +.addtask-form margin-bottom: 0.75em + outline: 1px solid rgba(0,0,0,0.15) + outline-offset: -1px +// the input field +.addtask-field + display: inline-block + width: 80% // fallback for Safari 5.1 + width: calc(unquote('100% - 3em')) + input + font-family: 'Lato', sans-serif + border: 0 + outline: 0 + border-radius: 0 + box-shadow: none + background-color: white + height: 2.5em + padding: 0 0 0 0.5em + width: 100% + &:focus + box-shadow: inset 0 0 3px darken($best, 20%) + +// the button +.addtask-btn + display: inline-block + // important for overriding bootstrap, remove later + width: 1.51515em !important + height: 1.51515em + padding: 0 + font-size: 1.65em + line-height: 1.55 + outline: 0 + border: 0 + background-color: darken($best, 20%) + opacity: 0.75 + &:hover, + &:focus + opacity: 1 + background-color: darken($best, 20%) + &:active + background-color: darken($best, 30%) + opacity: 1 + + +// an individual task entry +// ------------------------ .task list-style: none clear: both @@ -126,114 +112,109 @@ li:hover .task-meta-controls .hover-show margin-bottom: 0.75em outline: 1px solid rgba(0,0,0,0.1) outline-offset: -1px - -webkit-background-clip: padding-box - border-radius: 0.25em - // overflow: hidden + &:hover + cursor: move &:last-child margin-bottom: 0 +// task content +.task-text + display: inline + + +// primary task commands +// ---------------------- .task-controls display: inline margin-left: -0.5em margin-right: 0.5em -.task-text - display: inline -.task-checker - label + // plus/minus commands + .task-action-btn + display: inline-block + width: 1.773em + height: 1.773em + padding: 0 + font-size: 1.41em + line-height: 1.773 + text-align: center + color: black + vertical-align: top + border-right: 1px solid rgba(0,0,0,0.25) + &:last-child + border: 0 + &:hover, &:focus + text-decoration: none + + // checkbox + .task-checker input[type=checkbox] + margin: 0 + padding: 0 + visibility: hidden + + .task-checker label display: inline-block width: 2.5em height: 2.5em - padding: 0 margin: 0 vertical-align: top cursor: pointer + + // uncompleted icon &:after content: '○' display: block - opacity: 0.2 + font-size: 3em line-height: 0.76 text-align: center color: black - font-size: 3em + opacity: 0.2 + + // hint at completed icon &:hover:after, &:focus:after content: '¬' - display: block font-size: 3em - color: black - transform: rotate(135deg) line-height: 1.1 text-align: left + transform: rotate(135deg) opacity: 0.5 !important &:active:after opacity: 0.75 !important - & input[type=checkbox]:checked + label:after + // completed icon + .task-checker input[type=checkbox]:checked + label:after content: '¬' transform: rotate(135deg) line-height: 1.1 text-align: left opacity: 0.75 - - input[type=checkbox] - margin: 0 - padding: 0 - visibility: hidden -.addtask-form - margin-bottom: 0.75em - .addtask-field - display: inline-block - width: 80% // fallback for Safari 5.1 - width: calc(unquote('100% - 3em')) - input - font-family: 'Lato', sans-serif - outline: 0 - border: 0 - box-shadow: none - background-color: white - height: 2.5em - padding: 0 0 0 0.5em - width: 100% - &:focus - box-shadow: inset 0 0 3px darken($best, 20%) - .addtask-btn - display: inline-block - width: 1.51515em - height: 1.51515em - padding: 0 - font-size: 1.65em - line-height: 1.55 - outline: 0 - border: 0 - background-color: darken($best, 20%) - opacity: 0.5 - &:hover, - &:focus - opacity: 0.75 - background-color: darken($best, 20%) - &:active - background-color: darken($best, 30%) - opacity: 1 -.task-action-btn - display: inline-block - width: 1.773em - height: 1.773em - padding: 0 - font-size: 1.41em - line-height: 1.773 - text-align: center - color: black - vertical-align: top - border-right: 1px solid rgba(0,0,0,0.25) - &:last-child - border: 0 - &:hover, - &:focus - text-decoration: none - // &.action-plus - // background-color: darken($color-good, 20%) - // &.action-minus - // background-color: darken($color-worst, 20%) \ No newline at end of file +// secondary task commands +// ----------------------- +.task-meta-controls + float: right + margin-left: 0.25em + opacity: 0.25 + a > i + margin-left: 0.125em + .task-notes + margin-left: 0.125em + +.task:hover .task-meta-controls + opacity: 1 + + +// .context-enabled +// .display-context-dependant, +// .task-list li +// display: none + +// &.context-completed +// .show-for-completed, .completed +// display: block + +// &.context-uncompleted +// .show-for-uncompleted, .uncompleted +// display: block \ No newline at end of file diff --git a/views/app/tasks.html b/views/app/tasks.html index 0826a1f742..fd880e1767 100644 --- a/views/app/tasks.html +++ b/views/app/tasks.html @@ -4,7 +4,7 @@
    -

    Habits

    +

    Habits

      {#each _habitList as :task}{/}
    @@ -13,7 +13,7 @@
    -

    Daily

    +

    Daily

      {#each _dailyList as :task}{/}
    @@ -29,7 +29,7 @@ -

    Todos

    +

    Todos

    @@ -38,7 +38,6 @@
    Clear Completed -

     

      @@ -53,7 +52,7 @@
      -

      Rewards

      +

      Rewards

      {#unless _view.activeTabPets} @@ -145,16 +144,16 @@
    • -
      - - - {#if :task.history} - - - - {/} -
      - + + + + + + + {#if :task.history} + + {/} + {#if :task.notes} {/} From 84e07a03178828d73c141c392c765d98444dfd80 Mon Sep 17 00:00:00 2001 From: Zachary Kain Date: Tue, 5 Mar 2013 22:19:20 -0500 Subject: [PATCH 18/57] better a11y than display:none --- src/app/tasks.coffee | 4 ++-- views/app/tasks.html | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/app/tasks.coffee b/src/app/tasks.coffee index 16d17257b7..c7888cce5f 100644 --- a/src/app/tasks.coffee +++ b/src/app/tasks.coffee @@ -117,8 +117,8 @@ module.exports.app = (appExports, model) -> appExports.toggleTaskEdit = (e, el) -> hideId = $(el).attr('data-hide-id') toggleId = $(el).attr('data-toggle-id') - $(document.getElementById(hideId)).hide() - $(document.getElementById(toggleId)).toggle() + $(document.getElementById(hideId)).addClass('visuallyhidden') + $(document.getElementById(toggleId)).toggleClass('visuallyhidden') appExports.toggleChart = (e, el) -> hideSelector = $(el).attr('data-hide-id') diff --git a/views/app/tasks.html b/views/app/tasks.html index fd880e1767..d1d67d137d 100644 --- a/views/app/tasks.html +++ b/views/app/tasks.html @@ -184,9 +184,10 @@
      • + - -
      -
      - {tokens(_user.balance)} - Tokens -
      -
      - + + ＋ + {tokens(_user.balance)} Tokens + - {#unless :item.hide} -
    • -
      - -
      -
      - {#if @reroll} - - {else} - {:item.value} - {/} -
      -
      - {#if :item.icon} - {:item.text} - {else} -
      • + +
      - - -
      		{:item.text}
      - {/} - -
      - - {/} \ No newline at end of file + {#unless :item.hide} +
    • + +
      + +
      + + +
      + {#if @reroll} + ⟲ + {else} + + {:item.value} + + + {/} +
      + + +

      {:item.text}

      +
      • + {/} \ No newline at end of file diff --git a/views/app/tasks.html b/views/app/tasks.html index 2dd39a9e83..c038cfdb8d 100644 --- a/views/app/tasks.html +++ b/views/app/tasks.html @@ -56,85 +56,84 @@
      - -
      -

      Rewards

      -
      - {#unless _view.activeTabPets} - - - - - - -
      {gold(_user.stats.gp)}
      		{silver(_user.stats.gp)}
      - {else} - - {/} + + + {#unless _view.activeTabPets} +
      + {gold(_user.stats.gp)} +
      -
      - +
      + {silver(_user.stats.gp)} + +
      + + {else} + + {/} + +

      Rewards

      + {#if equal(_user.flags.petsEnabled,true)}
      -
      - -
      + + +
      {#with _view.items.pets as :pets} - -
      - {#with :pets[0]}{/} - {#with :pets[1]}{/} - {#with :pets[2]}{/} - {#with :pets[3]}{/} -
      - -
      - {#with :pets[4]}{/} - {#with :pets[5]}{/} - {#with :pets[6]}{/} - {#with :pets[7]}{/} -
      - -
      - {#with :pets[8]}{/} - {#with :pets[9]}{/} - {#with :pets[10]}{/} - {#with :pets[11]}{/} -
      - -
      - {#with :pets[12]}{/} - {#with :pets[13]}{/} - {#with :pets[14]}{/} - {#with :pets[15]}{/} -
      - -
      - {#with :pets[16]}{/} -
      - - + + + {#with :pets[0]}{/} + {#with :pets[1]}{/} + {#with :pets[2]}{/} + {#with :pets[3]}{/} + + + {#with :pets[4]}{/} + {#with :pets[5]}{/} + {#with :pets[6]}{/} + {#with :pets[7]}{/} + + + {#with :pets[8]}{/} + {#with :pets[9]}{/} + {#with :pets[10]}{/} + {#with :pets[11]}{/} + + + {#with :pets[12]}{/} + {#with :pets[13]}{/} + {#with :pets[14]}{/} + {#with :pets[15]}{/} + + + {#with :pets[16]}{/} + +
      {/}
      -
      + + {else} - {/}
      + {/} +
      @@ -170,11 +169,16 @@
      {#if equal(:task.type, 'habit')} - {#if :task.up}＋{/} - {#if :task.down}−{/} + {#if :task.up}＋{/} + {#if :task.down}−{/} + {else if equal(:task.type, 'reward')} - {:task.value} + + {:task.value} + + + {else} From fb3cd788df1ff168ef343679442c82126cbc3e18 Mon Sep 17 00:00:00 2001 From: Zachary Kain Date: Sat, 9 Mar 2013 01:51:39 -0500 Subject: [PATCH 27/57] remove body scrollbar, only on task lists --- styles/app/scrollbars.styl | 66 ++++++++++++-------------------------- 1 file changed, 21 insertions(+), 45 deletions(-) diff --git a/styles/app/scrollbars.styl b/styles/app/scrollbars.styl index 1d87ff4c15..8b366133bf 100644 --- a/styles/app/scrollbars.styl +++ b/styles/app/scrollbars.styl @@ -1,45 +1,45 @@ /* Gmail style scrollbar */ -::-webkit-scrollbar { +.task-column::-webkit-scrollbar { width: 12px } -::-webkit-scrollbar-thumb { +.task-column::-webkit-scrollbar-thumb { border-width: 1px 1px 1px 2px } -::-webkit-scrollbar-track { +.task-column::-webkit-scrollbar-track { border-width: 0 } -::-webkit-scrollbar { +.task-column::-webkit-scrollbar { height: 16px; overflow: visible; width: 16px; } -::-webkit-scrollbar-button { +.task-column::-webkit-scrollbar-button { height: 0; width: 0; } -::-webkit-scrollbar-track { +.task-column::-webkit-scrollbar-track { background-clip: padding-box; border: solid transparent; border-width: 0 0 0 4px; } -::-webkit-scrollbar-track:horizontal { +.task-column::-webkit-scrollbar-track:horizontal { border-width: 4px 0 0 } -::-webkit-scrollbar-track:hover { +.task-column::-webkit-scrollbar-track:hover { background-color: rgba(150,150,150,.05); box-shadow: inset 1px 0 0 rgba(150,150,150,.1); } -::-webkit-scrollbar-track:horizontal:hover { +.task-column::-webkit-scrollbar-track:horizontal:hover { box-shadow: inset 0 1px 0 rgba(150,150,150,.1) } -::-webkit-scrollbar-track:active { +.task-column::-webkit-scrollbar-track:active { background-color: rgba(150,150,150,.05); box-shadow: inset 1px 0 0 rgba(150,150,150,.14),inset -1px 0 0 rgba(150,150,150,.07); } -::-webkit-scrollbar-track:horizontal:active { +.task-column::-webkit-scrollbar-track:horizontal:active { box-shadow: inset 0 1px 0 rgba(150,150,150,.14),inset 0 -1px 0 rgba(150,150,150,.07) } -::-webkit-scrollbar-thumb { +.task-column::-webkit-scrollbar-thumb { background-color: rgba(150,150,150,.2); background-clip: padding-box; border: solid transparent; @@ -48,59 +48,35 @@ padding: 100px 0 0; box-shadow: inset 1px 1px 0 rgba(150,150,150,.1),inset 0 -1px 0 rgba(150,150,150,.07); } -::-webkit-scrollbar-thumb:horizontal { +.task-column::-webkit-scrollbar-thumb:horizontal { border-width: 6px 1px 1px; padding: 0 0 0 100px; box-shadow: inset 1px 1px 0 rgba(150,150,150,.1),inset -1px 0 0 rgba(150,150,150,.07); } -::-webkit-scrollbar-thumb:hover { +.task-column::-webkit-scrollbar-thumb:hover { background-color: rgba(150,150,150,.4); box-shadow: inset 1px 1px 1px rgba(150,150,150,.25); } -::-webkit-scrollbar-thumb:active { +.task-column::-webkit-scrollbar-thumb:active { background-color: rgba(150,150,150,0.5); box-shadow: inset 1px 1px 3px rgba(150,150,150,0.35); } -::-webkit-scrollbar-track { +.task-column::-webkit-scrollbar-track { border-width: 0 1px 0 6px } -::-webkit-scrollbar-track:horizontal { +.task-column::-webkit-scrollbar-track:horizontal { border-width: 6px 0 1px } -::-webkit-scrollbar-track:hover { +.task-column::-webkit-scrollbar-track:hover { background-color: rgba(150,150,150,.035); box-shadow: inset 1px 1px 0 rgba(150,150,150,.14),inset -1px -1px 0 rgba(150,150,150,.07); } -::-webkit-scrollbar-thumb { +.task-column::-webkit-scrollbar-thumb { border-width: 0 1px 0 6px } -::-webkit-scrollbar-thumb:horizontal { +.task-column::-webkit-scrollbar-thumb:horizontal { border-width: 6px 0 1px } -::-webkit-scrollbar-corner { +.task-column::-webkit-scrollbar-corner { background: transparent -} -body::-webkit-scrollbar-track-piece { - background-clip: padding-box; - background-color: #f5f5f5; - border: solid #fff; - border-width: 0 0 0 3px; - box-shadow: inset 1px 0 0 rgba(150,150,150,.14),inset -1px 0 0 rgba(150,150,150,.07); -} -body::-webkit-scrollbar-track-piece:horizontal { - border-width: 3px 0 0; - box-shadow: inset 0 1px 0 rgba(150,150,150,.14),inset 0 -1px 0 rgba(150,150,150,.07); -} -body::-webkit-scrollbar-thumb { - border-width: 1px 1px 1px 5px -} -body::-webkit-scrollbar-thumb:horizontal { - border-width: 5px 1px 1px -} -body::-webkit-scrollbar-corner { - background-clip: padding-box; - background-color: #f5f5f5; - border: solid #fff; - border-width: 3px 0 0 3px; - box-shadow: inset 1px 1px 0 rgba(150,150,150,.14); } \ No newline at end of file From fd01da4f71ea9b49da7d50eae191d259cfa7ad8e Mon Sep 17 00:00:00 2001 From: Zachary Kain Date: Sat, 9 Mar 2013 02:10:33 -0500 Subject: [PATCH 28/57] layer shaded box AND check on completed task --- styles/app/tasks.styl | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/styles/app/tasks.styl b/styles/app/tasks.styl index 0aac92adb2..b8dd2d11e7 100644 --- a/styles/app/tasks.styl +++ b/styles/app/tasks.styl @@ -198,10 +198,11 @@ for $stage in $stages // yes/no checkbox .action-yesno + position: relative // uncompleted icon - label:after - // content: '▨' - content: '◯' + label:after, label:before + content: '▨' + // content: '◯' display: block height: 1.714285714em width: 1.714285714em @@ -211,6 +212,9 @@ for $stage in $stages color: black opacity: 0.2 + label:before + position: absolute + left: 0 // hint at completed icon label:hover:after, label:focus:after From 905719725e8d7f63ae3dda53059fcd103fefe876 Mon Sep 17 00:00:00 2001 From: Tyler Renelle Date: Thu, 14 Mar 2013 14:17:10 -0400 Subject: [PATCH 29/57] use Unroll-Me/derby#master --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index a80458cca0..d4a96c9dbe 100644 --- a/package.json +++ b/package.json @@ -4,7 +4,7 @@ "version": "0.0.0-150", "main": "./server.js", "dependencies": { - "derby": "git://github.com/lefnire/derby#habitrpg", + "derby": "git://github.com/Unroll-Me/derby#master", "racer": "git://github.com/lefnire/racer#habitrpg", "racer-db-mongo": "git://github.com/lefnire/racer-db-mongo#habitrpg", "derby-ui-boot": "git://github.com/codeparty/derby-ui-boot#master", From 646deb2cdd5915ada5ad7b97dc2574790c4e605a Mon Sep 17 00:00:00 2001 From: Tyler Renelle Date: Thu, 14 Mar 2013 15:51:29 -0400 Subject: [PATCH 30/57] protocol-agnostic fonts --- views/app/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/views/app/index.html b/views/app/index.html index b27d2563ee..032412e3a3 100644 --- a/views/app/index.html +++ b/views/app/index.html @@ -15,7 +15,7 @@ - + From 644a23cc57ab6f144419e48ba5aef2d2214cc8aa Mon Sep 17 00:00:00 2001 From: Shane Lister Date: Thu, 14 Mar 2013 21:57:08 -0700 Subject: [PATCH 31/57] Pet Egg Sprite Sheet and CSS --- public/img/sprites/Egg_Sprite_Sheet.png | Bin 0 -> 3332 bytes public/img/sprites/PetEggs.css | 17 +++++++++++++++++ 2 files changed, 17 insertions(+) create mode 100644 public/img/sprites/Egg_Sprite_Sheet.png create mode 100644 public/img/sprites/PetEggs.css diff --git a/public/img/sprites/Egg_Sprite_Sheet.png b/public/img/sprites/Egg_Sprite_Sheet.png new file mode 100644 index 0000000000000000000000000000000000000000..2258af3255b73868daa0c54ca86c5007b01ad7c5 GIT binary patch literal 3332 zcmX|Edpy(YALr=I+-j?>#ZoqNX>M7}+=?$_Q=DOQa*5o^Wt3Z5l43jNKD8o-rsXcm z<+!Cpj1W1??Sx2D$)%!;%Ws|Y`~CiUp68$U>-D^!_vP~>Q5wZoT*ZrGB=LBp^O;kT(caOC`o&3H17-8N1W)c$e zMPzGB>iMw`d2yWUG{vq(;)xL${-l+w&GFrlDm+J^U5OPp> zsDA9du&GCq{TArGB-?HlB$pgLd0V+=u_}hvJp0m|(Uk;d6a)AX?d&7J*JbI(*_f)Q zID7u0*J#27Y#Hw+e2u>AV?8eoV1mOvEG}9>Nd(0yF#=pC!qC73iaF9! ze=dEfZl{A*{??6pC#08o3Rq2*Lk`;Y%-@UokImA^n#d zTKGLeOuK|e$dU>$Q3@&axlQ6-DI}IajDO?qO>*x~#v-QWA^fd58w9cjY1i!0l44o? zJ*?QHWV2iPrrfu3prI@^aB1#)URY1on07T^R;>u#Zm&H2rQtHcKeEw|*p8l&t2M^% zxGTphJA{VC!LQ<5|0sgHNZxg+WZcduUA?7vG_{23^fq#^-(oq$*a{A~o1IBow$Vad zYG?O!u(Z;8te7oU>_h+6Oyr~H!immvTR*tT@p=^}%9U&4B4Qn;T1El_0;c3)r*$#j zhl0lpM6Ii3<6T1>*fG7}qdr|VziBWdln1oPt&UQhS+OGKbL z-t6c*6WnFccJ97yYxBWH0u;3f0qCK7%Z}*8iJGFad}Q90 zXqSKscv`P{Jtu7if?E7V@gpK<{pPqJSoWT22U|hvX7m+p0SP~p*DZ|=XfUyduK=w7 zUHB2Tu)I^*{g@is=hH`1y}&MmO%uZHwO2XL|3pk8#Am1>kn>J&!H`xLv!)#0eHIOP zs$fd{x>u##=wsVK!CUYIL=Y6Xc6K_wvap8*K~e>pVnok!N`Gt8R-qROR6b@o@1ZIY!1vk22U3%g5sC&G=THLt{R!7QotccGyVfkPNA1Ka< zEg1{meavNH{-{wv*HK@Haqagzl5V>Ye-|$Nb_e9lYOx~4KL7p0-Vz!{28rZhtmsPP zQuNMMbD`DatC@0!M$y~iz$3SUuCL1F!`7A%o#CM5dUX4dL$~D1B03&v)r#XFW_y8A zs|=Y@T>!s{z+&>2U^y>NMm3qAPThrlzEKJ!$@o1_*9mNb>U7g7mc0$WPv2W~D*iW` zOgPzM1O5yoiZy*HMW!~QZ_8o2@<3Ob^k``k-b6kTupj*3v*u)N|zq)a#iYEM0vah3CokM=3G{vU)U~wJo z>UseDoy)RJ(NH%9Ma_?ju1D&%ZYH@@%907AB?I5yOfl@`w$lU_EHN|#8~OTP*;K}O zc`BBhyCoYVnJ#)+f5VH?qWEQF?7r@e3S5?fYsLT9S?!v! zDDGovM(XhHU;Z^zkg83OZA{7P_*&?2dgj^bQyF4`(JN-|?w~dgcLt}*0h!>@9s zX++$C5^t4jy@rpV{EiZiy)KNHSps;LP`JFVP6`WxGU$+jC*_*AxS-@cOYlw)(}<4y z(6H0uBHKs_ej}aCeb6YtbzlMi{9?<`wgJUcVtHgllL6)rXw)epa8$1$s0WF$P$ z*A7sdjaQ%vQ#?pLDJJ@=JK0zI%+=^@PBb_S^v}E?uEwv~4#-OX=`0$oCGO8n#NGz$ z#`!<&LedRdHVx5K9vFqM%6MLIU}O5#$zH+Qb}|9V_bVPcL(Onr=$bIi*Y{Rcoc=uH zyfuj3Y1FFj#KO>XBoiF{&C}Kx566#Ce_Xl0$-Wk5oC#(mQd}6dE6fpUq@MmXb7T0# z+o~rAt~c5IXo@zVzcTu=3Bs+n_8OiX-G=Kv_=r5-D;DhYdCe>G@TB=jA1X=K)9K`6 zix=nKRD`W>4;Y_{)cV_2Hpp7j1q?@@Zv^3nZ`m+?;KKX{zK8u#UY~RtL5$SVX~Tfz zB0w$&5i3S{owrT*OPC#O7}<887&qx%A*?PCLq8AX9iE5k+y;S8OVU0M6r5KtwTJzr z39bm@x+adp9FVyQiGdTMXBPuJ1Bh;;Unll2aciazysNR)(V5Dee^*y3XYOpR8P*6n zeR(^K#KLGP#;`t{XVq`fXBgrdR>8a)lmP`@oE`Ko`!sO*!MCO(&=m((ZQ0el3nJr> z-*Txjy`l%Sm{G6zL{)0P$SXH|{aij+O`Q`P_hpZ0b0hJ)^xo9FCS_x1%nyOXaAmuo zD@uII*}*b<*!%34dXGwVDHnGejFIfe@ypT*>3U1N@WNu zp)2+AvWI`KV7=qP;fSrG*p~xt5Ghw}`}HEv?-Q~jnd0VWub%~rKs0ayOeyqG`*0t+ zBe^%2DF{vth;j-kUDm)GD8{w*RJmSD=InCI`;1HjGtz$YJ0SUU+`X(vjP?AGE*V=3 zT_#m+9>D^$ym7X@f&-~M;nF(8 z7Z&wT4|#v888a-~5arBwZuV7yhF^$|b*Gp>`6FoVZL`w*M_2z?ifYt-osje%z%$az zy*)9ChjrLpxbwy0PL@u{@*CbBZaUg)lgXx3P=z!Gz1s4JbHrInFEgeS*`?42{P1n%Z%?TV z{x2-JRap7!#TPnftc7080VNl`$MY@-k4Y#m>+3@C8v;LG{a0-?cMlW8yJ6M@lvA&c kzQ*H6Abi5;*0wzoB!bb)8)Z2r;%|)vndo4B7dRRJ9~%!2YXATM literal 0 HcmV?d00001 diff --git a/public/img/sprites/PetEggs.css b/public/img/sprites/PetEggs.css new file mode 100644 index 0000000000..347891779d --- /dev/null +++ b/public/img/sprites/PetEggs.css @@ -0,0 +1,17 @@ +#PetEggs { + /* egg sprite size */ + width: 48px; + height: 51px; + /* link to sprite sheet image */ + background-image: url(Egg_Sprite_Sheet.png); +} +/* defines where in the sheet the eggs are */ +.WolfEgg{background-position: 0px 0px;} +.TigerEgg{background-position: 0px -51px;} +.PolarBearEgg{background-position: 0px -102px;} +.PandaEgg{background-position: 0px -153px;} +.LionEgg{background-position: 0px -204px;} +.FlyingPigEgg{background-position: 0px -255px;} +.DrakeEgg{background-position: 0px -306px;} +.CactusEgg{background-position: 0px -357px;} +.BearEgg{background-position: 0px -408px;} \ No newline at end of file From d2837afbd464536a4225ad064c43e6d8ee0d6c19 Mon Sep 17 00:00:00 2001 From: Tyler Renelle Date: Fri, 15 Mar 2013 12:00:47 -0400 Subject: [PATCH 32/57] move tnl to a view function instead of model function, beging adding party stats visuals (hp & exp presently) --- src/app/browser.coffee | 10 ---------- src/app/character.coffee | 4 ++++ src/app/debug.coffee | 3 ++- src/app/scoring.coffee | 2 +- views/app/header.html | 24 ++++++++++++++++-------- 5 files changed, 23 insertions(+), 20 deletions(-) diff --git a/src/app/browser.coffee b/src/app/browser.coffee index ead5f06f33..e10340ac17 100644 --- a/src/app/browser.coffee +++ b/src/app/browser.coffee @@ -4,16 +4,6 @@ moment = require 'moment' restoreRefs = module.exports.restoreRefs = (model) -> - # tnl function - model.fn '_tnl', '_user.stats.lvl', (lvl) -> - # see https://github.com/lefnire/habitrpg/issues/4 - # also update in scoring.coffee. TODO create a function accessible in both locations - #TODO find a method of calling algos.tnl() - if lvl==100 - 0 - else - Math.round(((Math.pow(lvl,2)*0.25)+(10 * lvl) + 139.75)/10)*10 - #refLists _.each ['habit', 'daily', 'todo', 'reward'], (type) -> model.refList "_#{type}List", "_user.tasks", "_user.#{type}Ids" diff --git a/src/app/character.coffee b/src/app/character.coffee index 2fe875e563..1089645404 100644 --- a/src/app/character.coffee +++ b/src/app/character.coffee @@ -1,6 +1,7 @@ character = require './character' browser = require './browser' items = require './items' +algos = require './algos' moment = require 'moment' _ = require 'underscore' @@ -21,6 +22,9 @@ module.exports.username = username = (auth) -> module.exports.view = (view) -> view.fn "username", (auth) -> username(auth) + view.fn "tnl", (level) -> algos.tnl(level) + + module.exports.app = (appExports, model) -> user = model.at '_user' diff --git a/src/app/debug.coffee b/src/app/debug.coffee index 1f2172d272..1017118a9f 100644 --- a/src/app/debug.coffee +++ b/src/app/debug.coffee @@ -1,4 +1,5 @@ moment = require 'moment' +algos = require './algos' module.exports.app = (appExports, model) -> user = model.at('_user') @@ -14,7 +15,7 @@ module.exports.app = (appExports, model) -> window.location.reload() appExports.cheat = -> - user.incr 'stats.exp', model.get '_tnl' + user.incr 'stats.exp', algos.tnl(user.get('stats.lvl')) user.incr 'stats.gp', 1000 appExports.reset = -> diff --git a/src/app/scoring.coffee b/src/app/scoring.coffee index f6a5dd2e15..4a4882c02d 100644 --- a/src/app/scoring.coffee +++ b/src/app/scoring.coffee @@ -136,7 +136,7 @@ updateStats = (model, newStats, batch) -> obj.stats.hp = newStats.hp if newStats.exp? - tnl = model.get '_tnl' + tnl = algos.tnl(obj.stats.lvl) #silent = false # if we're at level 100, turn xp to gold if obj.stats.lvl >= 100 diff --git a/views/app/header.html b/views/app/header.html index d7bc716b3e..b3ce77e220 100644 --- a/views/app/header.html +++ b/views/app/header.html @@ -8,13 +8,21 @@ - {#each _partyMembers as :member} - {#unless equal(:member.id, _userId)} -
      - + {{#each _partyMembers as :member}} + {{#unless equal(:member.id, _userId)}} +
      + +
      +
      +
      +
      +
      +
      +
      +
      - {/} - {/} + {{/}} + {{/}}
      @@ -24,12 +32,12 @@
      -
      +
      {#if _user.history.exp}   {/} - {floor(_user.stats.exp)} / {_tnl} + {floor(_user.stats.exp)} / {tnl(_user.stats.lvl)}
      From b76b1a33f545902b596ca4d85a3f8bab9971f5cc Mon Sep 17 00:00:00 2001 From: Tyler Renelle Date: Fri, 15 Mar 2013 12:06:38 -0400 Subject: [PATCH 33/57] cleaner view.fn "tnl" --- src/app/character.coffee | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/character.coffee b/src/app/character.coffee index 1089645404..926d9a5e22 100644 --- a/src/app/character.coffee +++ b/src/app/character.coffee @@ -22,7 +22,7 @@ module.exports.username = username = (auth) -> module.exports.view = (view) -> view.fn "username", (auth) -> username(auth) - view.fn "tnl", (level) -> algos.tnl(level) + view.fn "tnl", algos.tnl module.exports.app = (appExports, model) -> From 916ac57917f1db794b0fbc05f7fedb9fe91de486 Mon Sep 17 00:00:00 2001 From: Zachary Kain Date: Fri, 15 Mar 2013 12:18:57 -0400 Subject: [PATCH 34/57] FIX Firefox outline freakout on tasks --- styles/app/tasks.styl | 1 + 1 file changed, 1 insertion(+) diff --git a/styles/app/tasks.styl b/styles/app/tasks.styl index b8dd2d11e7..789f8182b2 100644 --- a/styles/app/tasks.styl +++ b/styles/app/tasks.styl @@ -109,6 +109,7 @@ for $stage in $stages // an individual task entry // ------------------------ .task + overflow: hidden list-style: none clear: both padding: 0 0.5em 0 0.5em From eeec3cf1bcb499d405ef9b57d72f18383bcdd636 Mon Sep 17 00:00:00 2001 From: Zachary Kain Date: Fri, 15 Mar 2013 12:21:27 -0400 Subject: [PATCH 35/57] FIX Firefox task hover checkbox bug --- styles/app/tasks.styl | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/styles/app/tasks.styl b/styles/app/tasks.styl index 789f8182b2..d02012c28c 100644 --- a/styles/app/tasks.styl +++ b/styles/app/tasks.styl @@ -202,8 +202,8 @@ for $stage in $stages position: relative // uncompleted icon label:after, label:before - content: '▨' // content: '◯' + content: '' display: block height: 1.714285714em width: 1.714285714em @@ -213,10 +213,15 @@ for $stage in $stages color: black opacity: 0.2 + label:after + content: '▨' label:before position: absolute left: 0 // hint at completed icon + label:hover:before, + label:focus:before + content: '' label:hover:after, label:focus:after content: '¬' From a7de94f180622e38b36c4d8a84995644cccb56c4 Mon Sep 17 00:00:00 2001 From: Tyler Renelle Date: Fri, 15 Mar 2013 12:24:30 -0400 Subject: [PATCH 36/57] move party stats to a modal --- views/app/header.html | 17 ++++++++++------- views/app/party.html | 2 +- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/views/app/header.html b/views/app/header.html index b3ce77e220..39ba259fdc 100644 --- a/views/app/header.html +++ b/views/app/header.html @@ -10,16 +10,19 @@ {{#each _partyMembers as :member}} {{#unless equal(:member.id, _userId)}} -
      - -
      -
      -
      +
      -
      +
      +
      +
      GP: {{floor(:member.stats.gp)}}
      + "> + +
      {{/}} {{/}} diff --git a/views/app/party.html b/views/app/party.html index 0427883c7f..aa632630b7 100644 --- a/views/app/party.html +++ b/views/app/party.html @@ -43,4 +43,4 @@ <@footer> - \ No newline at end of file + From d8918790e52a26a872b9429b03b8c700e305dad8 Mon Sep 17 00:00:00 2001 From: Tyler Renelle Date: Fri, 15 Mar 2013 12:27:22 -0400 Subject: [PATCH 37/57] update comment --- views/app/header.html | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/views/app/header.html b/views/app/header.html index 39ba259fdc..c88f3cf06e 100644 --- a/views/app/header.html +++ b/views/app/header.html @@ -21,7 +21,8 @@
      GP: {{floor(:member.stats.gp)}}
      "> - + + {{/}} From 823f524d57c37e4344ae15323033987db3a632d1 Mon Sep 17 00:00:00 2001 From: Tyler Renelle Date: Fri, 15 Mar 2013 16:47:48 -0400 Subject: [PATCH 38/57] begin adding toggle-header --- src/app/character.coffee | 3 ++ views/app/header.html | 85 +++++++++++++++++++++------------------- 2 files changed, 47 insertions(+), 41 deletions(-) diff --git a/src/app/character.coffee b/src/app/character.coffee index 926d9a5e22..6496a1a631 100644 --- a/src/app/character.coffee +++ b/src/app/character.coffee @@ -89,6 +89,9 @@ module.exports.app = (appExports, model) -> batch.set $(this).attr('data-for'), parseInt($(this).val() || 1) batch.commit() + appExports.toggleHeader = (e, el) -> + user.set 'preferences.hideHeader', !user.get('preferences.hideHeader') + user.on 'set', 'flags.customizationsNotification', (captures, args) -> return unless captures == true $('.main-avatar').popover('destroy') #remove previous popovers diff --git a/views/app/header.html b/views/app/header.html index c88f3cf06e..077ec5b31a 100644 --- a/views/app/header.html +++ b/views/app/header.html @@ -1,52 +1,55 @@ -
      -
      + [toggle header] + {#unless _user.preferences.hideHeader} +
      +
      - -
      - -
      + +
      + +
      - - {{#each _partyMembers as :member}} - {{#unless equal(:member.id, _userId)}} -
      - + "> + - -
      + + + {{/}} {{/}} - {{/}} - -
      -
      -
      - {ceil(_user.stats.hp)} / 50 -
      + +
      +
      +
      + {ceil(_user.stats.hp)} / 50 +
      -
      -
      - - {#if _user.history.exp} -   - {/} - {floor(_user.stats.exp)} / {tnl(_user.stats.lvl)} - +
      +
      + + {#if _user.history.exp} +   + {/} + {floor(_user.stats.exp)} / {tnl(_user.stats.lvl)} + +
      +
      - +
      - +
      - -
      \ No newline at end of file + {/} \ No newline at end of file From ae96dc8ddbdca0836447d78b11d26bbd32f71bc2 Mon Sep 17 00:00:00 2001 From: Tyler Renelle Date: Fri, 15 Mar 2013 16:53:39 -0400 Subject: [PATCH 39/57] add toggle header to settings dialog --- views/app/header.html | 1 - views/app/settings.html | 4 ++++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/views/app/header.html b/views/app/header.html index 077ec5b31a..ede91560a4 100644 --- a/views/app/header.html +++ b/views/app/header.html @@ -1,5 +1,4 @@ - [toggle header] {#unless _user.preferences.hideHeader}
      diff --git a/views/app/settings.html b/views/app/settings.html index d9715751f2..c05a5fa6ac 100644 --- a/views/app/settings.html +++ b/views/app/settings.html @@ -19,6 +19,10 @@ Habit defaults to check and reset your dailies at midnight each day. You can customize that here (Enter number between 0 and 24).
      +
      +

      Toggle Header

      + + {{#if _user.auth.local}}

      Change Password

      From 12274e2f34af1a846ca43bd0efb8f5b8587cb817 Mon Sep 17 00:00:00 2001 From: Tyler Renelle Date: Fri, 15 Mar 2013 16:58:07 -0400 Subject: [PATCH 40/57] move settings and API into tabs --- views/app/settings.html | 64 +++++++++++++++++++++++------------------ 1 file changed, 36 insertions(+), 28 deletions(-) diff --git a/views/app/settings.html b/views/app/settings.html index c05a5fa6ac..b1684b4aad 100644 --- a/views/app/settings.html +++ b/views/app/settings.html @@ -1,37 +1,45 @@ {{#if _loggedIn}} -

      API

      - Copy these for use in third party applications. -
      User ID
      - 
      {_user.id}
      + -
      API Token
      - 
      {_user.apiToken}
      +
      +
      +

      Custom Day Start

      +
      + + :00 (24h) +
      +
      + Habit defaults to check and reset your dailies at midnight each day. You can customize that here (Enter number between 0 and 24). +
      -
      -

      Custom Day Start

      -
      - - :00 (24h) +
      +

      Toggle Header

      + + + {{#if _user.auth.local}} +
      +

      Change Password

      + + {{/}} + +
      + Reset +  Restore +
      +
      + Copy these for use in third party applications. +
      User ID
      + 
      {_user.id}
      + +
      API Token
      + 
      {_user.apiToken}
      +
      -
      - Habit defaults to check and reset your dailies at midnight each day. You can customize that here (Enter number between 0 and 24). -
      - -
      -

      Toggle Header

      - - - {{#if _user.auth.local}} -
      -

      Change Password

      - - {{/}} - -
      - Reset -  Restore <@footer> From f2faf8c968ada2b7c743d0e11e4a3bc283102ae3 Mon Sep 17 00:00:00 2001 From: Tyler Renelle Date: Fri, 15 Mar 2013 17:20:01 -0400 Subject: [PATCH 41/57] add 'show helm' option --- src/app/character.coffee | 2 +- views/app/avatar.html | 12 ++++++++++-- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/src/app/character.coffee b/src/app/character.coffee index 6496a1a631..320791fa31 100644 --- a/src/app/character.coffee +++ b/src/app/character.coffee @@ -112,7 +112,7 @@ userSchema = stats: { gp: 0, exp: 0, lvl: 1, hp: 50 } party: { current: null, invitation: null } items: { weapon: 0, armor: 0, head: 0, shield: 0 } - preferences: { gender: 'm', skin: 'white', hair: 'blond', armorSet: 'v1', dayStart:0 } + preferences: { gender: 'm', skin: 'white', hair: 'blond', armorSet: 'v1', dayStart:0, showHelm: true } habitIds: [] dailyIds: [] todoIds: [] diff --git a/views/app/avatar.html b/views/app/avatar.html index 8cf756a837..d39b5c57f4 100644 --- a/views/app/avatar.html +++ b/views/app/avatar.html @@ -31,7 +31,11 @@ - + {#if :p.showHelm} + + {else} + + {/} {/} @@ -52,10 +56,14 @@
    • - + + +
      • From 3fa6aaceed84587b8f38d4ca1989981edf32a762 Mon Sep 17 00:00:00 2001 From: Tyler Renelle Date: Fri, 15 Mar 2013 17:20:01 -0400 Subject: [PATCH 42/57] add 'show helm' option --- src/app/character.coffee | 2 +- views/app/avatar.html | 12 ++++++++++-- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/src/app/character.coffee b/src/app/character.coffee index 2fe875e563..9846811aa8 100644 --- a/src/app/character.coffee +++ b/src/app/character.coffee @@ -105,7 +105,7 @@ userSchema = stats: { gp: 0, exp: 0, lvl: 1, hp: 50 } party: { current: null, invitation: null } items: { weapon: 0, armor: 0, head: 0, shield: 0 } - preferences: { gender: 'm', skin: 'white', hair: 'blond', armorSet: 'v1', dayStart:0 } + preferences: { gender: 'm', skin: 'white', hair: 'blond', armorSet: 'v1', dayStart:0, showHelm: true } habitIds: [] dailyIds: [] todoIds: [] diff --git a/views/app/avatar.html b/views/app/avatar.html index 8cf756a837..d39b5c57f4 100644 --- a/views/app/avatar.html +++ b/views/app/avatar.html @@ -31,7 +31,11 @@ - + {#if :p.showHelm} + + {else} + + {/} {/} @@ -52,10 +56,14 @@
    • - + + +
      • From 7f93b525c0de3c0966df29b758ab8a4a136da682 Mon Sep 17 00:00:00 2001 From: Tyler Renelle Date: Fri, 15 Mar 2013 12:00:47 -0400 Subject: [PATCH 43/57] move tnl to a view function instead of model function, beging adding party stats visuals (hp & exp presently) --- src/app/browser.coffee | 10 ---------- src/app/character.coffee | 4 ++++ src/app/debug.coffee | 3 ++- src/app/scoring.coffee | 2 +- views/app/header.html | 24 ++++++++++++++++-------- 5 files changed, 23 insertions(+), 20 deletions(-) diff --git a/src/app/browser.coffee b/src/app/browser.coffee index 55a6c9229f..f12ab9832f 100644 --- a/src/app/browser.coffee +++ b/src/app/browser.coffee @@ -4,16 +4,6 @@ moment = require 'moment' restoreRefs = module.exports.restoreRefs = (model) -> - # tnl function - model.fn '_tnl', '_user.stats.lvl', (lvl) -> - # see https://github.com/lefnire/habitrpg/issues/4 - # also update in scoring.coffee. TODO create a function accessible in both locations - #TODO find a method of calling algos.tnl() - if lvl==100 - 0 - else - Math.round(((Math.pow(lvl,2)*0.25)+(10 * lvl) + 139.75)/10)*10 - #refLists _.each ['habit', 'daily', 'todo', 'reward'], (type) -> model.refList "_#{type}List", "_user.tasks", "_user.#{type}Ids" diff --git a/src/app/character.coffee b/src/app/character.coffee index 9846811aa8..047005baa5 100644 --- a/src/app/character.coffee +++ b/src/app/character.coffee @@ -1,6 +1,7 @@ character = require './character' browser = require './browser' items = require './items' +algos = require './algos' moment = require 'moment' _ = require 'underscore' @@ -21,6 +22,9 @@ module.exports.username = username = (auth) -> module.exports.view = (view) -> view.fn "username", (auth) -> username(auth) + view.fn "tnl", (level) -> algos.tnl(level) + + module.exports.app = (appExports, model) -> user = model.at '_user' diff --git a/src/app/debug.coffee b/src/app/debug.coffee index 1f2172d272..1017118a9f 100644 --- a/src/app/debug.coffee +++ b/src/app/debug.coffee @@ -1,4 +1,5 @@ moment = require 'moment' +algos = require './algos' module.exports.app = (appExports, model) -> user = model.at('_user') @@ -14,7 +15,7 @@ module.exports.app = (appExports, model) -> window.location.reload() appExports.cheat = -> - user.incr 'stats.exp', model.get '_tnl' + user.incr 'stats.exp', algos.tnl(user.get('stats.lvl')) user.incr 'stats.gp', 1000 appExports.reset = -> diff --git a/src/app/scoring.coffee b/src/app/scoring.coffee index f6a5dd2e15..4a4882c02d 100644 --- a/src/app/scoring.coffee +++ b/src/app/scoring.coffee @@ -136,7 +136,7 @@ updateStats = (model, newStats, batch) -> obj.stats.hp = newStats.hp if newStats.exp? - tnl = model.get '_tnl' + tnl = algos.tnl(obj.stats.lvl) #silent = false # if we're at level 100, turn xp to gold if obj.stats.lvl >= 100 diff --git a/views/app/header.html b/views/app/header.html index d7bc716b3e..b3ce77e220 100644 --- a/views/app/header.html +++ b/views/app/header.html @@ -8,13 +8,21 @@ - {#each _partyMembers as :member} - {#unless equal(:member.id, _userId)} -
      - + {{#each _partyMembers as :member}} + {{#unless equal(:member.id, _userId)}} +
      + +
      +
      +
      +
      +
      +
      +
      +
      - {/} - {/} + {{/}} + {{/}}
      @@ -24,12 +32,12 @@
      -
      +
      {#if _user.history.exp}   {/} - {floor(_user.stats.exp)} / {_tnl} + {floor(_user.stats.exp)} / {tnl(_user.stats.lvl)}
      From 174a0d23628fa2a5b90faa625a9fa9b58f13ab0e Mon Sep 17 00:00:00 2001 From: Tyler Renelle Date: Fri, 15 Mar 2013 12:06:38 -0400 Subject: [PATCH 44/57] cleaner view.fn "tnl" --- src/app/character.coffee | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/character.coffee b/src/app/character.coffee index 047005baa5..ae0b2f4d1a 100644 --- a/src/app/character.coffee +++ b/src/app/character.coffee @@ -22,7 +22,7 @@ module.exports.username = username = (auth) -> module.exports.view = (view) -> view.fn "username", (auth) -> username(auth) - view.fn "tnl", (level) -> algos.tnl(level) + view.fn "tnl", algos.tnl module.exports.app = (appExports, model) -> From b7425f4964d0098ab05bf17358d6de4d61d23029 Mon Sep 17 00:00:00 2001 From: Tyler Renelle Date: Fri, 15 Mar 2013 12:24:30 -0400 Subject: [PATCH 45/57] move party stats to a modal --- views/app/header.html | 17 ++++++++++------- views/app/party.html | 2 +- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/views/app/header.html b/views/app/header.html index b3ce77e220..39ba259fdc 100644 --- a/views/app/header.html +++ b/views/app/header.html @@ -10,16 +10,19 @@ {{#each _partyMembers as :member}} {{#unless equal(:member.id, _userId)}} -
      - -
      -
      -
      +
      -
      +
      +
      +
      GP: {{floor(:member.stats.gp)}}
      + "> + +
      {{/}} {{/}} diff --git a/views/app/party.html b/views/app/party.html index 0427883c7f..aa632630b7 100644 --- a/views/app/party.html +++ b/views/app/party.html @@ -43,4 +43,4 @@ <@footer> - \ No newline at end of file + From 054cf03614358e0075e4d72708b25e53bc29d7fa Mon Sep 17 00:00:00 2001 From: Tyler Renelle Date: Fri, 15 Mar 2013 12:27:22 -0400 Subject: [PATCH 46/57] update comment --- views/app/header.html | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/views/app/header.html b/views/app/header.html index 39ba259fdc..c88f3cf06e 100644 --- a/views/app/header.html +++ b/views/app/header.html @@ -21,7 +21,8 @@
      GP: {{floor(:member.stats.gp)}}
      "> - + + {{/}} From 325d90670836049eb0d6c52d65e6b46002129f8c Mon Sep 17 00:00:00 2001 From: Tyler Renelle Date: Fri, 15 Mar 2013 16:47:48 -0400 Subject: [PATCH 47/57] begin adding toggle-header --- src/app/character.coffee | 3 ++ views/app/header.html | 85 +++++++++++++++++++++------------------- 2 files changed, 47 insertions(+), 41 deletions(-) diff --git a/src/app/character.coffee b/src/app/character.coffee index ae0b2f4d1a..320791fa31 100644 --- a/src/app/character.coffee +++ b/src/app/character.coffee @@ -89,6 +89,9 @@ module.exports.app = (appExports, model) -> batch.set $(this).attr('data-for'), parseInt($(this).val() || 1) batch.commit() + appExports.toggleHeader = (e, el) -> + user.set 'preferences.hideHeader', !user.get('preferences.hideHeader') + user.on 'set', 'flags.customizationsNotification', (captures, args) -> return unless captures == true $('.main-avatar').popover('destroy') #remove previous popovers diff --git a/views/app/header.html b/views/app/header.html index c88f3cf06e..077ec5b31a 100644 --- a/views/app/header.html +++ b/views/app/header.html @@ -1,52 +1,55 @@ -
      -
      + [toggle header] + {#unless _user.preferences.hideHeader} +
      +
      - -
      - -
      + +
      + +
      - - {{#each _partyMembers as :member}} - {{#unless equal(:member.id, _userId)}} -
      - + "> + - -
      + + + {{/}} {{/}} - {{/}} - -
      -
      -
      - {ceil(_user.stats.hp)} / 50 -
      + +
      +
      +
      + {ceil(_user.stats.hp)} / 50 +
      -
      -
      - - {#if _user.history.exp} -   - {/} - {floor(_user.stats.exp)} / {tnl(_user.stats.lvl)} - +
      +
      + + {#if _user.history.exp} +   + {/} + {floor(_user.stats.exp)} / {tnl(_user.stats.lvl)} + +
      +
      - +
      - +
      - -
      \ No newline at end of file + {/} \ No newline at end of file From 281502499bedf76ace3c7aa1cf438fd8084b6768 Mon Sep 17 00:00:00 2001 From: Tyler Renelle Date: Fri, 15 Mar 2013 16:53:39 -0400 Subject: [PATCH 48/57] add toggle header to settings dialog --- views/app/header.html | 1 - views/app/settings.html | 4 ++++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/views/app/header.html b/views/app/header.html index 077ec5b31a..ede91560a4 100644 --- a/views/app/header.html +++ b/views/app/header.html @@ -1,5 +1,4 @@ - [toggle header] {#unless _user.preferences.hideHeader}
      diff --git a/views/app/settings.html b/views/app/settings.html index d9715751f2..c05a5fa6ac 100644 --- a/views/app/settings.html +++ b/views/app/settings.html @@ -19,6 +19,10 @@ Habit defaults to check and reset your dailies at midnight each day. You can customize that here (Enter number between 0 and 24).
      +
      +

      Toggle Header

      + + {{#if _user.auth.local}}

      Change Password

      From 37901ef4f4051e08021a645097b178ac540be79a Mon Sep 17 00:00:00 2001 From: Tyler Renelle Date: Fri, 15 Mar 2013 16:58:07 -0400 Subject: [PATCH 49/57] move settings and API into tabs --- views/app/settings.html | 64 +++++++++++++++++++++++------------------ 1 file changed, 36 insertions(+), 28 deletions(-) diff --git a/views/app/settings.html b/views/app/settings.html index c05a5fa6ac..b1684b4aad 100644 --- a/views/app/settings.html +++ b/views/app/settings.html @@ -1,37 +1,45 @@ {{#if _loggedIn}} -

      API

      - Copy these for use in third party applications. -
      User ID
      - 
      {_user.id}
      + -
      API Token
      - 
      {_user.apiToken}
      +
      +
      +

      Custom Day Start

      +
      + + :00 (24h) +
      +
      + Habit defaults to check and reset your dailies at midnight each day. You can customize that here (Enter number between 0 and 24). +
      -
      -

      Custom Day Start

      -
      - - :00 (24h) +
      +

      Toggle Header

      + + + {{#if _user.auth.local}} +
      +

      Change Password

      + + {{/}} + +
      + Reset +  Restore +
      +
      + Copy these for use in third party applications. +
      User ID
      + 
      {_user.id}
      + +
      API Token
      + 
      {_user.apiToken}
      +
      -
      - Habit defaults to check and reset your dailies at midnight each day. You can customize that here (Enter number between 0 and 24). -
      - -
      -

      Toggle Header

      - - - {{#if _user.auth.local}} -
      -

      Change Password

      - - {{/}} - -
      - Reset -  Restore <@footer> From 566f1aa230922eeb17a3b40d581098c2a7d7f997 Mon Sep 17 00:00:00 2001 From: Tyler Renelle Date: Fri, 15 Mar 2013 17:47:42 -0400 Subject: [PATCH 50/57] add change for mutlipel subdomain GA tracking --- views/app/index.html | 2 ++ 1 file changed, 2 insertions(+) diff --git a/views/app/index.html b/views/app/index.html index 032412e3a3..549cbbe348 100644 --- a/views/app/index.html +++ b/views/app/index.html @@ -41,11 +41,13 @@ + {#if equal(_view.nodeEnv,"production")} + {#if equal(_view.nodeEnv,"production")}