Merge wiki, wall & snippets under one tab - writeboards

4 files changed, 22 insertions, 24 deletions

diff --git a/app/views/snippets/edit.html.haml b/app/views/snippets/edit.html.haml
index 8afaf46e95d..f81c0b8bc64 100644
--- a/app/views/snippets/edit.html.haml
+++ b/app/views/snippets/edit.html.haml
@@ -1,2 +1 @@
-= render "projects/project_head"
 = render "snippets/form"
diff --git a/app/views/snippets/index.html.haml b/app/views/snippets/index.html.haml
index 28a533d238f..e2b7594395b 100644
--- a/app/views/snippets/index.html.haml
+++ b/app/views/snippets/index.html.haml
@@ -1,21 +1,23 @@
-= render "projects/project_head"
+.row
+  .span3
+    = render 'writeboards/nav'
+  .span9
+    %h3.page_title
+      Snippets
+      %small share code pastes with others out of git repository
 
-%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
-%table
-  %thead
-    %tr
-      %th Title
-      %th File Name
-      %th Expires At
-  = render @snippets
-  - if @snippets.empty?
-    %tr
-      %td{colspan: 3}
-        %h3.nothing_here_message Nothing here.
+      - 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
+    %table
+      %thead
+        %tr
+          %th Title
+          %th File Name
+          %th Expires At
+      = render @snippets
+      - if @snippets.empty?
+        %tr
+          %td{colspan: 3}
+            %h3.nothing_here_message Nothing here.
diff --git a/app/views/snippets/new.html.haml b/app/views/snippets/new.html.haml
index 8afaf46e95d..f81c0b8bc64 100644
--- a/app/views/snippets/new.html.haml
+++ b/app/views/snippets/new.html.haml
@@ -1,2 +1 @@
-= render "projects/project_head"
 = render "snippets/form"
diff --git a/app/views/snippets/show.html.haml b/app/views/snippets/show.html.haml
index 64b7d9330e1..12534edf8ba 100644
--- a/app/views/snippets/show.html.haml
+++ b/app/views/snippets/show.html.haml
@@ -1,5 +1,3 @@
-= render "projects/project_head"
-
 %h3.page_title
   = @snippet.title
   %small= @snippet.file_name