Download as
Browse Code »

Commit 58a581782b99b55ea3d516dca8c63511c6fbe3f3

Authored by Riyad Preukschas
1 parent 2e836fa4
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

Update forms to show consistent link to GFM.

Showing 5 changed files with 11 additions and 7 deletions   Show diff stats
app/assets/stylesheets/sections/notes.scss
  Diff comments   View file @58a5817
... ... @@ -38,6 +38,10 @@
38 38 }
39 39 }
40 40  
  41 +#preview-note {
  42 + margin-bottom: 0;
  43 +}
  44 +
41 45 .note {
42 46 padding: 8px 0;
43 47 border-bottom: 1px solid #eee;
... ...
app/views/issues/_form.html.haml
  Diff comments   View file @58a5817
... ... @@ -38,7 +38,7 @@
38 38 = f.label :description, "Details"
39 39 .input
40 40 = f.text_area :description, maxlength: 2000, class: "xxlarge", rows: 14
41   - %p.hint Markdown is enabled.
  41 + %p.hint Issues are parsed with #{link_to "Gitlab Flavored Markdown", help_markdown_path, target: '_blank'}.
42 42  
43 43  
44 44 .actions
... ...
app/views/milestones/_form.html.haml
  Diff comments   View file @58a5817
... ... @@ -22,7 +22,7 @@
22 22 = f.label :description, "Description", class: "control-label"
23 23 .controls
24 24 = f.text_area :description, maxlength: 2000, class: "input-xlarge", rows: 10
25   - %p.hint Markdown is enabled.
  25 + %p.hint Milestones are parsed with #{link_to "Gitlab Flavored Markdown", help_markdown_path, target: '_blank'}.
26 26 .span6
27 27 .control-group
28 28 = f.label :due_date, "Due Date", class: "control-label"
... ...
app/views/notes/_form.html.haml
  Diff comments   View file @58a5817
... ... @@ -9,10 +9,9 @@
9 9 = f.hidden_field :noteable_type
10 10 = f.text_area :note, size: 255
11 11 #preview-note.well.hide
12   - %p.hint
13   - = link_to "Gitlab Markdown", help_markdown_path, target: '_blank'
14   - is enabled.
  12 + .hint
15 13 = link_to 'Preview', preview_project_notes_path(@project), id: 'preview-link'
  14 + .right Comments are parsed with #{link_to "Gitlab Flavored Markdown", help_markdown_path, target: '_blank'}.
16 15  
17 16 .row.note_advanced_opts.hide
18 17 .span2
... ...
app/views/wikis/_form.html.haml
  Diff comments   View file @58a5817
... ... @@ -14,9 +14,10 @@
14 14 .middle_box_content
15 15 .input
16 16 %span.cgray
17   - Wiki content is parsed with #{link_to "Markdown", "http://en.wikipedia.org/wiki/Markdown"}.
18   - To add link to new page you can just type
  17 + Wiki content is parsed with #{link_to "Gitlab Flavored Markdown", help_markdown_path, target: '_blank'}.
  18 + To link to a (new) page you can just type
19 19 %code [Link Title](page-slug)
  20 + \.
20 21  
21 22 .bottom_box_content
22 23 = f.label :content
... ...