From e61e3eaadb7f0c7c106b72d1325437e7743a2027 Mon Sep 17 00:00:00 2001 From: Job van der Voort Date: Tue, 15 Apr 2014 18:01:54 +0200 Subject: [PATCH] render readme in help --- app/assets/stylesheets/application.scss | 1 + app/assets/stylesheets/sections/help.scss | 11 +++++++++++ app/views/help/index.html.haml | 54 +++++------------------------------------------------- 3 files changed, 17 insertions(+), 49 deletions(-) create mode 100644 app/assets/stylesheets/sections/help.scss diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index 0b372a8..630d2aa 100644 --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/application.scss @@ -34,6 +34,7 @@ /** * Page specific styles (issues, projects etc): */ + @import "sections/*"; /** diff --git a/app/assets/stylesheets/sections/help.scss b/app/assets/stylesheets/sections/help.scss new file mode 100644 index 0000000..c888185 --- /dev/null +++ b/app/assets/stylesheets/sections/help.scss @@ -0,0 +1,11 @@ +.documentation { + padding-bottom: 10px; + p { + padding: 10px; + margin: 0; + } + li { + list-style-type: none; + padding-left: 10px; + } +} \ No newline at end of file diff --git a/app/views/help/index.html.haml b/app/views/help/index.html.haml index 724fe1d..8f0db82 100644 --- a/app/views/help/index.html.haml +++ b/app/views/help/index.html.haml @@ -33,53 +33,9 @@ Use = link_to "shortcuts", '#', onclick: "new Shortcuts()" - .col-md-4 - .ui-box - .title - User documentation - %ul.well-list - %li - %strong= link_to "Workflow", help_workflow_path - %p Learn how to use Git and GitLab together. - - %li - %strong= link_to "SSH keys", help_ssh_path - %p Setup secure access to your projects. + .col-md-8 + .ui-box.documentation + .title Documentation - %li - %strong= link_to "GitLab Markdown", help_markdown_path - %p Learn what you can do with GitLab's advanced formatting system. - - %li - %strong= link_to "Permissions", help_permissions_path - %p Get familiar with GitLab's permission levels. - - %li - %strong= link_to "API", help_api_file_path(category: 'README') - %p Explore how you can access GitLab via a simple and powerful API. - - %li - %strong= link_to "Web Hooks", help_web_hooks_path - %p Let GitLab notify you when new code has been pushed to your project. - - .col-md-4 - .ui-box - .title - Admin documentation - %ul.well-list - - %li - %strong= link_to "Rake Tasks", help_raketasks_path - %p Explore what GitLab has in store for you to make administration easier. - - %li - %strong= link_to "System Hooks", help_system_hooks_path - %p Let GitLab notify you when certain management tasks need to be carried out. - - %li - %strong= link_to "Public Access", help_public_access_path - %p Learn how you can allow public access to a project. - - %li - %strong= link_to "Security", help_security_path - %p Learn what you can do to secure your GitLab instance. + = preserve do + = markdown File.read(Rails.root.join("doc", "README.md")) \ No newline at end of file -- libgit2 0.21.2