Download as
Browse Code »

Commit fbd5296e32badf6040fec62b43d27de61c1a65c5

Authored by Dmitriy Zaporozhets
1 parent fcd92f9d
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

layout refactored

Showing 7 changed files with 32 additions and 73 deletions   Show diff stats
app/views/layouts/_head.html.haml 0 → 100644
  Diff comments   View file @fbd5296
... ... @@ -0,0 +1,17 @@
  1 +%head
  2 + %meta{:charset => "utf-8"}
  3 + %title
  4 + GitLab
  5 + = " - #{@project.name}" if @project && !@project.new_record?
  6 + = favicon_link_tag 'favicon.ico'
  7 + = stylesheet_link_tag "application"
  8 + = javascript_include_tag "application"
  9 +
  10 + -# Atom feed
  11 + - if @project && !@project.new_record?
  12 + - if current_page?(tree_project_ref_path(@project, @project.root_ref)) || current_page?(project_commits_path(@project))
  13 + = auto_discovery_link_tag(:atom, project_commits_url(@project, :atom, :ref => @ref, :private_token => current_user.private_token), :title => "Recent commits to #{@project.name}:#{@ref}")
  14 + - if request.path == project_issues_path(@project)
  15 + = auto_discovery_link_tag(:atom, project_issues_url(@project, :atom, :private_token => current_user.private_token), :title => "#{@project.name} issues")
  16 + = csrf_meta_tags
  17 +
... ...
app/views/layouts/admin.html.haml
  Diff comments   View file @fbd5296
1   -!!!
2   -%html
3   - %head
4   - %meta{:charset => "utf-8"}
5   - %title
6   - GitLab #{" - #{@project.name}" if @project && !@project.new_record?}
7   - = favicon_link_tag 'favicon.ico'
8   - = stylesheet_link_tag "application"
9   - = javascript_include_tag "application"
10   - = csrf_meta_tags
11   - = javascript_tag do
12   - REQ_URI = "#{request.env["REQUEST_URI"]}";
13   - REQ_REFFER = "#{request.env["HTTP_REFERER"]}";
  1 +!!! 5
  2 +%html{ :lang => "en"}
  3 + = render "layouts/head"
14 4 %body.admin
15 5 = render :partial => "layouts/flash"
16 6 = render :partial => "layouts/head_panel"
... ...
app/views/layouts/application.html.haml
  Diff comments   View file @fbd5296
1   -!!!
2   -%html
3   - %head
4   - %meta{:charset => "utf-8"}
5   - %title
6   - GitLab
7   - = favicon_link_tag 'favicon.ico'
8   - = stylesheet_link_tag "application"
9   - = javascript_include_tag "application"
10   - = csrf_meta_tags
  1 +!!! 5
  2 +%html{ :lang => "en"}
  3 + = render "layouts/head"
11 4 %body.application
12 5 = render :partial => "layouts/flash"
13 6 = render :partial => "layouts/head_panel"
... ...
app/views/layouts/devise.html.haml
  Diff comments   View file @fbd5296
1   -!!!
2   -%html
3   - %head
4   - %meta{:charset => "utf-8"}
5   - %title
6   - GitLab #{" - #{@project.name}" if @project && !@project.new_record?}
7   - = favicon_link_tag 'favicon.ico'
8   - = stylesheet_link_tag "application"
9   - = javascript_include_tag "application"
10   - = csrf_meta_tags
11   - = javascript_tag do
12   - REQ_URI = "#{request.env["REQUEST_URI"]}";
13   - REQ_REFFER = "#{request.env["HTTP_REFERER"]}";
  1 +!!! 5
  2 +%html{ :lang => "en"}
  3 + = render "layouts/head"
14 4 %body.login-page
15 5 = render :partial => "layouts/flash"
16 6 .container-fluid= yield
... ...
app/views/layouts/profile.html.haml
  Diff comments   View file @fbd5296
1   -!!!
2   -%html
3   - %head
4   - %meta{:charset => "utf-8"}
5   - %title
6   - GitLab #{" - #{@project.name}" if @project && !@project.new_record?}
7   - = favicon_link_tag 'favicon.ico'
8   - = stylesheet_link_tag "application"
9   - = javascript_include_tag "application"
10   - = csrf_meta_tags
  1 +!!! 5
  2 +%html{ :lang => "en"}
  3 + = render "layouts/head"
11 4 %body.profile
12 5 = render :partial => "layouts/flash"
13 6 = render :partial => "layouts/head_panel"
... ...
app/views/layouts/project.html.haml
  Diff comments   View file @fbd5296
1   -!!!
2   -%html
3   - %head
4   - %meta{:charset => "utf-8"}
5   - %title
6   - GitLab
7   - = " - #{@project.name}" if @project && !@project.new_record?
8   - = favicon_link_tag 'favicon.ico'
9   - = stylesheet_link_tag "application"
10   - = javascript_include_tag "application"
11   - - if current_page?(tree_project_ref_path(@project, @project.root_ref)) || current_page?(project_commits_path(@project))
12   - = auto_discovery_link_tag(:atom, project_commits_url(@project, :atom, :ref => @ref, :private_token => current_user.private_token), :title => "Recent commits to #{@project.name}:#{@ref}")
13   - - if request.path == project_issues_path(@project)
14   - = auto_discovery_link_tag(:atom, project_issues_url(@project, :atom, :private_token => current_user.private_token), :title => "#{@project.name} issues")
15   - = csrf_meta_tags
  1 +!!! 5
  2 +%html{ :lang => "en"}
  3 + = render "layouts/head"
16 4 %body.project
17 5 = render :partial => "layouts/flash"
18 6 = render :partial => "layouts/head_panel"
... ...
db/schema.rb
  Diff comments   View file @fbd5296
... ... @@ -13,18 +13,6 @@
13 13  
14 14 ActiveRecord::Schema.define(:version => 20120206170141) do
15 15  
16   - create_table "features", :force => true do |t|
17   - t.string "name"
18   - t.string "branch_name"
19   - t.integer "assignee_id"
20   - t.integer "author_id"
21   - t.integer "project_id"
22   - t.datetime "created_at"
23   - t.datetime "updated_at"
24   - t.string "version"
25   - t.integer "status", :default => 0, :null => false
26   - end
27   -
28 16 create_table "issues", :force => true do |t|
29 17 t.string "title"
30 18 t.integer "assignee_id"
... ...