Merge remote-tracking branch 'origin/master'

Weblate
2 parents 6630bb1a 68569335
Showing 22 changed files with 58 additions and 44 deletions Show diff stats
app/helpers/application_helper.rb
app/helpers/block_helper.rb
app/helpers/categories_helper.rb
app/helpers/language_helper.rb
app/helpers/layout_helper.rb
app/views/account/login.html.erb
app/views/account/login_block.html.erb
app/views/blocks/login_block.html.erb
app/views/blocks/profile_info_actions/_community.html.erb
app/views/blocks/profile_info_actions/_enterprise.html.erb
app/views/blocks/profile_info_actions/_join_leave_community.html.erb
app/views/blocks/profile_info_actions/_person.html.erb
app/views/box_organizer/_highlights_block.html.erb
app/views/comment/_comment_actions.html.erb
app/views/favorite_enterprises/index.html.erb
app/views/search/_sellers_form.html.erb
app/views/shared/_change_image.html.erb
app/views/shared/_select_categories.html.erb
app/views/shared/_select_subcategories.html.erb
app/views/shared/_show_thumbnail.html.erb
@@ -592,7 +592,7 @@ module ApplicationHelper
     extra_info = extra_info.nil? ? '' : content_tag( 'span', extra_info, :class => 'extra_info' )
     links = links_for_balloon(profile)
     content_tag('div', content_tag(tag,
-                                   (environment.enabled?(:show_balloon_with_profile_links_when_clicked) ? link_to( content_tag( 'span', _('Profile links')), '#', :onclick => "toggleSubmenu(this, '#{profile.short_name}', #{CGI::escapeHTML(links.to_json)}); return false", :class => "menu-submenu-trigger #{trigger_class}", :url => url) : "") +
+                                   (environment.enabled?(:show_balloon_with_profile_links_when_clicked) ? popover_menu(_('Profile links'),profile.short_name,links,{:class => trigger_class, :url => url}) : "") +
     link_to(
       content_tag( 'span', profile_image( profile, size ), :class => 'profile-image' ) +
       content_tag( 'span', h(name), :class => ( profile.class == Person ? 'fn' : 'org' ) ) +
@@ -604,6 +604,14 @@ module ApplicationHelper
       :class => 'vcard'), :class => 'common-profile-list-block')
   end
+  def popover_menu(title,menu_title,links,html_options={})
+    html_options[:class] = "" unless html_options[:class]
+    html_options[:class] << " menu-submenu-trigger"
+    html_options[:onclick] = "toggleSubmenu(this, '#{menu_title}', #{CGI::escapeHTML(links.to_json)}); return false"
+
+    link_to(content_tag(:span, title), '#', html_options)
+  end
+
   def gravatar_default
     (respond_to?(:theme_option) && theme_option.present? && theme_option['gravatar']) || NOOSFERO_CONF['gravatar'] || 'mm'
   end
@@ -718,7 +726,7 @@ module ApplicationHelper
   class NoosferoFormBuilder < ActionView::Helpers::FormBuilder
     extend ActionView::Helpers::TagHelper
-    def self.output_field(text, field_html, field_id = nil)
+    def self.output_field(text, field_html, field_id = nil, options = {})
       # try to guess an id if none given
       if field_id.nil?
         field_html =~ /id=['"]([^'"]*)['"]/
@@ -1050,7 +1058,7 @@ module ApplicationHelper
     end
     link_to(content_tag(:span, _('Contents'), :class => 'icon-menu-articles'), {:controller => "search", :action => 'contents', :category_path => nil}, :id => 'submenu-contents') +
-    link_to(content_tag(:span, _('Contents menu')), '#', :onclick => "toggleSubmenu(this,'',#{CGI::escapeHTML(links.to_json)}); return false", :class => 'menu-submenu-trigger up', :id => 'submenu-contents-trigger')
+    popover_menu(_('Contents menu'),'',links,:class => 'up', :id => 'submenu-contents-trigger')
   end
   alias :browse_contents_menu :search_contents_menu
@@ -1066,7 +1074,7 @@ module ApplicationHelper
      end
     link_to(content_tag(:span, _('People'), :class => 'icon-menu-people'), {:controller => "search", :action => 'people', :category_path => ''}, :id => 'submenu-people') +
-    link_to(content_tag(:span, _('People menu')), '#', :onclick => "toggleSubmenu(this,'',#{CGI::escapeHTML(links.to_json)}); return false", :class => 'menu-submenu-trigger up', :id => 'submenu-people-trigger')
+    popover_menu(_('People menu'),'',links,:class => 'up', :id => 'submenu-people-trigger')
   end
   alias :browse_people_menu :search_people_menu
@@ -1082,7 +1090,7 @@ module ApplicationHelper
      end
     link_to(content_tag(:span, _('Communities'), :class => 'icon-menu-community'), {:controller => "search", :action => 'communities'}, :id => 'submenu-communities') +
-    link_to(content_tag(:span, _('Communities menu')), '#', :onclick => "toggleSubmenu(this,'',#{CGI::escapeHTML(links.to_json)}); return false", :class => 'menu-submenu-trigger up', :id => 'submenu-communities-trigger')
+    popover_menu(_('Communities menu'),'',links,:class => 'up', :id => 'submenu-communities-trigger')
   end
   alias :browse_communities_menu :search_communities_menu
@@ -19,7 +19,7 @@ module BlockHelper
         content_tag('span', _('Title')) +
         text_field_tag('block[images][][title]', image[:title], :class => 'highlight-title', :size => 45)
       }</label></td>
-      <td>#{link_to '', '#', :class=>'button icon-button icon-delete delete-highlight', :confirm=>_('Are you sure you want to remove this highlight')}</td>
+      <td>#{button_without_text(:delete, _('Remove'), '#', class: 'delete-highlight', :confirm=>_('Are you sure you want to remove this highlight'))}</td>
     </tr>
     "
   end
@@ -25,10 +25,13 @@ module CategoriesHelper
     )
   end
-  def update_categories_link(body, category_id=nil, html_options={})
+  #TODO: remove this function and, in views, use existing basic buttons
+  def update_categories_link(type, body, category_id=nil, html_options={})
+    html_class = 'select-subcategory-link'
+    html_class = " icon-#{type}  btn btn-primary btn-xs" if type.present?
     link_to body,
       { :action => "update_categories", :category_id => category_id, :id => @object },
-      {:id => category_id ? "select-category-#{category_id}-link" : nil, :remote => true, :class => 'select-subcategory-link'}.merge(html_options)
+      {:id => category_id ? "select-category-#{category_id}-link" : nil, :remote => true, :class => html_class}.merge(html_options)
   end
 end
 module LanguageHelper
   def language
-    locale
+    locale.to_s
   end
   def tinymce_language
@@ -20,7 +20,7 @@ module LanguageHelper
     separator = options[:separator] || ' &mdash; '
     if options[:element] == 'dropdown'
-      select_tag('lang', 
+      select_tag('lang',
         options_for_select(locales.map{|code,name| [name, code]}, current),
         :onchange => "document.location.href= #{url_for(params.merge(:lang => 'LANGUAGE'))}.replace(/LANGUAGE/, this.value) ;",
         :help => _('The language you choose here is the language used for options, buttons, etc. It does not affect the language of the content created by other users.')
@@ -31,12 +31,12 @@ module LayoutHelper
     plugins_javascripts = @plugins.map { |plugin| [plugin.js_files].flatten.map { |js| plugin.class.public_path(js) } }.flatten
     output = ''
-    output += render :file =>  'layouts/_javascript'
-    output += javascript_tag 'render_all_jquery_ui_widgets()'
+    output += render 'layouts/javascript'
     unless plugins_javascripts.empty?
       output += javascript_include_tag plugins_javascripts, :cache => "cache/plugins-#{Digest::MD5.hexdigest plugins_javascripts.to_s}"
     end
     output += theme_javascript_ng.to_s
+    output += javascript_tag 'render_all_jquery_ui_widgets()'
     output
   end
@@ -85,6 +85,7 @@ module LayoutHelper
     end
   end
+
   def icon_theme_stylesheet_path
     icon_themes = []
     theme_icon_themes = theme_option(:icon_theme) || []
@@ -7,7 +7,7 @@
 <%= @message %>
-<%= labelled_form_for :user, :url => login_url do |f| %>
+<%= labelled_form_for :user, :url => login_url, :horizontal => true do |f| %>
      <%= f.text_field :login, :id => 'main_user_login', :onchange => 'this.value = convToValidLogin( this.value )', :value => params[:userlogin] %>
@@ -20,9 +20,7 @@
       <% button_bar do %>
         <%= submit_button( 'login', _('Log in') )%>
         <% unless @plugins.dispatch(:allow_user_registration).include?(false) %>
-          <%= link_to content_tag( 'span', _('New user') ),
-              { :controller => 'account', :action => 'signup' },
-              :class => 'button with-text icon-add' %>
+          <%= button(:add, _('New user'), { :controller => 'account', :action => 'signup' }) %>
         <% end %>
       <% end %>
@@ -6,7 +6,7 @@
       <li><%= link_to _('Homepage'), user.public_profile_url %></li>
     </ul>
     <div class="user-actions">
-      <%= link_to content_tag('span', _('Logout')), { :controller => 'account', :action => 'logout' }, :class => 'button with-text icon-menu-logout' %>
+      <%= button(:'menu-logout',  _('Logout'), :controller => 'account', :action => 'logout') %>
     </div>
   </div>
 <% else %>
@@ -5,11 +5,11 @@
   <% if logged_in? %>
     <% if profile.enable_contact? %>
       <li>
-      <%= link_to content_tag('span', _('Send an e-mail')),
-        { :profile => profile.identifier,
-          :controller => 'contact',
-          :action => 'new' },
-        {:class => 'button with-text icon-menu-mail', :title => _('Send an e-mail to the administrators')} %>
+        <%= button(:'menu-mail', _('Send an e-mail'),
+                   { :profile => profile.identifier,
+                     :controller => 'contact',
+                     :action => 'new' },
+                   { :title => _('Send an e-mail to the administrators')}) %>
       </li>
     <% end %>
 <ul>
   <%if logged_in? %>
     <%if !user.favorite_enterprises.include?(profile) %>
-      <li><%= link_to content_tag('span', _('Add as favorite')), { :profile => user.identifier, :controller => 'favorite_enterprises', :action => 'add', :id => profile.id }, :class => 'button with-text icon-add', :title => _('Add enterprise as favorite') %></li>
+      <li><%= button(:add, _('Add as favorite'), { :profile => user.identifier, :controller => 'favorite_enterprises', :action => 'add', :id => profile.id }, :title => _('Add enterprise as favorite')) %></li>
     <% end %>
   <% end %>
   <% if profile.enable_contact? %>
-    <li> <%= link_to content_tag('span', _('Send an e-mail')), {:profile => profile.identifier, :controller => 'contact', :action => 'new'}, {:id => 'enterprise-contact-button', :class => 'button with-text icon-menu-mail'} %> </li>
+      <li><%= button(:'menu-mail', _('Send an e-mail'), {:profile => profile.identifier, :controller => 'contact', :action => 'new'}, {:id => 'enterprise-contact-button'} ) %></li>
   <% end %>
   <li><%= report_abuse(profile, :button) %></li>
@@ -22,8 +22,6 @@
       <% end %>
     <% end %>
   <% else %>
-    <%= link_to content_tag('span', _('Join')), profile.join_not_logged_url,
-      :class => 'button with-text icon-add',
-      :title => _('Join this community') %>
+      <%= button(:add, _('Join'), profile.join_not_logged_url, :title => _('Join this community')) %>
   <% end %>
 </div>
@@ -8,7 +8,7 @@
     <% end %>
     <% if user.is_a_friend?(profile) && profile.enable_contact? %>
-      <li> <%= link_to content_tag('span', _('Send an e-mail')), {:profile => profile.identifier, :controller => 'contact', :action => 'new'}, :class => 'button with-text icon-menu-mail' %> </li>
+      <li><%= button(:back, _('Send an e-mail'), {:profile => profile.identifier, :controller => 'contact', :action => 'new'}) %></li>
     <% end %>
     <li><%= report_abuse(profile, :button) %></li>
@@ -15,7 +15,7 @@
   </tbody>
 </table>
-<%= link_to(_('New highlight'), '#', :class => 'button icon-add with-text new-highlight-button')%>
+<%= button(:add, _('New highlight'), '#', class: 'new-highlight-button') %>
 <%= labelled_form_field _('Image transition:'), select('block', 'interval', [[_('No automatic transition'), 0]] + [1, 2, 3, 4, 5, 10, 20, 30, 60].map {|item| [n_('Every 1 second', 'Every %d seconds', item) % item, item]}) %>
@@ -2,7 +2,7 @@
   <% if !links_submenu.empty? %>
     <div class="comment-actions">
       <li class="vcard">
-        <%= link_to(content_tag(:span, _('Contents menu')), '#', :onclick => "toggleSubmenu(this,'',#{CGI::escapeHTML(links_submenu.to_json)}); return false", :class => 'menu-submenu-trigger comment-trigger', :url => url) %>
+        <%= popover_menu(_('Contents menu'),'',links_submenu,:class => 'comment-trigger', :url => url) %>
       </li>
     </div>
   <% end %>
@@ -9,10 +9,7 @@
                         enterprise.identifier, :class => 'profile-link' %>
     <%# profile_image_link enterprise, :portrait, 'div' %>
     <div class="controll">
-      <%= link_to content_tag('span',_('remove')),
-          { :action => 'remove', :id => enterprise.id },
-            :class => 'button icon-delete',
-            :title => _('remove') %>
+      <%= button(:delete, _('remove'), { :action => 'remove', :id => enterprise.id },:title => _('remove')) %>
     </div><!-- end class="controll" -->
   </li>
 <% end %>
@@ -18,7 +18,7 @@
   </div>
   <div class="button-bar">
-    <%= submit_tag _('Search'), :class => 'button with-text icon-search' %>
+    <%= submit_button :search, _('Search') %>
   </div>
 <% end %>
   <%= i.file_field( :uploaded_data, { :onchange => 'updateImg(this.value)' } ) %>
-  <%= link_to_function(_('Cancel'), "jQuery('#change-image-link').show(); jQuery('#change-image').html('')", :id => 'cancel-change-image-link', :class => 'button icon-cancel with-text', :style => 'display: none') %>
+  <%= button_to_function(:cancel,_('Cancel'),"jQuery('#change-image-link').show(); jQuery('#change-image').html('')", :id => 'cancel-change-image-link', :style => 'display: none')%>
@@ -4,12 +4,12 @@
   <%= hidden_field_tag "#{object_name}[#{object_name}_category_id]", @current_category.id unless multiple %>
   <%= hidden_field_tag "#{object_name}[category_ids][]", @current_category.id if multiple %>
-  <%= update_categories_link("", nil, :id => "cancel-category-button", :class => "button icon-back") %>
+  <%= update_categories_link(:back, "", nil, :id => "cancel-category-button") %>
   <%
     categories = [@current_category]
     categories.push(@current_category) while @current_category = @current_category.parent
   %>
-  <%= categories.compact.reverse.map{|i| update_categories_link(i.name, i.id)}.join %>
+  <%= categories.compact.reverse.map{|i| update_categories_link(nil,i.name, i.id)}.join %>
   <script>
     function add_category() {
@@ -3,6 +3,6 @@
   <div class="category-helper-label"><%= _('Click to select a category') %></div>
   <% categories.select{|i| @object.accept_category?(i)}.each do |category| %>
-    <%= update_categories_link(category.name, category.id) %>
+    <%= update_categories_link(nil,category.name, category.id) %>
   <% end %>
 <% end %>
@@ -2,7 +2,7 @@
   <br/>
-  <%= link_to_function(_('Change image'), 'display_change_image()', :id => 'change-image-link', :class => 'button icon-photos with-text') %>
+  <%= button_to_function(:photos, _('Change image'), 'display_change_image()', :id => 'change-image-link' ) %>
   <script>
     function display_change_image() {
@@ -23,7 +23,7 @@
 <% if @tasks.empty? %>
   <p>
-    <%= labelled_select(_('Filter')+': ', :filter_type, :first, :last, @filter,  type_collection, :onchange => 'document.location.href = "?filter_type="+this.value')%>
+    <%= labelled_select(_('Filter')+': ', :filter_type, :first, :last, @filter,  type_collection, :onchange => "document.location.href = '?filter_type='+this.value")%>
   </p>
   <em><%= _('No pending tasks for %s') % profile.name %></em>
 <% else %>
@@ -140,9 +140,18 @@ class ActiveSupport::TestCase
   end
   # For models that render views (blocks, articles, ...)
-  def render(*args)
-    view_paths = @explicit_view_paths || ActionController::Base.view_paths
-    ActionView::Base.new(view_paths, {}).render(*args)
+  def self.action_view
+    @action_view ||= begin
+      view_paths = ActionController::Base.view_paths
+      action_view = ActionView::Base.new view_paths, {}
+      # for using Noosfero helpers inside render calls
+      action_view.extend ApplicationHelper
+      action_view
+    end
+  end
+
+  def render *args
+    self.class.action_view.render(*args)
   end
   private
	@@ -19,7 +19,7 @@ module BlockHelper		@@ -19,7 +19,7 @@ module BlockHelper
19	content_tag('span', _('Title')) +	19	content_tag('span', _('Title')) +
20	text_field_tag('block[images][][title]', image[:title], :class => 'highlight-title', :size => 45)	20	text_field_tag('block[images][][title]', image[:title], :class => 'highlight-title', :size => 45)
21	}</label></td>	21	}</label></td>
22	- <td>#{link_to '', '#', :class=>'button icon-button icon-delete delete-highlight', :confirm=>_('Are you sure you want to remove this highlight')}</td>	22	+ <td>#{button_without_text(:delete, _('Remove'), '#', class: 'delete-highlight', :confirm=>_('Are you sure you want to remove this highlight'))}</td>
23	</tr>	23	</tr>
24	"	24	"
25	end	25	end
1	module LanguageHelper	1	module LanguageHelper
2	def language	2	def language
3	- locale	3	+ locale.to_s
4	end	4	end
5		5
6	def tinymce_language	6	def tinymce_language
	@@ -20,7 +20,7 @@ module LanguageHelper		@@ -20,7 +20,7 @@ module LanguageHelper
20	separator = options[:separator] \|\| ' — '	20	separator = options[:separator] \|\| ' — '
21		21
22	if options[:element] == 'dropdown'	22	if options[:element] == 'dropdown'
23	- select_tag('lang',	23	+ select_tag('lang',
24	options_for_select(locales.map{\|code,name\| [name, code]}, current),	24	options_for_select(locales.map{\|code,name\| [name, code]}, current),
25	:onchange => "document.location.href= #{url_for(params.merge(:lang => 'LANGUAGE'))}.replace(/LANGUAGE/, this.value) ;",	25	:onchange => "document.location.href= #{url_for(params.merge(:lang => 'LANGUAGE'))}.replace(/LANGUAGE/, this.value) ;",
26	:help => _('The language you choose here is the language used for options, buttons, etc. It does not affect the language of the content created by other users.')	26	:help => _('The language you choose here is the language used for options, buttons, etc. It does not affect the language of the content created by other users.')
	@@ -7,7 +7,7 @@		@@ -7,7 +7,7 @@
7		7
8	<%= @message %>	8	<%= @message %>
9		9
10	-<%= labelled_form_for :user, :url => login_url do \|f\| %>	10	+<%= labelled_form_for :user, :url => login_url, :horizontal => true do \|f\| %>
11		11
12	<%= f.text_field :login, :id => 'main_user_login', :onchange => 'this.value = convToValidLogin( this.value )', :value => params[:userlogin] %>	12	<%= f.text_field :login, :id => 'main_user_login', :onchange => 'this.value = convToValidLogin( this.value )', :value => params[:userlogin] %>
13		13
	@@ -6,7 +6,7 @@		@@ -6,7 +6,7 @@
6	<li><%= link_to _('Homepage'), user.public_profile_url %></li>	6	<li><%= link_to _('Homepage'), user.public_profile_url %></li>
7	</ul>	7	</ul>
8	<div class="user-actions">	8	<div class="user-actions">
9	- <%= link_to content_tag('span', _('Logout')), { :controller => 'account', :action => 'logout' }, :class => 'button with-text icon-menu-logout' %>	9	+ <%= button(:'menu-logout', _('Logout'), :controller => 'account', :action => 'logout') %>
10	</div>	10	</div>
11	</div>	11	</div>
12	<% else %>	12	<% else %>
1	<ul>	1	<ul>
2	<%if logged_in? %>	2	<%if logged_in? %>
3	<%if !user.favorite_enterprises.include?(profile) %>	3	<%if !user.favorite_enterprises.include?(profile) %>
4	- <li><%= link_to content_tag('span', _('Add as favorite')), { :profile => user.identifier, :controller => 'favorite_enterprises', :action => 'add', :id => profile.id }, :class => 'button with-text icon-add', :title => _('Add enterprise as favorite') %></li>	4	+ <li><%= button(:add, _('Add as favorite'), { :profile => user.identifier, :controller => 'favorite_enterprises', :action => 'add', :id => profile.id }, :title => _('Add enterprise as favorite')) %></li>
5	<% end %>	5	<% end %>
6	<% end %>	6	<% end %>
7	<% if profile.enable_contact? %>	7	<% if profile.enable_contact? %>
8	- <li> <%= link_to content_tag('span', _('Send an e-mail')), {:profile => profile.identifier, :controller => 'contact', :action => 'new'}, {:id => 'enterprise-contact-button', :class => 'button with-text icon-menu-mail'} %> </li>	8	+ <li><%= button(:'menu-mail', _('Send an e-mail'), {:profile => profile.identifier, :controller => 'contact', :action => 'new'}, {:id => 'enterprise-contact-button'} ) %></li>
9	<% end %>	9	<% end %>
10		10
11	<li><%= report_abuse(profile, :button) %></li>	11	<li><%= report_abuse(profile, :button) %></li>
	@@ -8,7 +8,7 @@		@@ -8,7 +8,7 @@
8	<% end %>	8	<% end %>
9		9
10	<% if user.is_a_friend?(profile) && profile.enable_contact? %>	10	<% if user.is_a_friend?(profile) && profile.enable_contact? %>
11	- <li> <%= link_to content_tag('span', _('Send an e-mail')), {:profile => profile.identifier, :controller => 'contact', :action => 'new'}, :class => 'button with-text icon-menu-mail' %> </li>	11	+ <li><%= button(:back, _('Send an e-mail'), {:profile => profile.identifier, :controller => 'contact', :action => 'new'}) %></li>
12	<% end %>	12	<% end %>
13		13
14	<li><%= report_abuse(profile, :button) %></li>	14	<li><%= report_abuse(profile, :button) %></li>
	@@ -15,7 +15,7 @@		@@ -15,7 +15,7 @@
15	</tbody>	15	</tbody>
16	</table>	16	</table>
17		17
18	-<%= link_to(_('New highlight'), '#', :class => 'button icon-add with-text new-highlight-button')%>	18	+<%= button(:add, _('New highlight'), '#', class: 'new-highlight-button') %>
19		19
20	<%= labelled_form_field _('Image transition:'), select('block', 'interval', [[_('No automatic transition'), 0]] + [1, 2, 3, 4, 5, 10, 20, 30, 60].map {\|item\| [n_('Every 1 second', 'Every %d seconds', item) % item, item]}) %>	20	<%= labelled_form_field _('Image transition:'), select('block', 'interval', [[_('No automatic transition'), 0]] + [1, 2, 3, 4, 5, 10, 20, 30, 60].map {\|item\| [n_('Every 1 second', 'Every %d seconds', item) % item, item]}) %>
21		21
	@@ -2,7 +2,7 @@		@@ -2,7 +2,7 @@
2	<% if !links_submenu.empty? %>	2	<% if !links_submenu.empty? %>
3	<div class="comment-actions">	3	<div class="comment-actions">
4	<li class="vcard">	4	<li class="vcard">
5	- <%= link_to(content_tag(:span, _('Contents menu')), '#', :onclick => "toggleSubmenu(this,'',#{CGI::escapeHTML(links_submenu.to_json)}); return false", :class => 'menu-submenu-trigger comment-trigger', :url => url) %>	5	+ <%= popover_menu(_('Contents menu'),'',links_submenu,:class => 'comment-trigger', :url => url) %>
6	</li>	6	</li>
7	</div>	7	</div>
8	<% end %>	8	<% end %>
	@@ -18,7 +18,7 @@		@@ -18,7 +18,7 @@
18	</div>	18	</div>
19		19
20	<div class="button-bar">	20	<div class="button-bar">
21	- <%= submit_tag _('Search'), :class => 'button with-text icon-search' %>	21	+ <%= submit_button :search, _('Search') %>
22	</div>	22	</div>
23		23
24	<% end %>	24	<% end %>
1	<%= i.file_field( :uploaded_data, { :onchange => 'updateImg(this.value)' } ) %>	1	<%= i.file_field( :uploaded_data, { :onchange => 'updateImg(this.value)' } ) %>
2	- <%= link_to_function(_('Cancel'), "jQuery('#change-image-link').show(); jQuery('#change-image').html('')", :id => 'cancel-change-image-link', :class => 'button icon-cancel with-text', :style => 'display: none') %>	2	+ <%= button_to_function(:cancel,_('Cancel'),"jQuery('#change-image-link').show(); jQuery('#change-image').html('')", :id => 'cancel-change-image-link', :style => 'display: none')%>