Download as
Browse Code »

Commit e33357998be043f9aac79b760e40fbf73bf83c88

Authored by Caio Almeida
1 parent 0fd7f17a
Exists in master and in 2 other branches production, staging

Fixing layout issues

Showing 2 changed files with 8 additions and 7 deletions   Show diff stats
ConfJuvApp/www/index.html
  Diff comments   View file @e333579
@@ -29,10 +29,10 @@ @@ -29,10 +29,10 @@
29 <body ng-app="confjuvapp" ng-controller="ProposalCtrl" ng-init="openModal()" ng-class="{ 'logged-in': loggedIn, 'large': largeScreen }"> 29 <body ng-app="confjuvapp" ng-controller="ProposalCtrl" ng-init="openModal()" ng-class="{ 'logged-in': loggedIn, 'large': largeScreen }">
30 <ion-side-menus id="body"> 30 <ion-side-menus id="body">
31 <ion-side-menu-content> 31 <ion-side-menu-content>
32 - <ng-include src="'html/_header.html'"></ng-include> 32 + <ng-include src="'html/_header.html?1'"></ng-include>
33 <ion-pane> 33 <ion-pane>
34 <ion-content id="proposals-container" no-scroll=""> 34 <ion-content id="proposals-container" no-scroll="">
35 - <ng-include src="'html/_proposal_list.html?2'"></ng-include> 35 + <ng-include src="'html/_proposal_list.html?3'"></ng-include>
36 </ion-content> 36 </ion-content>
37 </ion-pane> 37 </ion-pane>
38 </ion-side-menu-content> 38 </ion-side-menu-content>
ConfJuvApp/www/js/controllers.js
  Diff comments   View file @e333579
@@ -31,7 +31,7 @@ angular.module(&#39;confjuvapp.controllers&#39;, []) @@ -31,7 +31,7 @@ angular.module(&#39;confjuvapp.controllers&#39;, [])
31 $scope.modal.show(); 31 $scope.modal.show();
32 } else { 32 } else {
33 // Initiate the modal 33 // Initiate the modal
34 - $ionicModal.fromTemplateUrl('html/_login.html?2', { 34 + $ionicModal.fromTemplateUrl('html/_login.html?3', {
35 scope: $scope, 35 scope: $scope,
36 animation: 'slide-in-up' 36 animation: 'slide-in-up'
37 }).then(function(modal) { 37 }).then(function(modal) {
@@ -481,7 +481,7 @@ angular.module(&#39;confjuvapp.controllers&#39;, []) @@ -481,7 +481,7 @@ angular.module(&#39;confjuvapp.controllers&#39;, [])
481 } 481 }
482 else { 482 else {
483 // Initiate the modal 483 // Initiate the modal
484 - $ionicModal.fromTemplateUrl('html/_proposal.html?5', { 484 + $ionicModal.fromTemplateUrl('html/_proposal.html?6', {
485 scope: $scope, 485 scope: $scope,
486 animation: 'slide-in-up' 486 animation: 'slide-in-up'
487 }).then(function(modal) { 487 }).then(function(modal) {
@@ -513,7 +513,7 @@ angular.module(&#39;confjuvapp.controllers&#39;, []) @@ -513,7 +513,7 @@ angular.module(&#39;confjuvapp.controllers&#39;, [])
513 else { 513 else {
514 // Initiate the modal 514 // Initiate the modal
515 $scope.loadStates(); 515 $scope.loadStates();
516 - $ionicModal.fromTemplateUrl('html/_create_proposal.html?12', { 516 + $ionicModal.fromTemplateUrl('html/_create_proposal.html?13', {
517 scope: $scope, 517 scope: $scope,
518 animation: 'slide-in-up' 518 animation: 'slide-in-up'
519 }).then(function(modal) { 519 }).then(function(modal) {
@@ -606,7 +606,7 @@ angular.module(&#39;confjuvapp.controllers&#39;, []) @@ -606,7 +606,7 @@ angular.module(&#39;confjuvapp.controllers&#39;, [])
606 $scope.closeProposalModal(); 606 $scope.closeProposalModal();
607 var popup = $ionicPopup.alert({ title: 'Criar proposta', template: 'Erro ao criar proposta!' }); 607 var popup = $ionicPopup.alert({ title: 'Criar proposta', template: 'Erro ao criar proposta!' });
608 $scope.loading = false; 608 $scope.loading = false;
609 - document.getElementById('save-proposal').innerHTML = 'Salvar'; 609 + document.getElementById('save-proposal').innerHTML = 'Criar';
610 popup.then(function() { 610 popup.then(function() {
611 $scope.openCreateProposalForm(); 611 $scope.openCreateProposalForm();
612 }); 612 });
@@ -626,7 +626,7 @@ angular.module(&#39;confjuvapp.controllers&#39;, []) @@ -626,7 +626,7 @@ angular.module(&#39;confjuvapp.controllers&#39;, [])
626 } 626 }
627 else { 627 else {
628 // Initiate the modal 628 // Initiate the modal
629 - $ionicModal.fromTemplateUrl('html/_create_comment.html?5', { 629 + $ionicModal.fromTemplateUrl('html/_create_comment.html?6', {
630 scope: $scope, 630 scope: $scope,
631 animation: 'slide-in-up' 631 animation: 'slide-in-up'
632 }).then(function(modal) { 632 }).then(function(modal) {
@@ -689,6 +689,7 @@ angular.module(&#39;confjuvapp.controllers&#39;, []) @@ -689,6 +689,7 @@ angular.module(&#39;confjuvapp.controllers&#39;, [])
689 $scope.proposal.comments = []; 689 $scope.proposal.comments = [];
690 } 690 }
691 $scope.proposal.comments.unshift({ body: params.body, author: { name: $scope.user.name }}); 691 $scope.proposal.comments.unshift({ body: params.body, author: { name: $scope.user.name }});
  692 + $scope.commentStatus = '';
692 popup.then(function() { 693 popup.then(function() {
693 $scope.loading = false; 694 $scope.loading = false;
694 }); 695 });