Commit d431e28f921a421c30f530da753afa10732fda48
1 parent
265c3da0
Exists in
master
and in
1 other branch
realing buttons
Showing
2 changed files
with
40 additions
and
22 deletions
Show diff stats
src/web/static/css/survey.css
| @@ -20,22 +20,20 @@ top: 40px; | @@ -20,22 +20,20 @@ top: 40px; | ||
| 20 | width: 420px; | 20 | width: 420px; |
| 21 | } | 21 | } |
| 22 | 22 | ||
| 23 | -#tip-restart .tip, | ||
| 24 | -#tip-finish .tip, | ||
| 25 | -#tip-strategy .tip { | 23 | +#panel-controls label .tip, |
| 24 | +#controls-form label .tip { | ||
| 26 | display: none; | 25 | display: none; |
| 27 | position: absolute; | 26 | position: absolute; |
| 28 | -top: 15px; | ||
| 29 | -width: 400px; | ||
| 30 | -right: 0px; | 27 | +width: 200px; |
| 28 | +margin-top: -30px; | ||
| 29 | +right: 160px; | ||
| 31 | font-size: 11px; | 30 | font-size: 11px; |
| 32 | font-weight: normal; | 31 | font-weight: normal; |
| 33 | color: #000000; | 32 | color: #000000; |
| 34 | } | 33 | } |
| 35 | 34 | ||
| 36 | -#tip-restart:hover .tip, | ||
| 37 | -#tip-finish:hover .tip, | ||
| 38 | -#tip-strategy:hover .tip { | 35 | +#panel-controls label:hover .tip, |
| 36 | +#controls-form label:hover .tip { | ||
| 39 | display: block; | 37 | display: block; |
| 40 | z-index: 3; | 38 | z-index: 3; |
| 41 | } | 39 | } |
| @@ -53,9 +51,14 @@ height: auto; | @@ -53,9 +51,14 @@ height: auto; | ||
| 53 | max-width: 780px; | 51 | max-width: 780px; |
| 54 | } | 52 | } |
| 55 | 53 | ||
| 54 | +#sidebar { | ||
| 55 | +min-height: 200px; | ||
| 56 | +} | ||
| 57 | + | ||
| 56 | body.survey #wrap { | 58 | body.survey #wrap { |
| 57 | padding-top: 0px; | 59 | padding-top: 0px; |
| 58 | min-height: 450px; | 60 | min-height: 450px; |
| 61 | +position: relative; | ||
| 59 | } | 62 | } |
| 60 | 63 | ||
| 61 | /* Display None itens Survey */ | 64 | /* Display None itens Survey */ |
| @@ -85,7 +88,7 @@ margin-bottom: 10px; | @@ -85,7 +88,7 @@ margin-bottom: 10px; | ||
| 85 | .radioButton, | 88 | .radioButton, |
| 86 | #next-button, | 89 | #next-button, |
| 87 | #restart-button, | 90 | #restart-button, |
| 88 | -#strategy-button, | 91 | +#continue-button, |
| 89 | #finish-button { | 92 | #finish-button { |
| 90 | border: 1px solid #888a85; | 93 | border: 1px solid #888a85; |
| 91 | box-shadow: 0 1px 4px gray inset; | 94 | box-shadow: 0 1px 4px gray inset; |
| @@ -93,7 +96,7 @@ border-radius: 5px; | @@ -93,7 +96,7 @@ border-radius: 5px; | ||
| 93 | color: #585C60; | 96 | color: #585C60; |
| 94 | font-size: 12px; | 97 | font-size: 12px; |
| 95 | font-weight: 600; | 98 | font-weight: 600; |
| 96 | -width: 135px; | 99 | +width: 150px; |
| 97 | height: 30px; | 100 | height: 30px; |
| 98 | line-height: 14px; | 101 | line-height: 14px; |
| 99 | margin: 0; | 102 | margin: 0; |
| @@ -114,11 +117,13 @@ text-align: left; | @@ -114,11 +117,13 @@ text-align: left; | ||
| 114 | vertical-align: middle; | 117 | vertical-align: middle; |
| 115 | cursor: normal; | 118 | cursor: normal; |
| 116 | width: 150px; | 119 | width: 150px; |
| 120 | +height: 20px; | ||
| 117 | margin-bottom: 10px; | 121 | margin-bottom: 10px; |
| 118 | float: left; | 122 | float: left; |
| 119 | } | 123 | } |
| 120 | 124 | ||
| 121 | -#panel-controls { | 125 | +#panel-controls { |
| 126 | +position: relative; | ||
| 122 | width: 180px; | 127 | width: 180px; |
| 123 | float: right; | 128 | float: right; |
| 124 | } | 129 | } |
| @@ -127,11 +132,17 @@ float: right; | @@ -127,11 +132,17 @@ float: right; | ||
| 127 | #next-button { | 132 | #next-button { |
| 128 | text-align: center; | 133 | text-align: center; |
| 129 | position: absolute; | 134 | position: absolute; |
| 130 | -top: 145px; | ||
| 131 | -left: 50%; | ||
| 132 | -margin-left: -250px; | ||
| 133 | -width: 500px; | 135 | +top: 120px; |
| 136 | +right: 65px; | ||
| 137 | +width: 150px; | ||
| 134 | height: 20px; | 138 | height: 20px; |
| 139 | +z-index: 3; | ||
| 140 | +} | ||
| 141 | + | ||
| 142 | +#controls-form { | ||
| 143 | +top: 90px; | ||
| 144 | +right: 85px; | ||
| 145 | +height: auto; | ||
| 135 | } | 146 | } |
| 136 | 147 | ||
| 137 | 148 |
src/web/templates/survey.html
| @@ -30,21 +30,19 @@ $var jsfiles: static/coda-slider-2.0/javascripts/jquery-1.3.2.min.js static/coda | @@ -30,21 +30,19 @@ $var jsfiles: static/coda-slider-2.0/javascripts/jquery-1.3.2.min.js static/coda | ||
| 30 | <input type="hidden" name="user_id" value=$request.user_id> | 30 | <input type="hidden" name="user_id" value=$request.user_id> |
| 31 | <input type="hidden" name="strategy" value=$request.strategy> | 31 | <input type="hidden" name="strategy" value=$request.strategy> |
| 32 | <div id="controls-form" style="display: none;"><!-- display show in the end form --> | 32 | <div id="controls-form" style="display: none;"><!-- display show in the end form --> |
| 33 | - | ||
| 34 | <label for="finish_button" id="tip-finish"> | 33 | <label for="finish_button" id="tip-finish"> |
| 35 | <div class="tip important"> | 34 | <div class="tip important"> |
| 36 | <p>Conclude your participation in this survey</p> | 35 | <p>Conclude your participation in this survey</p> |
| 37 | </div> | 36 | </div> |
| 38 | <input id="finish-button" name="finish_button" type="submit" value="Finish" class="glass" /> | 37 | <input id="finish-button" name="finish_button" type="submit" value="Finish" class="glass" /> |
| 39 | </label> | 38 | </label> |
| 40 | - | ||
| 41 | -<label for="strategy_button" id="tip-strategy"> | 39 | +<br /> |
| 40 | +<label for="strategy_button" id="tip-continue"> | ||
| 42 | <div class="tip tip"> | 41 | <div class="tip tip"> |
| 43 | <p>Evaluate more suggestions </p> | 42 | <p>Evaluate more suggestions </p> |
| 44 | </div> | 43 | </div> |
| 45 | - <input id="strategy-button" name="strategy_button" type="submit" value="Continue" class="glass" /> | 44 | + <input id="continue-button" name="strategy_button" type="submit" value="Continue" class="glass" /> |
| 46 | </label> | 45 | </label> |
| 47 | - | ||
| 48 | </div><!-- id="controls-form" --> | 46 | </div><!-- id="controls-form" --> |
| 49 | 47 | ||
| 50 | <div class="coda-slider-wrapper"> | 48 | <div class="coda-slider-wrapper"> |
| @@ -59,17 +57,26 @@ $for pkg in pkg_details: | @@ -59,17 +57,26 @@ $for pkg in pkg_details: | ||
| 59 | <div id="panel-controls"> | 57 | <div id="panel-controls"> |
| 60 | <label class="glass radioButton"> | 58 | <label class="glass radioButton"> |
| 61 | <input class="radio" type="radio" name="evaluation-$pkg_details.index(pkg)" value="surprising" /> | 59 | <input class="radio" type="radio" name="evaluation-$pkg_details.index(pkg)" value="surprising" /> |
| 62 | - Pleasantly surprising | 60 | + Pleasantly surprising |
| 61 | + <div class="tip tip"> | ||
| 62 | + <p>Pleasantly $pkg['package'] FIXME </p> | ||
| 63 | + </div> | ||
| 63 | </label><br /> | 64 | </label><br /> |
| 64 | <label class="glass radioButton"> | 65 | <label class="glass radioButton"> |
| 65 | <img src="/static/images/yes-enb.JPG" alt="Yes, Good" style="float: right;"> | 66 | <img src="/static/images/yes-enb.JPG" alt="Yes, Good" style="float: right;"> |
| 66 | <input class="radio" type="radio" name="evaluation-$pkg_details.index(pkg)" value="good" /> | 67 | <input class="radio" type="radio" name="evaluation-$pkg_details.index(pkg)" value="good" /> |
| 67 | Good | 68 | Good |
| 69 | + <div class="tip tip"> | ||
| 70 | + <p>Good $pkg['package'] FIXME </p> | ||
| 71 | + </div> | ||
| 68 | </label><br /> | 72 | </label><br /> |
| 69 | <label class="glass radioButton"> | 73 | <label class="glass radioButton"> |
| 70 | <img src="/static/images/no-dis.JPG" alt="Poor" style="float: right;"> | 74 | <img src="/static/images/no-dis.JPG" alt="Poor" style="float: right;"> |
| 71 | <input class="radio" type="radio" name="evaluation-$pkg_details.index(pkg)" value="poor" /> | 75 | <input class="radio" type="radio" name="evaluation-$pkg_details.index(pkg)" value="poor" /> |
| 72 | Poor | 76 | Poor |
| 77 | + <div class="tip tip"> | ||
| 78 | + <p>Poor $pkg['package'] FIXME </p> | ||
| 79 | + </div> | ||
| 73 | </label> | 80 | </label> |
| 74 | <br style="clear: both;" /> | 81 | <br style="clear: both;" /> |
| 75 | <div class="screenshot"> | 82 | <div class="screenshot"> |