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

Evandro Jr
2 parents 6b5c6d97 610d620f
Showing 4 changed files with 19 additions and 6 deletions Show diff stats
index.html
js/handlebars-helpers.js
js/main.js
sass/style.sass
@@ -146,6 +146,7 @@
                     <a href="#/temas/{{slug}}/{{id}}" class="proposal-link" data-target="proposal-item-{{id}}">
                       <span class="icon icon-theme icon-{{slug}}"></span>
                       <span class="themes-name">{{name}}</span>
+                      <span class="fa fa-angle-right hidden-xs"></span>
                     </a>
                     <!-- <div class="arrow-box" style="display: none"></div> -->
                   </li>
@@ -180,7 +181,7 @@
                 <input placeholder="palavra chave" id="search-input" type="text" name="search" />
               </div>
               -->
-              <a class="ver-todos" href="#/programas" role="tab" aria-controls="proposal-group">Ver todos os programas</a>
+              <a class="ver-todos" href="#/programas" role="tab" aria-controls="proposal-group"><span class="fa fa-angle-right"></span>Ver todos os programas</a>
               <h2 class="name">Programas</h2>
  
               <ul class="proposal-list row">
@@ -426,7 +427,6 @@
         <div class="row">
           <div class="actions col-sm-4">
             <input type="submit" class="login-action button col-sm-12" value="Acessar"/>
-            <a href="http://www.participa.br/account/forgot_password" target="_blank" class="forgot-password">Esqueci minha senha</a>
           </div>
           <div class="oauth col-sm-8">
             <span class="label">Ou acesse usando <i>&raquo;</i></span>
@@ -82,7 +82,7 @@ define([&#39;handlebars&#39;], function(Handlebars){
  
   Handlebars.registerHelper('proposal_action', function(discussion, target) {
     if(discussion.setting && discussion.setting.moderate_proposals) {
-      return '/api/v1/articles/'+target.id+'/children/suggest';
+      return '/api/v1/proposals_discussion_plugin/'+target.id+'/propose';
     } else {
       return '/api/v1/articles/'+target.id+'/children';
     }
@@ -108,7 +108,7 @@ define([&#39;handlebars&#39;, &#39;fastclick&#39;, &#39;handlebars_helpers&#39;], function(Handlebars, F
               }
  
               if(!logged_in) {
-                $(this).closest('.support-proposal').find('.send-button a').click();
+                $(this).closest('.support-proposal').find('.button-send a').click();
                 e.preventDefault();
                 return;
               }
@@ -644,12 +644,12 @@ define([&#39;handlebars&#39;, &#39;fastclick&#39;, &#39;handlebars_helpers&#39;], function(Handlebars, F
         Main.updateHash(newHash);
       });
  
-      $( '.send-button a' ).on('click', function(e){
+      $( '.button-send a' ).on('click', function(e){
         e.preventDefault();
  
         //display form to send proposal (or login form for non-logged users)
         var $this = $(this);
-        loginButton = $this.parents('.send-button');
+        loginButton = $this.parents('.button-send');
         loginButton.hide();
         $this.parents('.success-proposal-sent').hide();
         $wrapper = $this.parents('.make-proposal');
@@ -411,6 +411,14 @@ h1
     +hover(#fff,$darken)
     &:hover,&:focus
       text-decoration: none
+  .fa
+    color: #898989
+    float: right
+    font-size: 45px
+  &-name
+    display: inline-block
+    width: 50%
+    vertical-align: middle
   .arrow-box
     position: relative
     top: $gutter
@@ -427,6 +435,10 @@ h1
 //   6.7 - listagem dos programas aleatorios
 .ver-todos
   float: right
+  .fa
+    font-size: $theme-size-header
+    margin-right: $gutter * 0.5
+    vertical-align: bottom
 .proposal
   &-container
     border-radius: $radius
@@ -1136,6 +1148,7 @@ h3.titulo-destaque
     font-size: 0
     &-name
       display: block
+      width: 100%
     li
       display: inline-block
       font-size: $font-size-base
...	...	@@ -146,6 +146,7 @@
146	146	<a href="#/temas/{{slug}}/{{id}}" class="proposal-link" data-target="proposal-item-{{id}}">
147	147	<span class="icon icon-theme icon-{{slug}}"></span>
148	148	<span class="themes-name">{{name}}</span>
	149	+ <span class="fa fa-angle-right hidden-xs"></span>
149	150	</a>
150	151	<!-- <div class="arrow-box" style="display: none"></div> -->
151	152	</li>
...	...	@@ -180,7 +181,7 @@
180	181	<input placeholder="palavra chave" id="search-input" type="text" name="search" />
181	182	</div>
182	183	-->
183		- <a class="ver-todos" href="#/programas" role="tab" aria-controls="proposal-group">Ver todos os programas</a>
	184	+ <a class="ver-todos" href="#/programas" role="tab" aria-controls="proposal-group"><span class="fa fa-angle-right"></span>Ver todos os programas</a>
184	185	<h2 class="name">Programas</h2>
185	186
186	187	<ul class="proposal-list row">
...	...	@@ -426,7 +427,6 @@
426	427	<div class="row">
427	428	<div class="actions col-sm-4">
428	429	<input type="submit" class="login-action button col-sm-12" value="Acessar"/>
429		- <a href="http://www.participa.br/account/forgot_password" target="_blank" class="forgot-password">Esqueci minha senha</a>
430	430	</div>
431	431	<div class="oauth col-sm-8">
432	432	<span class="label">Ou acesse usando <i>»</i></span>
...	...
...	...	@@ -82,7 +82,7 @@ define(['handlebars'], function(Handlebars){
82	82
83	83	Handlebars.registerHelper('proposal_action', function(discussion, target) {
84	84	if(discussion.setting && discussion.setting.moderate_proposals) {
85		- return '/api/v1/articles/'+target.id+'/children/suggest';
	85	+ return '/api/v1/proposals_discussion_plugin/'+target.id+'/propose';
86	86	} else {
87	87	return '/api/v1/articles/'+target.id+'/children';
88	88	}
...	...
...	...	@@ -108,7 +108,7 @@ define(['handlebars', 'fastclick', 'handlebars_helpers'], function(Handlebars, F
108	108	}
109	109
110	110	if(!logged_in) {
111		- $(this).closest('.support-proposal').find('.send-button a').click();
	111	+ $(this).closest('.support-proposal').find('.button-send a').click();
112	112	e.preventDefault();
113	113	return;
114	114	}
...	...	@@ -644,12 +644,12 @@ define(['handlebars', 'fastclick', 'handlebars_helpers'], function(Handlebars, F
644	644	Main.updateHash(newHash);
645	645	});
646	646
647		- $( '.send-button a' ).on('click', function(e){
	647	+ $( '.button-send a' ).on('click', function(e){
648	648	e.preventDefault();
649	649
650	650	//display form to send proposal (or login form for non-logged users)
651	651	var $this = $(this);
652		- loginButton = $this.parents('.send-button');
	652	+ loginButton = $this.parents('.button-send');
653	653	loginButton.hide();
654	654	$this.parents('.success-proposal-sent').hide();
655	655	$wrapper = $this.parents('.make-proposal');
...	...
...	...	@@ -411,6 +411,14 @@ h1
411	411	+hover(#fff,$darken)
412	412	&:hover,&:focus
413	413	text-decoration: none
	414	+ .fa
	415	+ color: #898989
	416	+ float: right
	417	+ font-size: 45px
	418	+ &-name
	419	+ display: inline-block
	420	+ width: 50%
	421	+ vertical-align: middle
414	422	.arrow-box
415	423	position: relative
416	424	top: $gutter
...	...	@@ -427,6 +435,10 @@ h1
427	435	// 6.7 - listagem dos programas aleatorios
428	436	.ver-todos
429	437	float: right
	438	+ .fa
	439	+ font-size: $theme-size-header
	440	+ margin-right: $gutter * 0.5
	441	+ vertical-align: bottom
430	442	.proposal
431	443	&-container
432	444	border-radius: $radius
...	...	@@ -1136,6 +1148,7 @@ h3.titulo-destaque
1136	1148	font-size: 0
1137	1149	&-name
1138	1150	display: block
	1151	+ width: 100%
1139	1152	li
1140	1153	display: inline-block
1141	1154	font-size: $font-size-base
...	...