diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index b6caaa6..ee64cda 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -328,9 +328,7 @@ module ApplicationHelper
end
- # displays a link to the profile homepage with its image (as generated by
- # #profile_image) and its name below it.
- def profile_image_link( profile, size=:portrait, tag='li' )
+ def profile_sex_icon( profile )
if profile.class == Person
sex = ( profile.sex ? profile.sex.to_s() : 'undef' )
title = ( sex == 'undef' ? _('non registered gender') : ( sex == 'male' ? _('Male') : _('Female') ) )
@@ -341,6 +339,12 @@ module ApplicationHelper
else
sex = ''
end
+ sex
+ end
+
+ # displays a link to the profile homepage with its image (as generated by
+ # #profile_image) and its name below it.
+ def profile_image_link( profile, size=:portrait, tag='li' )
if profile.class == Person
name = profile.first_name
city = content_tag 'span', content_tag( 'span', profile.city, :class => 'locality' ), :class => 'adr'
@@ -352,7 +356,7 @@ module ApplicationHelper
link_to(
content_tag( 'span', profile_image( profile, size ), :class => 'profile-image' ) +
content_tag( 'span', name, :class => ( profile.class == Person ? 'fn' : 'org' ) ) +
- city + sex,
+ city + profile_sex_icon( profile ),
profile.url,
:class => 'profile_link url',
:help => _('Click on this icon to go to the %s\'s home page') % profile.name ),
diff --git a/app/views/blocks/profile_info.rhtml b/app/views/blocks/profile_info.rhtml
index 5b0eeca..b44561e 100644
--- a/app/views/blocks/profile_info.rhtml
+++ b/app/views/blocks/profile_info.rhtml
@@ -1,6 +1,15 @@
<%= block.owner.name %>
-<%= profile_image(block.owner, :thumb) %>
+
+
+
+ <%=
+ profile_image(block.owner, :thumb) +"\n"+
+ profile_sex_icon( profile )
+ %>
+
+
+
- <%= _('Since %{year}/%{month}') % { :year => block.owner.created_at.year, :month => block.owner.created_at.month } %>
diff --git a/public/designs/themes/ecosol/stylesheets/blocks/profile-info-block.css b/public/designs/themes/ecosol/stylesheets/blocks/profile-info-block.css
index b3f7701..8b13789 100644
--- a/public/designs/themes/ecosol/stylesheets/blocks/profile-info-block.css
+++ b/public/designs/themes/ecosol/stylesheets/blocks/profile-info-block.css
@@ -1,31 +1 @@
-.profile-info-block h2 {
- text-align: center;
-}
-.profile-info-picture {
- border: 2px solid #204A87;
- padding: 1px;
- background: #FFF;
- margin-right: 40px;
-}
-.msie6 .profile-info-picture {
- margin-right: 20px;
-}
-
-.profile-info-data {
- width: 110px;
- font-size: 10px;
- text-align: right;
- position: relative;
- top: 20px;
-}
-
-.profile-info-options {
- clear: both;
-}
-
-.profile-info-options {
- padding-top: 20px;
- text-align: right;
- padding-right: 5px;
-}
diff --git a/public/designs/themes/zen3/stylesheets/blocks/profile-info-block.css b/public/designs/themes/zen3/stylesheets/blocks/profile-info-block.css
index 68b6ed1..efde9d3 100644
--- a/public/designs/themes/zen3/stylesheets/blocks/profile-info-block.css
+++ b/public/designs/themes/zen3/stylesheets/blocks/profile-info-block.css
@@ -1,31 +1,7 @@
-.profile-info-block h2 {
- text-align: center;
-}
-.profile-info-picture {
- border: 2px solid #A40000;
- padding: 1px;
+.profile-info-picture img {
+ border: 1px solid #A40000;
+ padding: 2px;
background: #FFF;
- margin-right: 40px;
-}
-.msie6 .profile-info-picture {
- margin-right: 20px;
-}
-
-.profile-info-data {
- width: 110px;
- font-size: 10px;
- text-align: right;
- position: relative;
- top: 20px;
}
-.profile-info-options {
- clear: both;
-}
-
-.profile-info-options {
- padding-top: 20px;
- text-align: right;
- padding-right: 5px;
-}
diff --git a/public/stylesheets/blocks/profile-info-block.css b/public/stylesheets/blocks/profile-info-block.css
index 603bc1d..d3f0eba 100644
--- a/public/stylesheets/blocks/profile-info-block.css
+++ b/public/stylesheets/blocks/profile-info-block.css
@@ -1,6 +1,93 @@
+.profile-info-block h2 {
+ text-align: center;
+}
+
.profile-info-picture {
+ position: relative;
float: right;
+ display: table;
+ margin-right: 40px;
+ width: 106px;
+ height: 106px;
+}
+.msie6 .profile-info-picture {
+ margin-right: 20px;
+}
+
+.profile-info-picture-inner1 {
+ display: table-cell;
+ text-align: center;
+ vertical-align: middle;
+}
+.profile-info-picture-inner2 {
+ position: relative;
+ left: 0px;
+ display: block;
+}
+
+.profile-info-picture img {
+ border: 1px solid #204A87;
+ padding: 2px;
+ background: #FFF;
+}
+
+.profile-info-picture .sex-male,
+.profile-info-picture .sex-female,
+.profile-info-picture .sex-undef {
+ position: absolute;
+ top: 4px;
+ right: 4px;
+ display: block;
+ width: 15px;
+ height: 15px;
+}
+
+.profile-info-picture .sex-male {
+ background: url(/images/icons-app/ico-male.png);
+}
+.profile-info-picture .sex-female {
+ background: url(/images/icons-app/ico-female.png);
+}
+.profile-info-picture .sex-undef {
+ background: url(/images/icons-app/ico-sex-undef.png);
+}
+.msie6 .profile-info-picture .sex-male {
+ background: none;
+ filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(src='/images/icons-app/ico-male.png',sizingMethod='scale');
+}
+.msie6 .profile-info-picture .sex-female {
+ background: none;
+ filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(src='/images/icons-app/ico-female.png',sizingMethod='scale');
+}
+.msie6 .profile-info-picture .sex-undef {
+ background: none;
+ filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(src='/images/icons-app/ico-sex-undef.png',sizingMethod='scale');
+}
+
+#content .profile-info-picture .sex-male span,
+#content .profile-info-picture .sex-female span,
+#content .profile-info-picture .sex-undef span {
+ display: none;
+}
+
+
+.profile-info-data {
+ width: 110px;
+ font-size: 10px;
+ text-align: right;
+ position: relative;
+ top: 20px;
+}
+
+.profile-info-options {
+ clear: both;
+}
+
+.profile-info-options {
+ padding-top: 20px;
+ text-align: right;
+ padding-right: 5px;
}
.profile-info-block {
diff --git a/public/stylesheets/blocks/profile-list-block.css b/public/stylesheets/blocks/profile-list-block.css
index c33e4f1..e82e7e5 100644
--- a/public/stylesheets/blocks/profile-list-block.css
+++ b/public/stylesheets/blocks/profile-list-block.css
@@ -47,6 +47,12 @@
border: none;
}
+.common-profile-list-block .locality {
+ font-size: 9px;
+ opacity: 0.5;
+ filter: alpha(opacity=50);
+}
+
.common-profile-list-block .sex-male,
.common-profile-list-block .sex-female,
.common-profile-list-block .sex-undef {
@@ -58,12 +64,6 @@
height: 15px;
}
-.common-profile-list-block .locality {
- font-size: 9px;
- opacity: 0.5;
- filter: alpha(opacity=50);
-}
-
.common-profile-list-block .sex-male {
background: url(/images/icons-app/ico-male.png);
}
--
libgit2 0.21.2