Download as
Browse Code »

Commit eaff26e984b3897f0186d19ed14816317cbbfdbe

Authored by Valessio S Brito
Committed by Antonio Terceiro
1 parent 0e9005ab
Exists in master and in 29 other branches add_member_task_reject_details, admin_visible_profile, article-list-template, community_notifications, contact_admin_translation, event_fixes, fix_comments_pagination, fix_rails4_organization_ratings, fix_sign_up_form, follow_step_fix, forum_topic_creation, mirror_block_improvements, multi_env_on_remote_user, new_security, noosfero_spb_ci, organization_ratings_improvements, organization_ratings_link_to_profile_stable-spb-1.3, organization_ratings_translations_fix, profile_api_improvements, ratings_minor_fixes, remote_user_fix, send_email_to_admins, stable-spb-1.3, stable-spb-1.3-fixes, stable-spb-1.4, stable-spb-1.5, suggest_rejected_value, web_steps_improvements, xss_terminate_custom_options

ActionItem1020: template fixes

Showing 5 changed files with 22 additions and 21 deletions   Show diff stats
app/views/account/_signup_form.rhtml
  Diff comments   View file @eaff26e
... ... @@ -19,26 +19,30 @@
19 19  
20 20 <%= required_fields_message %>
21 21  
  22 +<div id='signup-email'>
  23 +<%= required f.text_field(:email,
  24 + :help => help=_('This e-mail address will be used to contact you.')) %>
  25 +<div class='help-small-msg'><%= help %></div>
  26 +</div>
  27 +
22 28 <%= required f.text_field(:login,
  29 + :help => help=_('Insert your login'),
23 30 :onchange => 'this.value = convToValidLogin( this.value )') %>
24   -<small><%= help %></small>
25   -
26   -<%= observe_field 'user_login', :url => {:action => 'check_url'}, :with => 'identifier', :update => 'url-check' %>
27   -
28 31 <div id='url-check'>
  32 +<div class='help-small-msg'><%= help %></div>
29 33 </div>
30 34  
31   -<%= required f.text_field(:email,
32   - :help => help=_('This e-mail address will be used to contact you.')) %>
33   -<small><%= help %></small>
  35 +<%= observe_field 'user_login', :url => {:action => 'check_url'}, :with => 'identifier', :update => 'url-check' %>
34 36  
  37 +<div id='signup-password'>
35 38 <%= required f.password_field(:password,
36 39 :help => help=_('Choose a password that you can remember easily.')) %>
37   -<small><%= help %></small>
  40 +<div class='help-small-msg'><%= help %></div>
  41 +</div>
38 42  
39 43 <%= required f.password_field(:password_confirmation,
40 44 :help => help=_('To confirm, repeat your password.')) %>
41   -<small><%= help %></small>
  45 +<div class='help-small-msg'><%= help %></div>
42 46  
43 47 <% labelled_fields_for :profile_data, @person do |f| %>
44 48 <%= render :partial => 'profile_editor/person_form', :locals => {:f => f} %>
... ... @@ -52,7 +56,7 @@
52 56 page['terms-of-use'].show
53 57 end %>
54 58  
55   - <div id='terms-of-use' style='max-height: 200px; overflow: auto; display:none;'>
  59 + <div id='terms-of-use' style='display: none;'>
56 60 <%= @terms_of_use %>
57 61 <%= link_to_function(_('Hide'), nil) do |page|
58 62 page['terms-of-use'].hide
... ...
app/views/account/logout_popup.rhtml
  Diff comments   View file @eaff26e
1   -<p><%= _('Are you sure you want to get out?') %></p>
2   -
  1 +<h2><%= _('Are you sure you want to get out?') %></h2>
  2 +<p>
3 3 <% button_bar do %>
4 4 <%= button :ok, _('Yes'), { :controller => 'account', :action => 'logout' } %>
5 5 <%= lightbox_close_button _('No, I want to stay.') %>
6 6 <% end %>
  7 +</p>
... ...
app/views/account/wizard.rhtml
  Diff comments   View file @eaff26e
1 1 <%= lightbox_close_button _('Close') %>
2 2  
3   -<iframe id='wizard-iframe' width=100% height='420px' src="<%= url_for(:controller => 'account', :action => 'signup', :wizard => true) %>" >
  3 +<iframe id='wizard-iframe' width='590px' height='410px' border='0' src="<%= url_for(:controller => 'account', :action => 'signup', :wizard => true) %>" >
4 4 <p><%= _('Your browser does not support iframes.') %></p>
5 5 </iframe>
... ...
app/views/layouts/wizard.rhtml
  Diff comments   View file @eaff26e
... ... @@ -11,9 +11,9 @@
11 11  
12 12 <%=
13 13 # Load the principal css files:
14   - stylesheet_import( %w( common button search forms)
  14 + stylesheet_import( %w( common button search forms profiles)
15 15 ) + "\n" +
16   - stylesheet_import( %w( common button search forms),
  16 + stylesheet_import( %w( common button search forms profiles),
17 17 :themed_source => true ) + "\n" +
18 18 # Load the boxes's css file if each exists:
19 19 import_blocks_stylesheets +
... ... @@ -22,13 +22,9 @@
22 22 %>
23 23 </head>
24 24  
25   - <body class='noosfero'>
26   - <div id="iframe">
27   - <div id="content">
  25 + <body class='noosfero' id='wizard'>
28 26 <div id="wizard-content">
29 27 <%= yield %>
30 28 </div><!-- id="wizard-content" -->
31   - </div><!-- id="content" -->
32   - </div><!-- id="frame" -->
33 29 </body>
34 30 </html>
... ...
public/javascripts/lightbox.js
  Diff comments   View file @eaff26e
... ... @@ -147,7 +147,7 @@ lightbox.prototype = {
147 147  
148 148 // Display Ajax response
149 149 processInfo: function(response){
150   - info = "<div id='lbContent'>" + response.responseText + "</div>";
  150 + info = "<div id='lbContent'><div id='lbBottomBG'><div id='lbTopBG'>" + response.responseText + "</div></div></div>";
151 151 new Insertion.Before($('lbLoadMessage'), info)
152 152 if (this.lightbox_className) {
153 153 $('lightbox').className = "done " + this.lightbox_className;
... ...