Download as
Browse Code »

Commit 845ae13ebf3ab5408970b1ffacdd9d5e84b7c588

Authored by Rodrigo Souto
1 parent a739edce
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

minor: removing empty lines and trailing whitespaces

Showing 3 changed files with 4 additions and 11 deletions   Show diff stats
app/controllers/public/content_viewer_controller.rb
  Diff comments   View file @845ae13
1   -require 'diffy'
  1 +require 'diffy'
2 2  
3 3 class ContentViewerController < ApplicationController
4 4  
... ... @@ -123,7 +123,6 @@ class ContentViewerController &lt; ApplicationController
123 123 path = params[:page].join('/')
124 124 @page = profile.articles.find_by_path(path)
125 125 @v1, @v2 = @page.versions.find_by_version(params[:v1]), @page.versions.find_by_version(params[:v2])
126   - p params
127 126 end
128 127  
129 128 def article_versions
... ... @@ -191,9 +190,4 @@ class ContentViewerController &lt; ApplicationController
191 190 user_agent.match(/crawler/) ||
192 191 user_agent.match(/\(.*https?:\/\/.*\)/)
193 192 end
194   -
195 193 end
196   -
197   -
198   -
199   -
... ...
app/views/content_viewer/article_versions.rhtml
  Diff comments   View file @845ae13
... ... @@ -27,7 +27,7 @@
27 27 var li = input.parentNode;
28 28 var checkedBrotherLi = jQuery('#article-versions input[name=' + sisterColumn + ']:checked').parent()[0];
29 29 updateColumn(selectedColumn, li);
30   - updateColumn(sisterColumn, checkedBrotherLi);
  30 + updateColumn(sisterColumn, checkedBrotherLi);
31 31 }
32 32  
33 33 function updateColumn(selectedColumn, startLi){
... ... @@ -52,8 +52,7 @@
52 52 penultVersion.checked = lastVersion.checked = true;
53 53 lastVersion.onclick();
54 54 }
55   -</script>
  55 +</script>
56 56 <%= submit_button(:clock, _('Show differences between selected versions')) %>
57 57 <% end %>
58 58 <%= pagination_links @versions, :param_name => 'npage' %>
59   -
... ...
public/designs/icons/tango/style.css
  Diff comments   View file @845ae13
1 1 /******************SMALL ICONS********************/
2 2 .icon-edit { background-image: url(Tango/16x16/apps/text-editor.png) }
3   -.icon-undo { background-image: url(Tango/16x16/actions/edit-undo.png) }
  3 +.icon-undo { background-image: url(Tango/16x16/actions/edit-undo.png) }
4 4 .icon-home { background-image: url(Tango/16x16/actions/go-home.png) }
5 5 .icon-home-not { background-image: url(mod/16x16/actions/go-home-not.png) }
6 6 .icon-new,
... ...