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

Augusto dos Anjos Almeida
2 parents f1e992e0 dca0efe7
Showing 3 changed files with 29 additions and 9 deletions Show diff stats
index.html
js/main.js
sass/style.sass
@@ -109,7 +109,10 @@
         </div>
       </header>
-      <div id="article-container" class="hide"></div>
+      <div id="article-container" class="article-container hide">
+        <a href="#" class="go-back">Voltar</a>
+        <div class="article-content"></div>
+      </div>
       <div id="content" class="container">
         <div class="embed-responsive embed-responsive-16by9">
@@ -479,7 +482,7 @@
       </div>
     </script>
-    <div class="terms-of-use">
+    <div class="terms-of-use text-center">
       <a href="#/artigo/107880">Termos de uso</a>
     </div>
@@ -18,13 +18,15 @@ define([&#39;handlebars&#39;, &#39;fastclick&#39;, &#39;handlebars_helpers&#39;], function(Handlebars, F
   var loginButton;
+  var lastHash;
+
   var participa = true;
   //Detects for localhost settings
   var patt = new RegExp(":3000/");
   if(patt.test(window.location.href))
     participa = false;
-  
+
   if(participa){
     var host = 'http://www.participa.br';
     var proposal_discussion = '103358'; //participa
@@ -226,15 +228,16 @@ define([&#39;handlebars&#39;, &#39;fastclick&#39;, &#39;handlebars_helpers&#39;], function(Handlebars, F
           }
           return s4() + s4() + '-' + s4() + '-' + s4() + '-' + s4() + '-' + s4() + s4() + s4();
         },
-        display_article: function(article_id) {
+        display_article: function(article_id, backTo) {
           var url = host + '/api/v1/articles/' + article_id + '?private_token=' + Main.private_token;
           $.getJSON(url).done(function( data ) {
-            $('#article-container').html(articleTemplate(data.article));
+            $('#article-container .article-content').html(articleTemplate(data.article));
             $('#article-container').show();
             $('#proposal-categories').hide();
             $('#proposal-group').hide();
             $('nav').hide();
             $('#content').hide();
+            $('#article-container .go-back').attr('href', backTo);
           });
         },
         // inicio Eduardo
@@ -267,6 +270,7 @@ define([&#39;handlebars&#39;, &#39;fastclick&#39;, &#39;handlebars_helpers&#39;], function(Handlebars, F
           // this.randomProposalByTheme(['category-saude', 'category-seguranca-publica', 'category-educacao', 'category-reducao-da-pobreza']);
           $('.proposal-item').show(); /* Show all programs */
           $('#proposal-group').show();
+          $('.proposal-category-items').hide();
           $('#nav-proposal-group a').addClass('active');
           $('#nav-proposal-categories a').removeClass('active');
           $('#content').show();
@@ -429,9 +433,10 @@ define([&#39;handlebars&#39;, &#39;fastclick&#39;, &#39;handlebars_helpers&#39;], function(Handlebars, F
         },
         locationHashChanged: function(){
           var hash = window.location.hash;
-          this.navigateTo(hash);
+          this.navigateTo(hash, lastHash);
+          lastHash = hash;
         },
-        navigateTo: function(hash){
+        navigateTo: function(hash, lastHash) {
           var scrollTop = 0;
           var $nav = $('nav[role="tabpanel"]');
           var navOffset = $nav.offset();
@@ -457,7 +462,7 @@ define([&#39;handlebars&#39;, &#39;fastclick&#39;, &#39;handlebars_helpers&#39;], function(Handlebars, F
           var isArticle  = regexArticle.exec(hash) !== null;
           if(isArticle) {
-            this.display_article(hash.split('/')[2]);
+            this.display_article(hash.split('/')[2], lastHash);
           }
           if( isProposal ){
@@ -771,6 +771,18 @@ h1
     padding-right: 0
     padding-top: $gutter * 0.25
+//  6.17 - artigo
+.article-container
+  max-width: 1170px
+  margin-left: auto
+  margin-right: auto
+  .abstract
+    font-style: italic
+    color: rgb(114, 114, 114)
+    margin-bottom: 30px
+    margin-top: 10px
+  .title
+    font-size: 22px
 // ------------------------------------
 // 7 - Modificadores
@@ -957,4 +969,4 @@ h3.titulo-destaque
       .date,.time
         color: #fff
   .bloco-destaque
-    background: darken(#fff, 85%)
 \ No newline at end of file
+    background: darken(#fff, 85%)
	@@ -771,6 +771,18 @@ h1		@@ -771,6 +771,18 @@ h1
771	padding-right: 0	771	padding-right: 0
772	padding-top: $gutter * 0.25	772	padding-top: $gutter * 0.25
773		773
		774	+// 6.17 - artigo
		775	+.article-container
		776	+ max-width: 1170px
		777	+ margin-left: auto
		778	+ margin-right: auto
		779	+ .abstract
		780	+ font-style: italic
		781	+ color: rgb(114, 114, 114)
		782	+ margin-bottom: 30px
		783	+ margin-top: 10px
		784	+ .title
		785	+ font-size: 22px
774		786
775	// ------------------------------------	787	// ------------------------------------
776	// 7 - Modificadores	788	// 7 - Modificadores
	@@ -957,4 +969,4 @@ h3.titulo-destaque		@@ -957,4 +969,4 @@ h3.titulo-destaque
957	.date,.time	969	.date,.time
958	color: #fff	970	color: #fff
959	.bloco-destaque	971	.bloco-destaque
960	- background: darken(#fff, 85%)
961	\ No newline at end of file	972	\ No newline at end of file
		973	+ background: darken(#fff, 85%)