deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Update forms to show consistent link to GFM.

Browse source
This commit is contained in:
Riyad Preukschas 2012-08-24 17:35:21 +02:00
parent 2e836fa428
commit 58a581782b
5 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/assets/stylesheets/sections/notes.scss
View file

@ -38,6 +38,10 @@
} }
} }
#preview-note {
margin-bottom: 0;
}
.note { .note {
padding: 8px 0; padding: 8px 0;
border-bottom: 1px solid #eee; border-bottom: 1px solid #eee;

2
app/views/issues/_form.html.haml
View file

@ -38,7 +38,7 @@
= f.label :description, "Details" = f.label :description, "Details"
.input .input
= f.text_area :description, maxlength: 2000, class: "xxlarge", rows: 14 = f.text_area :description, maxlength: 2000, class: "xxlarge", rows: 14
%p.hint Markdown is enabled. %p.hint Issues are parsed with #{link_to "Gitlab Flavored Markdown", help_markdown_path, target: '_blank'}.
.actions .actions

2
app/views/milestones/_form.html.haml
View file

@ -22,7 +22,7 @@
= f.label :description, "Description", class: "control-label" = f.label :description, "Description", class: "control-label"
.controls .controls
= f.text_area :description, maxlength: 2000, class: "input-xlarge", rows: 10 = f.text_area :description, maxlength: 2000, class: "input-xlarge", rows: 10
%p.hint Markdown is enabled. %p.hint Milestones are parsed with #{link_to "Gitlab Flavored Markdown", help_markdown_path, target: '_blank'}.
.span6 .span6
.control-group .control-group
= f.label :due_date, "Due Date", class: "control-label" = f.label :due_date, "Due Date", class: "control-label"

5
app/views/notes/_form.html.haml
View file

@ -9,10 +9,9 @@
= f.hidden_field :noteable_type = f.hidden_field :noteable_type
= f.text_area :note, size: 255 = f.text_area :note, size: 255
#preview-note.well.hide #preview-note.well.hide
%p.hint .hint
= link_to "Gitlab Markdown", help_markdown_path, target: '_blank'
is enabled.
= link_to 'Preview', preview_project_notes_path(@project), id: 'preview-link' = link_to 'Preview', preview_project_notes_path(@project), id: 'preview-link'
.right Comments are parsed with #{link_to "Gitlab Flavored Markdown", help_markdown_path, target: '_blank'}.
.row.note_advanced_opts.hide .row.note_advanced_opts.hide
.span2 .span2

5
app/views/wikis/_form.html.haml
View file

@ -14,9 +14,10 @@
.middle_box_content .middle_box_content
.input .input
%span.cgray %span.cgray
Wiki content is parsed with #{link_to "Markdown", "http://en.wikipedia.org/wiki/Markdown"}. Wiki content is parsed with #{link_to "Gitlab Flavored Markdown", help_markdown_path, target: '_blank'}.
To add link to new page you can just type To link to a (new) page you can just type
%code [Link Title](page-slug) %code [Link Title](page-slug)
\.
.bottom_box_content .bottom_box_content
= f.label :content = f.label :content