From 2587de74df824b8c81b9d51a3bd47fd246173e29 Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Tue, 10 Apr 2012 20:06:17 +0300 Subject: [PATCH] Minor fixes --- app/assets/stylesheets/common.scss | 14 ++++++ app/assets/stylesheets/gitlab_bootstrap.scss | 11 ++++- app/assets/stylesheets/jquery_ui.scss | 2 + app/assets/stylesheets/notes.scss | 1 + app/assets/stylesheets/tree.scss | 3 +- app/views/dashboard/_issues.html.haml | 17 +++++++ app/views/dashboard/_merge_requests.html.haml | 20 +++++++++ app/views/dashboard/_projects.html.haml | 22 ++++++++++ app/views/devise/sessions/new.html.erb | 2 +- app/views/help/permissions.html.haml | 8 ++-- app/views/issues/index.html.haml | 13 +++--- app/views/milestones/_milestone.html.haml | 7 +-- app/views/notes/_per_line_form.html.haml | 44 +++++++++---------- app/views/refs/_tree.html.haml | 2 +- db/schema.rb | 40 ++++++++--------- 15 files changed, 145 insertions(+), 61 deletions(-) create mode 100644 app/views/dashboard/_issues.html.haml create mode 100644 app/views/dashboard/_merge_requests.html.haml create mode 100644 app/views/dashboard/_projects.html.haml diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss index d531411d41a..e5465816b28 100644 --- a/app/assets/stylesheets/common.scss +++ b/app/assets/stylesheets/common.scss @@ -880,3 +880,17 @@ li.note { color:#aaa; } } + +.remember_me { + text-align:left; +} + + +/** + * Milestones list + * + */ + +.milestone { + @extend .wll; +} diff --git a/app/assets/stylesheets/gitlab_bootstrap.scss b/app/assets/stylesheets/gitlab_bootstrap.scss index 42493f5945e..50ca028fea2 100644 --- a/app/assets/stylesheets/gitlab_bootstrap.scss +++ b/app/assets/stylesheets/gitlab_bootstrap.scss @@ -35,6 +35,10 @@ a { } } +.neib { + margin-right:10px; +} + .alert-message { @extend .alert; @@ -111,7 +115,9 @@ table { background:$blue_link; } } - &.danger, + &.primary { + @extend .btn-primary; + } &.btn-danger { background:#DD4B39; color:white; @@ -122,6 +128,9 @@ table { background:#DD0000; } } + &.danger { + @extend .btn-danger; + } &.small { @extend .btn-small; diff --git a/app/assets/stylesheets/jquery_ui.scss b/app/assets/stylesheets/jquery_ui.scss index 70401539ac1..1063f1d080e 100644 --- a/app/assets/stylesheets/jquery_ui.scss +++ b/app/assets/stylesheets/jquery_ui.scss @@ -22,6 +22,8 @@ .ui-progressbar { border:1px solid #ddd; height:6px; + margin:0; + padding:0; .ui-progressbar-value { background-color: #62C462;//$blue_link; diff --git a/app/assets/stylesheets/notes.scss b/app/assets/stylesheets/notes.scss index 1f05d13b868..3142d6406af 100644 --- a/app/assets/stylesheets/notes.scss +++ b/app/assets/stylesheets/notes.scss @@ -90,6 +90,7 @@ tr.line_notes_row { .per_line_form { background:#f5f5f5; + border-top:1px solid #eee; form { margin: 0; } td { border-bottom:1px solid #ddd; diff --git a/app/assets/stylesheets/tree.scss b/app/assets/stylesheets/tree.scss index 969aaa9d692..e7677d7024c 100644 --- a/app/assets/stylesheets/tree.scss +++ b/app/assets/stylesheets/tree.scss @@ -135,6 +135,7 @@ img { position: relative; + top:-1px; } } } @@ -161,7 +162,7 @@ border-color:#ccc; td { - padding:7px; + padding:8px; border-color:#f1f1f1; background:#fafafa; } diff --git a/app/views/dashboard/_issues.html.haml b/app/views/dashboard/_issues.html.haml new file mode 100644 index 00000000000..ea93840f289 --- /dev/null +++ b/app/views/dashboard/_issues.html.haml @@ -0,0 +1,17 @@ +%div.ui-box + %h5 + = link_to "Issues" , "#issues", :id => "issues" + %small (assigned to you) + %ul.unstyled + - @issues.each do |issue| + %li.wll + = link_to [issue.project, issue] do + %p + %span.btn.disabled.small= issue.project.name + %strong + – + Issue # + = issue.id + = truncate issue.title, :length => 50 + %span.right.cgray + = issue.updated_at.stamp("Aug 21, 2011") diff --git a/app/views/dashboard/_merge_requests.html.haml b/app/views/dashboard/_merge_requests.html.haml new file mode 100644 index 00000000000..a4174588a1b --- /dev/null +++ b/app/views/dashboard/_merge_requests.html.haml @@ -0,0 +1,20 @@ +%div.ui-box + %h5 + = link_to "5 Latest Merge Requests" , "#merge_requests", :id => "merge_requests" + %small (authored or assigned to you) + %ul.unstyled + - @merge_requests.each do |merge_request| + %li.wll + = link_to [merge_request.project, merge_request] do + %p + %span.btn.disabled.small= merge_request.project.name + %strong + – + Merge Request ##{merge_request.id} + = truncate merge_request.title, :length => 50 + %span.right.cgray + = merge_request.updated_at.stamp("Aug 21, 2011") + + %li.bottom + + diff --git a/app/views/dashboard/_projects.html.haml b/app/views/dashboard/_projects.html.haml new file mode 100644 index 00000000000..97dab62fdbe --- /dev/null +++ b/app/views/dashboard/_projects.html.haml @@ -0,0 +1,22 @@ +%div + %h3 + %span.ico.projects + Projects + %small + (most recent) + %hr + %div.dash_projects + - projects.first(5).each do |project| + %div.dash_project + %h4 + = link_to project, :class => "project_link" do + = truncate project.name, :length => 30 + %small + last activity at + = project.last_activity_date.stamp("Aug 25, 2011") + + .right + %small + %strong= link_to "Browse Code »", tree_project_ref_path(project, project.root_ref), :class => "neib" + %strong= link_to "Commits »", project_commits_path(project) + diff --git a/app/views/devise/sessions/new.html.erb b/app/views/devise/sessions/new.html.erb index da8f911753b..a2956eb31d9 100644 --- a/app/views/devise/sessions/new.html.erb +++ b/app/views/devise/sessions/new.html.erb @@ -4,7 +4,7 @@ <%= f.password_field :password, :class => "text bottom", :placeholder => "Password" %> <% if devise_mapping.rememberable? -%> -
+
<% end -%>
<%= f.submit "Sign in", :class => "primary btn" %> diff --git a/app/views/help/permissions.html.haml b/app/views/help/permissions.html.haml index 7b911f3fb6b..8b2ba14fdaa 100644 --- a/app/views/help/permissions.html.haml +++ b/app/views/help/permissions.html.haml @@ -2,14 +2,14 @@ %hr .row - .ui-box.span3 + .ui-box.span2 %h5 Guest %ul.unstyled %li Create new issue %li Leave comments %li Write on project wall - .ui-box.span4 + .ui-box.span3 %h5 Reporter %ul.unstyled %li Pull project code @@ -20,7 +20,7 @@ %li Create a code snippets - .ui-box.span4 + .ui-box.span3 %h5 Developer %ul.unstyled %li Pull project code @@ -33,7 +33,7 @@ %li Write on project wall %li Write a wiki - .ui-box.span4 + .ui-box.span3 %h5 Master %ul.unstyled %li Full repository access diff --git a/app/views/issues/index.html.haml b/app/views/issues/index.html.haml index b6212fc63bd..32e972c9200 100644 --- a/app/views/issues/index.html.haml +++ b/app/views/issues/index.html.haml @@ -7,16 +7,15 @@ = image_tag "Rss-UI.PNG", :width => 16, :title => "feed" .right - .span4.left - = form_tag search_project_issues_path(@project), :method => :get, :remote => true, :id => "issue_search_form", :class => :left do + .span5 + - if can? current_user, :write_issue, @project + = link_to new_project_issue_path(@project), :class => "right btn small", :title => "New Issue", :remote => true do + New Issue + = 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' } + = search_field_tag :issue_search, nil, { :placeholder => 'Search', :class => 'issue_search span3 right neib' } - - if can? current_user, :write_issue, @project - .span2.left - = link_to new_project_issue_path(@project), :class => "right btn small", :title => "New Issue", :remote => true do - New Issue %br %div#issues-table-holder.ui-box .title diff --git a/app/views/milestones/_milestone.html.haml b/app/views/milestones/_milestone.html.haml index a21df7e2d51..00e95feb636 100644 --- a/app/views/milestones/_milestone.html.haml +++ b/app/views/milestones/_milestone.html.haml @@ -1,4 +1,4 @@ -%li{:class => "wll", :id => dom_id(milestone) } +%li{:class => "milestone", :id => dom_id(milestone) } .right - if milestone.issues.count > 0 = link_to 'Browse Issues', project_issues_path(milestone.project, :milestone_id => milestone.id), :class => "btn small" @@ -10,9 +10,10 @@ %h4.row_title = truncate(milestone.title, :length => 100) %small= milestone.expires_at + %br + .progress.span3 - .progress.span4 - +   :javascript $(function() { $( "##{dom_id(milestone)} .progress" ).progressbar({ diff --git a/app/views/notes/_per_line_form.html.haml b/app/views/notes/_per_line_form.html.haml index 28faa6301c0..e8558cbd15a 100644 --- a/app/views/notes/_per_line_form.html.haml +++ b/app/views/notes/_per_line_form.html.haml @@ -3,31 +3,29 @@ %td{:colspan => 3 } = form_for [@project, @note], :remote => "true", :multipart => true do |f| %h3 Leave a note - .row - .span16 - -if @note.errors.any? - .alert-message.block-message.error - - @note.errors.full_messages.each do |msg| - %div= msg + %div.span10 + -if @note.errors.any? + .alert-message.block-message.error + - @note.errors.full_messages.each do |msg| + %div= msg - = f.hidden_field :noteable_id - = f.hidden_field :noteable_type - = f.hidden_field :line_code - = f.text_area :note, :size => 255 - .actions - = f.submit 'Add note', :class => "btn primary", :id => "submit_note" - = link_to "Close", "#", :class => "btn hide-button" - .span6.entry - %h5 Notify via email: - .clearfix - = label_tag :notify do - = check_box_tag :notify, 1, @note.noteable_type != "Commit" - %span Project team + = f.hidden_field :noteable_id + = f.hidden_field :noteable_type + = f.hidden_field :line_code + = f.text_area :note, :size => 255 + %h5 Notify via email: + .clearfix + = label_tag :notify do + = check_box_tag :notify, 1, @note.noteable_type != "Commit" + %span Project team - - if @note.notify_only_author?(current_user) - = label_tag :notify_author do - = check_box_tag :notify_author, 1 , @note.noteable_type == "Commit" - %span Commit author + - if @note.notify_only_author?(current_user) + = label_tag :notify_author do + = check_box_tag :notify_author, 1 , @note.noteable_type == "Commit" + %span Commit author + .actions + = f.submit 'Add note', :class => "btn primary", :id => "submit_note" + = link_to "Close", "#", :class => "btn hide-button" :javascript $(function(){ diff --git a/app/views/refs/_tree.html.haml b/app/views/refs/_tree.html.haml index 63ff6196a1f..389a5a9cfb9 100644 --- a/app/views/refs/_tree.html.haml +++ b/app/views/refs/_tree.html.haml @@ -13,7 +13,7 @@ = render :partial => "refs/tree_file", :locals => { :name => tree.name, :content => tree.data, :file => tree } - else - contents = tree.contents - %table#tree-slider.bordered-table + %table#tree-slider.bordered-table.table %thead %th Name %th Last Update diff --git a/db/schema.rb b/db/schema.rb index 9b16c9fcb69..906c5b0024c 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -30,8 +30,8 @@ ActiveRecord::Schema.define(:version => 20120408181910) do t.integer "assignee_id" t.integer "author_id" t.integer "project_id" - t.datetime "created_at" - t.datetime "updated_at" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false t.boolean "closed", :default => false, :null => false t.integer "position", :default => 0 t.boolean "critical", :default => false, :null => false @@ -44,8 +44,8 @@ ActiveRecord::Schema.define(:version => 20120408181910) do create_table "keys", :force => true do |t| t.integer "user_id" - t.datetime "created_at" - t.datetime "updated_at" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false t.text "key" t.string "title" t.string "identifier" @@ -60,10 +60,10 @@ ActiveRecord::Schema.define(:version => 20120408181910) do t.integer "assignee_id" t.string "title" t.boolean "closed", :default => false, :null => false - t.datetime "created_at" - t.datetime "updated_at" - t.text "st_commits", :limit => 4294967295 - t.text "st_diffs", :limit => 4294967295 + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + t.text "st_commits", :limit => 2147483647 + t.text "st_diffs", :limit => 2147483647 t.boolean "merged", :default => false, :null => false end @@ -84,8 +84,8 @@ ActiveRecord::Schema.define(:version => 20120408181910) do t.string "noteable_id" t.string "noteable_type" t.integer "author_id" - t.datetime "created_at" - t.datetime "updated_at" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false t.integer "project_id" t.string "attachment" t.string "line_code" @@ -98,8 +98,8 @@ ActiveRecord::Schema.define(:version => 20120408181910) do t.string "name" t.string "path" t.text "description" - t.datetime "created_at" - t.datetime "updated_at" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false t.boolean "private_flag", :default => true, :null => false t.string "code" t.integer "owner_id" @@ -122,8 +122,8 @@ ActiveRecord::Schema.define(:version => 20120408181910) do t.text "content" t.integer "author_id", :null => false t.integer "project_id", :null => false - t.datetime "created_at" - t.datetime "updated_at" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false t.string "file_name" t.datetime "expires_at" end @@ -156,8 +156,8 @@ ActiveRecord::Schema.define(:version => 20120408181910) do t.datetime "last_sign_in_at" t.string "current_sign_in_ip" t.string "last_sign_in_ip" - t.datetime "created_at" - t.datetime "updated_at" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false t.string "name" t.boolean "admin", :default => false, :null => false t.integer "projects_limit", :default => 10 @@ -176,16 +176,16 @@ ActiveRecord::Schema.define(:version => 20120408181910) do create_table "users_projects", :force => true do |t| t.integer "user_id", :null => false t.integer "project_id", :null => false - t.datetime "created_at" - t.datetime "updated_at" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false t.integer "project_access", :default => 0, :null => false end create_table "web_hooks", :force => true do |t| t.string "url" t.integer "project_id" - t.datetime "created_at" - t.datetime "updated_at" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false end create_table "wikis", :force => true do |t| -- GitLab