From 94f04939990400c60be3d345d69d42d0f05e8355 Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Fri, 15 Mar 2013 17:21:01 +0200 Subject: [PATCH] few fixes afte merge gollum wiki --- app/views/wikis/_nav.html.haml | 2 +- app/views/wikis/show.html.haml | 12 ------------ 2 files changed, 1 insertion(+), 13 deletions(-) diff --git a/app/views/wikis/_nav.html.haml b/app/views/wikis/_nav.html.haml index 36ab1053..f4b0b190 100644 --- a/app/views/wikis/_nav.html.haml +++ b/app/views/wikis/_nav.html.haml @@ -1,7 +1,7 @@ %ul.nav.nav-tabs - if @project.wiki_enabled = nav_link(controller: 'wikis') do - = link_to 'Wiki', project_wiki_path(@project, :index) + = link_to 'Wiki', project_wiki_path(@project, :home) - if @project.wall_enabled = nav_link(path: 'projects#wall') do diff --git a/app/views/wikis/show.html.haml b/app/views/wikis/show.html.haml index 9d87fdf1..b660a15e 100644 --- a/app/views/wikis/show.html.haml +++ b/app/views/wikis/show.html.haml @@ -9,18 +9,6 @@ You can view the #{link_to "most recent version", project_wiki_path(@project, @wiki)} or browse the #{link_to "history", history_project_wiki_path(@project, @wiki)}. .file_holder - .file_title - = @wiki.title - %span.options - = link_to pages_project_wikis_path(@project), class: "btn btn-tiny grouped" do - Pages - - if can? current_user, :write_wiki, @project - = link_to history_project_wiki_path(@project, @wiki), class: "btn btn-tiny grouped" do - History - = link_to edit_project_wiki_path(@project, @wiki), class: "btn btn-tiny grouped" do - %i.icon-edit - Edit - .file_content.wiki = preserve do = render_wiki_content(@wiki)