few fixes afte merge gollum wiki

diff --git a/app/views/wikis/_nav.html.haml b/app/views/wikis/_nav.html.haml
index 36ab105..f4b0b19 100644 (file)
--- 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 9d87fdf..b660a15 100644 (file)
--- 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)