Commit 6a58deb5 authored by randx's avatar randx

UI changes:

* .page_title  class added. Used for better page headers
* improved help page
* added back links for help pages
* show app version & revision on help page

Backend changes:
* Gitab::Version && Gitlab::Revision constants
parent ad3f4922
...@@ -281,6 +281,7 @@ table.no-borders { ...@@ -281,6 +281,7 @@ table.no-borders {
font-size:13px; font-size:13px;
background: #474D57; background: #474D57;
color:#fff; color:#fff;
font-weight:bold;
font-family: monospace; font-family: monospace;
} }
} }
...@@ -590,3 +591,27 @@ ul.breadcrumb { ...@@ -590,3 +591,27 @@ ul.breadcrumb {
border-top:1px solid #eee; border-top:1px solid #eee;
} }
} }
input[type=text] {
&.large_text {
padding:6px;
font-size:16px;
}
}
p {
&.slead {
color:#456;
font-size:16px;
margin-bottom: 12px;
font-weight: 200;
line-height: 24px;
}
}
h3.page_title {
color:#456;
font-size:20px;
font-weight: 600;
line-height: 28px;
}
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
%i.icon-download-alt %i.icon-download-alt
Get Patch Get Patch
   
%h3.commit-title %h3.commit-title.page_title
= commit_msg_with_link_to_issues(@project, @commit.title) = commit_msg_with_link_to_issues(@project, @commit.title)
- if @commit.description.present? - if @commit.description.present?
%pre.commit-description %pre.commit-description
......
%h3 %h3.page_title
Issues Issues
%small (assigned to you) %small (assigned to you)
%small.right #{@issues.total_count} issues %small.right #{@issues.total_count} issues
%br
.clearfix .clearfix
- if @issues.any? - if @issues.any?
- @issues.group_by(&:project).each do |group| - @issues.group_by(&:project).each do |group|
......
%h3 %h3.page_title
Merge Requests Merge Requests
%small (authored or assigned to you) %small (authored or assigned to you)
%small.right #{@merge_requests.total_count} merge requests %small.right #{@merge_requests.total_count} merge requests
......
%h3.cgray %h3.page_title
GITLAB GITLAB
%span.right v2.6 .right
%span= Gitlab::Version
%small= Gitlab::Revision
%hr %hr
%h4 Self Hosted Git Management %p.lead
%h4 Fast, secure and stable solution based on Ruby on Rails & Gitolite. Self Hosted Git Management
%br
Fast, secure and stable solution based on Ruby on Rails & Gitolite.
%hr %hr
...@@ -15,3 +19,6 @@ ...@@ -15,3 +19,6 @@
%li %li
%h5= link_to "Permissions", help_permissions_path %h5= link_to "Permissions", help_permissions_path
%li
%h5= link_to "Web Hooks", help_web_hooks_path
%h3 Permissions %h3 Permissions
.back_link
= link_to help_path do
← to index
%hr %hr
.row .row
......
%h3 Web hooks %h3 Web hooks
%br .back_link
= link_to help_path do
← to index
%hr
%p Application will send POST request with some data like example below: %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"
- bash_lexer = Pygments::Lexer[:bash] - bash_lexer = Pygments::Lexer[:bash]
%h3 Workflow %h3 Workflow
.back_link
= link_to help_path do
← to index
%hr %hr
%ol.help %ol.help
......
...@@ -36,7 +36,8 @@ ...@@ -36,7 +36,8 @@
:email => "gitlabdev@dv6700.(none)" :email => "gitlabdev@dv6700.(none)"
} }
} }
] ],
total_commits_count => 3
} }
eos eos
%> %>
......
= render "issues/head" = render "issues/head"
.issues_content .issues_content
%h3 %h3.page_title
Issues Issues
%small (#{@issues.total_count}) %small (#{@issues.total_count})
.right .right
......
%h3 %h3.page_title
Issue ##{@issue.id} Issue ##{@issue.id}
%small %small
......
%h3 %h3.page_title
SSH Keys SSH Keys
= link_to "Add new", new_key_path, :class => "btn small right" = link_to "Add new", new_key_path, :class => "btn small right"
%br %hr
%p.slead
SSH key allows you to establish a secure connection between your computer and Gitlab
%table#keys-table.admin-table %table#keys-table.admin-table
%thead %thead
......
%h3 %h3.page_title
Public key: Public key:
= @key.title = @key.title
%small %small
......
%h3 %h3.page_title
Merge Requests Merge Requests
- if can? current_user, :write_issue, @project - if can? current_user, :write_issue, @project
= link_to new_project_merge_request_path(@project), :class => "right btn small", :title => "New Merge Request" do = link_to new_project_merge_request_path(@project), :class => "right btn small", :title => "New Merge Request" do
......
%h3 %h3.page_title
= "Merge Request ##{@merge_request.id}:" = "Merge Request ##{@merge_request.id}:"
   
%span.pretty_label.branch= @merge_request.source_branch %span.pretty_label.branch= @merge_request.source_branch
......
= render "issues/head" = render "issues/head"
.milestones_content .milestones_content
%h3 %h3.page_title
Milestones Milestones
- if can? current_user, :admin_milestone, @project - if can? current_user, :admin_milestone, @project
= link_to "New Milestone", new_project_milestone_path(@project), :class => "right btn small", :title => "New Milestone" = link_to "New Milestone", new_project_milestone_path(@project), :class => "right btn small", :title => "New Milestone"
......
%h3 Password %h3.page_title Password
%hr %hr
= form_for @user, :url => profile_password_path, :method => :put do |f| = form_for @user, :url => profile_password_path, :method => :put do |f|
.data .data
.alert.alert-info %p.slead After successful password update you will be redirected to login page where you should login with new password
%span After successful password update you will be redirected to login page where you should login with new password
-if @user.errors.any? -if @user.errors.any?
.alert-message.block-message.error .alert-message.block-message.error
%ul %ul
......
.profile_avatar_holder .profile_avatar_holder
= image_tag gravatar_icon(@user.email, 90), :class => "styled_image" = image_tag gravatar_icon(@user.email, 90), :class => "styled_image"
%h3 %h3.page_title
= @user.name = @user.name
%br %br
%small %small
......
%h3 %h3.page_title
Private token Private token
%span.cred.right %span.cred.right
keep it in secret! keep it in secret!
%hr %hr
= form_for @user, :url => profile_reset_private_token_path, :method => :put do |f| = form_for @user, :url => profile_reset_private_token_path, :method => :put do |f|
.data .data
.alert.alert-info %p.slead
%p Private token used to access application resources without authentication. Private token used to access application resources without authentication.
%p * required for rss feed %br
It can be used for atom feed or API
%p.cgray %p.cgray
- if current_user.private_token - if current_user.private_token
= text_field_tag "token", current_user.private_token = text_field_tag "token", current_user.private_token, :class => "xxlarge large_text"
- else - else
You don`t have one yet. Click generate to fix it. You don`t have one yet. Click generate to fix it.
.actions .actions
......
%h3 Project Network Graph %h3.page_title Project Network Graph
%br %br
.graph_holder .graph_holder
%h4 %h4
......
= render "project_head" = render "project_head"
%h3 %h3.page_title
Team Members Team Members
%small (#{@project.users_projects.count}) %small (#{@project.users_projects.count})
- if can? current_user, :admin_team_member, @project - if can? current_user, :admin_team_member, @project
.alert.alert-info %p.slead
= link_to new_project_team_member_path(@project), :class => "btn small right", :title => "New Team Member" do = link_to new_project_team_member_path(@project), :class => "btn small right", :title => "New Team Member" do
New Team Member New Team Member
Read more about project permissions Read more about project permissions
%strong= link_to "here", help_permissions_path, :class => "vlink" %strong= link_to "here", help_permissions_path, :class => "vlink"
%br
To open team member profile - click on avatar.
= render :partial => "team", :locals => {:project => @project} = render :partial => "team", :locals => {:project => @project}
......
module Gitlab
Version = File.read(Rails.root.join("VERSION"))
Revision = `git log --pretty=format:'%h' -n 1`
end
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment