Download as
Browse Code »

Commit f2548b058fdf87293ed97be414769e3ded4ed798

Authored by Valessio Brito
1 parent a403afac
Exists in master and in 1 other branch add_vagrant

realing buttons

Showing 6 changed files with 66 additions and 41 deletions   Show diff stats
src/web/static/coda-slider-2.0/stylesheets/coda-slider-2.0.css
  Diff comments   View file @f2548b0
... ... @@ -19,10 +19,10 @@
19 19 .coda-slider-no-js .coda-slider { height: 300px; overflow: auto !important; padding-right: 20px }
20 20  
21 21 /* Change the width of the entire slider (without dynamic arrows) */
22   - .coda-slider, .coda-slider .panel { width: 700px }
  22 + .coda-slider, .coda-slider .panel { width: 780px }
23 23  
24 24 /* Change margin and width of the slider (with dynamic arrows) */
25   - .coda-slider-wrapper.arrows .coda-slider, .coda-slider-wrapper.arrows .coda-slider .panel { width: 600px }
  25 + .coda-slider-wrapper.arrows .coda-slider, .coda-slider-wrapper.arrows .coda-slider .panel { width: 700px }
26 26 .coda-slider-wrapper.arrows .coda-slider { margin: 0 10px }
27 27  
28 28 /* Arrow styling
... ...
src/web/static/css/style.css
  Diff comments   View file @f2548b0
... ... @@ -44,7 +44,7 @@ html { background-color: transparent; }
44 44 :focus { outline: 0; }
45 45 caption, th, td { text-align: left; font-weight: normal; }
46 46 blockquote:before, blockquote:after, q:before, q:after { content: ""; }
47   -
  47 +p { margin-bottom: 5px; }
48 48  
49 49 /*
50 50 * Layout, font, size.. colors..
... ... @@ -66,7 +66,6 @@ margin-top: 40px;
66 66 margin-bottom: 40px;
67 67 margin-right: auto;
68 68 margin-left: auto;
69   -background-color: white;
70 69 border-radius: 10px;
71 70 box-shadow: 0 2px 20px #545454;
72 71 }
... ... @@ -407,7 +406,6 @@ font-weight: bold;
407 406  
408 407 #upload-slide,
409 408 #advanced-slide fieldset {
410   -boder: 1px solid gray;
411 409 font-size: 0.9em;
412 410 padding: 5px;
413 411 margin: 10px;
... ...
src/web/static/css/survey.css
  Diff comments   View file @f2548b0
... ... @@ -112,8 +112,15 @@ background: white;
112 112 .radioButton {
113 113 text-align: left;
114 114 vertical-align: middle;
115   -float: right;
116 115 cursor: normal;
  116 +width: 150px;
  117 +margin-bottom: 10px;
  118 +float: left;
  119 +}
  120 +
  121 +#panel-controls {
  122 +width: 180px;
  123 +float: right;
117 124 }
118 125  
119 126 #controls-form,
... ...
src/web/templates/layout.html
  Diff comments   View file @f2548b0
... ... @@ -59,7 +59,7 @@ function validateForm()
59 59  
60 60 <body class="$content.mod">
61 61  
62   -<div id="wrap" class="glass">
  62 +<div id="wrap" class="vert-grad">
63 63 <div id="header" class="glass">
64 64 <a href="$url_base" title="AppRecommender"><h1 id="logo"><span>AppRecommender</span></h1></a>
65 65 <div id="recommender-box">
... ...
src/web/templates/survey.html
  Diff comments   View file @f2548b0
... ... @@ -4,7 +4,6 @@ $var mod = &#39;survey&#39;;
4 4 $var cssfiles: static/coda-slider-2.0/stylesheets/coda-slider-2.0.css static/css/facebox.css static/css/survey.css
5 5 $var jsfiles: static/coda-slider-2.0/javascripts/jquery-1.3.2.min.js static/coda-slider-2.0/javascripts/jquery.coda-slider-2.0.js static/coda-slider-2.0/javascripts/jquery.easing.1.3.js static/js/facebox.js
6 6  
7   -
8 7 <script type="text/javascript">
9 8 $$(document).ready(function() {
10 9 $$("input[type=radio]").click(function () {
... ... @@ -36,7 +35,7 @@ $var jsfiles: static/coda-slider-2.0/javascripts/jquery-1.3.2.min.js static/coda
36 35 <div class="tip important">
37 36 <p>Conclude your participation in this survey</p>
38 37 </div>
39   - <input id="finish-button" name="finish_button" type="submit" value="Finish" class="glass" rel="facebox" />
  38 + <input id="finish-button" name="finish_button" type="submit" value="Finish" class="glass" />
40 39 </label>
41 40  
42 41 <label for="strategy_button" id="tip-strategy">
... ... @@ -53,33 +52,35 @@ $var jsfiles: static/coda-slider-2.0/javascripts/jquery-1.3.2.min.js static/coda
53 52 $for pkg in pkg_details:
54 53 <div class="panel">
55 54 <div class="panel-wrapper">
56   - <div id="panel-controls">
  55 + <p>
  56 + <h1 id="title_pkg">$pkg['package'] <br />
  57 + <span>$pkg['description']</span></h1>
  58 + </p>
  59 + <div id="panel-controls">
57 60 <label class="glass radioButton">
58   - <img src="/static/images/smile-s.png" alt="Smile Surprising" style="float: right;">
59 61 <input class="radio" type="radio" name="evaluation-$pkg_details.index(pkg)" value="surprising" />
60 62 Pleasantly surprising
61   - </label>
  63 + </label><br />
62 64 <label class="glass radioButton">
63   - <img src="/static/images/smile-g.png" alt="Smile Good" style="float: right;">
  65 + <img src="/static/images/yes-enb.JPG" alt="Yes, Good" style="float: right;">
64 66 <input class="radio" type="radio" name="evaluation-$pkg_details.index(pkg)" value="good" />
65 67 Good
66   - </label>
  68 + </label><br />
67 69 <label class="glass radioButton">
68   - <img src="/static/images/smile-p.png" alt="Smile Poor" style="float: right;">
  70 + <img src="/static/images/no-dis.JPG" alt="Poor" style="float: right;">
69 71 <input class="radio" type="radio" name="evaluation-$pkg_details.index(pkg)" value="poor" />
70 72 Poor
71 73 </label>
72 74 <br style="clear: both;" />
73   - </div><!-- #panel-controls -->
74   - <p>
75   - <h1 id="title_pkg">$pkg['package'] <br />
76   - <span>$pkg['description']</span></h1>
77   - </p>
  75 + <div class="screenshot">
  76 + <a class="link-thumb" rel="facebox"
  77 + href="http://screenshots.debian.net/screenshot/$pkg['package']?.jpg"
  78 + title="Screenshot of package $pkg['package']">
  79 + <img src="http://screenshots.debian.net/thumbnail/$pkg['package']"
  80 + alt="Screenshot $pkg['package']" /></a>
  81 + </div><!-- screenshot -->
  82 + </div><!-- #panel-controls -->
78 83 <div class="content-pkg">
79   - <div class="screenshot">
80   - <a class="link-thumb" rel="facebox" href="http://screenshots.debian.net/screenshot/$pkg['package']?.jpg" title="Screenshot of package $pkg['package']">
81   - <img src="http://screenshots.debian.net/thumbnail/$pkg['package']" alt="Screenshot $pkg['package']" /></a>
82   - </div><!-- .item -->
83 84 <li><b>Description</b>: <br />$:pkg['long_description']</li>
84 85 $if pkg['homepage']:
85 86 <li><b>Homepage</b>: $pkg['homepage']</li>
... ...
src/web/templates/thanks.html
  Diff comments   View file @f2548b0
... ... @@ -2,10 +2,44 @@ $var title: Feedback
2 2 $var mod = 'thanks';
3 3 $var cssfiles: static/css/survey.css
4 4  
5   -<div id="maincontent">
  5 +
  6 +<div id="sidebar">
6 7 <div class="innertube">
7 8  
8   -<div class="index_include">
  9 +<h2>Identification</h2>
  10 + <form>
  11 + <p><label>
  12 + <input type="checkbox" name="public" value="checked">
  13 + Can we publish your name in our thanks page?
  14 + </label></p>
  15 + <p>
  16 + <label>
  17 + Name: <input type="text" name="name" value="" size="30">
  18 + </label></p>
  19 + <p>
  20 + <label>
  21 + E-mail:<input type="text" name="email" value="" size="30">
  22 + </label></p>
  23 + <p>
  24 + <label>
  25 + Country:<input type="text" name="country" value="" size="30">
  26 + </label></p>
  27 + <p>
  28 + <label>
  29 + Comments:<br />
  30 + <textarea name="comments" value="" rows="2" cols="30"></textarea>
  31 + </label></p>
  32 + <p align="right">
  33 + <input type="submit" name="send_button" value="Submit" class="glass" id="finish-button">
  34 + </p>
  35 + </form>
  36 +
  37 +<br style="clear: both" />
  38 +</div><!-- class="innertube" -->
  39 +</div><!-- id="sidebar" -->
  40 +
  41 +<div id="maincontent">
  42 +<div class="innertube">
9 43  
10 44 <center>
11 45 <h1>Thanks!</h1>
... ... @@ -15,21 +49,6 @@ $var cssfiles: static/css/survey.css
15 49 address you'll be sent the survey results report as soon as it is released. If
16 50 you have any further comments, please send it through the form below.</p><br />
17 51  
18   -<div class=graybox>
19   -<h2>Identification</h2>
20   -<form>
21   -<label><input type="checkbox" name="public" value="checked">Can we publish your name
22   -in our thanks page?</label><br >
23   -<label>Name: <input type="text" name="name" value="" size="30"></label><br />
24   -<label>E-mail:<input type="text" name="email" value="" size="30"></label><br >
25   -<label>Country:<input type="text" name="country" value="" size="30"></label><br >
26   -<label>Comments:<textarea name="comments" value="" rows="2"
27   -cols="30"></textarea></label><br />
28   -<input type="submit" name="send_button" value="Submit" class="glass">
29   -</form>
30   -</div>
31   -
32   -</div>
33 52  
34 53 </div><!-- class="innertube" -->
35 54 </div><!-- id="maincontent" -->
... ...