diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index b95509f..6e89ce8 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -398,6 +398,7 @@ module ApplicationHelper # #profile_image) and its name below it. def profile_image_link(profile, size=:portrait) link_to( '
'+ profile_image(profile, size) +'
'+ profile.name() +'', profile.url, + :class => 'profile_link', :help => _('Click on this icon to go to the %s\'s home page') % profile.name ) end diff --git a/app/views/friends/index.rhtml b/app/views/friends/index.rhtml index e318703..c094a0f 100644 --- a/app/views/friends/index.rhtml +++ b/app/views/friends/index.rhtml @@ -1,11 +1,18 @@ +
+

<%= _("%s's friends") % profile.name %>

@@ -18,7 +25,9 @@

<% end %> - <% button_bar do %> <%= button(:back, _('Go back'), :controller => 'profile_editor') %> <% end %> + +
+ diff --git a/app/views/friends/remove.rhtml b/app/views/friends/remove.rhtml index e4d3408..8318c1a 100644 --- a/app/views/friends/remove.rhtml +++ b/app/views/friends/remove.rhtml @@ -1,5 +1,9 @@ +
+

<%= _('Removing friend: %s') % @friend.name %>

+<%= profile_image @friend, :thumb, :class => 'friend_picture' %> +

<%= _('Are you sure you want to remove %s from your friends list?') % @friend.name %>

@@ -16,3 +20,5 @@ <%= submit_button(:ok, _("Yes, I want to remove %s from my friend list") % @friend.name) %> <%= button(:cancel, _("No, I don't want"), :action => 'index') %> <% end %> + +
diff --git a/app/views/layouts/application.rhtml b/app/views/layouts/application.rhtml index 356f3d9..d8d1b90 100644 --- a/app/views/layouts/application.rhtml +++ b/app/views/layouts/application.rhtml @@ -170,6 +170,19 @@ // the onload will run only after all related documents load. // by that we need to cal this here: if ( window.addEventListener ) resizePrincipalTemplateBox() + + // Sory IE: + if ( document.all ) { + if ( confirm("<%= +_("Ups... It seems you are using Internet Explorer. + +We are sory, but some things will not work well on this web browser for now... +We propose you to use Firefox, for this web site and any other. + +Do you want to get your Firefox now?").gsub(/\n/,'\n') %>") ) { + document.location.href = "http://getfirefox.com"; + } + } diff --git a/public/designs/themes/default/stylesheets/controller_friends.css b/public/designs/themes/default/stylesheets/controller_friends.css new file mode 100644 index 0000000..a3e91df --- /dev/null +++ b/public/designs/themes/default/stylesheets/controller_friends.css @@ -0,0 +1,9 @@ + +.profile-list .profile_link span { + font-weight: bold; +} + +.profile-list li:hover .profile_link span { + color: #FFF; +} + diff --git a/public/stylesheets/controller_friends.css b/public/stylesheets/controller_friends.css new file mode 100644 index 0000000..2f8f6dc --- /dev/null +++ b/public/stylesheets/controller_friends.css @@ -0,0 +1,59 @@ + +#content #manage_friends ul { + margin: 0px; + padding: 0px; + list-style: none; +} + +#content #manage_friends li { + float: left; + width: 200px; + height: 68px; + margin: 5px; + padding: 5px; + border: 2px solid #B8CFE7; + list-style: none; + overflow: hidden; + position: relative; +} +#content #manage_friends li:hover { + border: 2px solid #2A5896; + background: #729FCF; +} + +.profile-list img { + float: left; + border: none; +} + +.profile-list a { + text-decoration: none; +} + +.profile-list .profile_link span { + width: 200px; + display: block; + overflow: hidden; +} + +.controll { + position: absolute; + right: 5px; + bottom: 10px; +} + +#manage_friends .button-bar { + clear: both; + padding-top: 20px; +} + +#remove_friend .friend_picture { + float: left; + margin-right: 15px; +} + +#remove_friend form { + clear: both; + padding-top: 20px; +} + -- libgit2 0.21.2