diff --git a/ConfJuvApp/builds/confjuv-dev.apk b/ConfJuvApp/builds/confjuv-dev.apk index 526cf7e..26914ef 100644 Binary files a/ConfJuvApp/builds/confjuv-dev.apk and b/ConfJuvApp/builds/confjuv-dev.apk differ diff --git a/ConfJuvApp/builds/confjuvapp-live.apk b/ConfJuvApp/builds/confjuvapp-live.apk index 6a507da..dd26abf 100644 Binary files a/ConfJuvApp/builds/confjuvapp-live.apk and b/ConfJuvApp/builds/confjuvapp-live.apk differ diff --git a/ConfJuvApp/builds/confjuvapp-web.zip b/ConfJuvApp/builds/confjuvapp-web.zip index bd14c9f..f933849 100644 Binary files a/ConfJuvApp/builds/confjuvapp-web.zip and b/ConfJuvApp/builds/confjuvapp-web.zip differ diff --git a/ConfJuvApp/config.xml b/ConfJuvApp/config.xml index fda0101..47a7b39 100644 --- a/ConfJuvApp/config.xml +++ b/ConfJuvApp/config.xml @@ -1,5 +1,5 @@ - + #3ConfJuv Aplicativo móvel para 3ª Conferência Nacional de Juventude diff --git a/ConfJuvApp/get-badges.sh b/ConfJuvApp/get-badges.sh new file mode 100755 index 0000000..e6ac30d --- /dev/null +++ b/ConfJuvApp/get-badges.sh @@ -0,0 +1,14 @@ +#!/bin/bash +cd www/img +wget "https://img.shields.io/badge/tema-Direito à Cidade e Mobilidade-ff9800.svg" -O badge-101577.svg +wget "https://img.shields.io/badge/tema-Segurança e Paz-ff9800.svg" -O badge-101578.svg +wget "https://img.shields.io/badge/tema-Meio Ambiente-ff9800.svg" -O badge-101576.svg +wget "https://img.shields.io/badge/tema-Esporte e Lazer-ff9800.svg" -O badge-101575.svg +wget "https://img.shields.io/badge/tema-Direito à Comunicação-ff9800.svg" -O badge-101574.svg +wget "https://img.shields.io/badge/tema-Cultura-ff9800.svg" -O badge-101573.svg +wget "https://img.shields.io/badge/tema-Saúde-ff9800.svg" -O badge-101572.svg +wget "https://img.shields.io/badge/tema-Diversidade e Igualdade-ff9800.svg" -O badge-101571.svg +wget "https://img.shields.io/badge/tema-Trabalho-ff9800.svg" -O badge-101570.svg +wget "https://img.shields.io/badge/tema-Educação-ff9800.svg" -O badge-101569.svg +wget "https://img.shields.io/badge/tema-Cidadania-ff9800.svg" -O badge-99896.svg +cd .. diff --git a/ConfJuvApp/www/html/_proposal.html b/ConfJuvApp/www/html/_proposal.html index 9951a19..94d502b 100644 --- a/ConfJuvApp/www/html/_proposal.html +++ b/ConfJuvApp/www/html/_proposal.html @@ -24,7 +24,7 @@

- +

diff --git a/ConfJuvApp/www/html/_proposal_list.html b/ConfJuvApp/www/html/_proposal_list.html index 1dff921..aecfa14 100644 --- a/ConfJuvApp/www/html/_proposal_list.html +++ b/ConfJuvApp/www/html/_proposal_list.html @@ -21,7 +21,7 @@ {{proposal.body | htmlToPlainText | limitTo:280}}...
diff --git a/ConfJuvApp/www/img/badge-101569.svg b/ConfJuvApp/www/img/badge-101569.svg new file mode 100644 index 0000000..f9cb52c --- /dev/null +++ b/ConfJuvApp/www/img/badge-101569.svg @@ -0,0 +1 @@ +tematemaEducaçãoEducação \ No newline at end of file diff --git a/ConfJuvApp/www/img/badge-101570.svg b/ConfJuvApp/www/img/badge-101570.svg new file mode 100644 index 0000000..0c26744 --- /dev/null +++ b/ConfJuvApp/www/img/badge-101570.svg @@ -0,0 +1 @@ +tematemaTrabalhoTrabalho \ No newline at end of file diff --git a/ConfJuvApp/www/img/badge-101571.svg b/ConfJuvApp/www/img/badge-101571.svg new file mode 100644 index 0000000..054954d --- /dev/null +++ b/ConfJuvApp/www/img/badge-101571.svg @@ -0,0 +1 @@ +tematemaDiversidade e IgualdadeDiversidade e Igualdade \ No newline at end of file diff --git a/ConfJuvApp/www/img/badge-101572.svg b/ConfJuvApp/www/img/badge-101572.svg new file mode 100644 index 0000000..fdbe82a --- /dev/null +++ b/ConfJuvApp/www/img/badge-101572.svg @@ -0,0 +1 @@ +tematemaSaúdeSaúde \ No newline at end of file diff --git a/ConfJuvApp/www/img/badge-101573.svg b/ConfJuvApp/www/img/badge-101573.svg new file mode 100644 index 0000000..43c84eb --- /dev/null +++ b/ConfJuvApp/www/img/badge-101573.svg @@ -0,0 +1 @@ +tematemaCulturaCultura \ No newline at end of file diff --git a/ConfJuvApp/www/img/badge-101574.svg b/ConfJuvApp/www/img/badge-101574.svg new file mode 100644 index 0000000..594f08d --- /dev/null +++ b/ConfJuvApp/www/img/badge-101574.svg @@ -0,0 +1 @@ +tematemaDireito à ComunicaçãoDireito à Comunicação \ No newline at end of file diff --git a/ConfJuvApp/www/img/badge-101575.svg b/ConfJuvApp/www/img/badge-101575.svg new file mode 100644 index 0000000..705d3a8 --- /dev/null +++ b/ConfJuvApp/www/img/badge-101575.svg @@ -0,0 +1 @@ +tematemaEsporte e LazerEsporte e Lazer \ No newline at end of file diff --git a/ConfJuvApp/www/img/badge-101576.svg b/ConfJuvApp/www/img/badge-101576.svg new file mode 100644 index 0000000..080e64b --- /dev/null +++ b/ConfJuvApp/www/img/badge-101576.svg @@ -0,0 +1 @@ +tematemaMeio AmbienteMeio Ambiente \ No newline at end of file diff --git a/ConfJuvApp/www/img/badge-101577.svg b/ConfJuvApp/www/img/badge-101577.svg new file mode 100644 index 0000000..012a087 --- /dev/null +++ b/ConfJuvApp/www/img/badge-101577.svg @@ -0,0 +1 @@ +tematemaDireito à Cidade e MobilidadeDireito à Cidade e Mobilidade \ No newline at end of file diff --git a/ConfJuvApp/www/img/badge-101578.svg b/ConfJuvApp/www/img/badge-101578.svg new file mode 100644 index 0000000..30ec7c2 --- /dev/null +++ b/ConfJuvApp/www/img/badge-101578.svg @@ -0,0 +1 @@ +tematemaSegurança e PazSegurança e Paz \ No newline at end of file diff --git a/ConfJuvApp/www/img/badge-99896.svg b/ConfJuvApp/www/img/badge-99896.svg new file mode 100644 index 0000000..2a2c791 --- /dev/null +++ b/ConfJuvApp/www/img/badge-99896.svg @@ -0,0 +1 @@ +tematemaCidadaniaCidadania \ No newline at end of file diff --git a/ConfJuvApp/www/js/controllers.js b/ConfJuvApp/www/js/controllers.js index 4eb672f..ba7b6ee 100644 --- a/ConfJuvApp/www/js/controllers.js +++ b/ConfJuvApp/www/js/controllers.js @@ -410,7 +410,7 @@ angular.module('confjuvapp.controllers', []) } else { // Initiate the modal - $ionicModal.fromTemplateUrl('html/_proposal.html?3', { + $ionicModal.fromTemplateUrl('html/_proposal.html?4', { scope: $scope, animation: 'slide-in-up' }).then(function(modal) { -- libgit2 0.21.2