Download as
Browse Code »

Commit ddc187121ee2abd3df1139ef1fb07ce9a2626a5e

Authored by Augusto dos Anjos Almeida
2 parents 3e107985 92111acd
Exists in master and in 6 other branches build, build2, capa, contigency_plan_recaptcha, production, staging

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

Showing 4 changed files with 24 additions and 3 deletions   Show diff stats
css/bootstrap-alert.min.css 0 → 100644
  Diff comments   View file @ddc1871
... ... @@ -0,0 +1,6 @@
  1 +/*!
  2 + * Bootstrap v3.3.4 (http://getbootstrap.com)
  3 + * Copyright 2011-2015 Twitter, Inc.
  4 + * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
  5 + */
  6 + .alert{padding:15px;margin-bottom:20px;border:1px solid transparent;border-radius:4px}.alert h4{margin-top:0;color:inherit}.alert .alert-link{font-weight:700}.alert>p,.alert>ul{margin-bottom:0}.alert>p+p{margin-top:5px}.alert-dismissable,.alert-dismissible{padding-right:35px}.alert-dismissable .close,.alert-dismissible .close{position:relative;top:-2px;right:-21px;color:inherit}.alert-success{color:#3c763d;background-color:#dff0d8;border-color:#d6e9c6}.alert-success hr{border-top-color:#c9e2b3}.alert-success .alert-link{color:#2b542c}.alert-info{color:#31708f;background-color:#d9edf7;border-color:#bce8f1}.alert-info hr{border-top-color:#a6e1ec}.alert-info .alert-link{color:#245269}.alert-warning{color:#8a6d3b;background-color:#fcf8e3;border-color:#faebcc}.alert-warning hr{border-top-color:#f7e1b5}.alert-warning .alert-link{color:#66512c}.alert-danger{color:#a94442;background-color:#f2dede;border-color:#ebccd1}.alert-danger hr{border-top-color:#e4b9c0}.alert-danger .alert-link{color:#843534}
... ...
index.html
  Diff comments   View file @ddc1871
... ... @@ -43,6 +43,7 @@
43 43 function loadCSSFiles(){
44 44 var css_files = [
45 45 'css/bootstrap.min.css',
  46 + 'css/bootstrap-alert.min.css',
46 47 'css/hover.custom.css',
47 48 'http://maxcdn.bootstrapcdn.com/font-awesome/4.3.0/css/font-awesome.min.css',
48 49 'http://fonts.googleapis.com/css?family=Open+Sans:400,300,700',
... ... @@ -243,6 +244,9 @@
243 244 <div class="support-proposal-container">
244 245 <div class="support-proposal">
245 246 <div class="container-title"> Apoie outras propostas</div>
  247 + <div class="alert alert-warning hide" role="alert">
  248 + <i class="fa fa-warning"></i><strong>Proposta não encontrada</strong>
  249 + </div>
246 250 <div class="support-proposal-content require-login">
247 251 <div class="random-proposal"></div>
248 252 <div class="loading">Carregando...</div>
... ... @@ -254,7 +258,7 @@
254 258 </div>
255 259  
256 260 <div class="results-container hide"></div>
257   -
  261 +
258 262 <div class="talk-proposal-container">
259 263 <div class="talk-proposal">
260 264 <div class="container-title">Bate-papo com os ministros</div>
... ...
js/main.js
  Diff comments   View file @ddc1871
... ... @@ -34,12 +34,12 @@ define([&#39;handlebars&#39;, &#39;fastclick&#39;, &#39;handlebars_helpers&#39;], function(Handlebars, F
34 34 return {
35 35 private_token: '375bee7e17d0021af7160ce664874618',
36 36 getProposalId: function() {
37   - var regexProposals = /\d.*\/propostas\/\d.*/;
  37 + var regexProposals = /\d.*\/propostas\/*.*/;
38 38 var proposalId = 0;
39 39  
40 40 var hasProposal = regexProposals.test(location.hash);
41 41 if( hasProposal ){
42   - var regexExtractProposal = /propostas\/\d.*/;
  42 + var regexExtractProposal = /propostas\/*.*/;
43 43 proposalId = regexExtractProposal.exec(location.hash)[0].split('/')[1];
44 44  
45 45 }
... ... @@ -69,6 +69,7 @@ define([&#39;handlebars&#39;, &#39;fastclick&#39;, &#39;handlebars_helpers&#39;], function(Handlebars, F
69 69  
70 70 $.getJSON(url).done(function( data ) {
71 71 $loading.hide();
  72 + $('.support-proposal .alert').hide();
72 73  
73 74 data.articles = data.articles || [data.article];
74 75 if(data.articles.length === 0) {
... ... @@ -130,6 +131,9 @@ define([&#39;handlebars&#39;, &#39;fastclick&#39;, &#39;handlebars_helpers&#39;], function(Handlebars, F
130 131 }
131 132 e.preventDefault();
132 133 });
  134 + }).fail(function(){
  135 + $loading.hide();
  136 + $('.support-proposal .alert').show();
133 137 });
134 138 },
135 139  
... ...
sass/_proposal_detail.scss
  Diff comments   View file @ddc1871
... ... @@ -434,6 +434,13 @@
434 434 position: relative;
435 435 margin: 0 0 20px 10px;
436 436 overflow: auto;
  437 + .alert{
  438 + width: 95%;
  439 + margin: 0 auto;
  440 + strong{
  441 + margin-left: 5px;
  442 + }
  443 + }
437 444 }
438 445 .subtitle {
439 446 color: #000;
... ...