Small refactoring on code for signup

Removing unused code

Small refactoring on code for signup
Removing unused code
Daniela Feitosa · Daniela Feitosa
1 parent 19ece8ee
Showing 5 changed files with 25 additions and 48 deletions Show diff stats
app/views/account/_signup_form.rhtml
plugins/stoa/lib/stoa_plugin.rb
plugins/stoa/public/javascripts/signup_complement.js
plugins/stoa/public/style.css
public/stylesheets/application.css
@@ -11,7 +11,7 @@
     <span id="signup-domain"><%= environment.default_hostname %>/</span>
     <div id='signup-login'>
       <div id='signup-login-field' class='formfield'>
-        <%= required text_field(:profile_data, :login, :id => 'user_login', :onchange => 'this.value = convToValidLogin(this.value);') %>
+        <%= required text_field(:user, :login, :id => 'user_login', :onchange => 'this.value = convToValidLogin(this.value);') %>
         <div id='url-check'><p>&nbsp;</p></div>
       </div>
       <%= content_tag(:small, _('Choose your login name carefully! It will be your network access and you will not be able to change it later.'), :id => 'signup-balloon') %>
@@ -107,28 +107,14 @@ jQuery(function($) {
   $('#signup-form #user_login').css('width', 335 - $('#signup-domain').outerWidth());
   $('#signup-form input[type=text], #signup-form textarea').each(function() {
-    if ($(this).attr('rel')) var default_value = $(this).attr('rel').toLowerCase();
-    if ($(this).val() == '') $(this).val(default_value);
-    $(this).bind('focus', function() {
-      if ($(this).val() == default_value) $(this).val('');
-    });
     $(this).bind('blur', function() {
       if ($(this).val() == '') {
-        $(this).val(default_value);
         $(this).removeClass('filled-in');
       }
       else $(this).addClass('filled-in');
     });
   });
-  $('#signup-form').bind('submit', function() {
-    $('#signup-form input[type=text], #signup-form textarea').each(function() {
-      if ($(this).attr('rel')) var default_value = $(this).attr('rel').toLowerCase();
-      if ($(this).val() == default_value) $(this).val('');
-    });
-    return true;
-  });
-
   $('#user_pw').focus(function() {
     $('#password-balloon').fadeIn('slow');
   });
@@ -20,7 +20,8 @@ class StoaPlugin &lt; Noosfero::Plugin
   def signup_extra_contents
     lambda {
       content_tag(:div, labelled_form_field(_('USP number'), text_field_tag('profile_data[usp_id]', '', :id => 'usp_id_field')) +
-      content_tag(:small, _('The usp id grants you special powers in the network. Don\'t forget to fill it wth a valid number if you have one.'), :id => 'usp-id-balloon'), :id => 'signup-usp-id') +
+      content_tag(:small, _('The usp id grants you special powers in the network. Don\'t forget to fill it with a valid number if you have one.'), :id => 'usp-id-balloon') +
+      content_tag('div', '', :id => 'usp-id-check'), :id => 'signup-usp-id') +
       content_tag('div', required(labelled_form_field(_('Birth date (yyyy-mm-dd)'), text_field_tag('birth_date', ''))) +
       content_tag(:small, _('Confirm your birth date. Pay attention to the format: yyyy-mm-dd.'), :id => 'usp-birth-date-balloon'), :id => 'signup-birth-date', :style => 'display: none') +
       content_tag('div', required(labelled_form_field(_('CPF'), text_field_tag('cpf', ''))) +
 jQuery("#usp_id_field").observe_field(1, function(){
   var me=this;
   jQuery(this).addClass('checking').removeClass('validated');
-//  jQuery(this.parentNode).addClass('checking')
   jQuery.getJSON('/plugin/stoa/check_usp_id?usp_id='+me.value,
     function(data){
       if(data.exists) {
@@ -21,12 +20,10 @@ jQuery(&quot;#usp_id_field&quot;).observe_field(1, function(){
             }
             jQuery('#signup-form .submit').attr('disabled', false);
             jQuery(me).removeClass('checking').addClass('validated');
- //           jQuery(me.parentNode).removeClass('checking')
           });
       }
       else {
         jQuery(me).removeClass('checking');
-//       jQuery(me.parentNode).removeClass('checking')
         if(me.value) {
           jQuery('#signup-form .submit').attr('disabled', true);
           jQuery(me).addClass('invalid');
@@ -34,8 +34,8 @@
   background: transparent url(/images/orange-balloon.png) bottom center no-repeat;
   position: absolute;
   z-index: 2;
-  right: 20px;
-  top: -75px;
+  right: 10px;
+  top: -80px;
 }
 .controller-profile_editor input.checking {
@@ -45,3 +45,13 @@
 .controller-profile_editor div.checking {
   background: transparent url(/images/loading-small.gif) 153px center no-repeat;
 }
+
+#signup-form .invalid.valid.filled-in {
+  background-image: url("/images/passwords_nomatch.png");
+  border-color: #FFA000;
+}
+
+#signup-form .invalid.valid.filled-in.validated {
+  background-image: url("/images/passwords_match.png");
+  border-color: #88BD00;
+}
@@ -5597,7 +5597,7 @@ li.profile-activity-item.upload_image .activity-gallery-images-count-1 img {
 #email-check,
 #fake-check,
 #password-check {
-  margin: -2px 171px -5px 0;
+  margin: -2px 176px -5px 13px;
   text-align: right;
   clear: both;
 }
@@ -5674,7 +5674,6 @@ li.profile-activity-item.upload_image .activity-gallery-images-count-1 img {
 #signup-form select,
 #signup-form textarea,
-#signup-form #profile_data_name,
 #signup-form input {
   padding: 7px 30px 10px 7px;
   height: 20px;
@@ -5690,7 +5689,7 @@ li.profile-activity-item.upload_image .activity-gallery-images-count-1 img {
 #signup-form .filled-in,
 #signup-form .invalid,
-#signup-form .validated,
+#signup-form input.validated,
 #signup-form .checking {
   border-width: 2px;
   border-style: solid;
@@ -5765,10 +5764,6 @@ li.profile-activity-item.upload_image .activity-gallery-images-count-1 img {
   display: block;
 }
-#signup-form #profile_data_name {
-  padding-left: 10px;
-}
-
 #signup-form .invalid {
   border-color: #FFA000;
   background-image: url(/images/passwords_nomatch.png);
@@ -5793,7 +5788,8 @@ li.profile-activity-item.upload_image .activity-gallery-images-count-1 img {
   color: #4A4A4A;
 }
-#signup-form .validated {
+#signup-form .validated,
+#signup-form .valid.filled-in {
   border-color: #88BD00;
   background-image: url(/images/passwords_match.png);
 }
@@ -5809,7 +5805,7 @@ li.profile-activity-item.upload_image .activity-gallery-images-count-1 img {
   vertical-align: middle;
   background: #EEE;
   border: 1px solid #CFCFCF;
-  line-height: 37px;
+  line-height: 35px;
   padding: 0px 7px;
   color: #4A4A4A;
   font-size: 20px;
@@ -5822,10 +5818,6 @@ li.profile-activity-item.upload_image .activity-gallery-images-count-1 img {
   padding-right: 30px;
 }
-#url-check {
-  width: 239px;
-}
-
 #signup-login-field {
   float: left;
 }
@@ -5855,27 +5847,18 @@ li.profile-activity-item.upload_image .activity-gallery-images-count-1 img {
   background: transparent url(/images/orange-balloon.png) bottom center no-repeat;
   position: absolute;
   z-index: 2;
-  right: 30px;
+  right: 10px;
 }
 #signup-form small#signup-balloon {
   top: -110px;
 }
-#signup-form small#password-balloon {
-  top: -85px;
-}
-
-#signup-form small#password-confirmation-balloon {
-  top: -85px;
-}
-
-#signup-form small#email-balloon {
-  top: -85px;
-}
-
+#signup-form small#password-balloon,
+#signup-form small#password-confirmation-balloon,
+#signup-form small#email-balloon,
 #signup-form small#name-balloon {
-  top: -85px;
+  top: -80px;
 }
 #signup-form .required-field label,
	@@ -34,8 +34,8 @@		@@ -34,8 +34,8 @@
34	background: transparent url(/images/orange-balloon.png) bottom center no-repeat;	34	background: transparent url(/images/orange-balloon.png) bottom center no-repeat;
35	position: absolute;	35	position: absolute;
36	z-index: 2;	36	z-index: 2;
37	- right: 20px;
38	- top: -75px;	37	+ right: 10px;
		38	+ top: -80px;
39	}	39	}
40		40
41	.controller-profile_editor input.checking {	41	.controller-profile_editor input.checking {
	@@ -45,3 +45,13 @@		@@ -45,3 +45,13 @@
45	.controller-profile_editor div.checking {	45	.controller-profile_editor div.checking {
46	background: transparent url(/images/loading-small.gif) 153px center no-repeat;	46	background: transparent url(/images/loading-small.gif) 153px center no-repeat;
47	}	47	}
		48	+
		49	+#signup-form .invalid.valid.filled-in {
		50	+ background-image: url("/images/passwords_nomatch.png");
		51	+ border-color: #FFA000;
		52	+}
		53	+
		54	+#signup-form .invalid.valid.filled-in.validated {
		55	+ background-image: url("/images/passwords_match.png");
		56	+ border-color: #88BD00;
		57	+}