From e3ce8b11e075d6c549428fad43dc19c675506643 Mon Sep 17 00:00:00 2001
From: Caio SBA <caiosba@gmail.com>
Date: Sun, 5 Jul 2015 16:12:51 -0300
Subject: [PATCH] Tags improvements: edit tag, delete tag, disclaimer about commas separation, auto-refresh tags when new ones are added/removed and implementing tag badges

---
 .gitignore                                     | 1 +
 ConfJuvApp/scss/_login.scss                    | 4 ++++
 ConfJuvApp/www/html/_create_tag.html           | 3 ++-
 ConfJuvApp/www/html/_proposal.html             | 5 ++++-
 ConfJuvApp/www/html/_proposal_list.html        | 3 ++-
 ConfJuvApp/www/html/_signup_person_fields.html | 2 +-
 ConfJuvApp/www/js/controllers.js               | 7 ++-----
 7 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/.gitignore b/.gitignore
index e514b05..88fddf6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
 *.swo
 *.swp
 ConfJuvApp/www/js/config.js
+node_modules
diff --git a/ConfJuvApp/scss/_login.scss b/ConfJuvApp/scss/_login.scss
index b1cd62d..03ef55b 100644
--- a/ConfJuvApp/scss/_login.scss
+++ b/ConfJuvApp/scss/_login.scss
@@ -81,6 +81,10 @@
         &:focus {
           border-bottom: 2px solid $purple;
         }
+
+        &.ckbox {
+          border-bottom: 0;
+        }
       }
     }
   }
diff --git a/ConfJuvApp/www/html/_create_tag.html b/ConfJuvApp/www/html/_create_tag.html
index 319bee9..5fbfdeb 100644
--- a/ConfJuvApp/www/html/_create_tag.html
+++ b/ConfJuvApp/www/html/_create_tag.html
@@ -1,12 +1,13 @@
 <div class="modal" id="create-tag">
   <ion-content>
-    <form ng-submit="createTag(data)">
+    <form ng-submit="createTag(data)" ng-init="data.tag = proposal.tag_list.join(',')">
       <h1 class="title">
         <span>Adicionar Tag</span>
         <a class="back icon-left ion-reply" ng-click="closeTagModal()">Voltar</a>
       </h1>
 
       <label class="item item-input"><textarea placeholder="Lista de Tags" ng-model="data.tag"></textarea></label>
+      <p><small>Separe as tags por vírgulas, sem espaços entre elas. Exemplo: tag1,tag2,tag3</small></p>
 
       <p class="text-center">
         <button class="button" type="submit">Enviar</button>
diff --git a/ConfJuvApp/www/html/_proposal.html b/ConfJuvApp/www/html/_proposal.html
index 120b3fa..2e3eefe 100644
--- a/ConfJuvApp/www/html/_proposal.html
+++ b/ConfJuvApp/www/html/_proposal.html
@@ -13,7 +13,10 @@
     <button class="button comment" ng-click="openCommentForm()">
       <i class="icon ion-chatbox-working"></i> Comentar
     </button>
-    <img ng-src="https://img.shields.io/badge/tag-{{proposal.topic.title}} {{proposal.tag_list.join(' ').replace('-', '--')}}-ff9800.svg" alt="" />
+
+    <img ng-src="https://img.shields.io/badge/tema-{{proposal.topic.title}}-ff9800.svg" alt="" />
+    <img ng-repeat="tag in proposal.tag_list" ng-src="https://img.shields.io/badge/tag-{{tag}}-4db6ac.svg" alt="" />
+
     <p>{{proposal.body | htmlToPlainText}}</p>
 
     <h2>Comentários</h2>
diff --git a/ConfJuvApp/www/html/_proposal_list.html b/ConfJuvApp/www/html/_proposal_list.html
index 60b5619..fd8fbdf 100644
--- a/ConfJuvApp/www/html/_proposal_list.html
+++ b/ConfJuvApp/www/html/_proposal_list.html
@@ -11,7 +11,8 @@
           {{proposal.body | htmlToPlainText | limitTo:280}}...
         </div>
         <div class="card-footer">
-          <img ng-src="https://img.shields.io/badge/tag-{{proposal.topic.title}} {{proposal.tag_list.join(' ').replace('-', '--')}}-ff9800.svg" alt="" />
+          <img ng-src="https://img.shields.io/badge/tema-{{proposal.topic.title}}-ff9800.svg" alt="" />
+          <img ng-repeat="tag in proposal.tag_list" ng-src="https://img.shields.io/badge/tag-{{tag}}-4db6ac.svg" alt="" />
           <a ng-click="openProposal(proposal)" class="icon-left ion-android-open"> Acessar</a>
         </div>
         <br style="clear: both;" />
diff --git a/ConfJuvApp/www/html/_signup_person_fields.html b/ConfJuvApp/www/html/_signup_person_fields.html
index dfef142..fbfd94b 100644
--- a/ConfJuvApp/www/html/_signup_person_fields.html
+++ b/ConfJuvApp/www/html/_signup_person_fields.html
@@ -16,7 +16,7 @@
   <ul class="list" ng-if="'transgenero' == field">
     <li class="item item-checkbox">
        <label class="checkbox">
-         <input type="checkbox" ng-model="data.transgenero">
+         <input type="checkbox" ng-model="data.transgenero" class="ckbox">
        </label>
        Sou transgênero
     </li>
diff --git a/ConfJuvApp/www/js/controllers.js b/ConfJuvApp/www/js/controllers.js
index f7df911..eb8f834 100644
--- a/ConfJuvApp/www/js/controllers.js
+++ b/ConfJuvApp/www/js/controllers.js
@@ -694,7 +694,7 @@ angular.module('confjuvapp.controllers', [])
     $scope.createTag = function(data) {
       if (!data || !data.tag) {
         $scope.closeTagModal();
-        var popup = $ionicPopup.alert({ title: 'Tag', template: 'Sua list de tags não pode ficar em branco!' });
+        var popup = $ionicPopup.alert({ title: 'Tag', template: 'Sua lista de tags não pode ficar em branco!' });
         popup.then(function() {
           $scope.openTagForm();
         });
@@ -718,10 +718,7 @@ angular.module('confjuvapp.controllers', [])
         .then(function(resp) {
           $scope.closeTagModal();
           var popup = $ionicPopup.alert({ title: 'Tag', template: 'Tag adicionada com sucesso!' });
-          if (!$scope.proposal.tags) {
-            $scope.proposal.tags = [];
-          }
-//          $scope.proposal.tags.unshift({ body: params.body, author: { name: $scope.user.name }});
+          $scope.proposal.tag_list = data.tag.split(',');
           popup.then(function() {
             $scope.loading = false;
           });
--
libgit2 0.21.2