You are here: Home > Latest news from Darcs > Switches between source and rendered views

Revision 20080326204712-9043f-f11653...

Switches between source and rendered views

app/helpers/wiki_helper.rb
app/views/wiki/_editbar.rhtml
db/translation/pt-BR.rb
test/functional/wiki_controller_test.rb

Changes to wiki_helper.rb

13
    end
    end
13
14
  end
  end
14
15
15
16
  def raw_text_link(page)
  def switch_view_link(page)
16
17
    '| ' + link_to('View raw text'.t,
    action, text = 'raw' == params[:action].to_s ? ['show','View wiki output'] :
17
18
                   :controller => :wiki, :action => 'raw',
                                                   ['raw' ,'View raw text']
18
 
    '| ' + link_to(text.t, :controller => :wiki, :action => action,
19
19
                   :page_name => page.name, :revision => page.position)
                   :page_name => page.name, :revision => page.position)
20
20
  end
  end
21
21
22

Changes to _editbar.rhtml

1
<div class='toolbar bottombar'>
<div class='toolbar bottombar'>
1
2
  <%= render :partial => 'editor' %>
  <%= render :partial => 'editor' %>
2
3
  <%= edition_link(current_user, @page) -%>
  <%= edition_link(current_user, @page) -%>
3
4
  <%= raw_text_link(@page) -%>
  <%= switch_view_link(@page) -%>
4
5
  <%= page_history_link(@page) -%>
  <%= page_history_link(@page) -%>
5
6
</div>
</div>
6

Changes to pt-BR.rb

94
'(requires authentication)' => '(identifique-se, por favor)',
'(requires authentication)' => '(identifique-se, por favor)',
94
95
'(not authorized)' => '(não autorizado)',
'(not authorized)' => '(não autorizado)',
95
96
'View raw text' => 'Mostrar em texto puro',
'View raw text' => 'Mostrar em texto puro',
96
 
'View wiki output' => 'Mostrar resultado wiki',
97
97
'Page has no history yet' => 'Página ainda sem histórico',
'Page has no history yet' => 'Página ainda sem histórico',
98
98
'Page history (%s revisions)' => 'Histórico da página (%s revisões)'
'Page history (%s revisions)' => 'Histórico da página (%s revisões)'
99
99
}
}
100

Changes to wiki_controller_test.rb

493
    assert false, "Refering page expired after text-only edition"
    assert false, "Refering page expired after text-only edition"
493
494
  end
  end
494
495
495
496
  def test_links_to_raw_wiki_text
 
497
    get :raw, :page_name => pages('multilanguage_page').name
 
498
    assert_xml_element %{//div[@class="toolbar bottombar")]/a[text() = "View raw text")]}
 
499
  end
 
500
 
501
  def test_shows_raw_wiki_text
  def test_shows_raw_wiki_text
496
502
    page = pages('multilanguage_page')
    page = pages('multilanguage_page')
497
503
    get :raw, :page_name => page.name
    get :raw, :page_name => page.name
498
13 more lines
517
    assert_no_xml_element '//div[@class="page-title"]/span[@id="revision"]'
    assert_no_xml_element '//div[@class="page-title"]/span[@id="revision"]'
512
518
  end
  end
513
519
514
 
  def test_links_to_raw_wiki_text
515
 
    get :show, :page_name => page_name = pages('multilanguage_page').name
516
 
    assert_xml_element %{//div[@class="toolbar bottombar")]/a[text() = "View raw text" and @href="#{@controller.url_for(:only_path => true, :action => 'raw', :page_name => page_name)}"]}
517
 
  end
518
 
519
 
  def test_links_to_rendered_result
520
 
    get :raw, :page_name => page_name = pages('multilanguage_page').name
521
 
    assert_xml_element %{//div[@class="toolbar bottombar")]/a[text() = "View wiki output" and @href="#{@controller.url_for(:only_path => true, :action => 'show', :page_name => page_name)}"]}
522
 
  end
523
 
524
520
private
private
525
521
526
522
  def log_as(user_name)
  def log_as(user_name)
527