Download as
Browse Code »

Commit fc29298eaab31dbb2bb9d7b005273a318b8cf308

Authored by Daniela Feitosa
2 parents 7afc0fe4 666351d4
Exists in master and in 29 other branches add_member_task_reject_details, admin_visible_profile, article-list-template, community_notifications, contact_admin_translation, event_fixes, fix_comments_pagination, fix_rails4_organization_ratings, fix_sign_up_form, follow_step_fix, forum_topic_creation, mirror_block_improvements, multi_env_on_remote_user, new_security, noosfero_spb_ci, organization_ratings_improvements, organization_ratings_link_to_profile_stable-spb-1.3, organization_ratings_translations_fix, profile_api_improvements, ratings_minor_fixes, remote_user_fix, send_email_to_admins, stable-spb-1.3, stable-spb-1.3-fixes, stable-spb-1.4, stable-spb-1.5, suggest_rejected_value, web_steps_improvements, xss_terminate_custom_options

Merge commit 'refs/merge-requests/103' of git://gitorious.org/noosfero/noosfero … 

…into merge-requests/103
Showing 14 changed files with 13 additions and 13 deletions   Show diff stats
plugins/google_analytics/doc/google_analytics.textile
  Diff comments   View file @fc29298
@@ -4,25 +4,21 @@ Tracking and web analytics to people and communities. @@ -4,25 +4,21 @@ Tracking and web analytics to people and communities.
4 4
5 h2. Usage 5 h2. Usage
6 6
7 -* Create a "Google Analytics":http://www.google.com/analytics/ account  
8 -* Configure your Google Analytics account following these steps 7 +Create and configure Google Analytics account following these steps:
9 8
  9 +# Open "Google Analytics":http://www.google.com/analytics/
10 !=/plugins/google_analytics/images/doc/google-analytics-setup-step1.en.png(Google Setup - Step 1)! 10 !=/plugins/google_analytics/images/doc/google-analytics-setup-step1.en.png(Google Setup - Step 1)!
11 - 11 +# Signin to Google Analytics
12 !=/plugins/google_analytics/images/doc/google-analytics-setup-step2.en.png(Google Setup - Step 2)! 12 !=/plugins/google_analytics/images/doc/google-analytics-setup-step2.en.png(Google Setup - Step 2)!
13 - 13 +# Following signup instructions
14 !=/plugins/google_analytics/images/doc/google-analytics-setup-step3.en.png(Google Setup - Step 3)! 14 !=/plugins/google_analytics/images/doc/google-analytics-setup-step3.en.png(Google Setup - Step 3)!
15 - 15 +# 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
16 !=/plugins/google_analytics/images/doc/google-analytics-setup-step4.en.png(Google Setup - Step 4)! 16 !=/plugins/google_analytics/images/doc/google-analytics-setup-step4.en.png(Google Setup - Step 4)!
17 - 17 +# Accept default options, save and take note of your _Web Property ID_ (eg.: UA-23455430-3)
18 !=/plugins/google_analytics/images/doc/google-analytics-setup-step5.en.png(Google Setup - Step 5)! 18 !=/plugins/google_analytics/images/doc/google-analytics-setup-step5.en.png(Google Setup - Step 5)!
19 - 19 +# Login to Noosfero, go to your control panel, follow _Profile Info and Settings_ and fill in _Google Analytics Profile ID_ with ID above
20 !=/plugins/google_analytics/images/doc/google-analytics-setup-step6.en.png(Google Setup - Step 6)! 20 !=/plugins/google_analytics/images/doc/google-analytics-setup-step6.en.png(Google Setup - Step 6)!
21 21
22 -* Take note of your Google Analytics Profile ID  
23 -* Login to Noosfero and go to your control panel  
24 -* Follow Profile Info and Settings and fill in Google Analytics Profile ID  
25 -  
26 h2. Info 22 h2. Info
27 23
28 * "Google Analytics Support":http://support.google.com/analytics 24 * "Google Analytics Support":http://support.google.com/analytics
plugins/google_analytics/lib/google_analytics_plugin.rb
  Diff comments   View file @fc29298
@@ -4,6 +4,7 @@ class GoogleAnalyticsPlugin < Noosfero::Plugin @@ -4,6 +4,7 @@ class GoogleAnalyticsPlugin < Noosfero::Plugin
4 4
5 include ActionView::Helpers::JavaScriptHelper 5 include ActionView::Helpers::JavaScriptHelper
6 include ActionView::Helpers::FormHelper 6 include ActionView::Helpers::FormHelper
  7 + include ActionView::Helpers::UrlHelper
7 include ApplicationHelper 8 include ApplicationHelper
8 9
9 def self.plugin_name 10 def self.plugin_name
@@ -15,7 +16,7 @@ class GoogleAnalyticsPlugin < Noosfero::Plugin @@ -15,7 +16,7 @@ class GoogleAnalyticsPlugin < Noosfero::Plugin
15 end 16 end
16 17
17 def profile_id 18 def profile_id
18 - context.profile && context.profile.data[:google_analytics_profile_id] 19 + context.profile && context.profile.google_analytics_profile_id
19 end 20 end
20 21
21 def head_ending 22 def head_ending
@@ -25,7 +26,7 @@ class GoogleAnalyticsPlugin < Noosfero::Plugin @@ -25,7 +26,7 @@ class GoogleAnalyticsPlugin < Noosfero::Plugin
25 end 26 end
26 27
27 def profile_editor_extras 28 def profile_editor_extras
28 - labelled_form_field(_('Google Analytics Profile ID'), text_field(:profile_data, :google_analytics_profile_id, :value => context.profile.google_analytics_profile_id)) 29 + expanded_template('profile-editor-extras.rhtml',{:profile_id => profile_id})
29 end 30 end
30 31
31 end 32 end
plugins/google_analytics/public/images/doc/google-analytics-setup-step1.en.png
View file @fc29298

107 KB | W: | H:

106 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
plugins/google_analytics/public/images/doc/google-analytics-setup-step1.pt.png
View file @7afc0fe

116 KB
plugins/google_analytics/public/images/doc/google-analytics-setup-step2.en.png
View file @fc29298

65.5 KB | W: | H:

35.9 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
plugins/google_analytics/public/images/doc/google-analytics-setup-step2.pt.png
View file @7afc0fe

86.2 KB
plugins/google_analytics/public/images/doc/google-analytics-setup-step3.en.png
View file @fc29298

38.7 KB | W: | H:

51.2 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
plugins/google_analytics/public/images/doc/google-analytics-setup-step3.pt.png
View file @7afc0fe

56 KB
plugins/google_analytics/public/images/doc/google-analytics-setup-step4.en.png
View file @fc29298

116 KB | W: | H:

68.9 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
plugins/google_analytics/public/images/doc/google-analytics-setup-step4.pt.png
View file @7afc0fe

119 KB
plugins/google_analytics/public/images/doc/google-analytics-setup-step5.en.png
View file @fc29298

75.4 KB | W: | H:

63.4 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
plugins/google_analytics/public/images/doc/google-analytics-setup-step5.pt.png
View file @7afc0fe

83.2 KB
plugins/google_analytics/public/images/doc/google-analytics-setup-step6.en.png
View file @fc29298

74.6 KB | W: | H:

53.1 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
plugins/google_analytics/views/profile-editor-extras.rhtml 0 → 100644
  Diff comments   View file @fc29298
@@ -0,0 +1,3 @@ @@ -0,0 +1,3 @@
  1 +<h2><%= _('Statistics') %></h2>
  2 +<%= link_to _('See how configure statistics for your profile'), '/doc/plugins/google_analytics' %>
  3 +<%= labelled_form_field(_('Google Analytics Profile ID'), text_field(:profile_data, :google_analytics_profile_id, :value => profile_id)) %>