diff --git a/app/views/profile_editor/edit.rhtml b/app/views/profile_editor/edit.rhtml index 6a7b44f..0acb67f 100644 --- a/app/views/profile_editor/edit.rhtml +++ b/app/views/profile_editor/edit.rhtml @@ -73,8 +73,6 @@ <% end %> - <%= select_categories(:profile_data, _('Select the categories of your interest'), 2) %> -

<%= _('Translations') %>

<%= labelled_check_box( _('Automatic redirect the visitor to the translated article of him language'), @@ -87,11 +85,7 @@ end.join("\n") %> - <%= - @plugins.map(:profile_editor_extras).each do |content| - content.respond_to?(:call) ? content.call : content - end.join("\n") - %> + <%= select_categories(:profile_data, _('Select the categories of your interest'), 2) %> <% button_bar do %> <%= submit_button('save', _('Save'), :cancel => {:action => 'index'}) %> diff --git a/plugins/google_analytics/doc/google_analytics.textile b/plugins/google_analytics/doc/google_analytics.textile index 761d73d..7bd0ea1 100644 --- a/plugins/google_analytics/doc/google_analytics.textile +++ b/plugins/google_analytics/doc/google_analytics.textile @@ -1,6 +1,6 @@ h1. Google Analytics -Tracking and web analytics to people and communities. +Tracking and web analytics for people and communities. h2. Usage @@ -8,11 +8,11 @@ Create and configure Google Analytics account following these steps: # Open "Google Analytics":http://www.google.com/analytics/ !=/plugins/google_analytics/images/doc/google-analytics-setup-step1.en.png(Google Setup - Step 1)! -# Signin to Google Analytics +# Sign in to Google Analytics !=/plugins/google_analytics/images/doc/google-analytics-setup-step2.en.png(Google Setup - Step 2)! -# Following signup instructions +# Follow signup instructions !=/plugins/google_analytics/images/doc/google-analytics-setup-step3.en.png(Google Setup - Step 3)! -# Fill in _Website's URL_ with your profile address (eg.: softwarelivre.org/joenio), _Account Name_ with your name and read and accept terms of use +# Fill in _Website's URL_ with your profile address (eg.: softwarelivre.org/joenio), _Account Name_ with your name and read and accept terms of use !=/plugins/google_analytics/images/doc/google-analytics-setup-step4.en.png(Google Setup - Step 4)! # Accept default options, save and take note of your _Web Property ID_ (eg.: UA-23455430-3) !=/plugins/google_analytics/images/doc/google-analytics-setup-step5.en.png(Google Setup - Step 5)! diff --git a/plugins/google_analytics/lib/google_analytics_plugin.rb b/plugins/google_analytics/lib/google_analytics_plugin.rb index bfb4ea7..b20fcd2 100644 --- a/plugins/google_analytics/lib/google_analytics_plugin.rb +++ b/plugins/google_analytics/lib/google_analytics_plugin.rb @@ -4,7 +4,8 @@ class GoogleAnalyticsPlugin < Noosfero::Plugin include ActionView::Helpers::JavaScriptHelper include ActionView::Helpers::FormHelper - include ActionView::Helpers::UrlHelper + include ActionView::Helpers::UrlHelper + include ActionView::Helpers::TagHelper include ApplicationHelper def self.plugin_name diff --git a/plugins/google_analytics/public/images/doc/google-analytics-setup-step6.en.png b/plugins/google_analytics/public/images/doc/google-analytics-setup-step6.en.png index 8f44b46..09cab40 100644 Binary files a/plugins/google_analytics/public/images/doc/google-analytics-setup-step6.en.png and b/plugins/google_analytics/public/images/doc/google-analytics-setup-step6.en.png differ diff --git a/plugins/google_analytics/views/profile-editor-extras.rhtml b/plugins/google_analytics/views/profile-editor-extras.rhtml index a68cd1c..07173c4 100644 --- a/plugins/google_analytics/views/profile-editor-extras.rhtml +++ b/plugins/google_analytics/views/profile-editor-extras.rhtml @@ -1,3 +1,3 @@

<%= _('Statistics') %>

-<%= link_to _('See how configure statistics for your profile'), '/doc/plugins/google_analytics' %> <%= labelled_form_field(_('Google Analytics Profile ID'), text_field(:profile_data, :google_analytics_profile_id, :value => profile_id)) %> +<%= link_to(_('See how to configure statistics for your profile'), '/doc/plugins/google_analytics', :target => '_blank') %> -- libgit2 0.21.2