[issue #195] Fixed bug with encodings. Added avatar. Stubbed blame.

This commit is contained in:
George Vinogradov 2012-03-02 04:39:43 +04:00
parent e66f0110fc
commit 6cfb5d0c3d
5 changed files with 10 additions and 5 deletions

View File

@ -316,3 +316,8 @@ div.gutter {
table.tablesorter tr td.centered { table.tablesorter tr td.centered {
text-align: center; text-align: center;
} }
/* TODO change this */
header div.user div.avatar img {
border: 1px solid #DDDDDD;
}

View File

@ -17,8 +17,8 @@ module WikiHelper
end end
end end
def gravatar_url(email) def gravatar_url(email, size = 16)
"http://www.gravatar.com/avatar/#{Digest::MD5.hexdigest(email.downcase)}?s=16&r=pg" "https://secure.gravatar.com/avatar/#{Digest::MD5.hexdigest(email.downcase)}?s=#{size}&r=pg"
end end
def escaped_name def escaped_name

View File

@ -10,7 +10,7 @@
.both .both
= t("layout.enter_commit_message") = t("layout.enter_commit_message")
= text_area_tag :message, "Updated #{@blob.name}", :class => 'commit-message' = text_area_tag :message, "Updated #{@blob.name.encode_to_default}", :class => 'commit-message'
%br %br
%br %br

View File

@ -17,7 +17,7 @@
- if render_way == :text and can? :write, @project and @treeish.in? @project.branches.map(&:name) - if render_way == :text and can? :write, @project and @treeish.in? @project.branches.map(&:name)
= raw "#{link_to "Edit", edit_blob_path(@project, @treeish, @path) } | " = raw "#{link_to "Edit", edit_blob_path(@project, @treeish, @path) } | "
= raw "#{link_to "Raw", raw_path(@project, @treeish, @path)} | " = raw "#{link_to "Raw", raw_path(@project, @treeish, @path)} | "
= raw "#{link_to "Blame", blame_path(@project, @treeish, @path)} | " =# raw "#{link_to "Blame", blame_path(@project, @treeish, @path)} | "
= link_to "History", commits_path(@project, @treeish, @path) = link_to "History", commits_path(@project, @treeish, @path)
.both .both
.data .data

View File

@ -22,7 +22,7 @@
.field .field
%input.gray{:onclick => "if(this.value=='#{t "layout.search"}'){this.value='';this.className='black';}", :onblur => "if(this.value==''){this.value='#{t "layout.search"}';this.className='gray';}", :type => "text", :value => "#{t "layout.search"}"} %input.gray{:onclick => "if(this.value=='#{t "layout.search"}'){this.value='';this.className='black';}", :onblur => "if(this.value==''){this.value='#{t "layout.search"}';this.className='gray';}", :type => "text", :value => "#{t "layout.search"}"}
.user .user
.avatar= image_tag 'ava.png', :alt => 'avatar', :height => "30" .avatar= image_tag gravatar_url(current_user.email, 30), :alt => 'avatar', :height => "30"
.profile .profile
%a{:href => "#"} %a{:href => "#"}
= current_user.uname = current_user.uname