Download as
Browse Code »

Commit eb225cf6be26750a41819ff195f5aa31da30af4f

Authored by Caio Almeida
2 parents 3148098a 50daa3ea
Exists in master and in 11 other branches build, build2, capa, captcha, contigency_plan_recaptcha, jasmine-testing, make_harder_to_vote_twice, production, refactory-sass, session_cookie, staging

Merge branch 'master' of https://gitlab.com/participa/proposal-app

Showing 3 changed files with 15 additions and 14 deletions   Show diff stats
index.html
  Diff comments   View file @eb225cf
... ... @@ -70,7 +70,6 @@
70 70 {{#each ../../article.children}}
71 71 <option value='{{id}}'> {{title}}</option>
72 72 {{/each}}
73   -
74 73 </select>
75 74 </li>
76 75 {{/each}}
... ... @@ -78,9 +77,9 @@
78 77 <div class='abstract'>
79 78 <img src="{{../host}}{{image.url}}"/>
80 79 </div>
81   - <div class='title'>{{title}}</div>
82   - <div class='abstract'>{{abstract}}</div>
83   - <div class='show_body'><a href='#'>Conheça o Programa</a></div>
  80 + <div class='title'>{{title}}</div>
  81 + <div class='abstract'>{{{abstract}}}</div>
  82 + <div class='show_body'><a href='#'>Conheça o Programa</a></div>
84 83 <div class='body hide'>{{body}}</div>
85 84 <div class='make-proposal-container'>
86 85 <div class='make-proposal'>
... ... @@ -91,10 +90,6 @@
91 90 <div class="login-container hide">Login</div>
92 91 <form class='make-proposal-form save-article-form hide' id='make-proposal-form-{{id}}'>
93 92 <div class="message"></div>
94   - <div class="name">
95   - <div><label>Título</label></div>
96   - <input id="article_name" name="article[name]" type="text" placeholder="Título">
97   - </div>
98 93 <div>
99 94 <div><label>Descrição</label></div>
100 95 <textarea id="article_abstract" name="article[abstract]" placeholder="Descrição"></textarea>
... ... @@ -126,10 +121,6 @@
126 121 <div class="login-container hide">Login</div>
127 122 <form class='make-experience-form save-article-form hide' id='make-experience-form-{{id}}'>
128 123 <div class="message"></div>
129   - <div class="name">
130   - <div><label>Título</label></div>
131   - <input id="article_name" name="article[name]" type="text" placeholder="Título">
132   - </div>
133 124 <div>
134 125 <div><label>Descrição</label></div>
135 126 <textarea id="article_abstract" name="article[abstract]" placeholder="Descrição"></textarea>
... ...
js/main.js
  Diff comments   View file @eb225cf
... ... @@ -113,7 +113,7 @@ $.getJSON(noosferoAPI)
113 113 $.ajax({
114 114 type: 'post',
115 115 url: host + '/api/v1/articles/' + proposal_id + '/children',
116   - data: $('#'+this.id).serialize() + "&private_token="+private_token+"&fields=id"
  116 + data: $('#'+this.id).serialize() + "&private_token="+private_token+"&fields=id&article[name]=article_"+guid()
117 117 })
118 118 .done(function( data ) {
119 119 form.reset();
... ... @@ -204,3 +204,13 @@ jQuery(document).ready(function($) {
204 204 e.preventDefault();
205 205 });
206 206 });
  207 +
  208 +function guid() {
  209 + function s4() {
  210 + return Math.floor((1 + Math.random()) * 0x10000)
  211 + .toString(16)
  212 + .substring(1);
  213 + }
  214 + return s4() + s4() + '-' + s4() + '-' + s4() + '-' +
  215 + s4() + '-' + s4() + s4() + s4();
  216 +}
... ...
sass/_proposal_categories.scss
  Diff comments   View file @eb225cf
... ... @@ -45,7 +45,7 @@
45 45 text-align: left;
46 46 font-family: asap_bold;
47 47 font-size: 16px;
48   - padding: 5px 12px;
  48 + padding: 5px 12px 5px 32px;
49 49 margin-bottom: 10px;
50 50 }
51 51  
... ...