Commit 76dfe9f57b56473a912ef1d17ec23bc36b4e391d
1 parent
23f3d3c3
Exists in
master
and in
28 other branches
ActionItem183: the index of profile editor is better now.
git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@1540 3f533792-8f58-4932-b0fe-aaf55b0a4547
Showing
8 changed files
with
39 additions
and
8 deletions
Show diff stats
app/views/layouts/application.rhtml
| @@ -13,12 +13,15 @@ | @@ -13,12 +13,15 @@ | ||
| 13 | stylesheet_import is better then stylesheet_link_tag because the stylesheet | 13 | stylesheet_import is better then stylesheet_link_tag because the stylesheet |
| 14 | must be loaded before the page show. | 14 | must be loaded before the page show. |
| 15 | %> | 15 | %> |
| 16 | - <%= stylesheet_import %w( common help menu article button search blocks forms login-box ) %> | ||
| 17 | - <%= import_blocks_stylesheets %> | ||
| 18 | <%= | 16 | <%= |
| 17 | + # Load the principal css files: | ||
| 18 | + stylesheet_import( %w( common help menu article button search blocks forms login-box ) ) + | ||
| 19 | + "\n" + | ||
| 20 | + # Load the boxes's css file if each exists: | ||
| 21 | + import_blocks_stylesheets + | ||
| 19 | # Load the controller's css file if it exists: | 22 | # Load the controller's css file if it exists: |
| 20 | - css = "controller_"+ @controller.controller_name() +".css" | ||
| 21 | - stylesheet_link_tag( css ) if File.exists?( "public/stylesheets/"+css ) | 23 | + stylesheet_import( "controller_"+ @controller.controller_name() ) + "\n" + |
| 24 | + stylesheet_import( "controller_"+ @controller.controller_name(), :themed_source => true ) | ||
| 22 | %> | 25 | %> |
| 23 | 26 | ||
| 24 | <%# FIXME %> | 27 | <%# FIXME %> |
app/views/profile_editor/index.rhtml
| 1 | +<div id="profile-editor-index"> | ||
| 2 | + | ||
| 1 | <h1 class="block-title"><%= _('My profile') %></h1> | 3 | <h1 class="block-title"><%= _('My profile') %></h1> |
| 2 | 4 | ||
| 3 | <%= render :partial => 'pending_tasks' %> | 5 | <%= render :partial => 'pending_tasks' %> |
| 4 | 6 | ||
| 5 | -<%= link_to (@profile.image ? image_tag( @profile.image.public_filename) : _('Put image')), :action => 'change_image' %> | 7 | +<%= link_to (@profile.image ? image_tag( @profile.image.public_filename) : |
| 8 | + _('Upload your picture') ), | ||
| 9 | + { :action => 'change_image' }, | ||
| 10 | + :class => (@profile.image ? 'change-user-picture' : 'set-user-picture' ), | ||
| 11 | + :help => _('Click here to upload any image to be your picture') %> | ||
| 12 | + | ||
| 13 | +<p/> | ||
| 6 | 14 | ||
| 7 | <%= display_profile_info(profile) %> | 15 | <%= display_profile_info(profile) %> |
| 8 | 16 | ||
| @@ -48,3 +56,5 @@ | @@ -48,3 +56,5 @@ | ||
| 48 | <% end %> | 56 | <% end %> |
| 49 | 57 | ||
| 50 | <% end %> | 58 | <% end %> |
| 59 | + | ||
| 60 | +</div><!-- end id="profile-editor-index" --> |
public/designs/themes/default/stylesheets/blocks/main-block.css
public/designs/themes/default/stylesheets/controller_profile.css
0 → 100644
public/designs/themes/default/stylesheets/controller_profile_editor.css
0 → 100644
| @@ -0,0 +1,12 @@ | @@ -0,0 +1,12 @@ | ||
| 1 | + | ||
| 2 | +#profile-editor-index .change-user-picture img { | ||
| 3 | + border: 2px solid #3465A4; | ||
| 4 | + padding: 1px; | ||
| 5 | +} | ||
| 6 | + | ||
| 7 | +#profile-editor-index .set-user-picture { | ||
| 8 | + text-decoration: none; | ||
| 9 | + border: 2px solid #3465A4; | ||
| 10 | + background: #B8CFE7; | ||
| 11 | + padding: 1px 5px; | ||
| 12 | +} |
public/stylesheets/blocks/main-block.css
No preview for this file type