Commit eb225cf6be26750a41819ff195f5aa31da30af4f
Exists in
master
and in
11 other branches
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
| @@ -70,7 +70,6 @@ | @@ -70,7 +70,6 @@ | ||
| 70 | {{#each ../../article.children}} | 70 | {{#each ../../article.children}} |
| 71 | <option value='{{id}}'> {{title}}</option> | 71 | <option value='{{id}}'> {{title}}</option> |
| 72 | {{/each}} | 72 | {{/each}} |
| 73 | - | ||
| 74 | </select> | 73 | </select> |
| 75 | </li> | 74 | </li> |
| 76 | {{/each}} | 75 | {{/each}} |
| @@ -78,9 +77,9 @@ | @@ -78,9 +77,9 @@ | ||
| 78 | <div class='abstract'> | 77 | <div class='abstract'> |
| 79 | <img src="{{../host}}{{image.url}}"/> | 78 | <img src="{{../host}}{{image.url}}"/> |
| 80 | </div> | 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 | <div class='body hide'>{{body}}</div> | 83 | <div class='body hide'>{{body}}</div> |
| 85 | <div class='make-proposal-container'> | 84 | <div class='make-proposal-container'> |
| 86 | <div class='make-proposal'> | 85 | <div class='make-proposal'> |
| @@ -91,10 +90,6 @@ | @@ -91,10 +90,6 @@ | ||
| 91 | <div class="login-container hide">Login</div> | 90 | <div class="login-container hide">Login</div> |
| 92 | <form class='make-proposal-form save-article-form hide' id='make-proposal-form-{{id}}'> | 91 | <form class='make-proposal-form save-article-form hide' id='make-proposal-form-{{id}}'> |
| 93 | <div class="message"></div> | 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 | <div> | 93 | <div> |
| 99 | <div><label>Descrição</label></div> | 94 | <div><label>Descrição</label></div> |
| 100 | <textarea id="article_abstract" name="article[abstract]" placeholder="Descrição"></textarea> | 95 | <textarea id="article_abstract" name="article[abstract]" placeholder="Descrição"></textarea> |
| @@ -126,10 +121,6 @@ | @@ -126,10 +121,6 @@ | ||
| 126 | <div class="login-container hide">Login</div> | 121 | <div class="login-container hide">Login</div> |
| 127 | <form class='make-experience-form save-article-form hide' id='make-experience-form-{{id}}'> | 122 | <form class='make-experience-form save-article-form hide' id='make-experience-form-{{id}}'> |
| 128 | <div class="message"></div> | 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 | <div> | 124 | <div> |
| 134 | <div><label>Descrição</label></div> | 125 | <div><label>Descrição</label></div> |
| 135 | <textarea id="article_abstract" name="article[abstract]" placeholder="Descrição"></textarea> | 126 | <textarea id="article_abstract" name="article[abstract]" placeholder="Descrição"></textarea> |
js/main.js
| @@ -113,7 +113,7 @@ $.getJSON(noosferoAPI) | @@ -113,7 +113,7 @@ $.getJSON(noosferoAPI) | ||
| 113 | $.ajax({ | 113 | $.ajax({ |
| 114 | type: 'post', | 114 | type: 'post', |
| 115 | url: host + '/api/v1/articles/' + proposal_id + '/children', | 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 | .done(function( data ) { | 118 | .done(function( data ) { |
| 119 | form.reset(); | 119 | form.reset(); |
| @@ -204,3 +204,13 @@ jQuery(document).ready(function($) { | @@ -204,3 +204,13 @@ jQuery(document).ready(function($) { | ||
| 204 | e.preventDefault(); | 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