polishing UI a bit. Added footer links for dashboard
This commit is contained in:
parent
6d8d32c244
commit
bf625b7c92
11 changed files with 117 additions and 71 deletions
|
@ -1,2 +1,4 @@
|
|||
%h3 Resque
|
||||
%iframe{src: resque_url, width: 1168, height: 600, style: "border: none"}
|
||||
%h3.page_title Resque
|
||||
%br
|
||||
.ui-box
|
||||
%iframe{src: resque_url, width: '100%', height: 600, style: "border: none"}
|
||||
|
|
|
@ -31,13 +31,19 @@
|
|||
%span= project_last_activity(project)
|
||||
.bottom= paginate @projects, theme: "gitlab"
|
||||
|
||||
%hr
|
||||
%div
|
||||
%span.rss-icon
|
||||
= link_to dashboard_path(:atom, { private_token: current_user.private_token }) do
|
||||
= image_tag "rss_ui.png", title: "feed"
|
||||
%strong News Feed
|
||||
|
||||
%hr
|
||||
.gitlab-promo
|
||||
= link_to "Homepage", "http://gitlabhq.com"
|
||||
= link_to "Blog", "http://blog.gitlabhq.com"
|
||||
= link_to "@gitlabhq", "https://twitter.com/gitlabhq"
|
||||
|
||||
|
||||
- else
|
||||
%h3.nothing_here_message There are no projects you have access to.
|
||||
%br
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
.event_lp
|
||||
%div
|
||||
= image_tag gravatar_icon(event.author_email), class: "avatar"
|
||||
%span Your pushed to
|
||||
%span Your pushed to
|
||||
= event.ref_type
|
||||
= link_to project_commits_path(event.project, ref: event.ref_name) do
|
||||
%strong= truncate(event.ref_name, length: 28)
|
||||
|
|
|
@ -4,7 +4,7 @@
|
|||
= check_box_tag dom_id(issue,"selected"), nil, false, 'data-id' => issue.id, class: "selected_issue", disabled: !can?(current_user, :modify_issue, issue)
|
||||
.right
|
||||
- issue.labels.each do |label|
|
||||
%span.label.label-issue.grouped
|
||||
%span.label.label-tag.grouped
|
||||
%i.icon-tag
|
||||
= label.name
|
||||
- if issue.notes.any?
|
||||
|
|
|
@ -12,7 +12,7 @@
|
|||
= form_tag search_project_issues_path(@project), method: :get, remote: true, id: "issue_search_form", class: :right do
|
||||
= hidden_field_tag :project_id, @project.id, { id: 'project_id' }
|
||||
= hidden_field_tag :status, params[:f]
|
||||
= search_field_tag :issue_search, nil, { placeholder: 'Search', class: 'issue_search span3 right neib' }
|
||||
= search_field_tag :issue_search, nil, { placeholder: 'Search', class: 'issue_search span3 right neib search-text-input' }
|
||||
|
||||
.clearfix
|
||||
|
||||
|
|
|
@ -1,4 +1,9 @@
|
|||
%li.wll
|
||||
%strong= label.name
|
||||
%strong
|
||||
%i.icon-tag
|
||||
= label.name
|
||||
.right
|
||||
%span= pluralize label.count, 'issue'
|
||||
= link_to project_issues_path(label_name: label.name) do
|
||||
%strong
|
||||
= pluralize(label.count, 'issue')
|
||||
= "»"
|
||||
|
|
|
@ -3,8 +3,8 @@
|
|||
= label_tag :search do
|
||||
%strong Looking for
|
||||
.input
|
||||
= text_field_tag :search, params[:search], placeholder: "issue 143", class: "input-xxlarge", id: "dashboard_search"
|
||||
= submit_tag 'Search', class: "btn primary"
|
||||
= search_field_tag :search, params[:search], placeholder: "issue 143", class: "input-xxlarge search-text-input", id: "dashboard_search"
|
||||
= submit_tag 'Search', class: "btn primary wide"
|
||||
- if params[:search].present?
|
||||
%br
|
||||
%h3
|
||||
|
@ -15,8 +15,9 @@
|
|||
.row
|
||||
.span6
|
||||
%table
|
||||
%tr
|
||||
%th Projects
|
||||
%thead
|
||||
%tr
|
||||
%th Projects
|
||||
%tbody
|
||||
- @projects.each do |project|
|
||||
%tr
|
||||
|
@ -32,8 +33,9 @@
|
|||
%h4.nothing_here_message No Projects
|
||||
%br
|
||||
%table
|
||||
%tr
|
||||
%th Merge Requests
|
||||
%thead
|
||||
%tr
|
||||
%th Merge Requests
|
||||
%tbody
|
||||
- @merge_requests.each do |merge_request|
|
||||
%tr
|
||||
|
@ -50,8 +52,9 @@
|
|||
%h4.nothing_here_message No Merge Requests
|
||||
.span6
|
||||
%table
|
||||
%tr
|
||||
%th Issues
|
||||
%thead
|
||||
%tr
|
||||
%th Issues
|
||||
%tbody
|
||||
- @issues.each do |issue|
|
||||
%tr
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue