Commit 3488c13e2a17bf06e89201a6377fe3b6521f59fd
1 parent
7cbb363a
Exists in
master
and in
1 other branch
small changes css and improve
Showing
3 changed files
with
46 additions
and
19 deletions
Show diff stats
src/web/static/coda-slider-2.0/javascripts/jquery.coda-slider-2.0.js
| @@ -99,9 +99,9 @@ $.fn.codaSlider = function(settings) { | @@ -99,9 +99,9 @@ $.fn.codaSlider = function(settings) { | ||
| 99 | $('#coda-nav-right-' + sliderCount + ' a').click(function(){ | 99 | $('#coda-nav-right-' + sliderCount + ' a').click(function(){ |
| 100 | navClicks++; | 100 | navClicks++; |
| 101 | if (currentPanel == panelCount) { | 101 | if (currentPanel == panelCount) { |
| 102 | - this.style.display = 'none'; // Button display none; | ||
| 103 | - document.getElementById("controls-form").style.display = 'block'; // Show buttons controls; | ||
| 104 | - document.getElementById("coda-slider-1").style.display = 'none'; // Description hidden; | 102 | + $(this).hide("fast"); // Button display none; |
| 103 | + $(".show-end").show("fast"); // Show buttons controls; | ||
| 104 | + $(".hide-end").hide("fast"); // Description hidden; | ||
| 105 | return false; | 105 | return false; |
| 106 | offset = 0; | 106 | offset = 0; |
| 107 | currentPanel = 1; | 107 | currentPanel = 1; |
src/web/static/css/survey.css
| @@ -38,6 +38,16 @@ display: block; | @@ -38,6 +38,16 @@ display: block; | ||
| 38 | z-index: 3; | 38 | z-index: 3; |
| 39 | } | 39 | } |
| 40 | 40 | ||
| 41 | +#controls-form label#tip-finish .tip { | ||
| 42 | +margin-top: -50px; | ||
| 43 | +left: 90px; | ||
| 44 | +} | ||
| 45 | + | ||
| 46 | +#controls-form label#tip-continue .tip { | ||
| 47 | +margin-top: -80px; | ||
| 48 | +right: -60px; | ||
| 49 | +} | ||
| 50 | + | ||
| 41 | .innertube { | 51 | .innertube { |
| 42 | margin: 30px; | 52 | margin: 30px; |
| 43 | } | 53 | } |
| @@ -73,16 +83,13 @@ display: none; | @@ -73,16 +83,13 @@ display: none; | ||
| 73 | } | 83 | } |
| 74 | 84 | ||
| 75 | .screenshot { | 85 | .screenshot { |
| 76 | -float: right; | 86 | +float: left; |
| 77 | margin: 5px; | 87 | margin: 5px; |
| 78 | } | 88 | } |
| 79 | 89 | ||
| 80 | -.content-pkg ul { | ||
| 81 | -list-style: none; | ||
| 82 | -} | ||
| 83 | - | ||
| 84 | .content-pkg ul li { | 90 | .content-pkg ul li { |
| 85 | margin-bottom: 10px; | 91 | margin-bottom: 10px; |
| 92 | +font-size: | ||
| 86 | } | 93 | } |
| 87 | 94 | ||
| 88 | .radioButton, | 95 | .radioButton, |
| @@ -106,6 +113,10 @@ z-index: 2; | @@ -106,6 +113,10 @@ z-index: 2; | ||
| 106 | cursor: pointer; | 113 | cursor: pointer; |
| 107 | } | 114 | } |
| 108 | 115 | ||
| 116 | +#continue-button { | ||
| 117 | +float: right; | ||
| 118 | +} | ||
| 119 | + | ||
| 109 | .radioButton:hover, | 120 | .radioButton:hover, |
| 110 | #next-button:hover, | 121 | #next-button:hover, |
| 111 | #controls-form input:hover { | 122 | #controls-form input:hover { |
| @@ -128,24 +139,30 @@ width: 180px; | @@ -128,24 +139,30 @@ width: 180px; | ||
| 128 | float: right; | 139 | float: right; |
| 129 | } | 140 | } |
| 130 | 141 | ||
| 131 | -#controls-form, | ||
| 132 | #next-button { | 142 | #next-button { |
| 133 | text-align: center; | 143 | text-align: center; |
| 134 | position: absolute; | 144 | position: absolute; |
| 135 | -top: 120px; | 145 | +top: 90px; |
| 136 | right: 65px; | 146 | right: 65px; |
| 137 | width: 150px; | 147 | width: 150px; |
| 138 | height: 20px; | 148 | height: 20px; |
| 149 | +float: right; | ||
| 139 | z-index: 3; | 150 | z-index: 3; |
| 140 | } | 151 | } |
| 141 | 152 | ||
| 142 | #controls-form { | 153 | #controls-form { |
| 143 | -top: 90px; | ||
| 144 | -right: 85px; | ||
| 145 | -height: auto; | 154 | +position: absolute; |
| 155 | +top: 390px; | ||
| 156 | +width: 600px; | ||
| 157 | +margin-right: auto; | ||
| 158 | +margin-left: auto; | ||
| 159 | +text-align: center; | ||
| 160 | +height: 20px; | ||
| 161 | +z-index: 3; | ||
| 146 | } | 162 | } |
| 147 | 163 | ||
| 148 | 164 | ||
| 165 | + | ||
| 149 | /* | 166 | /* |
| 150 | * Package Box | 167 | * Package Box |
| 151 | */ | 168 | */ |
src/web/templates/survey.html
| @@ -25,18 +25,26 @@ $var jsfiles: static/coda-slider-2.0/javascripts/jquery-1.3.2.min.js static/coda | @@ -25,18 +25,26 @@ $var jsfiles: static/coda-slider-2.0/javascripts/jquery-1.3.2.min.js static/coda | ||
| 25 | 25 | ||
| 26 | <h1>AppRecommender Survey</h1> | 26 | <h1>AppRecommender Survey</h1> |
| 27 | 27 | ||
| 28 | +<div class="show-end" style="display: none;"> | ||
| 29 | + | ||
| 30 | +<p> | ||
| 31 | +A class <b>show-end</b> ou <b>hide-end</b> mostra um elemento ou esconde um elemento ao final do último Next. | ||
| 32 | +</p> | ||
| 33 | + | ||
| 34 | +</div> | ||
| 35 | + | ||
| 36 | + | ||
| 28 | <form action="/save" method="post" enctype="multipart/form-data" name="surveyform"> | 37 | <form action="/save" method="post" enctype="multipart/form-data" name="surveyform"> |
| 29 | 38 | ||
| 30 | <input type="hidden" name="user_id" value=$request.user_id> | 39 | <input type="hidden" name="user_id" value=$request.user_id> |
| 31 | <input type="hidden" name="strategy" value=$request.strategy> | 40 | <input type="hidden" name="strategy" value=$request.strategy> |
| 32 | -<div id="controls-form" style="display: none;"><!-- display show in the end form --> | 41 | +<div id="controls-form" style="display: none;" class="show-end"><!-- display show in the end form --> |
| 33 | <label for="finish_button" id="tip-finish"> | 42 | <label for="finish_button" id="tip-finish"> |
| 34 | <div class="tip important"> | 43 | <div class="tip important"> |
| 35 | <p>Conclude your participation in this survey</p> | 44 | <p>Conclude your participation in this survey</p> |
| 36 | </div> | 45 | </div> |
| 37 | <input id="finish-button" name="finish_button" type="submit" value="Finish" class="glass" /> | 46 | <input id="finish-button" name="finish_button" type="submit" value="Finish" class="glass" /> |
| 38 | </label> | 47 | </label> |
| 39 | -<br /> | ||
| 40 | <label for="strategy_button" id="tip-continue"> | 48 | <label for="strategy_button" id="tip-continue"> |
| 41 | <div class="tip tip"> | 49 | <div class="tip tip"> |
| 42 | <p>Evaluate more suggestions </p> | 50 | <p>Evaluate more suggestions </p> |
| @@ -45,7 +53,7 @@ $var jsfiles: static/coda-slider-2.0/javascripts/jquery-1.3.2.min.js static/coda | @@ -45,7 +53,7 @@ $var jsfiles: static/coda-slider-2.0/javascripts/jquery-1.3.2.min.js static/coda | ||
| 45 | </label> | 53 | </label> |
| 46 | </div><!-- id="controls-form" --> | 54 | </div><!-- id="controls-form" --> |
| 47 | 55 | ||
| 48 | -<div class="coda-slider-wrapper"> | 56 | +<div class="coda-slider-wrapper hide-end"> |
| 49 | <div class="coda-slider preload" id="coda-slider-1"> | 57 | <div class="coda-slider preload" id="coda-slider-1"> |
| 50 | $for pkg in pkg_details: | 58 | $for pkg in pkg_details: |
| 51 | <div class="panel"> | 59 | <div class="panel"> |
| @@ -79,6 +87,10 @@ $for pkg in pkg_details: | @@ -79,6 +87,10 @@ $for pkg in pkg_details: | ||
| 79 | </div> | 87 | </div> |
| 80 | </label> | 88 | </label> |
| 81 | <br style="clear: both;" /> | 89 | <br style="clear: both;" /> |
| 90 | + </div><!-- #panel-controls --> | ||
| 91 | + <div class="content-pkg"> | ||
| 92 | + <ul> | ||
| 93 | + <li><b>Description</b>: | ||
| 82 | <div class="screenshot"> | 94 | <div class="screenshot"> |
| 83 | <a class="link-thumb" rel="facebox" | 95 | <a class="link-thumb" rel="facebox" |
| 84 | href="http://screenshots.debian.net/screenshot/$pkg['package']?.jpg" | 96 | href="http://screenshots.debian.net/screenshot/$pkg['package']?.jpg" |
| @@ -86,9 +98,7 @@ $for pkg in pkg_details: | @@ -86,9 +98,7 @@ $for pkg in pkg_details: | ||
| 86 | <img src="http://screenshots.debian.net/thumbnail/$pkg['package']" | 98 | <img src="http://screenshots.debian.net/thumbnail/$pkg['package']" |
| 87 | alt="Screenshot $pkg['package']" /></a> | 99 | alt="Screenshot $pkg['package']" /></a> |
| 88 | </div><!-- screenshot --> | 100 | </div><!-- screenshot --> |
| 89 | - </div><!-- #panel-controls --> | ||
| 90 | - <div class="content-pkg"> | ||
| 91 | - <li><b>Description</b>: <br />$:pkg['long_description']</li> | 101 | + <br />$:pkg['long_description']</li> |
| 92 | $if pkg['homepage']: | 102 | $if pkg['homepage']: |
| 93 | <li><b>Homepage</b>: $pkg['homepage']</li> | 103 | <li><b>Homepage</b>: $pkg['homepage']</li> |
| 94 | $if pkg['task']: | 104 | $if pkg['task']: |