social_stream-base 0.9.18 → 0.9.19

data/app/assets/stylesheets/contacts.css.scss

@@ -58,12 +58,18 @@ span.ui-helper-hidden {
 }
 
 #contact-form label {
-  display: block;
-  font-family: sans-serif;
   padding: 2px;
+}
+
+#contact-form label[for=contact_message] {
+  display: block;
   margin-left: 20px;
 }
 
+#contact-form .new_contact_text_area {
+	width: 99%;
+}
+
 span.ui-radio-state-hover, span.ui-checkbox-state-hover {
   background-position: 0 -114px;
 }
@@ -92,4 +98,3 @@ span.ui-radio-state-checked-hover {
 .checked-option{
   background-color: $secondary-color;
 }
-

data/app/assets/stylesheets/frontpage.css.scss

@@ -39,7 +39,7 @@ span.find{  padding-right:5px;}
 #icon_collaborate{  background: transparent url(frontpage/collaborate.png);  width:56px;  height:57px;}
 .icon_text{  text-align:center;  width:100%;  font-weight:bold;}
 #join_form{  margin: 15px 0px; text-align:center;}
-#join_form input[type="submit"] {font-size: 17px; padding: 6px 20px;}
+#join_form input[type="submit"] {font-size: 14px; padding: 6px 10px;}
 .sentences{  width:80%;  display:inline-block;  vertical-align:top;  padding-top:10px;}
 .sentences ul,.sentences li{  list-style-type:none;  font-size:14px;  margin-left:10px;  padding-top:3px;}
 .sentences li.purple{  list-style-image:url("frontpage/purple_sq.png");}

data/app/assets/stylesheets/search.css.scss

@@ -118,7 +118,23 @@
   overflow: hidden;
   text-align: center;
 }
-.subject_search_results img {
+.subject_search_results.post {
+  width: 560px;
+  height: 100%;
+  overflow: hidden;
+  text-align: center;
+}
+.subject_search_results.post .activity_objects a,.subject_search_results .brief a{
+  text-decoration: none;
+  color: inherit;
+}
+.subject_search_results .post.content_size {
+  word-wrap: break-word;
+}
+.subject_search_results .logo {
+  display:inline-block;
+}
+.subject_search_results .logo img {
   width: 48px;
   height: 48px;
 }

data/app/controllers/contacts_controller.rb

@@ -23,11 +23,8 @@ class ContactsController < ApplicationController
 
   def update
     # FIXME: This should be in the model
-    if params[:contact][:relation_ids].present? &&
-       params[:contact][:relation_ids].delete("gotcha") &&
-       params[:contact][:relation_ids].blank?
-      params[:contact][:relation_ids] << @contact.sender.relation_public.id
-    end
+    params[:contact][:relation_ids].present? &&
+     params[:contact][:relation_ids].delete("0")
 
     if @contact.update_attributes(params[:contact])
       redirect_to @contact.receiver_subject

data/app/models/contact.rb

@@ -63,8 +63,8 @@ class Contact < ActiveRecord::Base
     end
   }
 
-
   validates_presence_of :sender_id, :receiver_id
+  validates_presence_of :relation_ids, :on => :update
   validates_uniqueness_of :sender_id, :scope => :receiver_id
   validates_uniqueness_of :receiver_id, :scope => :sender_id
 
@@ -181,7 +181,8 @@ class Contact < ActiveRecord::Base
   end
 
   def set_inverse
-    inverse = Contact.sent_by(receiver_id).received_by(sender_id).first
+    
+    inverse = self.class.sent_by(receiver_id).received_by(sender_id).first
 
     return if inverse.blank?
 

data/app/views/activities/_options.html.erb

@@ -9,7 +9,7 @@
     <% if user_signed_in? %>
       ·
       <%= link_to activity.audience_in_words(current_subject, :details => :summary),
-                  '#',
+                  'javascript:;',
                   :class => 'activity_audience_summary' %>
       <div class="activity_audience">
         <%= activity.audience_in_words(current_subject) %>

data/app/views/contacts/_form.html.erb

@@ -1,16 +1,23 @@
 <div id="contact-form">
   <%= form_for @contact do |f| %>
-    <%= hidden_field_tag "contact[relation_ids][]", "gotcha" %>
+    <%= hidden_field_tag "contact[relation_ids][]", "0" %>
+
+    <% if @contact.errors.any? %>
+      <div id="error_explanation">
+        <h2><%= t 'contact.error_count', :count => @contact.errors.count %></h2>
+
+        <ul>
+        <% @contact.errors.full_messages.each do |msg| %>
+          <li><%= msg %></li>
+        <% end %>
+        </ul>
+      </div>
+    <% end %>
 
     <ul>
     <% current_subject.relation_customs.each do |relation| %>
       <li>
-        <div contain="<%= dom_id relation %>">
-          <input id="<%= dom_id relation %>" name="contact[relation_ids][]" value="<%= relation.id %>" type="checkbox" <%= raw('checked="checked"') if @contact.relation_ids.include?(relation.id) %> />
-          <label for="<%= dom_id relation %>">
-            <%= relation.name %>
-          </label>
-        </div>
+      <%= check_box_tag "contact[relation_ids][]", relation.id, f.object.relation_ids.include?(relation.id), :id => "contact_relation_ids_#{ relation.id }" %><%= label_tag "contact_relation_ids_#{ relation.id }", relation.name %>
       </li>
     <% end %>
     </ul>

data/app/views/frontpage/_social_networks.html.erb

@@ -0,0 +1,3 @@
+<span>|</span>
+<%= link_to image_tag('btn/facebook.png'), user_omniauth_authorize_path(:facebook), :class => "menu_icon" %>
+<%= link_to image_tag('btn/linkedin.png'), user_omniauth_authorize_path(:linked_in), :class => "menu_icon" %>

data/app/views/groups/_new.html.erb

@@ -12,8 +12,8 @@
 <% end %>
 
 <%= location(
-    link_to(image_tag("btn/btn_group.png", :class => "menu_icon")+t('group.other'), groups_path),
-    link_to(image_tag("btn/btn_group.png", :class => "menu_icon")+t('group.new.action'), new_group_path)
+    link_to(t('group.other'), groups_path),
+    link_to(t('group.new.action'), new_group_path)
   ) %>
 
 <div class="space_center"></div>

data/app/views/groups/_show.html.erb

@@ -15,8 +15,7 @@
   <%= render :partial => 'sidebar_show' %>
 <% end %>
 
-<%= location(link_to(image_tag("btn/btn_group.png", :class => "btn_config")+t('group.one')+": "+
-                      content_tag(:span, ( truncate_name sanitize @group.name), :class=>"name_group")))%>
+<%= location(link_to(t('group.one')+": "+truncate_name(sanitize @group.name)))%>
                       
 <% toolbar :profile => @group %>
 

data/app/views/groups/index.html.erb

@@ -7,7 +7,7 @@
 <% content_for :sidebar do %>
 	<%= render :partial => "groups/sidebar_index" %>
 <% end %>
-<%= location(image_tag("btn/btn_browse.png", :class=>"btn_config") + t('browse') +": "+ 
+<%= location(t('browse') +": "+ 
              link_to(t('user.by'), users_path) + ", "+ 
              content_tag(:b,content_tag(:span, t('group.all'), :id=>'name_group')))%>
 

data/app/views/layouts/_header_signed_out.erb

@@ -24,9 +24,7 @@
         <%= link_to t('sign_up'), new_user_registration_path, :class => "register_link" %> 
         <span>|</span>
         <%= link_to t('forgot_password'), new_user_password_path, :class => "register_link" %> 
-        <span>|</span>
-        <%= link_to image_tag('btn/facebook.png'), user_omniauth_authorize_path(:facebook), :class => "menu_icon" %>
-        <%= link_to image_tag('btn/linkedin.png'), user_omniauth_authorize_path(:linked_in), :class => "menu_icon" %>
+        <%= render :partial => "frontpage/social_networks" %>
       </div>
       <% end -%>
     </div>

data/app/views/notifications/activities/_follow_subject.html.erb

@@ -1,2 +1,5 @@
-%{sender} added %{who} as contact.
-
+<% if activity.receiver.subject.is_a?(User) %>
+  <%= t('notification.added.user') %>
+<% else %>
+  <%= t('notification.added.other') %>
+<% end %>

data/app/views/notifications/activities/_like_subject.html.erb

@@ -1,5 +1,9 @@
 <% if activity.direct_object.is_a? Actor or activity.direct_object.respond_to? :actor %>
-%{sender} is now %{whose} fan.
+  <%= t('notification.fan')%>
 <% else %>
-%{sender} likes %{whose} %{object.name}%>
+  <% if activity.receiver.subject.is_a?(User) %>
+    <%= t('notification.like.user') %>
+  <% else %>
+    <%= t('notification.like.other') %>
+  <% end %>
 <% end %>

data/app/views/notifications/activities/_make-friend_subject.html.erb

@@ -1,2 +1,5 @@
-%{sender} also added %{who} as contact. 
-
+<% if activity.receiver.subject.is_a?(User) %>
+  <%= t('notification.makefriend.user') %>
+<% else %>
+  <%= t('notification.makefriend.other') %>
+<% end %>

data/app/views/notifications/activities/_post_subject.html.erb

@@ -1 +1,6 @@
-%{sender} added a %{object} in %{whose} wall 
+<% if activity.receiver.subject.is_a?(User) %>
+  <%= t('notification.post.user') %>
+<% else %>
+  <%= t('notification.post.other') %>
+<% end %>
+ 

data/app/views/notifications/activities/_update_body.html.erb

@@ -1 +1,5 @@
-%{sender} updated a %{object} in %{whose} wall. 
+<% if activity.receiver.subject.is_a?(User) %>
+  <%= t('notification.update.user') %>
+<% else %>
+  <%= t('notification.update.other') %>
+<% end %>

data/app/views/notifications/activities/_update_subject.html.erb

@@ -1 +1,5 @@
-%{sender.name} updated a %{object.name} in %{whose} wall
+<% if activity.receiver.subject.is_a?(User) %>
+  <%= t('notification.update.user') %>
+<% else %>
+  <%= t('notification.update.other') %>
+<% end %>

data/app/views/posts/_post_focus_search.html.erb

@@ -1,3 +1,37 @@
-<%= div_for post, :class => 'content_size' do %>
-  <%= simple_format post.text %>
-<% end %>
+<% activity = post.post_activity %>
+<%= div_for activity, :class => 'super_activity' do %>
+<div class="actor_logo">
+  <%= link_to image_tag(activity.sender_subject.logo.url(:actor),
+  :alt => activity.sender_subject.name),
+  activity.sender_subject %>
+</div>
+<div class="activity_content">
+  <div class="actor_name">
+    <%= activity.title(self) %>
+  </div>
+  <div class="activity_objects">
+    <%= link_to post do%>
+      <% text = excerpt(strip_tags(post.text),get_search_query_words.first,:radius => 180) %>
+      <% if text.length < 400 %>
+        <% text = excerpt(strip_tags(post.text),get_search_query_words.first,:radius => 540 - text.length) %>
+      <% end %>
+      <%= highlight(text,get_search_query_words) %>
+      <% end %>
+  </div>
+  <div class="activity_options">
+    <div class="post_time_ago">
+      <%= t('time.ago', :time => time_ago_in_words(activity.created_at)) %>
+    </div>
+    <% if user_signed_in? %>
+    ·
+    <%= link_to activity.audience_in_words(current_subject, :details => :summary),
+    'javascript:;',
+    :class => 'activity_audience_summary' %>
+    <div class="activity_audience">
+      <%= activity.audience_in_words(current_subject) %>
+    </div>
+    <% end %>
+  </div>
+</div>
+<% end %> 
+

data/app/views/posts/_post_global_search.html.erb

@@ -5,11 +5,13 @@
   </div>
   <div class="sub-block">
     <div class="brief">
+    <%= link_to post do%>
       <% text = excerpt(strip_tags(post.text),get_search_query_words.first,:radius => 25) %>
       <% if text.length < 60 %>
         <% text = excerpt(strip_tags(post.text),get_search_query_words.first,:radius => 30 + (60 - text.length)) %>
       <% end %>
       <%= highlight(text,get_search_query_words) %>
+      <% end %>
       <br>
     </div>
   </div>

data/app/views/profiles/_contact.html.erb

@@ -63,7 +63,7 @@
               </div>
             </div>
           <%end%>
-          <% if @profile.subject.email? %>  
+          <% if @profile.subject.email? && user_signed_in? %>  
             <div class="row">
               <div class="label">
                 <%=t('profile.email')%>:

data/app/views/search/index.js.erb

@@ -18,3 +18,5 @@
   <% end %> 
   
   $('#global_search_input').removeClass("searching");
+
+  setActivityPrivacyTooltips();

data/app/views/toolbar/_home.html.erb

@@ -7,5 +7,9 @@
     <%= yield(:toolbar_menu).empty? ? home_toolbar_menu : yield(:toolbar_menu)%>
 </div>
 
+<% if defined?(SocialStream::Presence) %>
+  <%= render :partial => 'xmpp/chat' %>
+<% end %>
+
 <div class="block space_center">
 </div>

data/config/locales/en.yml

@@ -17,6 +17,8 @@ en:
     privacy: "Privacy"
   activerecord:
     attributes:
+      contact:
+        relation_ids: "Contact type"
       user:
         email: "Email"
         name: "Name"
@@ -91,6 +93,9 @@ en:
     edit:
       title: "Edit contact to %{name}"
       submit: "Edit contact"
+    error_count:
+      one: "1 error prohibited this contact from being saved:"
+      other: "%{count} errors prohibited this contact from being saved:"
     graph:
       one: "Graph"
       empty: "We're sorry but you don't have any contacts yet. You can try the search box to look for somebody!"
@@ -242,14 +247,35 @@ en:
     sentbox: "Sentbox"
     trash: "Trash"
   notification:
+    added:
+      other: "%{sender} added %{who} as contact."
+      user: "%{sender} added %{who} as contact."
     confirm: "Confirm %{sender.name} as contact?"
     destroy_sure: "Do you want to delete this notification?"
+    fan: "%{sender} is now %{whose} fan."
+    like:
+      other: "%{sender} likes %{whose} %{object.name}." 
+      user: "%{sender} likes %{whose} %{object.name}."
     look: "Take a look at %{sender.name}'s wall"
+    makefriend:
+      other: "%{sender} also added %{who} as contact."
+      user: "%{sender} also added %{who} as contact."
     one: "Notification"
     other: "Notifications"
+    post:
+      other: "%{sender} added a %{object} in %{whose} wall."
+      user: "%{sender} added a %{object} in %{whose} wall."
     read: "Mark as read"
     read_all: "Mark all as read"
     unread: "Mark as unread"
+    update:
+      other: "%{sender} updated a %{object} in %{whose} wall."
+      user: "%{sender} updated a %{object} in %{whose} wall."
+    who:
+      user: "you"
+    whose: 
+      others: "%{receiver}'s"
+      user: "your"
   post:
     confirm_delete: "Delete post?"
     form:

data/config/locales/es.yml

@@ -17,6 +17,8 @@ es:
     privacy: "Privacidad"
   activerecord:
     attributes:
+      contact:
+        relation_ids: "El tipo de contacto"
       user:
         email: "Correo"
         name: "Nombre"
@@ -90,6 +92,9 @@ es:
     edit:
       title: "Editar contacto con %{name}"
       submit: "Editar contacto"
+    error_count:
+      one: "1 error impidió que se guardara este contacto:"
+      other: "%{count} errores impidieron que se guardara este contacto"
     graph:
       one: "Gráfico"
       empty: "Lo sentimos pero aún no tienes contactos, pero ¡puedes probar a buscar en la caja de búsqueda!"
@@ -239,14 +244,35 @@ es:
     sentbox: "Salida"
     trash: "Papelera"
   notification:
+    added: 
+      other: "%{sender} añadió a %{who} como contacto."
+      user: "%{sender} te añadió como contacto."
     confirm: "¿Confirmar contacto con %{sender.name}?"
     destroy_sure: "¿Borrar notificación?"
+    fan: "%{sender} es ahora fan %{whose}."
+    like:
+      other: "A %{sender} le gusta el %{object.name} %{whose}." 
+      user: "A %{sender} le gusta tu %{object.name}."
     look: "Écha un vistazo al muro de %{sender.name}"
+    makefriend:
+      other: "%{sender} también añadió a %{who} como contacto."
+      user: "%{sender} también te añadió como contacto."
     one: "Notificación"
     other: "Notificaciones"
+    post:
+      other: "%{sender} añadió %{object} en el muro %{whose}."
+      user: "%{sender} añadió %{object} en tu muro."
     read: "Marcar como leída"
     read_all: "Marcar todas como leídas"
     unread: "Marcar como no leídas"
+    update:
+      other: "%{sender} actualizó %{object} en el muro %{whose}."
+      user: "%{sender} actualizó %{object} en tu muro."
+    who:
+      user: "tú"
+    whose: 
+      user: "tuyo"
+      others: "de %{receiver}"
   post:
     confirm_delete: "¿Borrar texto?"
     form:

data/lib/mailboxer/notification_decoder.rb

@@ -13,10 +13,11 @@ module Mailboxer
       notification_text = notification_text.gsub(/\%\{sender.name\}/,truncate_name(activity.sender.name))
 
       if activity.receiver.subject.is_a?(User)
-        notification_text = notification_text.gsub(/\%\{whose\}/,"your")
-        notification_text = notification_text.gsub(/\%\{who\}/,"you")
+        notification_text = notification_text.gsub(/\%\{whose\}/,t('notification.whose.user'))
+        notification_text = notification_text.gsub(/\%\{who\}/,t('notification.who.user'))
       else
-        notification_text = notification_text.gsub(/\%\{whose\}/,truncate_name(activity.receiver.name)+"'s")
+        notification_text = notification_text.gsub(/\%\{whose\}/,t('notification.whose.others', 
+                                                    :receiver => truncate_name(activity.receiver.name)))
         notification_text = notification_text.gsub(/\%\{who\}/,truncate_name(activity.receiver.name))
       end
 
@@ -49,10 +50,11 @@ module Mailboxer
       notification_text = notification_text.gsub(/\%\{sender.name\}/,truncate_name(activity.sender.name))
 
       if activity.receiver.subject.is_a?(User)
-        notification_text = notification_text.gsub(/\%\{whose\}/,"your")
-        notification_text = notification_text.gsub(/\%\{who\}/,"you")
+        notification_text = notification_text.gsub(/\%\{whose\}/,t('notification.whose.user'))
+        notification_text = notification_text.gsub(/\%\{who\}/,t('notification.who.user'))
       else
-        notification_text = notification_text.gsub(/\%\{whose\}/,truncate_name(activity.receiver.name)+"'s")
+        notification_text = notification_text.gsub(/\%\{whose\}/,t('notification.whose.others', 
+                                                  :receiver => truncate_name(activity.receiver.name)))
         notification_text = notification_text.gsub(/\%\{who\}/,truncate_name(activity.receiver.name))
       end
 

data/lib/social_stream-base.rb

@@ -77,7 +77,7 @@ module SocialStream
   @@objects = [ :post, :comment ]
 
   mattr_accessor :activity_forms
-  @@activity_forms = [ :post, :group ]
+  @@activity_forms = [ :post ]
   
   mattr_accessor :quick_search_models
   @@quick_search_models = [ :user, :group, :post ]

data/lib/social_stream/base/version.rb

@@ -1,5 +1,5 @@
 module SocialStream
   module Base
-    VERSION = "0.9.18".freeze
+    VERSION = "0.9.19".freeze
   end
 end

data/lib/social_stream/migrations/components.rb

@@ -4,7 +4,7 @@ module SocialStream
   module Migrations
     class Components < Base
       def initialize
-        @component = find_migration("social_stream-#{ self.class.name.split('::').last.tableize }")
+        @component = find_migration("social_stream-#{ self.class.name.split('::').last.underscore }")
       end
 
       def up(options = {})

data/lib/social_stream/toolbar_config/base.rb

@@ -4,7 +4,7 @@ module SocialStream
       # Base toolbar items
       def home_toolbar_items
         Array.new.tap do |items|
-        #Contacts
+          #Contacts
           items << {
             :key => :contacts,
             :name => image_tag("btn/btn_friend.png")+t('contact.other'),
@@ -17,6 +17,17 @@ module SocialStream
               {:key => :invitations, :name => image_tag("btn/btn_invitation.png")+t('invitation.toolbar'), :url => new_invitation_path}
             ]
           }
+
+          # Groups
+          items << {
+            :key  => :groups,
+            :name => image_tag("btn/btn_group.png") + t('group.other'),
+            :url  => '#',
+            :options => { :link => { :id => "groups_menu" } },
+            :items => [
+              {:key => :new_group ,:name => image_tag("btn/btn_group.png")+t('group.new.action'),:url => new_group_path}
+            ]
+          }
         end
       end
 

data/social_stream-base.gemspec

@@ -26,7 +26,7 @@ Gem::Specification.new do |s|
   # Slug generation
   s.add_runtime_dependency('stringex', '~> 1.3.0')
   # Avatar attachments
-  s.add_runtime_dependency('avatars_for_rails', '~> 0.1.4')
+  s.add_runtime_dependency('avatars_for_rails', '~> 0.1.5')
   # jQuery
   s.add_runtime_dependency('jquery-rails', '~> 1.0.9')
   # Authorization

data/spec/controllers/contacts_controller_spec.rb

@@ -28,7 +28,7 @@ describe ContactsController do
     sign_in @user
 
     put :update, :id => @tie.contact_id,
-                 :contact => { "relation_ids" => [ "gotcha", @user.relations.last.id ] }
+                 :contact => { "relation_ids" => [ @user.relations.last.id ] }
 
     response.should redirect_to(@tie.receiver_subject)
     @user.reload.
@@ -46,7 +46,7 @@ describe ContactsController do
     
 
     put :update, :id => contact.id,
-                 :contact => { :relation_ids => [ "gotcha", @user.relations.last.id ],
+                 :contact => { :relation_ids => [ @user.relations.last.id ],
                                :message => "Testing" }
 
     response.should redirect_to(contact.receiver_subject)
@@ -67,7 +67,7 @@ describe ContactsController do
     
 
     put :update, :id => contact.id,
-                 :contact => { :relation_ids => [ "gotcha", relations.map(&:id) ].flatten,
+                 :contact => { :relation_ids => relations.map(&:id),
                                :message => "Testing" }
 
     response.should redirect_to(contact.receiver_subject)
@@ -96,7 +96,7 @@ describe ContactsController do
       sign_in @user
 
       put :update, :id => @contact,
-                   :contact => { "relation_ids" => [ "gotcha", @user.relations.last.id ] }
+                   :contact => { "relation_ids" => [ @user.relations.last.id ] }
 
       response.should redirect_to(home_path)
     end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: social_stream-base
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 29
   prerelease: 
   segments: 
   - 0
   - 9
-  - 18
-  version: 0.9.18
+  - 19
+  version: 0.9.19
 platform: ruby
 authors: 
 - GING - DIT - UPM
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-11 00:00:00 +02:00
+date: 2011-10-13 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -123,12 +123,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 19
+        hash: 17
         segments: 
         - 0
         - 1
-        - 4
-        version: 0.1.4
+        - 5
+        version: 0.1.5
   type: :runtime
   version_requirements: *id007
 - !ruby/object:Gem::Dependency 
@@ -798,6 +798,7 @@ files:
 - app/views/devise/sessions/new.html.erb
 - app/views/devise/shared/_links.erb
 - app/views/frontpage/_caracteristics.html.erb
+- app/views/frontpage/_social_networks.html.erb
 - app/views/frontpage/_sponsor.html.erb
 - app/views/frontpage/host_meta.xml.builder
 - app/views/frontpage/index.html.erb
@@ -807,8 +808,6 @@ files:
 - app/views/groups/_group_with_details.html.erb
 - app/views/groups/_index.html.erb
 - app/views/groups/_new.html.erb
-- app/views/groups/_new_activity.html.erb
-- app/views/groups/_new_activity_fields.html.erb
 - app/views/groups/_show.html.erb
 - app/views/groups/_sidebar_index.html.erb
 - app/views/groups/_sidebar_show.html.erb

data/app/views/groups/_new_activity.html.erb

@@ -1 +0,0 @@
-<%= render :partial => 'objects/new_activity', :locals => {:receiver => receiver, :object => Group.new, :remote => false} %>

data/app/views/groups/_new_activity_fields.html.erb

@@ -1,7 +0,0 @@
-<%= f.text_field :name %>
-
-<%= javascript_tag do %>
-  $(function() {
-    $('#group_name').Watermark("<%= t('group.input') %>", "#666");
-  });
-<% end %>