Download as
Browse Code »

Commit 01ad0fd18eb09f9310f6de5a118e823e97bbda80

Authored by Daniela Feitosa
1 parent ec368658
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

Fixed google_cse files names to match plugin routes 

Routes changed on commit bfce4eb13212734b675c4fd07f23ecca6946cb3e
Showing 6 changed files with 54 additions and 54 deletions   Show diff stats
plugins/google_cse/controllers/google_cse_plugin_controller.rb 0 → 100644
  Diff comments   View file @01ad0fd
... ... @@ -0,0 +1,4 @@
  1 +class GoogleCsePluginController < ApplicationController
  2 + append_view_path File.join(File.dirname(__FILE__) + '/../views')
  3 + no_design_blocks
  4 +end
... ...
plugins/google_cse/controllers/google_cse_plugin_environment_controller.rb
View file @ec36865
... ... @@ -1,4 +0,0 @@
1   -class GoogleCsePluginEnvironmentController < ApplicationController
2   - append_view_path File.join(File.dirname(__FILE__) + '/../views')
3   - no_design_blocks
4   -end
plugins/google_cse/test/functional/google_cse_plugin_controller_test.rb 0 → 100644
  Diff comments   View file @01ad0fd
... ... @@ -0,0 +1,20 @@
  1 +require File.dirname(__FILE__) + '/../../../../test/test_helper'
  2 +require File.dirname(__FILE__) + '/../../controllers/google_cse_plugin_controller'
  3 +
  4 +# Re-raise errors caught by the controller.
  5 +class GoogleCsePluginController; def rescue_action(e) raise e end; end
  6 +
  7 +class GoogleCsePluginControllerTest < ActionController::TestCase
  8 +
  9 + def setup
  10 + @controller = GoogleCsePluginController.new
  11 + @request = ActionController::TestRequest.new
  12 + @response = ActionController::TestResponse.new
  13 + end
  14 +
  15 + should 'get results page' do
  16 + get :results
  17 + assert_response :success
  18 + end
  19 +
  20 +end
... ...
plugins/google_cse/test/functional/google_cse_plugin_environment_controller_test.rb
View file @ec36865
... ... @@ -1,20 +0,0 @@
1   -require File.dirname(__FILE__) + '/../../../../test/test_helper'
2   -require File.dirname(__FILE__) + '/../../controllers/google_cse_plugin_environment_controller'
3   -
4   -# Re-raise errors caught by the controller.
5   -class GoogleCsePluginEnvironmentController; def rescue_action(e) raise e end; end
6   -
7   -class GoogleCsePluginEnvironmentControllerTest < ActionController::TestCase
8   -
9   - def setup
10   - @controller = GoogleCsePluginEnvironmentController.new
11   - @request = ActionController::TestRequest.new
12   - @response = ActionController::TestResponse.new
13   - end
14   -
15   - should 'get results page' do
16   - get :results
17   - assert_response :success
18   - end
19   -
20   -end
plugins/google_cse/views/google_cse_plugin/results.rhtml 0 → 100644
  Diff comments   View file @01ad0fd
... ... @@ -0,0 +1,30 @@
  1 +<% plugin = @plugins[:google_cse] %>
  2 +<div id="cse" style="width: 100%;"><%= _('Loading') %></div>
  3 +<script src="//www.google.com/jsapi" type="text/javascript"></script>
  4 +<script type="text/javascript">
  5 + function parseQueryFromUrl () {
  6 + var queryParamName = "q";
  7 + var search = window.location.search.substr(1);
  8 + var parts = search.split('&');
  9 + for (var i = 0; i < parts.length; i++) {
  10 + var keyvaluepair = parts[i].split('=');
  11 + if (decodeURIComponent(keyvaluepair[0]) == queryParamName) {
  12 + return decodeURIComponent(keyvaluepair[1].replace(/\+/g, ' '));
  13 + }
  14 + }
  15 + return '';
  16 + }
  17 + google.load('search', '1', {style : google.loader.themes.MINIMALIST});
  18 + google.setOnLoadCallback(function() {
  19 + var customSearchControl = new google.search.CustomSearchControl(
  20 + '<%= plugin && plugin.google_id %>');
  21 + customSearchControl.setResultSetSize(google.search.Search.FILTERED_CSE_RESULTSET);
  22 + var options = new google.search.DrawOptions();
  23 + options.enableSearchResultsOnly();
  24 + customSearchControl.draw('cse', options);
  25 + var queryFromUrl = parseQueryFromUrl();
  26 + if (queryFromUrl) {
  27 + customSearchControl.execute(queryFromUrl);
  28 + }
  29 + }, true);
  30 +</script>
... ...
plugins/google_cse/views/google_cse_plugin_environment/results.rhtml
View file @ec36865
... ... @@ -1,30 +0,0 @@
1   -<% plugin = @plugins[:google_cse] %>
2   -<div id="cse" style="width: 100%;"><%= _('Loading') %></div>
3   -<script src="//www.google.com/jsapi" type="text/javascript"></script>
4   -<script type="text/javascript">
5   - function parseQueryFromUrl () {
6   - var queryParamName = "q";
7   - var search = window.location.search.substr(1);
8   - var parts = search.split('&');
9   - for (var i = 0; i < parts.length; i++) {
10   - var keyvaluepair = parts[i].split('=');
11   - if (decodeURIComponent(keyvaluepair[0]) == queryParamName) {
12   - return decodeURIComponent(keyvaluepair[1].replace(/\+/g, ' '));
13   - }
14   - }
15   - return '';
16   - }
17   - google.load('search', '1', {style : google.loader.themes.MINIMALIST});
18   - google.setOnLoadCallback(function() {
19   - var customSearchControl = new google.search.CustomSearchControl(
20   - '<%= plugin && plugin.google_id %>');
21   - customSearchControl.setResultSetSize(google.search.Search.FILTERED_CSE_RESULTSET);
22   - var options = new google.search.DrawOptions();
23   - options.enableSearchResultsOnly();
24   - customSearchControl.draw('cse', options);
25   - var queryFromUrl = parseQueryFromUrl();
26   - if (queryFromUrl) {
27   - customSearchControl.execute(queryFromUrl);
28   - }
29   - }, true);
30   -</script>