Skip to content

Commit e0fb070

Browse files
dzaporozhetsdzaporozhets
committed
Merge branch 'features/help_with_index'
2 parents e982a95 + 2be107d commit e0fb070

File tree

11 files changed

+442
-424
lines changed

11 files changed

+442
-424
lines changed

‎app/assets/stylesheets/gitlab_bootstrap/common.scss

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,8 @@
8181
}
8282
}
8383
}
84+
85+
&.nav-small-tabs > li > a { padding: 6px 9px; }
8486
}
8587

8688
/** ALERT MESSAGES **/

‎app/views/help/_layout.html.haml

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
.row
2+
.span3{:"data-spy" => 'affix'}
3+
.ui-box
4+
.title
5+
%h5 Help
6+
%ul.well-list
7+
%li
8+
%strong= link_to "Workflow", help_workflow_path
9+
%li
10+
%strong= link_to "SSH keys", help_ssh_path
11+
12+
%li
13+
%strong= link_to "GitLab Markdown", help_markdown_path
14+
15+
%li
16+
%strong= link_to "Permissions", help_permissions_path
17+
18+
%li
19+
%strong= link_to "API", help_api_path
20+
21+
%li
22+
%strong= link_to "Web Hooks", help_web_hooks_path
23+
24+
%li
25+
%strong= link_to "Rake Tasks", help_raketasks_path
26+
27+
%li
28+
%strong= link_to "System Hooks", help_system_hooks_path
29+
30+
%li
31+
%strong= link_to "Public Access", help_public_access_path
32+
33+
.span9.right
34+
= yield

‎app/views/help/api.html.haml

Lines changed: 95 additions & 97 deletions
Original file line numberDiff line numberDiff line change
@@ -1,107 +1,105 @@
1-
%h3.page_title API
2-
.back_link
3-
= link_to help_path do
4-
← to index
5-
%br
1+
= render layout: 'help/layout' do
2+
%h3.page_title API
3+
%br
64

7-
%ul.nav.nav-tabs.log-tabs
8-
%li.active
9-
= link_to "README", "#README", 'data-toggle' => 'tab'
10-
%li
11-
= link_to "Projects", "#projects", 'data-toggle' => 'tab'
12-
%li
13-
= link_to "Snippets", "#snippets", 'data-toggle' => 'tab'
14-
%li
15-
= link_to "Repositories", "#repositories", 'data-toggle' => 'tab'
16-
%li
17-
= link_to "Users", "#users", 'data-toggle' => 'tab'
18-
%li
19-
= link_to "Session", "#session", 'data-toggle' => 'tab'
20-
%li
21-
= link_to "Issues", "#issues", 'data-toggle' => 'tab'
22-
%li
23-
= link_to "Milestones", "#milestones", 'data-toggle' => 'tab'
24-
%li
25-
= link_to "Notes", "#notes", 'data-toggle' => 'tab'
5+
%ul.nav.nav-tabs.log-tabs.nav-small-tabs
6+
%li.active
7+
= link_to "README", "#README", 'data-toggle' => 'tab'
8+
%li
9+
= link_to "Projects", "#projects", 'data-toggle' => 'tab'
10+
%li
11+
= link_to "Snippets", "#snippets", 'data-toggle' => 'tab'
12+
%li
13+
= link_to "Repositories", "#repositories", 'data-toggle' => 'tab'
14+
%li
15+
= link_to "Users", "#users", 'data-toggle' => 'tab'
16+
%li
17+
= link_to "Session", "#session", 'data-toggle' => 'tab'
18+
%li
19+
= link_to "Issues", "#issues", 'data-toggle' => 'tab'
20+
%li
21+
= link_to "Milestones", "#milestones", 'data-toggle' => 'tab'
22+
%li
23+
= link_to "Notes", "#notes", 'data-toggle' => 'tab'
2624

27-
.tab-content
28-
.tab-pane.active#README
29-
.file_holder
30-
.file_title
31-
%i.icon-file
32-
README
33-
.file_content.wiki
34-
= preserve do
35-
= markdown File.read(Rails.root.join("doc", "api", "README.md"))
25+
.tab-content
26+
.tab-pane.active#README
27+
.file_holder
28+
.file_title
29+
%i.icon-file
30+
README
31+
.file_content.wiki
32+
= preserve do
33+
= markdown File.read(Rails.root.join("doc", "api", "README.md"))
3634

37-
.tab-pane#projects
38-
.file_holder
39-
.file_title
40-
%i.icon-file
41-
Projects
42-
.file_content.wiki
43-
= preserve do
44-
= markdown File.read(Rails.root.join("doc", "api", "projects.md"))
35+
.tab-pane#projects
36+
.file_holder
37+
.file_title
38+
%i.icon-file
39+
Projects
40+
.file_content.wiki
41+
= preserve do
42+
= markdown File.read(Rails.root.join("doc", "api", "projects.md"))
4543

46-
.tab-pane#snippets
47-
.file_holder
48-
.file_title
49-
%i.icon-file
50-
Projects Snippets
51-
.file_content.wiki
52-
= preserve do
53-
= markdown File.read(Rails.root.join("doc", "api", "snippets.md"))
44+
.tab-pane#snippets
45+
.file_holder
46+
.file_title
47+
%i.icon-file
48+
Projects Snippets
49+
.file_content.wiki
50+
= preserve do
51+
= markdown File.read(Rails.root.join("doc", "api", "snippets.md"))
5452

55-
.tab-pane#repositories
56-
.file_holder
57-
.file_title
58-
%i.icon-file
59-
Projects
60-
.file_content.wiki
61-
= preserve do
62-
= markdown File.read(Rails.root.join("doc", "api", "repositories.md"))
53+
.tab-pane#repositories
54+
.file_holder
55+
.file_title
56+
%i.icon-file
57+
Projects
58+
.file_content.wiki
59+
= preserve do
60+
= markdown File.read(Rails.root.join("doc", "api", "repositories.md"))
6361

64-
.tab-pane#users
65-
.file_holder
66-
.file_title
67-
%i.icon-file
68-
Users
69-
.file_content.wiki
70-
= preserve do
71-
= markdown File.read(Rails.root.join("doc", "api", "users.md"))
62+
.tab-pane#users
63+
.file_holder
64+
.file_title
65+
%i.icon-file
66+
Users
67+
.file_content.wiki
68+
= preserve do
69+
= markdown File.read(Rails.root.join("doc", "api", "users.md"))
7270

73-
.tab-pane#session
74-
.file_holder
75-
.file_title
76-
%i.icon-file
77-
Session
78-
.file_content.wiki
79-
= preserve do
80-
= markdown File.read(Rails.root.join("doc", "api", "session.md"))
71+
.tab-pane#session
72+
.file_holder
73+
.file_title
74+
%i.icon-file
75+
Session
76+
.file_content.wiki
77+
= preserve do
78+
= markdown File.read(Rails.root.join("doc", "api", "session.md"))
8179

82-
.tab-pane#issues
83-
.file_holder
84-
.file_title
85-
%i.icon-file
86-
Issues
87-
.file_content.wiki
88-
= preserve do
89-
= markdown File.read(Rails.root.join("doc", "api", "issues.md"))
80+
.tab-pane#issues
81+
.file_holder
82+
.file_title
83+
%i.icon-file
84+
Issues
85+
.file_content.wiki
86+
= preserve do
87+
= markdown File.read(Rails.root.join("doc", "api", "issues.md"))
9088

91-
.tab-pane#milestones
92-
.file_holder
93-
.file_title
94-
%i.icon-file
95-
Milestones
96-
.file_content.wiki
97-
= preserve do
98-
= markdown File.read(Rails.root.join("doc", "api", "milestones.md"))
89+
.tab-pane#milestones
90+
.file_holder
91+
.file_title
92+
%i.icon-file
93+
Milestones
94+
.file_content.wiki
95+
= preserve do
96+
= markdown File.read(Rails.root.join("doc", "api", "milestones.md"))
9997

100-
.tab-pane#notes
101-
.file_holder
102-
.file_title
103-
%i.icon-file
104-
Notes
105-
.file_content.wiki
106-
= preserve do
107-
= markdown File.read(Rails.root.join("doc", "api", "notes.md"))
98+
.tab-pane#notes
99+
.file_holder
100+
.file_title
101+
%i.icon-file
102+
Notes
103+
.file_content.wiki
104+
= preserve do
105+
= markdown File.read(Rails.root.join("doc", "api", "notes.md"))

0 commit comments

Comments
 (0)