Styled wiki area. fixed commit feed feature

This commit is contained in:
randx 2012-07-25 22:08:47 +03:00
parent 501ca8e6e8
commit 14c9723724
3 changed files with 12 additions and 8 deletions

View file

@ -1,5 +1,6 @@
%h3 Versions
%table
%h3.page_title Versions
%br
%table.admin-table
%thead
%tr
%th #

View file

@ -5,15 +5,18 @@
= link_to history_project_wiki_path(@project, @wiki), :class => "btn small grouped" do
History
= link_to edit_project_wiki_path(@project, @wiki), :class => "btn small grouped" do
%i.icon-edit
Edit
%hr
.wiki_content
= preserve do
= markdown @wiki.content
%br
.file_holder
.file_content.wiki
= preserve do
= markdown @wiki.content
%p.time Last edited by #{@wiki.user.name}, #{time_ago_in_words @wiki.created_at} ago
- if can? current_user, :admin_wiki, @project
= link_to project_wiki_path(@project, @wiki), :confirm => "Are you sure you want to delete this page?", :method => :delete do
Delete this page
%hr
.wiki_notes#notes= render "notes/notes", :tid => @wiki.id, :tt => "wiki"

View file

@ -16,11 +16,11 @@ Given /^I click atom feed link$/ do
end
Then /^I see commits atom feed$/ do
commit = @project.commit
commit = CommitDecorator.decorate(@project.commit)
page.response_headers['Content-Type'].should have_content("application/atom+xml")
page.body.should have_selector("title", :text => "Recent commits to #{@project.name}")
page.body.should have_selector("author email", :text => commit.author_email)
page.body.should have_selector("entry summary", :text => commit.message)
page.body.should have_selector("entry summary", :text => commit.description)
end
Given /^I click on commit link$/ do