From 76dfe9f57b56473a912ef1d17ec23bc36b4e391d Mon Sep 17 00:00:00 2001 From: AurelioAHeckert Date: Sat, 1 Mar 2008 00:08:24 +0000 Subject: [PATCH] ActionItem183: the index of profile editor is better now. --- app/views/layouts/application.rhtml | 11 +++++++---- app/views/profile_editor/index.rhtml | 12 +++++++++++- public/designs/themes/default/stylesheets/blocks/main-block.css | 1 - public/designs/themes/default/stylesheets/controller_profile.css | 2 ++ public/designs/themes/default/stylesheets/controller_profile_editor.css | 12 ++++++++++++ public/stylesheets/blocks/main-block.css | 1 - public/stylesheets/controller_profile.css | 2 ++ public/stylesheets/controller_profile_editor.css | 6 +++++- 8 files changed, 39 insertions(+), 8 deletions(-) create mode 100644 public/designs/themes/default/stylesheets/controller_profile.css create mode 100644 public/designs/themes/default/stylesheets/controller_profile_editor.css create mode 100644 public/stylesheets/controller_profile.css diff --git a/app/views/layouts/application.rhtml b/app/views/layouts/application.rhtml index 55337a4..a634b9c 100644 --- a/app/views/layouts/application.rhtml +++ b/app/views/layouts/application.rhtml @@ -13,12 +13,15 @@ stylesheet_import is better then stylesheet_link_tag because the stylesheet must be loaded before the page show. %> - <%= stylesheet_import %w( common help menu article button search blocks forms login-box ) %> - <%= import_blocks_stylesheets %> <%= + # Load the principal css files: + stylesheet_import( %w( common help menu article button search blocks forms login-box ) ) + + "\n" + + # Load the boxes's css file if each exists: + import_blocks_stylesheets + # Load the controller's css file if it exists: - css = "controller_"+ @controller.controller_name() +".css" - stylesheet_link_tag( css ) if File.exists?( "public/stylesheets/"+css ) + stylesheet_import( "controller_"+ @controller.controller_name() ) + "\n" + + stylesheet_import( "controller_"+ @controller.controller_name(), :themed_source => true ) %> <%# FIXME %> diff --git a/app/views/profile_editor/index.rhtml b/app/views/profile_editor/index.rhtml index 191cd12..e74e535 100644 --- a/app/views/profile_editor/index.rhtml +++ b/app/views/profile_editor/index.rhtml @@ -1,8 +1,16 @@ +
+

<%= _('My profile') %>

<%= render :partial => 'pending_tasks' %> -<%= link_to (@profile.image ? image_tag( @profile.image.public_filename) : _('Put image')), :action => 'change_image' %> +<%= link_to (@profile.image ? image_tag( @profile.image.public_filename) : + _('Upload your picture') ), + { :action => 'change_image' }, + :class => (@profile.image ? 'change-user-picture' : 'set-user-picture' ), + :help => _('Click here to upload any image to be your picture') %> + +

<%= display_profile_info(profile) %> @@ -48,3 +56,5 @@ <% end %> <% end %> + +

diff --git a/public/designs/themes/default/stylesheets/blocks/main-block.css b/public/designs/themes/default/stylesheets/blocks/main-block.css index c8fbbb3..78b54de 100644 --- a/public/designs/themes/default/stylesheets/blocks/main-block.css +++ b/public/designs/themes/default/stylesheets/blocks/main-block.css @@ -1,4 +1,3 @@ -@import url(profile-list-block.css); .article { position: relative; diff --git a/public/designs/themes/default/stylesheets/controller_profile.css b/public/designs/themes/default/stylesheets/controller_profile.css new file mode 100644 index 0000000..bb81a3f --- /dev/null +++ b/public/designs/themes/default/stylesheets/controller_profile.css @@ -0,0 +1,2 @@ +@import url(profile-list-block.css); + diff --git a/public/designs/themes/default/stylesheets/controller_profile_editor.css b/public/designs/themes/default/stylesheets/controller_profile_editor.css new file mode 100644 index 0000000..54329fd --- /dev/null +++ b/public/designs/themes/default/stylesheets/controller_profile_editor.css @@ -0,0 +1,12 @@ + +#profile-editor-index .change-user-picture img { + border: 2px solid #3465A4; + padding: 1px; +} + +#profile-editor-index .set-user-picture { + text-decoration: none; + border: 2px solid #3465A4; + background: #B8CFE7; + padding: 1px 5px; +} diff --git a/public/stylesheets/blocks/main-block.css b/public/stylesheets/blocks/main-block.css index bb81a3f..8b13789 100644 --- a/public/stylesheets/blocks/main-block.css +++ b/public/stylesheets/blocks/main-block.css @@ -1,2 +1 @@ -@import url(profile-list-block.css); diff --git a/public/stylesheets/controller_profile.css b/public/stylesheets/controller_profile.css new file mode 100644 index 0000000..bb81a3f --- /dev/null +++ b/public/stylesheets/controller_profile.css @@ -0,0 +1,2 @@ +@import url(profile-list-block.css); + diff --git a/public/stylesheets/controller_profile_editor.css b/public/stylesheets/controller_profile_editor.css index c7dceeb..19c421c 100644 --- a/public/stylesheets/controller_profile_editor.css +++ b/public/stylesheets/controller_profile_editor.css @@ -1,4 +1,8 @@ .profile_info th { text-align: right; - padding-right: 20px; +} + +.profile_info td, +.profile_info th { + padding: 2px 10px; } -- libgit2 0.21.2