Merge branch 'phone-number-work'

4 files changed, 24 insertions, 4 deletions

diff --git a/web/cobrands/fixmystreet/fixmystreet.js b/web/cobrands/fixmystreet/fixmystreet.js
index 8673b6b76..3bf78ee31 100644
--- a/web/cobrands/fixmystreet/fixmystreet.js
+++ b/web/cobrands/fixmystreet/fixmystreet.js
@@ -343,9 +343,8 @@ $.extend(fixmystreet.set_up, {
     } );
 
     $('#facebook_sign_in, #twitter_sign_in').click(function(e){
-        $('#form_email').removeClass();
-        $('#form_rznvy').removeClass();
-        $('#email').removeClass();
+        $('#form_username').removeClass();
+        $('#username').removeClass();
     });
 
     $('#planned_form').submit(function(e) {
@@ -737,6 +736,19 @@ $.extend(fixmystreet.set_up, {
     }
   },
 
+  reporting_hide_phone_email: function() {
+    $('#form_username').on('keyup change', function() {
+        var username = $(this).val();
+        if (/^[^a-z]+$/i.test(username)) {
+            $('#js-hide-if-username-phone').hide();
+            $('#js-hide-if-username-email').show();
+        } else {
+            $('#js-hide-if-username-phone').show();
+            $('#js-hide-if-username-email').hide();
+        }
+    });
+  },
+
   fancybox_images: function() {
     // Fancybox fullscreen images
     if (typeof $.fancybox == 'function') {
diff --git a/web/cobrands/fixmystreet/images/phone-in-circle-100px.png b/web/cobrands/fixmystreet/images/phone-in-circle-100px.png
new file mode 100644
index 000000000..0fab32f8a
--- /dev/null
+++ b/web/cobrands/fixmystreet/images/phone-in-circle-100px.png
diff --git a/web/cobrands/fixmystreet/staff.js b/web/cobrands/fixmystreet/staff.js
index c3d1650a6..48bd36909 100644
--- a/web/cobrands/fixmystreet/staff.js
+++ b/web/cobrands/fixmystreet/staff.js
@@ -171,7 +171,7 @@ $.extend(fixmystreet.set_up, {
         var opt = this.options[this.selectedIndex],
             val = opt.value,
             txt = opt.text;
-        var $emailInput = $('input[name=email]').add('input[name=rznvy]');
+        var $emailInput = $('input[name=username]');
         var $nameInput = $('input[name=name]');
         var $phoneInput = $('input[name=phone]');
         var $showNameCheckbox = $('input[name=may_show_name]');
diff --git a/web/cobrands/sass/_base.scss b/web/cobrands/sass/_base.scss
index ce28badab..9d6052c45 100644
--- a/web/cobrands/sass/_base.scss
+++ b/web/cobrands/sass/_base.scss
@@ -228,6 +228,8 @@ input[type=file] {
     width: 100%;
 }
 
+input[type=tel],
+input[type=number],
 input[type=text],
 input[type=password],
 input[type=email],
@@ -402,6 +404,8 @@ select.form-control {
 .form-txt-submit-box {
   @include clearfix();
   input[type=password],
+  input[type=tel],
+  input[type=number],
   input[type=text],
   input[type=email] {
     width: 65%;
@@ -2200,6 +2204,10 @@ table.nicetable {
     background-image: url(/cobrands/fixmystreet/images/inbox-in-circle-100px.png);
   }
 
+  &.confirmation-header--phone {
+    background-image: url(/cobrands/fixmystreet/images/phone-in-circle-100px.png);
+  }
+
   h1, h2 {
     margin: 0;
     line-height: 1.2em;