Download as
Browse Code »

Commit 7811b292b2d549068ec183f05daddb27c40f3c5e

Authored by Leandro Santos
2 parents 2b209b27 5542e31a
Exists in master and in 10 other branches build, build2, capa, captcha, contigency_plan_recaptcha, jasmine-testing, make_harder_to_vote_twice, production, refactory-sass, staging

fixing conflit

Showing 2 changed files with 12 additions and 11 deletions   Show diff stats
index.html
  Diff comments   View file @7811b29
1   -<html>
  1 +<html lang-"pt-br">
2 2 <head>
3 3 <meta charset="utf-8" />
4 4 <title>Dialoga Brasil</title>
... ... @@ -58,9 +58,9 @@
58 58 </ul>
59 59  
60 60 <div id="proposal-group" class='hide'>
61   - <label for="search">Selecione um programa para fazer propostas e contar sua experiência.</label>
  61 + <label for="search-input">Selecione um programa para fazer propostas e contar sua experiência.</label>
62 62 <div id="search-input-container">
63   - <input placeholder="palavra chave" id="search-input" type="text" />
  63 + <input placeholder="palavra chave" id="search-input" type="text" name="search" />
64 64 </div>
65 65 <ul>
66 66  
... ... @@ -84,7 +84,7 @@
84 84  
85 85 <div class='proposal-header'>
86 86 <div class='abstract'>
87   - <img src="{{../host}}{{image.url}}"/>
  87 + <img src="{{../host}}{{image.url}}" alt="Imagem de apresentação do programa."/>
88 88 </div>
89 89 <div class='title'>{{title}}</div>
90 90 <div class='abstract'>{{{abstract}}}</div>
... ... @@ -108,7 +108,7 @@
108 108 <form class='make-proposal-form save-article-form hide' id='make-proposal-form-{{id}}'>
109 109 <div class="message"></div>
110 110 <div>
111   - <div><label>Descrição</label></div>
  111 + <div><label for="article_abstract">Descrição</label></div>
112 112 <textarea id="article_abstract" name="article[abstract]" placeholder="Descrição"></textarea>
113 113 </div>
114 114 <input id='content_type' name='content_type' value='ProposalsDiscussionPlugin::Proposal' type='hidden'>
... ... @@ -141,7 +141,7 @@
141 141 <form class='make-experience-form save-article-form hide' id='make-experience-form-{{id}}'>
142 142 <div class="message"></div>
143 143 <div>
144   - <div><label>Descrição</label></div>
  144 + <div><label for="article_abstract">Descrição</label></div>
145 145 <textarea id="article_abstract" name="article[abstract]" placeholder="Descrição"></textarea>
146 146 </div>
147 147 <input id='content_type' name='content_type' value='ProposalsDiscussionPlugin::Story' type='hidden'>
... ... @@ -210,18 +210,18 @@
210 210 </script>
211 211  
212 212 <script id='login' type='text/x-handlebars-template'>
213   - <form class="login">
  213 + <form id="login-form" class="login">
214 214 <div class="message"></div>
215 215 <div class="username">
216   - <div class="label">Nome de Usuário / E-mail:</div>
  216 + <label for="user_name" class="label">Nome de Usuário / E-mail:</label>
217 217 <input id="user_name" name="login" type="text" placeholder="Nome do usuário / E-mail">
218 218 </div>
219 219 <div class="password">
220   - <div class="label">Senha:</div>
  220 + <label for="user_password" class="label">Senha:</label>
221 221 <input id="user_password" name="password" type="password" placeholder="Senha">
222 222 </div>
223 223 <div class="actions">
224   - <a href="#" class="login-action">Acessar</a>
  224 + <input type="submit" class="login-action" value="Acessar"/>
225 225 <a href="http://www.participa.br/account/forgot_password" target="_blank" class="forgot-password">Esqueci minha senha</a>
226 226 </div>
227 227 <div class="oauth">
... ...
js/handlebars-helpers.js
  Diff comments   View file @7811b29
... ... @@ -54,7 +54,8 @@ Handlebars.registerHelper(&#39;score&#39;, function(article) {
54 54 });
55 55  
56 56 Handlebars.registerHelper('select_proposal', function(proposals, category_slug, selected_id) {
57   - var ret = '<select class="proposal-selection">';
  57 + var ret = '<label for="proposal-selection" class="sr-only">Selecione o programa</label>'
  58 + ret = ret + '<select id="proposal-selection" name="proposal-selection" title="Selecione o programa" class="proposal-selection">';
58 59  
59 60 for(var i=0; i<proposals.length; i++) {
60 61 if(!proposal_has_category(proposals[i], category_slug)) continue;
... ...