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

Conflicts: js/main.js

Merge branch 'master' of gitlab.com:participa/proposal-app
Conflicts: js/main.js
Evandro Jr
2 parents ba30cd10 2602ee8d
Showing 6 changed files with 78 additions and 14 deletions Show diff stats
images/icons/icon-login-success.png
images/icons/icon-proposal-sent.png
images/icons/icon-user-created.png
index.html
js/main.js
sass/style.sass
@@ -267,7 +267,11 @@
                             </div>
                             <input type="hidden" id="type" name="article[type]" value="ProposalsDiscussionPlugin::Proposal">
                             <input type="hidden" id="content_type" name="content_type" value="ProposalsDiscussionPlugin::Proposal">
-                            <input type="submit" id="make-proposal-button" name="make-proposal-button" class="make-proposal-button" value="Enviar">
+                            <div class="row">
+                              <div class="col-sm-6 col-sm-offset-3">
+                                <input type="submit" id="make-proposal-button" name="make-proposal-button" class="make-proposal-button button" value="Enviar">
+                              </div>
+                            </div>
                           </form>
                           <div class="success-proposal-sent success-sent hide button-send">
                             <p>Sua proposta foi encaminhada com sucesso! Ela se tornará pública em até 24 horas e poderá ser apoiada por outros participantes.</p>
@@ -206,7 +206,7 @@ define([&#39;handlebars&#39;, &#39;fastclick&#39;, &#39;handlebars_helpers&#39;], function(Handlebars, F
           var requireLoginContainer = loginButton.closest('.require-login-container');
           if(logged_in) {
-            $('.logout').show();
+            Main.showLogout();
             if(token){
               Main.private_token = token;
             }
@@ -228,7 +228,7 @@ define([&#39;handlebars&#39;, &#39;fastclick&#39;, &#39;handlebars_helpers&#39;], function(Handlebars, F
           } else {
             requireLoginContainer.find('.require-login').hide();
             requireLoginContainer.find('.login-container').show();
-            $('.logout').hide();
+            Main.showLogin();
           }
         },
         guid: function() {
@@ -561,10 +561,11 @@ define([&#39;handlebars&#39;, &#39;fastclick&#39;, &#39;handlebars_helpers&#39;], function(Handlebars, F
               }
           }, 300);
         },
-        displaySuccess: function(container, text, timeout) {
+        displaySuccess: function(container, text, timeout, iconClass) {
           timeout = typeof timeout !== 'undefined' ? timeout : 2000;
           container.css('opacity', 0.1);
           var successPanel = $('.success-panel').clone();
+          successPanel.find('.icon').addClass(iconClass);
           successPanel.find('.message').html(text);
           successPanel.appendTo(container.closest('.categories'));
           successPanel.show();
@@ -577,6 +578,25 @@ define([&#39;handlebars&#39;, &#39;fastclick&#39;, &#39;handlebars_helpers&#39;], function(Handlebars, F
             successPanel.remove();
           }, timeout);
         },
+        setUser: function(user){
+          this.user = user;
+        },
+        getUser: function(){
+          return this.user;
+        },
+        showLogin: function(){
+          $('.entrar').show();
+          $('.logout').hide();
+        },
+        showLogout: function(){
+          $('.entrar').hide();
+          var name = '';
+          if(this.user){
+            name = this.user.person.name + ' | ';
+          }
+          $('.logout').text(name + 'Sair');
+          $('.logout').show();
+        },
       responseToText: function(responseJSONmessage){
         var o = JSON.parse(responseJSONmessage);
         var msg = "";
@@ -757,7 +777,7 @@ define([&#39;handlebars&#39;, &#39;fastclick&#39;, &#39;handlebars_helpers&#39;], function(Handlebars, F
           $form.siblings('.success-sent').show();
           $form.siblings('.subtitle').hide();
           $form.siblings('.info').hide();
-          Main.displaySuccess($form.closest('.make-proposal .section-content'), 'Proposta enviada com sucesso', 2000);
+          Main.displaySuccess($form.closest('.make-proposal .section-content'), 'Proposta enviada com sucesso', 2000, 'icon-proposal-sent');
         })
         .fail(function( jqxhr, textStatus, error ) {
           var err = textStatus + ', ' + error;
@@ -786,10 +806,14 @@ define([&#39;handlebars&#39;, &#39;fastclick&#39;, &#39;handlebars_helpers&#39;], function(Handlebars, F
     if($.cookie('_dialoga_session')) {
       var url = host + '/api/v1/users/me?private_token=' + $.cookie('_dialoga_session');
-      $.getJSON(url).done(function( /*data*/ ) {
+      $.getJSON(url).done(function( data ) {
         logged_in = true;
         Main.private_token = $.cookie('_dialoga_session');
-        setTimeout(function(){ $('.logout').show(); }, 2000);
+
+        if(data && data.user){
+          Main.setUser(data.user);
+          Main.showLogout();
+        }
       });
     }
@@ -807,7 +831,7 @@ define([&#39;handlebars&#39;, &#39;fastclick&#39;, &#39;handlebars_helpers&#39;], function(Handlebars, F
         }
       }).done(function(data) {
         Main.loginCallback(true, data.private_token);
-        Main.displaySuccess(button.closest('.section-content'), 'Login efetuado com sucesso', 1000);
+        Main.displaySuccess(button.closest('.section-content'), 'Login efetuado com sucesso', 1000, 'icon-login-success');
       }).fail(function(data) {
         message.show();
         if(data.status==401){
@@ -870,7 +894,7 @@ define([&#39;handlebars&#39;, &#39;fastclick&#39;, &#39;handlebars_helpers&#39;], function(Handlebars, F
         data: $(this).parents('.signup').serialize(),
       }).done(function(data) {
         Main.loginCallback(true, data.private_token);
-        Main.displaySuccess(button.closest('.section-content'), 'Cadastro efetuado com sucesso', 1000);
+        Main.displaySuccess(button.closest('.section-content'), 'Cadastro efetuado com sucesso', 1000, 'icon-user-created');
       }).fail(function(data) {
         var msg = Main.responseToText(data.responseJSON.message);
         message.show();
@@ -913,8 +937,7 @@ define([&#39;handlebars&#39;, &#39;fastclick&#39;, &#39;handlebars_helpers&#39;], function(Handlebars, F
       $.removeCookie('votedProposals');
       $.removeCookie('*');
       logged_in = false;
-      $('.logout').hide();
-      $('.entrar').show();
+      Main.showLogin();
       location.reload();
       e.preventDefault();
     });
@@ -167,6 +167,15 @@ td
     border-left: 0
   &:last-child
     border-right: 0
+input
+  width: 100%
+textarea
+  border: 1px solid
+  padding-bottom: $gutter * 0.25
+  padding-left: $gutter * 0.5
+  padding-right: $gutter * 0.5
+  padding-top: $gutter * 0.25
+  width: 100%
 // ------------------------------------
@@ -302,6 +311,21 @@ td
       background-color: #32dbb5
       border-bottom: 3px solid darken(#32dbb5, $darken) !important
       +hover(#32dbb5, $darken)
+  &-user-created
+    height: 71px
+    width: 71px
+    background: url(images/icons/icon-user-created.png) no-repeat 50% 50%
+    border-radius: 0
+  &-login-success
+    height: 71px
+    width: 71px
+    background: url(images/icons/icon-login-success.png) no-repeat 50% 50%
+    border-radius: 0
+  &-proposal-sent
+    height: 71px
+    width: 71px
+    background: url(images/icons/icon-proposal-sent.png) no-repeat 50% 50%
+    border-radius: 0
 // ------------------------------------
@@ -488,7 +512,7 @@ h1
     border: 1px solid
     margin-bottom: $gutter * 1.5
     margin-top: 0
-    height: 500px
+    height: 570px
     overflow: auto
     padding: $gutter
     position: relative
@@ -645,8 +669,13 @@ h1
     padding: 2px 10px
   .entrar
     background: url(images/icons/icon-user.png) no-repeat 20px 50%
-    border-left: 1px solid #bcbcbc
-    margin-left: 20px
+    // border-left: 1px solid #bcbcbc
+    // margin-left: 20px
+    padding-left: 40px
+  .logout
+    background: url(images/icons/icon-user.png) no-repeat 20px 50%
+    // border-left: 1px solid #bcbcbc
+    // margin-left: 20px
     padding-left: 40px
 .login,.signup
   text-align: left
@@ -694,6 +723,10 @@ h1
   .row
     input
       margin-bottom: 0
+.maxlength
+  margin: ($gutter * 0.5) 0 ($gutter * 2)
+  text-align: right
+
 //   6.12 - votacao
 .vote-actions
@@ -923,6 +956,7 @@ td
 .success-panel
   position: absolute
   z-index: 100
+  text-align: center
 // ------------------------------------
 // 7 - Modificadores
@@ -980,6 +1014,8 @@ h3.titulo-destaque
     color: $color
     a
       color: $color
+    textarea
+      border-color: $color
     .button,.show_body a
       background-color: $color
       border-color: darken($color, $darken)
@@ -1022,6 +1058,7 @@ h3.titulo-destaque
           +hover($color,$darken)
       i
         color: $color
+
     .list
       &-unstyled li
         color: $color
	@@ -167,6 +167,15 @@ td		@@ -167,6 +167,15 @@ td
167	border-left: 0	167	border-left: 0
168	&:last-child	168	&:last-child
169	border-right: 0	169	border-right: 0
		170	+input
		171	+ width: 100%
		172	+textarea
		173	+ border: 1px solid
		174	+ padding-bottom: $gutter * 0.25
		175	+ padding-left: $gutter * 0.5
		176	+ padding-right: $gutter * 0.5
		177	+ padding-top: $gutter * 0.25
		178	+ width: 100%
170		179
171		180
172	// ------------------------------------	181	// ------------------------------------
	@@ -302,6 +311,21 @@ td		@@ -302,6 +311,21 @@ td
302	background-color: #32dbb5	311	background-color: #32dbb5
303	border-bottom: 3px solid darken(#32dbb5, $darken) !important	312	border-bottom: 3px solid darken(#32dbb5, $darken) !important
304	+hover(#32dbb5, $darken)	313	+hover(#32dbb5, $darken)
		314	+ &-user-created
		315	+ height: 71px
		316	+ width: 71px
		317	+ background: url(images/icons/icon-user-created.png) no-repeat 50% 50%
		318	+ border-radius: 0
		319	+ &-login-success
		320	+ height: 71px
		321	+ width: 71px
		322	+ background: url(images/icons/icon-login-success.png) no-repeat 50% 50%
		323	+ border-radius: 0
		324	+ &-proposal-sent
		325	+ height: 71px
		326	+ width: 71px
		327	+ background: url(images/icons/icon-proposal-sent.png) no-repeat 50% 50%
		328	+ border-radius: 0
305		329
306		330
307	// ------------------------------------	331	// ------------------------------------
	@@ -488,7 +512,7 @@ h1		@@ -488,7 +512,7 @@ h1
488	border: 1px solid	512	border: 1px solid
489	margin-bottom: $gutter * 1.5	513	margin-bottom: $gutter * 1.5
490	margin-top: 0	514	margin-top: 0
491	- height: 500px	515	+ height: 570px
492	overflow: auto	516	overflow: auto
493	padding: $gutter	517	padding: $gutter
494	position: relative	518	position: relative
	@@ -645,8 +669,13 @@ h1		@@ -645,8 +669,13 @@ h1
645	padding: 2px 10px	669	padding: 2px 10px
646	.entrar	670	.entrar
647	background: url(images/icons/icon-user.png) no-repeat 20px 50%	671	background: url(images/icons/icon-user.png) no-repeat 20px 50%
648	- border-left: 1px solid #bcbcbc
649	- margin-left: 20px	672	+ // border-left: 1px solid #bcbcbc
		673	+ // margin-left: 20px
		674	+ padding-left: 40px
		675	+ .logout
		676	+ background: url(images/icons/icon-user.png) no-repeat 20px 50%
		677	+ // border-left: 1px solid #bcbcbc
		678	+ // margin-left: 20px
650	padding-left: 40px	679	padding-left: 40px
651	.login,.signup	680	.login,.signup
652	text-align: left	681	text-align: left
	@@ -694,6 +723,10 @@ h1		@@ -694,6 +723,10 @@ h1
694	.row	723	.row
695	input	724	input
696	margin-bottom: 0	725	margin-bottom: 0
		726	+.maxlength
		727	+ margin: ($gutter * 0.5) 0 ($gutter * 2)
		728	+ text-align: right
		729	+
697		730
698	// 6.12 - votacao	731	// 6.12 - votacao
699	.vote-actions	732	.vote-actions
	@@ -923,6 +956,7 @@ td		@@ -923,6 +956,7 @@ td
923	.success-panel	956	.success-panel
924	position: absolute	957	position: absolute
925	z-index: 100	958	z-index: 100
		959	+ text-align: center
926		960
927	// ------------------------------------	961	// ------------------------------------
928	// 7 - Modificadores	962	// 7 - Modificadores
	@@ -980,6 +1014,8 @@ h3.titulo-destaque		@@ -980,6 +1014,8 @@ h3.titulo-destaque
980	color: $color	1014	color: $color
981	a	1015	a
982	color: $color	1016	color: $color
		1017	+ textarea
		1018	+ border-color: $color
983	.button,.show_body a	1019	.button,.show_body a
984	background-color: $color	1020	background-color: $color
985	border-color: darken($color, $darken)	1021	border-color: darken($color, $darken)
	@@ -1022,6 +1058,7 @@ h3.titulo-destaque		@@ -1022,6 +1058,7 @@ h3.titulo-destaque
1022	+hover($color,$darken)	1058	+hover($color,$darken)
1023	i	1059	i
1024	color: $color	1060	color: $color
		1061	+
1025	.list	1062	.list
1026	&-unstyled li	1063	&-unstyled li
1027	color: $color	1064	color: $color