diff --git a/view/css/main.css b/view/css/main.css
index 3184faf..ded42aa 100644
--- a/view/css/main.css
+++ b/view/css/main.css
@@ -62,7 +62,11 @@ body {
}
.navbar-default .navbar-nav>li>a {
- color: #FFFFFF;
+ color: #ffffff;
+}
+
+.navbar-default .navbar-nav .open .dropdown-menu>li>a {
+ color: #ffffff;
}
.col-centered {
diff --git a/view/css/submit-sign.css b/view/css/submit-sign.css
index 2d2bc4f..962e664 100644
--- a/view/css/submit-sign.css
+++ b/view/css/submit-sign.css
@@ -28,3 +28,11 @@
#upload-success-msg {
display: none;
}
+
+.radio-inline .wl-national-sign-radio {
+ margin-top: 12px;
+}
+
+#input-state-container, #input-city-container {
+ display: none;
+}
diff --git a/view/js/submit-sign.js b/view/js/submit-sign.js
index 6d17859..ebe1fa8 100644
--- a/view/js/submit-sign.js
+++ b/view/js/submit-sign.js
@@ -2,8 +2,7 @@
var submitUrl = '';
var loggedUser = '';
- var MIN_PHRASES_LENGTH = 3;
- var MAX_PHRASES_LENGTH = 20;
+ var MAX_CHAR_LENGTH = 255;
function _isEmpty(str) {
return (!str || 0 === str.length);
@@ -28,21 +27,17 @@
}
}
- function _areValidPhrases(phrases) {
- var cleanPhrases = phrases.replace(/[.,\/#!$%\^&\*;:{}=\-_`~()]/g, "");
- var splitPhrasesLength = cleanPhrases.trim().split(/\s+/g).length;
- return splitPhrasesLength >= MIN_PHRASES_LENGTH
- && splitPhrasesLength <= MAX_PHRASES_LENGTH;
+ function _arePhrasesValid(phrases) {
+ return phrases.length <= MAX_CHAR_LENGTH;
}
function _alertPhrase() {
$('#upload-warning-msg').hide();
var phrases = $('#input-phrases').val();
- if (!_areValidPhrases(phrases)) {
+ if (!_arePhrasesValid(phrases)) {
$('#upload-warning-msg').html(
- 'As frases de exemplo devem possuir no minímo '
- + MIN_PHRASES_LENGTH + ' e no máximo '
- + MAX_PHRASES_LENGTH + ' palavras.');
+ 'As frases de exemplo devem possuir no máximo '
+ + MAX_CHAR_LENGTH + ' caracteres.');
$('#upload-warning-msg').show();
}
}
@@ -56,16 +51,6 @@
}
}
- function _alertCity() {
- $('#upload-warning-msg').hide();
- var city = $('#input-city').val();
- if (_isEmpty(city)) {
- $('#upload-warning-msg').html(
- 'Por favor indique o nome da sua cidade.');
- $('#upload-warning-msg').show();
- }
- }
-
function _alertSignUpload() {
$('#upload-warning-msg').hide();
var signUpload = $('#input-sign-upload').val();
@@ -76,16 +61,24 @@
}
}
+ function _getNationalRadioCheckedValue() {
+ return $(".wl-national-sign-radio:checked").attr("value");
+ }
+
+ function _isValidState(state) {
+ var value = _getNationalRadioCheckedValue();
+ return value === 'no' && state != '' || value === 'yes';
+ }
+
function _validadeAllFields() {
var signName = $('#input-sign-name').val();
var wordClass = $('#input-word-class').val();
var phrases = $('#input-phrases').val();
var state = $('#input-state').val();
- var city = $('#input-city').val();
var signUpload = $('#input-sign-upload').val();
return !_isEmpty(signName) && !_isEmpty(wordClass)
- && _areValidPhrases(phrases) && !_isEmpty(state)
- && !_isEmpty(city) && !_isEmpty(signUpload);
+ && _arePhrasesValid(phrases) && !_isEmpty(signUpload)
+ && _isValidState(state);
}
function _updateSubmitButton() {
@@ -169,16 +162,34 @@
_alertPhrase();
_updateSubmitButton();
});
- $('#input-state').on('input', function() {
- _alertState();
+ $('#input-sign-upload').on('change', function() {
+ _alertSignUpload();
_updateSubmitButton();
});
- $('#input-city').on('input', function() {
- _alertCity();
+
+ $('#input-state').on('input', function() {
+ var value = $(this).val();
+ if (value === 'Nacional') {
+ $('.wl-national-sign-radio[value=yes]').trigger("click");
+ } else {
+ _alertState();
+ }
+
_updateSubmitButton();
});
- $('#input-sign-upload').on('change', function() {
- _alertSignUpload();
+ $('.wl-national-sign-radio').on('click', function() {
+ var value = $(this).attr("value");
+ if (value === 'no') {
+ $("#input-state-container").show();
+ $("#input-city-container").show();
+ $("#input-state").val('');
+ } else {
+ $("#input-state-container").hide();
+ $("#input-city-container").hide();
+ $("#input-state").val('Nacional');
+ $("#input-city").val('');
+ }
+
_updateSubmitButton();
});
}
diff --git a/view/templates/submit-sign/submit-sign.html b/view/templates/submit-sign/submit-sign.html
index 8a3e0ff..b8ee57d 100644
--- a/view/templates/submit-sign/submit-sign.html
+++ b/view/templates/submit-sign/submit-sign.html
@@ -43,14 +43,26 @@
+
-