Use wiki tab for wiki, wall, snippets

app/assets/javascripts/main.js.coffee

@@ -53,12 +53,6 @@ $ ->
   $('.trigger-submit').on 'change', ->
     $(@).parents('form').submit()
 
-  # Wiki resizer
-  $('.wiki-fullscreen').on 'click', ->
-    $('.writeboards-menu').toggleClass('hide')
-    $('.writeboards-content').toggleClass('span9').toggleClass('span12')
-
-
   # Flash
   if (flash = $(".flash-container")).length > 0
     flash.click -> $(@).fadeOut()

app/helpers/tab_helper.rb

@@ -80,7 +80,7 @@ module TabHelper
     end
   end
 
-  def project_writeboards_tab_class
+  def project_wiki_tab_class
     [:files, :wall].each do |action|
       return "active" if current_page?(controller: "projects", action: action, id: @project)
     end

app/views/layouts/project_resource.html.haml

@@ -35,7 +35,7 @@
               Merge Requests
               %span.count.merge_counter= @project.merge_requests.opened.count
 
-        = nav_link(html_options: {class: "#{project_writeboards_tab_class}"}) do
+        = nav_link(html_options: {class: "#{project_wiki_tab_class}"}) do
           = link_to 'Wiki', project_wiki_path(@project, :index)
 
         - if can? current_user, :admin_project, @project

app/views/projects/files.html.haml

@@ -1,8 +1,5 @@
-.row
+= render 'wikis/nav'
-  .span3
+- unless @notes.empty?
-    = render 'writeboards/nav'
-  .span9
-    - unless @notes.empty?
   %table
     %thead
       %tr
@@ -19,7 +16,7 @@
           Added
           = time_ago_in_words(note.created_at)
           ago
-    - else
+- else
   %p.slead All files attached to project wall, issues etc will be displayed here
 
 

app/views/projects/wall.html.haml

@@ -1,6 +1,3 @@
-.row
+= render 'wikis/nav'
-  .span3
+%div.wall_page
-    = render 'writeboards/nav'
-  .span9
-    %div.wall_page
   = render "notes/reversed_notes_with_form"

app/views/snippets/index.html.haml

@@ -1,16 +1,13 @@
-.row
+= render 'wikis/nav'
-  .span3
+%h3.page_title
-    = render 'writeboards/nav'
-  .span9
-    %h3.page_title
   Snippets
   %small share code pastes with others out of git repository
 
   - if can? current_user, :write_snippet, @project
     = link_to new_project_snippet_path(@project), class: "btn btn-small add_new pull-right", title: "New Snippet" do
       Add new snippet
-    %br
+%br
-    %table
+%table
   %thead
     %tr
       %th Title

app/views/wikis/_nav.html.haml

@@ -1,4 +1,4 @@
-%ul.nav.nav-pills.nav-stacked
+%ul.nav.nav-tabs
   - if @project.wiki_enabled
     = nav_link(controller: 'wikis') do
       = link_to 'Wiki', project_wiki_path(@project, :index)

app/views/wikis/pages.html.haml

@@ -1,10 +1,7 @@
-.row
+= render 'wikis/nav'
-  .span3
+%h3.page_title All Pages
-    = render 'writeboards/nav'
+%br
-  .span9
+%table
-    %h3.page_title All Pages
-    %br
-    %table
   %thead
     %tr
       %th Title

app/views/wikis/show.html.haml

@@ -1,17 +1,11 @@
-.row
+= render 'wikis/nav'
-  .span3.writeboards-menu
+- if @wiki != @most_recent_wiki
-    = render 'writeboards/nav'
-  .span9.writeboards-content
-    - if @wiki != @most_recent_wiki
   .alert
     This is an old version of this page.
     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_holder
   .file_title
-        = link_to '#', class: 'wiki-fullscreen' do
-          %i.icon-resize-horizontal
-         
     = @wiki.title
     %span.options
       = link_to pages_project_wikis_path(@project), class: "btn btn-tiny grouped" do
@@ -27,4 +21,4 @@
     = preserve do
       = markdown @wiki.content
 
-    %p.time Last edited by #{link_to_member @project, @wiki.user}, #{time_ago_in_words @wiki.created_at} ago
+%p.time Last edited by #{link_to_member @project, @wiki.user}, #{time_ago_in_words @wiki.created_at} ago

spec/features/gitlab_flavored_markdown_spec.rb

@@ -218,7 +218,7 @@ describe "Gitlab Flavored Markdown" do
     end
 
     it "should NOT render title in wikis#show" do
-      within(".content h3") do # page title
+      within(".content .file_title") do # page title
         page.should have_content("Circumvent ##{issue.id}")
         page.should_not have_link("##{issue.id}")
       end