author - #60 - para imagenes y ayuda

alabs · Mar 28, 2012 · 673f5b8 · 673f5b8
1 parent 8d7d9e5
commit 673f5b8
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 3 deletions.
diff --git a/webapp/app/views/images/_create_step.html.erb b/webapp/app/views/images/_create_step.html.erb
@@ -21,6 +21,24 @@
       <%= f.file_field :img, required: true, class: 'upload' %>
         <p class="help-block"><%= I18n.t("help.image.archive") %></p>
     </div>
+
+    <% if user_signed_in? %>
+      <%= f.check_box :author_myself, :class => "author_myself" do %>
+        <%= I18n.t("help.content.author.myself") %>
+      <% end %>
+    <% end %>
+
+    <div class="form-field author-field">
+      <%= f.text_field :author_name, class: 'span8', :required => "true"  do %>
+        <p class="help-block"><%= I18n.t("help.content.author.name") %></p>
+      <% end %>
+    </div>
+
+    <div class="form-field author-field">
+      <%= f.text_field :author_link, class: 'span8', :type => "url" do %>
+        <p class="help-block"><%= I18n.t("help.content.author.url") %></p>
+      <% end %>
+    </div>
 
     <div class="form-field">
       <%= f.text_field :tag_list, class: 'span8', :required => 'true' do %>

diff --git a/webapp/app/views/partials/_form_for_content.html.erb b/webapp/app/views/partials/_form_for_content.html.erb
@@ -1,15 +1,19 @@
   <% if user_signed_in? %>
     <%= f.check_box :author_myself, :class => "author_myself" do %>
-      Soy el autor
+      <%= I18n.t("help.content.author.myself") %>
     <% end %>
   <% end %>
 
   <div class="form-field author-field">
-    <%= f.text_field :author_name, class: 'span8', :required => "true" %>
+    <%= f.text_field :author_name, class: 'span8', :required => "true"  do %>
+      <p class="help-block"><%= I18n.t("help.content.author.name") %></p>
+    <% end %>
   </div>
 
   <div class="form-field author-field">
-    <%= f.text_field :author_link, class: 'span8', :type => "url" %>
+    <%= f.text_field :author_link, class: 'span8', :type => "url" do %>
+      <p class="help-block"><%= I18n.t("help.content.author.url") %></p>
+    <% end %>
   </div>
 
   <div class="form-field">

diff --git a/webapp/config/environments/development.rb b/webapp/config/environments/development.rb
@@ -37,6 +37,7 @@
 
   # Configuración para ActionMailer
   config.action_mailer.smtp_settings = {
+    :port => 1025,
     :enable_starttls_auto => false
   }
 

diff --git a/webapp/config/locales/es.yml b/webapp/config/locales/es.yml
@@ -271,3 +271,7 @@ es:
         address: "Ayuda de la direccion"
         city: "Ayuda de la ciudad"
         country: "Ayuda de la país"
+      author:
+        myself: "Soy el autor"
+        name: "Autor (nombre)"
+        url: "Autor (URL)"