Commit 539dbfeb authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets
Browse files

Restyle wiki for for twbs3


Signed-off-by: default avatarDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
parent b705cf0f8a42
......@@ -19,7 +19,7 @@
= label_tag 'commit_message', class: "control-label" do
Commit message
.col-sm-10
= text_area_tag 'commit_message', '', placeholder: "Update #{@blob.name}", required: true, rows: 3
= text_area_tag 'commit_message', '', placeholder: "Update #{@blob.name}", required: true, rows: 3, class: 'form-control'
.form-actions
= hidden_field_tag 'last_commit', @last_commit
= hidden_field_tag 'content', '', id: "file-content"
......
= form_for [@project, @wiki], method: @wiki.persisted? ? :put : :post do |f|
= form_for [@project, @wiki], method: @wiki.persisted? ? :put : :post, html: { class: 'form-horizontal' } do |f|
-if @wiki.errors.any?
#error_explanation
%h2= "#{pluralize(@wiki.errors.count, "error")} prohibited this wiki from being saved:"
......@@ -6,18 +6,9 @@
- @wiki.errors.full_messages.each do |msg|
%li= msg
.issue-box
%h3.title
.edit-wiki-header
= @wiki.title.titleize
= f.hidden_field :title, value: @wiki.title
= f.select :format, options_for_select(GollumWiki::MARKUPS, {selected: @wiki.format}), {}, class: "pull-right input-medium"
= f.label :format, class: "pull-right", style: "padding-right: 20px;"
.context
.col-sm-10
%span.cgray
Wiki content is parsed with #{link_to "GitLab Flavored Markdown", help_markdown_path, target: '_blank'}.
To link to a (new) page you can just type
%code [Link Title](page-slug)
\.
= f.hidden_field :title, value: @wiki.title
.form-group
= f.label :format, class: 'control-label'
.col-sm-10
= f.select :format, options_for_select(GollumWiki::MARKUPS, {selected: @wiki.format}), {}, class: "form-control"
......@@ -23,12 +14,22 @@
.description
.form-group
= f.label :content
.col-sm-10= f.text_area :content, class: 'span8 js-gfm-input', rows: 18
.description
.form-group
= f.label :commit_message
.col-sm-10= f.text_field :message, class: 'span8', rows: 18
.row
.col-sm-2
.col-sm-10
%p.cgray
Wiki content is parsed with #{link_to "GitLab Flavored Markdown", help_markdown_path, target: '_blank'}.
To link to a (new) page you can just type
%code [Link Title](page-slug)
\.
.form-group
= f.label :content, class: 'control-label'
.col-sm-10
= f.text_area :content, class: 'form-control js-gfm-input', rows: 18
.form-group
= f.label :commit_message, class: 'control-label'
.col-sm-10= f.text_field :message, class: 'form-control', rows: 18
.form-actions
- if @wiki && @wiki.persisted?
= f.submit 'Save changes', class: "btn-save btn"
......
%ul.nav.nav-tabs
%ul.nav.nav-tabs.append-bottom-20
= nav_link(html_options: {class: params[:id] == 'home' ? 'active' : '' }) do
= link_to 'Home', project_wiki_path(@project, :home)
......
= render 'nav'
%h3.page-title
Editing page
= render 'main_links'
Editing -
%span.light #{@wiki.title.titleize}
= render 'main_links'
%hr
= render 'form'
.pull-right
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment