Download as
Browse Code »

Commit fb01f45890da1883d622b4550af2bf997c029764

Authored by gitlabhq
1 parent 7d773ecb
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

issue search styleup

Showing 3 changed files with 49 additions and 30 deletions   Show diff stats
app/assets/stylesheets/projects.css.scss
  Diff comments   View file @fb01f45
... ... @@ -681,3 +681,20 @@ tbody tr:nth-child(2n) td, tbody tr.even td {
681 681 }
682 682 }
683 683 }
  684 +
  685 +.top_panel_issues{
  686 + #issue_search_form {
  687 + margin:5px 0;
  688 + input {
  689 + border:1px solid #D3D3D3;
  690 + padding: 3px;
  691 + height: 20px;
  692 + width: 300px;
  693 +
  694 + &:focus {
  695 + border-color:#c2e1ef;
  696 + }
  697 + }
  698 + }
  699 +}
  700 +
... ...
app/views/issues/index.html.haml
  Diff comments   View file @fb01f45
1 1 %div
2   - - if can? current_user, :write_issue, @project
3   - .left
4   - = form_tag search_project_issues_path(@project), :method => :get, :remote => true do
5   - = hidden_field_tag :project_id, @project.id, { :id => 'project_id' }
6   - = search_field_tag :issue_search, nil, { :placeholder => 'Search', :class => 'issue_search' }
7   - = link_to 'New Issue', new_project_issue_path(@project), :remote => true, :class => "lbutton vm"
8   -
9   - .right
10   - = form_tag project_issues_path(@project), :method => :get do
11   - .span-2
12   - = radio_button_tag :f, 0, (params[:f] || "0") == "0", :onclick => "this.form.submit()", :id => "open_issues", :class => "status"
13   - = label_tag "open_issues","Open"
14   - .span-2
15   - = radio_button_tag :f, 2, params[:f] == "2", :onclick => "this.form.submit()", :id => "closed_issues", :class => "status"
16   - = label_tag "closed_issues","Closed"
17   - .span-2
18   - = radio_button_tag :f, 3, params[:f] == "3", :onclick => "this.form.submit()", :id => "my_issues", :class => "status"
19   - = label_tag "my_issues","To Me"
20   - .span-2
21   - = radio_button_tag :f, 1, params[:f] == "1", :onclick => "this.form.submit()", :id => "all_issues", :class => "status"
22   - = label_tag "all_issues","All"
  2 + .top_panel_issues
  3 + - if can? current_user, :write_issue, @project
  4 + %div{:class => "left", :style => "margin-right: 10px;" }
  5 + = link_to 'New Issue', new_project_issue_path(@project), :remote => true, :class => "lbutton vm"
  6 + = form_tag search_project_issues_path(@project), :method => :get, :remote => true, :class => :left, :id => "issue_search_form" do
  7 + = hidden_field_tag :project_id, @project.id, { :id => 'project_id' }
  8 + = search_field_tag :issue_search, nil, { :placeholder => 'Search', :class => 'issue_search' }
  9 +
  10 + .right
  11 + = form_tag project_issues_path(@project), :method => :get do
  12 + .span-2
  13 + = radio_button_tag :f, 0, (params[:f] || "0") == "0", :onclick => "this.form.submit()", :id => "open_issues", :class => "status"
  14 + = label_tag "open_issues","Open"
  15 + .span-2
  16 + = radio_button_tag :f, 2, params[:f] == "2", :onclick => "this.form.submit()", :id => "closed_issues", :class => "status"
  17 + = label_tag "closed_issues","Closed"
  18 + .span-2
  19 + = radio_button_tag :f, 3, params[:f] == "3", :onclick => "this.form.submit()", :id => "my_issues", :class => "status"
  20 + = label_tag "my_issues","To Me"
  21 + .span-2
  22 + = radio_button_tag :f, 1, params[:f] == "1", :onclick => "this.form.submit()", :id => "all_issues", :class => "status"
  23 + = label_tag "all_issues","All"
23 24  
24 25 #issues-table-holder= render "issues"
25 26 %br
... ...
config/database.yml
  Diff comments   View file @fb01f45
... ... @@ -4,9 +4,8 @@
4 4 # Ensure the SQLite 3 gem is defined in your Gemfile
5 5 # gem 'sqlite3'
6 6 development:
7   - adapter: mysql2
8   - database: gitlab_development
9   - username: root
  7 + adapter: sqlite3
  8 + database: db/development.sqlite3
10 9 pool: 5
11 10 timeout: 5000
12 11  
... ... @@ -14,11 +13,13 @@ development:
14 13 # re-generated from your development database when you run "rake".
15 14 # Do not set this db to the same as development or production.
16 15 test:
17   - adapter: mysql2
18   - database: gitlab_development
19   - username: root
  16 + adapter: sqlite3
  17 + database: db/test.sqlite3
  18 + pool: 5
  19 + timeout: 5000
20 20  
21 21 production:
22   - adatper: mysql2
23   - database: gitlab_test
24   - username: root
  22 + adapter: sqlite3
  23 + database: db/production.sqlite3
  24 + pool: 5
  25 + timeout: 5000
... ...