registration validation fix

apps/registration/models.py

@@ -281,7 +281,7 @@ class RegistrationProfile(models.Model):
                  ('/img/soc-medias/sm-icon-twit.png', 'twit'),
                  ('/img/mail-logo-2.jpg','logo2'))
         for img in images:
-            fp = open(os.path.join(settings.STATIC_ROOT, img[0]), 'rb')
+            fp = open('%s%s' % (settings.STATIC_ROOT, img[0]), 'rb')
             msg_img = MIMEImage(fp.read())
             fp.close()
             msg_img.add_header('Content-ID', '<'+img[1]+'>')

static/client/css/main.css

@@ -5000,6 +5000,9 @@ dl.add-info dd a:hover {
     display: inline-block;
     vertical-align: middle
 }
+.i-address .place_link {
+    color: #464646;
+}
 .i-address header .address {
     margin-right: 10px
 }

static/client/js/_modules/block.common.js

@@ -343,25 +343,18 @@ if (EXPO.common){
 				timer = setTimeout(function () {
 					$.post($form.data('validate-url'), $form.serializeArray(), function (data) {
 						if (data.success){
-							$form.find('button').prop('disabled', false);
 							$(".error", $form).remove();
 							$(".required.err", $form).removeClass("required err");
 
 							$(".pwf-line .msg-help",$form).each(function () {
 								var $this = $(this),
 									defaultT = $this.attr("data-default");
+
 								if($.trim(defaultT) != '') {
 									$this.html('').text(defaultT);
 								}
 							});
-
-							//$resend.attr('data-email',mailVal);
-							// $.fancybox.close(true);
-							// $.fancybox('#pw-reg-complete');
-
-						}
-						else{
-							$form.find('button').prop('disabled', true);
+						} else {
 							// delete previous error messages
 							$(".error", $form).remove();
 							$(".required.err", $form).removeClass("required err");
@@ -378,11 +371,14 @@ if (EXPO.common){
 								var $input = $("#id_" + index, $form),
 									$error = $("<div/>").attr("class", "error").append(value),
 									$msg = $input.closest(".pwf-line").find(".msg-help");
+
+								if ($.trim($input.val()).length > 0){
                                     $input.parent().addClass('required err');
                                     $input.parents('.pwf-line').addClass('has_error');
                                     $msg.attr("data-default", $msg.text());
                                     $msg.text('').prepend($error);
                                     $msg.show();
+								}
 							});
 
 						}
@@ -439,7 +435,8 @@ if (EXPO.common){
 
 		});
 		/**
-		 * very simple (probably in much need of improvement) Jquery plugin I've thrown together that will get you the value of an inline style property
+		 * very simple (probably in much need of improvement) Jquery plugin I've thrown together
+         * that will get you the value of an inline style property
 		 */
 		(function ($) {
 			$.fn.inlineStyle = function (prop) {

templates/client/includes/exposition/expo_paid.html

@@ -63,7 +63,7 @@
                         <header>
                             <div class="address">
                                 {% if exposition.place.web_page %}
-                                    <a href="{{ exposition.place.web_page }}">{{ exposition.place.name }}</a>
+                                    <a href="{{ exposition.place.web_page }}" class="place_link">{{ exposition.place.name }}</a>
                                 {% else %}
                                     {{ exposition.place.name }}
                                 {% endif %}

templates/client/includes/exposition/exposition_object.html

@@ -62,7 +62,7 @@
                         <header>
                             <div class="address">
                                 {% if exposition.place.web_page %}
-                                    <a href="{{ exposition.place.web_page }}">{{ exposition.place.name }}</a>
+                                    <a href="{{ exposition.place.web_page }}" class="place_link">{{ exposition.place.name }}</a>
                                 {% else %}
                                     {{ exposition.place.name }}
                                 {% endif %}

templates/client/popups/register.html

@@ -51,7 +51,7 @@
 
             <div class="pwf-buttons-line pwf-line" style="margin-top: 12px;">
                 <div class="pwf-field">
-                    <button type="submit" disabled="disabled" class="icon-check">{% trans 'Зарегистрироваться' %}</button>
+                    <button type="submit" class="icon-check">{% trans 'Зарегистрироваться' %}</button>
                 </div>
                 <div class="pwf-msg err-message-box pd-top-14 red"> {% trans "Ошибка" %}</div>
             </div>