Merge branch 'features/help_with_index'

e0fb0703 · Dmitriy Zaporozhets · e982a951 · 2be107d0 · e0fb0703 · e0fb0703
Commit e0fb0703 authored Jan 22, 2013 by Dmitriy Zaporozhets
11 changed files
--- a/app/assets/stylesheets/gitlab_bootstrap/common.scss
+++ b/app/assets/stylesheets/gitlab_bootstrap/common.scss
@@ -81,6 +81,8 @@
      }
    }
  }
+  &.nav-small-tabs > li > a { padding: 6px 9px; }
 }
 /** ALERT MESSAGES **/

--- a/app/views/help/_layout.html.haml
+++ b/app/views/help/_layout.html.haml
+.row
+  .span3{:"data-spy" => 'affix'}
+    .ui-box
+      .title
+        %h5 Help
+      %ul.well-list
+        %li
+          %strong= link_to "Workflow", help_workflow_path
+        %li
+          %strong= link_to "SSH keys", help_ssh_path
+        %li
+          %strong= link_to "GitLab Markdown", help_markdown_path
+        %li
+          %strong= link_to "Permissions", help_permissions_path
+        %li
+          %strong= link_to "API", help_api_path
+        %li
+          %strong= link_to "Web Hooks", help_web_hooks_path
+        %li
+          %strong= link_to "Rake Tasks", help_raketasks_path
+        %li
+          %strong= link_to "System Hooks", help_system_hooks_path
+        %li
+          %strong= link_to "Public Access", help_public_access_path
+  .span9.right
+    = yield
--- a/app/views/help/api.html.haml
+++ b/app/views/help/api.html.haml
-%h3.page_title API
+= render layout: 'help/layout' do
-.back_link
+  %h3.page_title API
-  = link_to help_path do
+  %br
-    &larr; to index
-%br
-%ul.nav.nav-tabs.log-tabs
+  %ul.nav.nav-tabs.log-tabs.nav-small-tabs
    %li.active
      = link_to "README", "#README", 'data-toggle' => 'tab'
    %li
@@ -24,7 +22,7 @@
    %li
      = link_to "Notes", "#notes", 'data-toggle' => 'tab'
-.tab-content
+  .tab-content
    .tab-pane.active#README
      .file_holder
        .file_title

--- a/app/views/help/markdown.html.haml
+++ b/app/views/help/markdown.html.haml
-%h3.page_title GitLab Flavored Markdown
+= render layout: 'help/layout' do
-.back_link
+  %h3.page_title GitLab Flavored Markdown
-  = link_to help_path do
+  %br
-    &larr; to index
-%hr
-.row
+  .row
    .span8
      %p
        For GitLab we developed something we call "GitLab Flavored Markdown" (GFM).
@@ -27,7 +25,7 @@
          %strong= link_to "Markdown Syntax Guide", "http://daringfireball.net/projects/markdown/syntax"
          at Daring Fireball.
-.row
+  .row
    .span8
      %h3 Differences from traditional Markdown
@@ -73,7 +71,7 @@
      %h4 Emoji
-.row
+  .row
    .span8
      :ruby
        puts markdown %Q{Sometimes you want to be :cool: and add some :sparkles: to your :speech_balloon:. Well we have a :gift: for you:
@@ -92,7 +90,7 @@
          %strong= link_to "Emoji Cheat Sheet", "http://www.emoji-cheat-sheet.com/"
          for a list of all supported emoji codes.
-.row
+  .row
    .span8
      %h4 Special GitLab references

--- a/app/views/help/permissions.html.haml
+++ b/app/views/help/permissions.html.haml
-%h3.page_title Permissions
+= render layout: 'help/layout' do
-.back_link
+  %h3.page_title Permissions
-  = link_to help_path do
+  %br
-    &larr; to index
-%hr
-%fieldset
+  %fieldset
    %legend Guest
    %ul
      %li Create new issue
      %li Leave comments
      %li Write on project wall
-%fieldset
+  %fieldset
    %legend Reporter
    %ul
      %li Create new issue
@@ -22,7 +20,7 @@
      %li Create a code snippets
-%fieldset
+  %fieldset
    %legend Developer
    %ul
      %li Create new issue
@@ -38,7 +36,7 @@
      %li Add tags
      %li Write a wiki
-%fieldset
+  %fieldset
    %legend Master
    %ul
      %li Create new issue
@@ -61,7 +59,7 @@
      %li Add Deploy Keys to project
      %li Configure Project Hooks
-%fieldset
+  %fieldset
    %legend Owner
    %ul
      %li Transfer project to another namespace

--- a/app/views/help/public_access.html.haml
+++ b/app/views/help/public_access.html.haml
-%h3.page_title Public Access
+= render layout: 'help/layout' do
-.back_link
+  %h3.page_title Public Access
-  = link_to help_path do
+  %br
-    &larr; to index
-%hr
-%p
+  %p
    GitLab allows you to open selected projects to be accessed publicly.
    These projects will be clonable
    %em without any
    authentication.
    Also they will be listed on the #{link_to "public access directory", public_root_path}.
-%ol
+  %ol
    %li Go to your project dashboard
    %li Click on the "Edit" tab
    %li Select "Public clone access"

--- a/app/views/help/raketasks.html.haml
+++ b/app/views/help/raketasks.html.haml
-%h3.page_title GitLab Rake Tasks
+= render layout: 'help/layout' do
-.back_link
+  %h3.page_title GitLab Rake Tasks
-  = link_to help_path do
+  %br
-    &larr; to index
-%hr
-%p.slead
+  %p.slead
    GitLab provides some specific rake tasks to enable special features or perform maintenance tasks.
-%ul.nav.nav-tabs.log-tabs
+  %ul.nav.nav-tabs.log-tabs
    %li.active
      = link_to "Features", "#features", 'data-toggle' => 'tab'
    %li
@@ -19,7 +17,7 @@
    %li
      = link_to "Cleanup", "#cleanup", 'data-toggle' => 'tab'
-.tab-content
+  .tab-content
    .tab-pane.active#features
      .file_holder
        .file_title

--- a/app/views/help/ssh.html.haml
+++ b/app/views/help/ssh.html.haml
-%h3.page_title SSH Keys
+= render layout: 'help/layout' do
-.back_link
+  %h3.page_title SSH Keys
-  = link_to help_path do
+  %br
-    &larr; to index
-%hr
-%p.slead
+  %p.slead
    SSH key allows you to establish a secure connection between your computer and GitLab
-%p.slead
+  %p.slead
    To generate a new SSH key just open your terminal and use code below.
-%pre.dark
+  %pre.dark
    ssh-keygen -t rsa -C "#{current_user.email}"
    \# Creates a new ssh key using the provided email
    \# Generating public/private rsa key pair...
-%p.slead
+  %p.slead
    Next just use code below to dump your public key and add to GitLab SSH Keys
-%pre.dark
+  %pre.dark
    cat ~/.ssh/id_rsa.pub
    \# ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC6eNtGpNGwstc....
--- a/app/views/help/system_hooks.html.haml
+++ b/app/views/help/system_hooks.html.haml
-%h3 System hooks
+= render layout: 'help/layout' do
-.back_link
+  %h3.page_title System hooks
-  = link_to :back do
+  %br
-    &larr; back
-%hr
-%p.slead
+  %p.slead
    Your GitLab instance can perform HTTP POST requests on the following events: create_project, delete_project, create_user, delete_user, change_team_member.
    %br
    %br
    System Hooks can be used, e.g. for logging or changing information in a LDAP server.
    %br
-%h5 Hooks request example:
+  %h5 Hooks request example:
-= render "admin/hooks/data_ex"
+  = render "admin/hooks/data_ex"
--- a/app/views/help/web_hooks.html.haml
+++ b/app/views/help/web_hooks.html.haml
-%h3.page_title Web hooks
+= render layout: 'help/layout' do
-.back_link
+  %h3.page_title Web hooks
-  = link_to help_path do
+  %br
-    &larr; to index
-%hr
-%p.slead
+  %p.slead
    Every GitLab project can trigger a web server whenever the repo is pushed to.
    %br
    Web Hooks can be used to update an external issue tracker, trigger CI builds, update a backup mirror, or even deploy to your production server.
    %br
    GitLab will send POST request with commits information on every push.
-%h5 Hooks request example:
+  %h5 Hooks request example:
-= render "hooks/data_ex"
+  = render "hooks/data_ex"
--- a/app/views/help/workflow.html.haml
+++ b/app/views/help/workflow.html.haml
-%h3.page_title Workflow
+= render layout: 'help/layout' do
-.back_link
+  %h3.page_title Workflow
-  = link_to help_path do
+  %br
-    &larr; to index
-%hr
-%ol.help
+  %ol.help
    %li
      %p Clone project
      .bash