From c12f8abdb8076feeb85a073c64f8d50dd022dddc Mon Sep 17 00:00:00 2001
From: Victor Costa <vfcosta@gmail.com>
Date: Wed, 12 Aug 2015 18:48:37 -0300
Subject: [PATCH] Add title to badge

---
 db/migrate/20150330102818_create_badges.rb      | 1 +
 lib/gamification_plugin/badge.rb                | 2 +-
 views/gamification/dashboard.html.erb           | 4 ++--
 views/gamification_plugin_badges/_form.html.erb | 4 ++++
 views/gamification_plugin_badges/index.html.erb | 4 ++--
 views/gamification_plugin_badges/show.html.erb  | 5 +++++
 6 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/db/migrate/20150330102818_create_badges.rb b/db/migrate/20150330102818_create_badges.rb
index 7ed30ea..51cf0b0 100644
--- a/db/migrate/20150330102818_create_badges.rb
+++ b/db/migrate/20150330102818_create_badges.rb
@@ -3,6 +3,7 @@ class CreateBadges < ActiveRecord::Migration
     create_table :gamification_plugin_badges do |t|
       t.string :name
       t.integer :level
+      t.string :title
       t.string :description
       t.string :custom_fields
       t.references :owner, :polymorphic => true
diff --git a/lib/gamification_plugin/badge.rb b/lib/gamification_plugin/badge.rb
index 83f4e2c..503823a 100644
--- a/lib/gamification_plugin/badge.rb
+++ b/lib/gamification_plugin/badge.rb
@@ -4,7 +4,7 @@ class GamificationPlugin::Badge < Noosfero::Plugin::ActiveRecord
 
   has_many :badges_sash, :class_name => 'Merit::BadgesSash'
 
-  attr_accessible :owner, :name, :description, :level, :custom_fields
+  attr_accessible :owner, :name, :description, :level, :custom_fields, :title
 
   serialize :custom_fields
 
diff --git a/views/gamification/dashboard.html.erb b/views/gamification/dashboard.html.erb
index 5bf9d12..ed0c5b1 100644
--- a/views/gamification/dashboard.html.erb
+++ b/views/gamification/dashboard.html.erb
@@ -38,9 +38,9 @@
     <ul class="badge-list">
       <% environment.gamification_plugin_badges.each do |badge| %>
         <li class="badge <%= badge.name %> <%= @target.badges.include?(badge) ? 'earned' : 'not-earned' %>">
-          <div class="badge">
+          <div class="badge" title="<%= badge.description %>">
             <div class="image <%= badge.name %>"></div>
-            <div class="description"><%= badge.description %></div>
+            <div class="title"><%= badge.title %></div>
             <div class="level"><%= _('Level %s' % badge.level) %></div>
           </div>
         </li>
diff --git a/views/gamification_plugin_badges/_form.html.erb b/views/gamification_plugin_badges/_form.html.erb
index 8f6852b..ef7d411 100644
--- a/views/gamification_plugin_badges/_form.html.erb
+++ b/views/gamification_plugin_badges/_form.html.erb
@@ -16,6 +16,10 @@
     <%= f.select :name, Merit::BadgeRules::AVAILABLE_RULES.map{ |key, rule| key } %>
   </div>
   <div class="field">
+    <%= f.label :title %><br />
+    <%= f.text_field :title %>
+  </div>
+  <div class="field">
     <%= f.label :description %><br />
     <%= f.text_field :description %>
   </div>
diff --git a/views/gamification_plugin_badges/index.html.erb b/views/gamification_plugin_badges/index.html.erb
index 2cababf..6f1baea 100644
--- a/views/gamification_plugin_badges/index.html.erb
+++ b/views/gamification_plugin_badges/index.html.erb
@@ -3,7 +3,7 @@
 <table>
   <tr>
     <th>Name</th>
-    <th>Description</th>
+    <th>Title</th>
     <th>Level</th>
     <th>Threshold</th>
     <th></th>
@@ -14,7 +14,7 @@
 <% @gamification_plugin_badges.each do |gamification_plugin_badge| %>
   <tr>
     <td><%= gamification_plugin_badge.name %></td>
-    <td><%= gamification_plugin_badge.description %></td>
+    <td><%= gamification_plugin_badge.title %></td>
     <td><%= gamification_plugin_badge.level %></td>
     <td><%= gamification_plugin_badge.threshold %></td>
     <td><%= link_to 'Show', :action => :show, :id => gamification_plugin_badge.id %></td>
diff --git a/views/gamification_plugin_badges/show.html.erb b/views/gamification_plugin_badges/show.html.erb
index 70ec21d..62612c3 100644
--- a/views/gamification_plugin_badges/show.html.erb
+++ b/views/gamification_plugin_badges/show.html.erb
@@ -8,6 +8,11 @@
 </p>
 
 <p>
+  <b>Title:</b>
+  <%= @gamification_plugin_badge.title %>
+</p>
+
+<p>
   <b>Description:</b>
   <%= @gamification_plugin_badge.description %>
 </p>
--
libgit2 0.21.2