deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge branch 'dev' into issue-184

Browse source 
Conflicts:
	app/views/layouts/project.html.haml
This commit is contained in:
Aleksei Kvitinskii 2011-11-07 21:29:28 +02:00
commit 444b69ddc2
17 changed files with 106 additions and 66 deletions
Download patch file Download diff file Expand all files Collapse all files

72
app/views/admin/users/_form.html.haml
View file

@ -7,44 +7,42 @@
- @admin_user.errors.full_messages.each do |msg|
%li= msg
.span-24
.span-11.colborder
.field
= f.label :name
%br
= f.text_field :name
.field
= f.label :email
%br
= f.text_field :email
.field
= f.label :password
%br
= f.password_field :password
.field
= f.label :password_confirmation
%br
= f.password_field :password_confirmation
.field.prepend-top
= f.check_box :admin
= f.label :admin
.span-11
.field.prepend-top
= f.text_field :projects_limit, :class => "small_input"
= f.label :projects_limit
.form-row
= f.label :name
%br
= f.text_field :name
.form-row
= f.label :email
%br
= f.text_field :email
.form-row
= f.label :password
%br
= f.password_field :password
.form-row
= f.label :password_confirmation
%br
= f.password_field :password_confirmation
.form-row
= f.check_box :admin
= f.label :admin
.field
= f.label :skype
%br
= f.text_field :skype
.field
= f.label :linkedin
%br
= f.text_field :linkedin
.field
= f.label :twitter
%br
= f.text_field :twitter
.form-row
= f.text_field :projects_limit, :class => "small_input"
= f.label :projects_limit
.form-row
= f.label :skype
%br
= f.text_field :skype
.form-row
= f.label :linkedin
%br
= f.text_field :linkedin
.form-row
= f.label :twitter
%br
= f.text_field :twitter
.clear
%br
.actions

1
app/views/admin/users/index.html.haml
View file

@ -21,4 +21,5 @@
%br
= paginate @admin_users
= link_to 'New User', new_admin_user_path

2
app/views/commits/_commits.html.haml
View file

@ -17,7 +17,7 @@
= image_tag "no_avatar.png", :class => "left", :width => 40, :style => "padding-right:5px;"
%span.commit-title
%strong
= truncate(commit.safe_message, :length => 60)
= truncate(commit.safe_message, :length => fixed_mode? ? 60 : 120)
%span.commit-author
%strong= commit.author_name
= time_ago_in_words(commit.committed_date)

13
app/views/issues/_form.html.haml
View file

@ -5,24 +5,21 @@
- @issue.errors.full_messages.each do |msg|
%li= msg
.span-8
.form-row
= f.label :title
= f.text_area :title, :style => "width:450px; height:100px", :maxlength => 255
-#.span-8
-#= f.label :content
-#= f.text_area :content, :style => "width:450px; height:130px"
.span-8.append-bottom
.form-row
= f.label :assignee_id
= f.select(:assignee_id, @project.users.all.collect {|p| [ p.name, p.id ] }, { :include_blank => "Select user" })
.span-1
.form-row
= f.label :critical, "Critical"
%br
= f.check_box :critical
- unless @issue.new_record?
.span-2.right
.form-row
= f.label :closed
%br
= f.check_box :closed
%hr
.span-6
.form-row
= f.submit 'Save', :class => "lbutton vm"

6
app/views/keys/_form.html.haml
View file

@ -5,12 +5,12 @@
- @key.errors.full_messages.each do |msg|
%li= msg
.span-6
.form-row
= f.label :title
= f.text_field :title, :style => "width:300px"
.span-6
.form-row
= f.label :key
= f.text_area :key, :style => "width:300px; height:130px"
.span-6
.form-row
= f.submit 'Save', :class => "lbutton vm"

4
app/views/layouts/project.html.haml
View file

@ -26,12 +26,12 @@
- if @project.users_projects.count > 0
%span{ :class => "number" }= @project.users_projects.count
= link_to project_issues_path(@project), :class => (controller.controller_name == "issues") ? "current" : nil do
Issues
Issuess
- if @project.issues.opened.count > 0
%span{ :class => "number" }= @project.issues.opened.count
= link_to wall_project_path(@project), :class => current_page?(:controller => "projects", :action => "wall", :id => @project) ? "current" : nil do
Wall
- if @project.common_notes.count > 0
- if @project.common_nsotes.count > 0
%span{ :class => "number" }= @project.common_notes.count
= link_to project_snippets_path(@project), :class => (controller.controller_name == "snippets") ? "current" : nil do
Snippets

9
app/views/notes/_form.html.haml
View file

@ -10,13 +10,16 @@
%div
= f.label :note
%cite
%cite.cgray markdown supported
%br
%br
= f.text_area :note, :size => 255
%div.attach_holder
%br
= f.label :attachment
%cite (less than 10 MB)
%cite.cgray (less than 10 MB)
%br
%br
= f.file_field :attachment

4
app/views/profile/password.html.haml
View file

@ -7,11 +7,11 @@
- @user.errors.full_messages.each do |msg|
%li= msg
.div
.form-row
= f.label :password
%br
= f.password_field :password
.div
.form-row
= f.label :password_confirmation
%br
= f.password_field :password_confirmation

6
app/views/profile/show.html.haml
View file

@ -16,15 +16,15 @@
- @user.errors.full_messages.each do |msg|
%li= msg
.div
.form-row
= f.label :skype
%br
= f.text_field :skype
.div
.form-row
= f.label :linkedin
%br
= f.text_field :linkedin
.div
.form-row
= f.label :twitter
%br
= f.text_field :twitter

7
app/views/projects/_tree_item.html.haml
View file

@ -11,5 +11,8 @@
%td
= time_ago_in_words(content_commit.committed_date)
ago
%td
= link_to truncate(content_commit.safe_message, :length => 40), project_commit_path(@project, content_commit)
%td.commit
= link_to truncate(content_commit.safe_message, :length => fixed_mode? ? 40 : 80), project_commit_path(@project, content_commit), :class => "tree-commit-link"
- tm = @project.team_member_by_name_or_email(content_commit.author_email, content_commit.author_name)
- if tm
= link_to "[#{tm.user_name}]", project_team_member_path(@project, tm)