Download as
Browse Code »

Commit 14c97237246f01da60ad73d9efd2c08c45927f09

Authored by randx
1 parent 501ca8e6
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

Styled wiki area. fixed commit feed feature

Showing 3 changed files with 12 additions and 8 deletions   Show diff stats
app/views/wikis/history.html.haml
  Diff comments   View file @14c9723
1 -%h3 Versions  
2 -%table 1 +%h3.page_title Versions
  2 +%br
  3 +%table.admin-table
3 %thead 4 %thead
4 %tr 5 %tr
5 %th # 6 %th #
app/views/wikis/show.html.haml
  Diff comments   View file @14c9723
@@ -5,15 +5,18 @@ @@ -5,15 +5,18 @@
5 = link_to history_project_wiki_path(@project, @wiki), :class => "btn small grouped" do 5 = link_to history_project_wiki_path(@project, @wiki), :class => "btn small grouped" do
6 History 6 History
7 = link_to edit_project_wiki_path(@project, @wiki), :class => "btn small grouped" do 7 = link_to edit_project_wiki_path(@project, @wiki), :class => "btn small grouped" do
  8 + %i.icon-edit
8 Edit 9 Edit
9 -%hr  
10 -.wiki_content  
11 - = preserve do  
12 - = markdown @wiki.content 10 +%br
  11 +.file_holder
  12 + .file_content.wiki
  13 + = preserve do
  14 + = markdown @wiki.content
13 15
14 %p.time Last edited by #{@wiki.user.name}, #{time_ago_in_words @wiki.created_at} ago 16 %p.time Last edited by #{@wiki.user.name}, #{time_ago_in_words @wiki.created_at} ago
15 - if can? current_user, :admin_wiki, @project 17 - if can? current_user, :admin_wiki, @project
16 = link_to project_wiki_path(@project, @wiki), :confirm => "Are you sure you want to delete this page?", :method => :delete do 18 = link_to project_wiki_path(@project, @wiki), :confirm => "Are you sure you want to delete this page?", :method => :delete do
17 Delete this page 19 Delete this page
18 20
  21 +%hr
19 .wiki_notes#notes= render "notes/notes", :tid => @wiki.id, :tt => "wiki" 22 .wiki_notes#notes= render "notes/notes", :tid => @wiki.id, :tt => "wiki"
features/step_definitions/project_commits_steps.rb
  Diff comments   View file @14c9723
@@ -16,11 +16,11 @@ Given /^I click atom feed link$/ do @@ -16,11 +16,11 @@ Given /^I click atom feed link$/ do
16 end 16 end
17 17
18 Then /^I see commits atom feed$/ do 18 Then /^I see commits atom feed$/ do
19 - commit = @project.commit 19 + commit = CommitDecorator.decorate(@project.commit)
20 page.response_headers['Content-Type'].should have_content("application/atom+xml") 20 page.response_headers['Content-Type'].should have_content("application/atom+xml")
21 page.body.should have_selector("title", :text => "Recent commits to #{@project.name}") 21 page.body.should have_selector("title", :text => "Recent commits to #{@project.name}")
22 page.body.should have_selector("author email", :text => commit.author_email) 22 page.body.should have_selector("author email", :text => commit.author_email)
23 - page.body.should have_selector("entry summary", :text => commit.message) 23 + page.body.should have_selector("entry summary", :text => commit.description)
24 end 24 end
25 25
26 Given /^I click on commit link$/ do 26 Given /^I click on commit link$/ do