Download as
Browse Code »

Commit 0926753ee320184e4d70defc63efc1c10d9c82c4

Authored by Antonio Terceiro
1 parent 5f0d0a34
Exists in master and in 28 other branches 1.2+SPB2, 2_split_by_role, add_fields_in_api, api_fixies, api_pagination, api_private_token, api_tasks, article_hit_count, blog_page_bug, checkbox_to_user_can_edit_page, communities_ratings, communities_ratings_moderation, community_ratings_rebase, fix_cloned_article_parent, fix_gallery_image_url, fix_javascript_categories, fix_optional_fields, fix_suggest_article, fix_user_email_validation, highlight_block_fix, notification_plugin, notification_plugin_rebase, script_to_update, split_by_role, stable, temp_ratings, tests, tests_fixies

Visual enhancements in enterprise registration 

(ActionItem1482)
Showing 3 changed files with 19 additions and 13 deletions   Show diff stats
app/views/enterprise_registration/basic_information.rhtml
  Diff comments   View file @0926753
1 <%= error_messages_for 'create_enterprise' %> 1 <%= error_messages_for 'create_enterprise' %>
2 2
3 -<h2><%= _('Register enterprise') %></h2> 3 +<h1><%= _('Register enterprise') %></h1>
4 4
5 5
6 <% if @validation == :region && @regions.empty? %> 6 <% if @validation == :region && @regions.empty? %>
@@ -19,8 +19,8 @@ @@ -19,8 +19,8 @@
19 <%= required_fields_message %> 19 <%= required_fields_message %>
20 20
21 <% labelled_form_for(:create_enterprise, @create_enterprise) do |f| %> 21 <% labelled_form_for(:create_enterprise, @create_enterprise) do |f| %>
22 - <%= required f.text_field 'identifier'%>  
23 - <%= required f.text_field 'name'%> 22 + <%= required f.text_field 'name', :onchange => "updateUrlField(this, 'create_enterprise_identifier')", :size => 40 %>
  23 + <%= required labelled_form_field(_('Address'), content_tag('code', environment.top_url + "/" + text_field(:create_enterprise, 'identifier', :size => 25))) %>
24 <%= render :partial => 'shared/custom_fields', :locals => { :f => f, :object_name => :create_enterprise, :profile => @create_enterprise, :only_required => false } %> 24 <%= render :partial => 'shared/custom_fields', :locals => { :f => f, :object_name => :create_enterprise, :profile => @create_enterprise, :only_required => false } %>
25 <%= required labelled_form_field(_('Region'), f.select('region_id', @regions)) if @validation == :region %> 25 <%= required labelled_form_field(_('Region'), f.select('region_id', @regions)) if @validation == :region %>
26 26
app/views/enterprise_registration/confirmation.rhtml
  Diff comments   View file @0926753
1 -<h2><%= _('Enterprise Registration completed') %></h2> 1 +<h1><%= _('Enterprise Registration completed') %></h1>
2 2
3 <p> 3 <p>
4 -<%= _("Your enterprise registration request was successfully registered. The validator organization you choose (%s) should get in touch with to start the validation process. As soon as the validators approve (or reject) your request, you will be notified by e-mail.") % @create_enterprise.target.name %> 4 +<%= _("Your enterprise registration request was successfully registered. The validator organization you choose (%s) should get in touch with to start the validation process. As soon as the validators approve (or reject) your request, you will be notified by e-mail.") % link_to(@create_enterprise.target.name, @create_enterprise.target.url) %>
5 </p> 5 </p>
6 6
7 <p> 7 <p>
app/views/enterprise_registration/select_validator.rhtml
  Diff comments   View file @0926753
1 -<h2><%= _('Enterprise Registration: Select a validator organization') %></h2> 1 +<h1><%= _('Enterprise Registration: validator organization') %></h1>
2 2
3 <p> 3 <p>
4 <%= _('Select one organization to validate your enterprise registration request. Check the provided information about their validation methodoly and criteria.') %> 4 <%= _('Select one organization to validate your enterprise registration request. Check the provided information about their validation methodoly and criteria.') %>
@@ -7,14 +7,20 @@ @@ -7,14 +7,20 @@
7 <% form_tag do %> 7 <% form_tag do %>
8 <%= render :partial => 'hidden_fields' %> 8 <%= render :partial => 'hidden_fields' %>
9 9
10 - <% for validator in @validators %>  
11 - <div>  
12 - <%= labelled_radio_button validator.name, 'create_enterprise[target_id]', validator.id, true %>  
13 -  
14 - <%= labelled_form_field(_('Validation Methodology:'), validator.validation_methodology || _("(not informed)")) %>  
15 - <%= labelled_form_field(_('Restrictions (if any):'), validator.validation_restrictions || _("(not informed)")) %>  
16 - </div> 10 + <table>
  11 + <tr>
  12 + <th><%= _('Name') %></th>
  13 + <th><%= _('Validation Methodology:') %></th>
  14 + <th><%= _('Restrictions (if any):') %></th>
  15 + </tr>
  16 + <% @validators.each do |validator| %>
  17 + <tr>
  18 + <td><%= labelled_radio_button validator.name, 'create_enterprise[target_id]', validator.id %></td>
  19 + <td><%= validator.validation_methodology || _("(not informed)") %></td>
  20 + <td><%= validator.validation_restrictions || _("(not informed)") %></td>
  21 + </tr>
17 <% end %> 22 <% end %>
  23 + </table>
18 24
19 <% button_bar do %> 25 <% button_bar do %>
20 <%= submit_button 'save', _('Confirm') %> 26 <%= submit_button 'save', _('Confirm') %>