From e33357998be043f9aac79b760e40fbf73bf83c88 Mon Sep 17 00:00:00 2001 From: Caio SBA Date: Sat, 8 Aug 2015 18:53:44 -0300 Subject: [PATCH] Fixing layout issues --- ConfJuvApp/www/index.html | 4 ++-- ConfJuvApp/www/js/controllers.js | 11 ++++++----- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/ConfJuvApp/www/index.html b/ConfJuvApp/www/index.html index 7951c56..0b96545 100644 --- a/ConfJuvApp/www/index.html +++ b/ConfJuvApp/www/index.html @@ -29,10 +29,10 @@ - + - + diff --git a/ConfJuvApp/www/js/controllers.js b/ConfJuvApp/www/js/controllers.js index def6d05..932e379 100644 --- a/ConfJuvApp/www/js/controllers.js +++ b/ConfJuvApp/www/js/controllers.js @@ -31,7 +31,7 @@ angular.module('confjuvapp.controllers', []) $scope.modal.show(); } else { // Initiate the modal - $ionicModal.fromTemplateUrl('html/_login.html?2', { + $ionicModal.fromTemplateUrl('html/_login.html?3', { scope: $scope, animation: 'slide-in-up' }).then(function(modal) { @@ -481,7 +481,7 @@ angular.module('confjuvapp.controllers', []) } else { // Initiate the modal - $ionicModal.fromTemplateUrl('html/_proposal.html?5', { + $ionicModal.fromTemplateUrl('html/_proposal.html?6', { scope: $scope, animation: 'slide-in-up' }).then(function(modal) { @@ -513,7 +513,7 @@ angular.module('confjuvapp.controllers', []) else { // Initiate the modal $scope.loadStates(); - $ionicModal.fromTemplateUrl('html/_create_proposal.html?12', { + $ionicModal.fromTemplateUrl('html/_create_proposal.html?13', { scope: $scope, animation: 'slide-in-up' }).then(function(modal) { @@ -606,7 +606,7 @@ angular.module('confjuvapp.controllers', []) $scope.closeProposalModal(); var popup = $ionicPopup.alert({ title: 'Criar proposta', template: 'Erro ao criar proposta!' }); $scope.loading = false; - document.getElementById('save-proposal').innerHTML = 'Salvar'; + document.getElementById('save-proposal').innerHTML = 'Criar'; popup.then(function() { $scope.openCreateProposalForm(); }); @@ -626,7 +626,7 @@ angular.module('confjuvapp.controllers', []) } else { // Initiate the modal - $ionicModal.fromTemplateUrl('html/_create_comment.html?5', { + $ionicModal.fromTemplateUrl('html/_create_comment.html?6', { scope: $scope, animation: 'slide-in-up' }).then(function(modal) { @@ -689,6 +689,7 @@ angular.module('confjuvapp.controllers', []) $scope.proposal.comments = []; } $scope.proposal.comments.unshift({ body: params.body, author: { name: $scope.user.name }}); + $scope.commentStatus = ''; popup.then(function() { $scope.loading = false; }); -- libgit2 0.21.2