add correção modal deletar ficha e mascaras users

RomeuCamurca · Aug 22, 2020 · dac9cf6 · dac9cf6
1 parent 4c70788
commit dac9cf6
Show file tree

Hide file tree

Showing 5 changed files with 47 additions and 30 deletions.
diff --git a/src/main/resources/static/css/partials/fichas.css b/src/main/resources/static/css/partials/fichas.css
@@ -22,3 +22,23 @@
 	margin-right: 800px;
 }
 
+/* Modal de deletar ficha */
+
+#id_Do_Modal_Do_Deletar .modal-header {
+	background-color: #e3f2fd; 
+	color: black; 
+	font-weight: bold;
+}
+
+#id_Do_Modal_Do_Deletar .modal-body p {
+	font-weight: bold;
+	margin: 0;
+}
+
+#id_Do_Modal_Do_Deletar .modal-footer {
+	background-color: #e3f2fd;
+}
+
+
+
+
diff --git a/src/main/resources/static/js/jquery-mascaras.js b/src/main/resources/static/js/jquery-mascaras.js
@@ -25,29 +25,5 @@ $(document).ready(
 					thousands : "."
 				});
 			});
-
-			//mascara do campo telefone do modal de adicionar usuário
-			var behavior = function(val) {
-				return val.replace(/\D/g, '').length === 11 ? '(00) 00000-0000'
-						: '(00) 0000-00009';
-			}, options = {
-				onKeyPress : function(val, e, field, options) {
-					field.mask(behavior.apply({}, arguments), options);
-				}
-			};
-
-			$('#telefone_add_user').mask(behavior, options);
-
-			//mascara do campo telefone do modal de atualizar usuário
-			var behavior = function(val) {
-				return val.replace(/\D/g, '').length === 11 ? '(00) 00000-0000'
-						: '(00) 0000-00009';
-			}, options = {
-				onKeyPress : function(val, e, field, options) {
-					field.mask(behavior.apply({}, arguments), options);
-				}
-			};
-
-			$('#telefone_edit').mask(behavior, options);
 
 		});
diff --git a/src/main/resources/static/js/mask-users.js b/src/main/resources/static/js/mask-users.js
@@ -0,0 +1,23 @@
+//mascara do campo telefone do modal de adicionar usuário
+			var behavior = function(val) {
+				return val.replace(/\D/g, '').length === 11 ? '(00) 00000-0000'
+						: '(00) 0000-00009';
+			}, options = {
+				onKeyPress : function(val, e, field, options) {
+					field.mask(behavior.apply({}, arguments), options);
+				}
+			};
+
+			$('#telefone_add_user').mask(behavior, options);
+
+			//mascara do campo telefone do modal de atualizar usuário
+			var behavior = function(val) {
+				return val.replace(/\D/g, '').length === 11 ? '(00) 00000-0000'
+						: '(00) 0000-00009';
+			}, options = {
+				onKeyPress : function(val, e, field, options) {
+					field.mask(behavior.apply({}, arguments), options);
+				}
+			};
+
+			$('#telefone_edit').mask(behavior, options);
diff --git a/src/main/resources/templates/fichas.html b/src/main/resources/templates/fichas.html
@@ -88,19 +88,17 @@
 		<div aria-hidden="true" aria-labelledby="myModalLabel" class="modal fade" id="id_Do_Modal_Do_Deletar" role="dialog" tabindex="-1">
 	        <div class="modal-dialog">
 	            <div class="modal-content">
-	                <div class="modal-header" style="background-color: #e3f2fd; color: black; font-weight: bold;">
+	                <div class="modal-header">
 	                    <h5 class="modal-title" id="myModalLabel" style="color: black; font-weight: bold;">DELETAR FICHA</h5>
 	                    <button aria-label="Close" class="close" data-dismiss="modal" type="button">
 	                    	<span aria-hidden="true">&times;</span>
 	                    </button>
 
 	                </div>
 	                <div class="modal-body">
-	                    <p class="alert" style="font-weight: bold;">
-	                        Tem certeza de que deseja excluir a ficha selecionada?
-	                    </p>
+	                    <p class="alert">Tem certeza de que deseja excluir a ficha selecionada?</p>
 	                </div>
-	                <div class="modal-footer" style="background-color: #e3f2fd;">
+	                <div class="modal-footer">
 	                    <button class="btn btn-secondary" data-dismiss="modal" type="button">Cancelar</button>
 	                    <a class="btn btn-primary" href="" id="botao_De_Deletar_Do_Modal">Deletar</a>
 	                </div>

diff --git a/src/main/resources/templates/usuarios.html b/src/main/resources/templates/usuarios.html
@@ -278,7 +278,7 @@ <h5 class="modal-title">ATUALIZAR USUÁRIO</h5>
     <script src="/js/localization/messages_pt_BR.js" type="text/javascript"></script>
     <script src="/js/validacao.js" type="text/javascript"></script>
     <script src="/js/modals.js" type="text/javascript"></script>
-    <script src="/js/jquery-mascaras.js" type="text/javascript"></script>
+    <script src="/js/mask-users.js" type="text/javascript"></script>
     <script src="/js/usuario.js" type="text/javascript"></script>
 
 	<script type="text/javascript" charset="utf8" src="https://cdn.datatables.net/1.10.21/js/jquery.dataTables.min.js"></script>