From 112dc875ba325cfb0b223165c20d8424698e7791 Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Mon, 18 Mar 2013 23:08:54 +0200
Subject: [PATCH] feature: wiki -> new page
---
app/views/wikis/_nav.html.haml | 8 ++++++++
app/views/wikis/_new.html.haml | 25 +++++++++++++++++++++++++
features/project/active_tab.feature | 2 +-
3 files changed, 34 insertions(+), 1 deletion(-)
create mode 100644 app/views/wikis/_new.html.haml
diff --git a/app/views/wikis/_nav.html.haml b/app/views/wikis/_nav.html.haml
index 6a922e16d61..0dffdd8fc14 100644
--- a/app/views/wikis/_nav.html.haml
+++ b/app/views/wikis/_nav.html.haml
@@ -9,3 +9,11 @@
= link_to git_access_project_wikis_path(@project) do
%i.icon-download-alt
Git Access
+
+ - if can?(current_user, :write_wiki, @project)
+ %li.pull-right
+ = link_to '#', class: "add-new-wiki" do
+ %i.icon-plus
+ New Page
+
+= render 'wikis/new'
diff --git a/app/views/wikis/_new.html.haml b/app/views/wikis/_new.html.haml
new file mode 100644
index 00000000000..50b40bff41c
--- /dev/null
+++ b/app/views/wikis/_new.html.haml
@@ -0,0 +1,25 @@
+%div#modal-new-wiki.modal.hide
+ .modal-header
+ %a.close{href: "#"} ×
+ %h3 New Wiki Page
+ .modal-body
+ = label_tag :new_wiki_path do
+ %span Page slug
+ = text_field_tag :new_wiki_path, nil, placeholder: 'how-to-setup', class: 'input-xlarge'
+ .modal-footer
+ = link_to 'Build', '#', class: 'build-new-wiki btn btn-create'
+
+:javascript
+ $(function(){
+ var modal = $('#modal-new-wiki').modal({modal: true, show:false});
+ $('.add-new-wiki').bind("click", function(){
+ modal.show();
+ });
+ $('.build-new-wiki').bind("click", function(){
+ location.href = "#{project_wikis_path(@project)}/" + $('#new_wiki_path').val();
+ });
+ $('.modal-header .close').bind("click", function(){
+ modal.hide();
+ })
+ })
+
diff --git a/features/project/active_tab.feature b/features/project/active_tab.feature
index 9392db36b87..f33e4b9e369 100644
--- a/features/project/active_tab.feature
+++ b/features/project/active_tab.feature
@@ -37,7 +37,7 @@ Feature: Project active tab
Scenario: On Project Wall
Given I visit my project's wall page
- Then the active main tab should be Wiki
+ Then the active main tab should be Wall
And no other main tabs should be active
Scenario: On Project Wiki
--
GitLab