Download as
Browse Code »

Commit eaff26e984b3897f0186d19ed14816317cbbfdbe

Authored by Valessio S Brito
Committed by Antonio Terceiro
1 parent 0e9005ab
Exists in master and in 28 other branches 1.2+SPB2, 2_split_by_role, add_fields_in_api, api_fixies, api_pagination, api_private_token, api_tasks, article_hit_count, blog_page_bug, checkbox_to_user_can_edit_page, communities_ratings, communities_ratings_moderation, community_ratings_rebase, fix_cloned_article_parent, fix_gallery_image_url, fix_javascript_categories, fix_optional_fields, fix_suggest_article, fix_user_email_validation, highlight_block_fix, notification_plugin, notification_plugin_rebase, script_to_update, split_by_role, stable, temp_ratings, tests, tests_fixies

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,26 +19,30 @@
19 19
20 <%= required_fields_message %> 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 <%= required f.text_field(:login, 28 <%= required f.text_field(:login,
  29 + :help => help=_('Insert your login'),
23 :onchange => 'this.value = convToValidLogin( this.value )') %> 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 <div id='url-check'> 31 <div id='url-check'>
  32 +<div class='help-small-msg'><%= help %></div>
29 </div> 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 <%= required f.password_field(:password, 38 <%= required f.password_field(:password,
36 :help => help=_('Choose a password that you can remember easily.')) %> 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 <%= required f.password_field(:password_confirmation, 43 <%= required f.password_field(:password_confirmation,
40 :help => help=_('To confirm, repeat your password.')) %> 44 :help => help=_('To confirm, repeat your password.')) %>
41 -<small><%= help %></small> 45 +<div class='help-small-msg'><%= help %></div>
42 46
43 <% labelled_fields_for :profile_data, @person do |f| %> 47 <% labelled_fields_for :profile_data, @person do |f| %>
44 <%= render :partial => 'profile_editor/person_form', :locals => {:f => f} %> 48 <%= render :partial => 'profile_editor/person_form', :locals => {:f => f} %>
@@ -52,7 +56,7 @@ @@ -52,7 +56,7 @@
52 page['terms-of-use'].show 56 page['terms-of-use'].show
53 end %> 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 <%= @terms_of_use %> 60 <%= @terms_of_use %>
57 <%= link_to_function(_('Hide'), nil) do |page| 61 <%= link_to_function(_('Hide'), nil) do |page|
58 page['terms-of-use'].hide 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 <% button_bar do %> 3 <% button_bar do %>
4 <%= button :ok, _('Yes'), { :controller => 'account', :action => 'logout' } %> 4 <%= button :ok, _('Yes'), { :controller => 'account', :action => 'logout' } %>
5 <%= lightbox_close_button _('No, I want to stay.') %> 5 <%= lightbox_close_button _('No, I want to stay.') %>
6 <% end %> 6 <% end %>
  7 +</p>
app/views/account/wizard.rhtml
  Diff comments   View file @eaff26e
1 <%= lightbox_close_button _('Close') %> 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 <p><%= _('Your browser does not support iframes.') %></p> 4 <p><%= _('Your browser does not support iframes.') %></p>
5 </iframe> 5 </iframe>
app/views/layouts/wizard.rhtml
  Diff comments   View file @eaff26e
@@ -11,9 +11,9 @@ @@ -11,9 +11,9 @@
11 11
12 <%= 12 <%=
13 # Load the principal css files: 13 # Load the principal css files:
14 - stylesheet_import( %w( common button search forms) 14 + stylesheet_import( %w( common button search forms profiles)
15 ) + "\n" + 15 ) + "\n" +
16 - stylesheet_import( %w( common button search forms), 16 + stylesheet_import( %w( common button search forms profiles),
17 :themed_source => true ) + "\n" + 17 :themed_source => true ) + "\n" +
18 # Load the boxes's css file if each exists: 18 # Load the boxes's css file if each exists:
19 import_blocks_stylesheets + 19 import_blocks_stylesheets +
@@ -22,13 +22,9 @@ @@ -22,13 +22,9 @@
22 %> 22 %>
23 </head> 23 </head>
24 24
25 - <body class='noosfero'>  
26 - <div id="iframe">  
27 - <div id="content"> 25 + <body class='noosfero' id='wizard'>
28 <div id="wizard-content"> 26 <div id="wizard-content">
29 <%= yield %> 27 <%= yield %>
30 </div><!-- id="wizard-content" --> 28 </div><!-- id="wizard-content" -->
31 - </div><!-- id="content" -->  
32 - </div><!-- id="frame" -->  
33 </body> 29 </body>
34 </html> 30 </html>
public/javascripts/lightbox.js
  Diff comments   View file @eaff26e
@@ -147,7 +147,7 @@ lightbox.prototype = { @@ -147,7 +147,7 @@ lightbox.prototype = {
147 147
148 // Display Ajax response 148 // Display Ajax response
149 processInfo: function(response){ 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 new Insertion.Before($('lbLoadMessage'), info) 151 new Insertion.Before($('lbLoadMessage'), info)
152 if (this.lightbox_className) { 152 if (this.lightbox_className) {
153 $('lightbox').className = "done " + this.lightbox_className; 153 $('lightbox').className = "done " + this.lightbox_className;