From ffe56f3c68a5c1df668b4b3271d8dc63b3b3990d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcos=20Garcia=20Nu=C3=B1ez?= <mgarcianun@uoc.edu>
Date: Thu, 19 Dec 2019 20:48:03 +0100
Subject: [PATCH] Cambiados mensajes a tipo growl (superpuestos sobre la
 interfaz).

---
 1.sources/MyHealth/docroot/error.xhtml        |  2 +-
 1.sources/MyHealth/docroot/header.xhtml       |  5 +-
 1.sources/MyHealth/docroot/home.xhtml         |  4 +-
 1.sources/MyHealth/docroot/login.xhtml        |  2 +-
 1.sources/MyHealth/docroot/menubar.xhtml      | 51 -------------------
 .../docroot/profile/ChangeFamilyDoctor.xhtml  |  2 +-
 .../ChangePrimaryHealthCareCenter.xhtml       |  2 +-
 .../docroot/profile/RegisterUser.xhtml        |  2 +-
 .../docroot/profile/UpdateProfile.xhtml       |  2 +-
 9 files changed, 10 insertions(+), 62 deletions(-)
 delete mode 100644 1.sources/MyHealth/docroot/menubar.xhtml
diff --git a/1.sources/MyHealth/docroot/error.xhtml b/1.sources/MyHealth/docroot/error.xhtml
index 54b3c37..708fed9 100644
--- a/1.sources/MyHealth/docroot/error.xhtml
+++ b/1.sources/MyHealth/docroot/error.xhtml
@@ -2,7 +2,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 
 <html xmlns="http://www.w3.org/1999/xhtml" xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:f="http://java.sun.com/jsf/core" xmlns:h="http://java.sun.com/jsf/html"
-	xmlns:p="http://primefaces.org/ui">
+	xmlns:p="http://primefaces.org/ui" xmlns:o="http://omnifaces.org/ui">
 
 <ui:composition template="./header.xhtml">
 	<ui:define name="content">
diff --git a/1.sources/MyHealth/docroot/header.xhtml b/1.sources/MyHealth/docroot/header.xhtml
index 37a8dc5..3942007 100644
--- a/1.sources/MyHealth/docroot/header.xhtml
+++ b/1.sources/MyHealth/docroot/header.xhtml
@@ -2,7 +2,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 
 <html xmlns="http://www.w3.org/1999/xhtml" xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:f="http://java.sun.com/jsf/core" xmlns:h="http://java.sun.com/jsf/html"
-	xmlns:p="http://primefaces.org/ui">
+	xmlns:p="http://primefaces.org/ui" xmlns:o="http://omnifaces.org/ui">
 
 <h:head>
 	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
@@ -32,8 +32,7 @@
 		<div id="top" class="top">
 			<h:graphicImage library="images" name="logo-small.png" />
 		</div>
-		<hr />
-		<div id="menuDiv">
+		<div id="menuDiv" style="margin-bottom: 10px;">
 			<p:ajaxStatus style="width:32px; height:32px; position:fixed; right:32px; bottom:32px">
 				<f:facet name="start">
 					<i id="loginSpin" class="pi pi-spin pi-spinner" style="font-size: 3em"></i>
diff --git a/1.sources/MyHealth/docroot/home.xhtml b/1.sources/MyHealth/docroot/home.xhtml
index c4f58b3..cfe7034 100644
--- a/1.sources/MyHealth/docroot/home.xhtml
+++ b/1.sources/MyHealth/docroot/home.xhtml
@@ -2,7 +2,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 
 <html xmlns="http://www.w3.org/1999/xhtml" xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:f="http://java.sun.com/jsf/core" xmlns:h="http://java.sun.com/jsf/html"
-	xmlns:p="http://primefaces.org/ui">
+	xmlns:p="http://primefaces.org/ui" xmlns:o="http://omnifaces.org/ui">
 <f:metadata>
 	<f:viewParam name="refresh" value="#{home.refresh}" />
 </f:metadata>
@@ -10,7 +10,7 @@
 <ui:composition template="./header.xhtml">
 	<ui:define name="content">
 		<h:form>
-			<p:messages id="mesgs" showDetail="true" closable="true" autoupdate="true" />
+			<p:growl id="mesgs" showDetail="true" closable="true" autoupdate="true" />
 			<p:panel header="Pagina principal">
 				<div class="ui-g ui-fluid">
 					<div class="ui-g-2 ui-md-2">
diff --git a/1.sources/MyHealth/docroot/login.xhtml b/1.sources/MyHealth/docroot/login.xhtml
index eb77bfa..2ecda5f 100644
--- a/1.sources/MyHealth/docroot/login.xhtml
+++ b/1.sources/MyHealth/docroot/login.xhtml
@@ -2,7 +2,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 
 <html xmlns="http://www.w3.org/1999/xhtml" xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:f="http://java.sun.com/jsf/core" xmlns:h="http://java.sun.com/jsf/html"
-	xmlns:p="http://primefaces.org/ui">
+	xmlns:p="http://primefaces.org/ui" xmlns:o="http://omnifaces.org/ui">
 
 <h:head>
 	<title>login</title>
diff --git a/1.sources/MyHealth/docroot/menubar.xhtml b/1.sources/MyHealth/docroot/menubar.xhtml
deleted file mode 100644
index 2097408..0000000
--- a/1.sources/MyHealth/docroot/menubar.xhtml
+++ /dev/null
@@ -1,51 +0,0 @@
-<h:form>
-	<p:growl id="messages" />
-
-	<p:menubar>
-		<p:submenu label="File" icon="pi pi-file">
-			<p:submenu label="New" icon="pi pi-briefcase">
-				<p:menuitem value="Project" url="#" />
-				<p:menuitem value="Other" url="#" />
-			</p:submenu>
-			<p:menuitem value="Open" url="#" />
-			<p:separator />
-			<p:menuitem value="Quit" url="#" />
-		</p:submenu>
-
-		<p:submenu label="Edit" icon="pi pi-pencil">
-			<p:menuitem value="Undo" url="#" icon="pi pi-angle-double-left" />
-			<p:menuitem value="Redo" url="#" icon="pi pi-angle-double-right" />
-		</p:submenu>
-
-		<p:submenu label="Help" icon="pi pi-question">
-			<p:menuitem value="Contents" url="#" />
-			<p:submenu label="Search" icon="pi pi-search">
-				<p:submenu label="Text">
-					<p:menuitem value="Workspace" url="#" />
-				</p:submenu>
-				<p:menuitem value="File" url="#" />
-			</p:submenu>
-		</p:submenu>
-
-		<p:submenu label="Actions" icon="pi pi-cog">
-			<p:submenu label="Ajax" icon="pi pi-refresh">
-				<p:menuitem value="Save" action="#{menuView.save}" icon="pi pi-save"
-					update="messages" />
-				<p:menuitem value="Update" action="#{menuView.update}"
-					icon="pi pi-refresh" update="messages" />
-			</p:submenu>
-			<p:submenu label="Non-Ajax" icon="pi pi-clone">
-				<p:menuitem value="Delete" action="#{menuView.delete}"
-					icon="pi pi-times" update="messages" ajax="false" />
-			</p:submenu>
-		</p:submenu>
-
-		<p:menuitem value="Quit" url="http://www.primefaces.org"
-			icon="pi pi-times" />
-
-		<f:facet name="options">
-			<p:inputText style="margin:1px 10px 1px 1px;" placeholder="Search" />
-			<p:commandButton type="button" value="Logout" icon="pi pi-home" />
-		</f:facet>
-	</p:menubar>
-</h:form>
\ No newline at end of file
diff --git a/1.sources/MyHealth/docroot/profile/ChangeFamilyDoctor.xhtml b/1.sources/MyHealth/docroot/profile/ChangeFamilyDoctor.xhtml
index 5d6c36f..4b53db3 100644
--- a/1.sources/MyHealth/docroot/profile/ChangeFamilyDoctor.xhtml
+++ b/1.sources/MyHealth/docroot/profile/ChangeFamilyDoctor.xhtml
@@ -7,7 +7,7 @@
 <ui:composition template="../header.xhtml">
 	<ui:define name="content">
 		<h:form id="frmChangeFD">
-			<p:messages id="mesgs" showDetail="true" closable="true" autoupdate="true" />
+			<p:growl id="mesgs" showDetail="true" closable="true" autoupdate="true" />
 			<p:panel id="badProfile" rendered="#{not home.patient}">
 				<div class="ui-g-3 ui-md-3" />
 				<div class="ui-g-6 ui-md-6">
diff --git a/1.sources/MyHealth/docroot/profile/ChangePrimaryHealthCareCenter.xhtml b/1.sources/MyHealth/docroot/profile/ChangePrimaryHealthCareCenter.xhtml
index de6d22a..a004747 100644
--- a/1.sources/MyHealth/docroot/profile/ChangePrimaryHealthCareCenter.xhtml
+++ b/1.sources/MyHealth/docroot/profile/ChangePrimaryHealthCareCenter.xhtml
@@ -7,7 +7,7 @@
 <ui:composition template="../header.xhtml">
 	<ui:define name="content">
 		<h:form id="frmChangePHCC">
-			<p:messages id="mesgs" showDetail="true" closable="true" autoupdate="true" />
+			<p:growl id="mesgs" showDetail="true" closable="true" autoupdate="true" />
 			<p:panel id="badProfile" rendered="#{not home.familyDoctor}">
 				<div class="ui-g-3 ui-md-3" />
 				<div class="ui-g-6 ui-md-6">
diff --git a/1.sources/MyHealth/docroot/profile/RegisterUser.xhtml b/1.sources/MyHealth/docroot/profile/RegisterUser.xhtml
index 6e67cad..db01793 100644
--- a/1.sources/MyHealth/docroot/profile/RegisterUser.xhtml
+++ b/1.sources/MyHealth/docroot/profile/RegisterUser.xhtml
@@ -63,7 +63,7 @@
 			    		}
 				    }
 				</h:outputScript>
-				<p:messages id="mesgs" globalOnly="true" showDetail="true" closable="true" autoupdate="true" />
+				<p:growl id="mesgs" globalOnly="true" showDetail="true" closable="true" autoupdate="true" />
 				<p:panel id="tipoUsuario" header="Especifique el tipo de usuario que desea registrarse">
 					<div class="ui-g ui-fluid">
 						<div class="ui-g-2 ui-md-2">
diff --git a/1.sources/MyHealth/docroot/profile/UpdateProfile.xhtml b/1.sources/MyHealth/docroot/profile/UpdateProfile.xhtml
index cc977d0..c817f7b 100644
--- a/1.sources/MyHealth/docroot/profile/UpdateProfile.xhtml
+++ b/1.sources/MyHealth/docroot/profile/UpdateProfile.xhtml
@@ -26,7 +26,7 @@
 		    		}
 			    }
 			</h:outputScript>
-			<p:messages id="mesgs" showDetail="true" closable="true" autoupdate="true" />
+			<p:growl id="mesgs" showDetail="true" closable="true" autoupdate="true" />
 
 			<p:panel id="tipoUsuario" header="Tipo de usuario registrado">
 				<div class="ui-g ui-fluid">
