mdweb
changeset 2095:f9fa6b33cd54
All accessDenied pages print message from common bundle msgsUI.
line diff
1.1 --- a/modules/web-applications/administration/core/src/main/resources/org/mdweb/bundle/admin/messages.properties Mon Jan 23 16:51:47 2012 +0100 1.2 +++ b/modules/web-applications/administration/core/src/main/resources/org/mdweb/bundle/admin/messages.properties Tue Jan 24 10:23:45 2012 +0100 1.3 @@ -27,10 +27,6 @@ 1.4 rsCodeExists=The code is ever used 1.5 rsDeleteButton=Delete RecordSet 1.6 rsContainsRecords=This record sets contains one or many records. Please, delete the records before delete this record set. 1.7 -accessDeniedTitle=Access denied 1.8 -accessDeniedSubTitle=The resource requested is not available. 1.9 -userUnauthenticated=To access this resource, you must sign in with your account or contact an administrator MDWeb. 1.10 -userNotAllowed=You are not allowed to access this page. 1.11 alertcaractermaxexeeded=Character limitation exceeded 1.12 mustBeAnExternalRs=Warning ! To user MDweb functionnality, you need an external record set ! 1.13 nameLabel=Name
2.1 --- a/modules/web-applications/administration/core/src/main/resources/org/mdweb/bundle/admin/messages_fr.properties Mon Jan 23 16:51:47 2012 +0100 2.2 +++ b/modules/web-applications/administration/core/src/main/resources/org/mdweb/bundle/admin/messages_fr.properties Tue Jan 24 10:23:45 2012 +0100 2.3 @@ -23,10 +23,6 @@ 2.4 rsCodeExists=Le code est d\u00e9j\u00e0 utilis\u00e9 2.5 rsDeleteButton=Supprimer 2.6 rsContainsRecords=Ce jeu contient un ou plusieurs enregistrements, merci de supprimer d'abord ces enregistrements avant de supprimer le jeu. 2.7 -accessDeniedTitle=Acc\u00e8s refus\u00e9 2.8 -accessDeniedSubTitle=La ressource demand\u00e9e n'est pas accessible. 2.9 -userUnauthenticated=Pour acc\u00e9der \u00e0 cette ressource, il vous faut vous connecter avec votre compte ou contacter un administrateur MDWeb. 2.10 -userNotAllowed=Vous n'\u00eates pas autoris\u00e9 \u00e0 acc\u00e9der \u00e0 cette page. 2.11 alertcaractermaxexeeded=Attention vous ne devez pas d\u00e9passer la limite de caract\u00e8res 2.12 mustBeAnExternalRs=Attention! Pour utiliser le module de recherche MDweb, il vous faut un jeu d'enregistrements externes! 2.13 nameLabel=Nom
3.1 --- a/modules/web-applications/administration/gui2/src/main/webapp/administration/parts/accessDenied.xhtml Mon Jan 23 16:51:47 2012 +0100 3.2 +++ b/modules/web-applications/administration/gui2/src/main/webapp/administration/parts/accessDenied.xhtml Tue Jan 24 10:23:45 2012 +0100 3.3 @@ -12,16 +12,16 @@ 3.4 3.5 <h:panelGroup layout="block" style="padding: 5px; font-size: 25px; font-weight: bold;"> 3.6 <h:graphicImage value="/administration/resources/img/accessDenied.gif" width="25px"/> 3.7 - <h:outputText value="#{adminmsgs.accessDeniedTitle}" /> 3.8 + <h:outputText value="#{msgsUI.accessDeniedTitle}" /> 3.9 </h:panelGroup> 3.10 3.11 <h:panelGroup layout="block" style="padding : 5px;"> 3.12 - <h:outputText value="#{adminmsgs.accessDeniedSubTitle}" /> 3.13 + <h:outputText value="#{msgsUI.accessDeniedSubTitle}" /> 3.14 </h:panelGroup> 3.15 3.16 <h:panelGroup layout="block" style="padding : 5px;"> 3.17 - <h:outputText value="#{adminmsgs.userUnauthenticated}" rendered="#{!bean_common.sessionIdentBean.userAuthenticated}" /> 3.18 - <h:outputText value=" #{adminmsgs.userNotAllowed}" rendered="#{!mdw:isAllowedTo('administer' , bean_common)}" /> 3.19 + <h:outputText value="#{msgsUI.userUnauthenticated}" rendered="#{!bean_common.sessionIdentBean.userAuthenticated}" /> 3.20 + <h:outputText value=" #{msgsUI.userNotAllowed}" rendered="#{!mdw:isAllowedTo('administer' , bean_common)}" /> 3.21 </h:panelGroup> 3.22 </h:panelGroup> 3.23 </ui:composition>
4.1 --- a/modules/web-applications/common/src/main/resources/org/mdweb/bundle/common/messages.properties Mon Jan 23 16:51:47 2012 +0100 4.2 +++ b/modules/web-applications/common/src/main/resources/org/mdweb/bundle/common/messages.properties Tue Jan 24 10:23:45 2012 +0100 4.3 @@ -57,7 +57,7 @@ 4.4 header_menu_connectedas=Connected as 4.5 header_menu_home=Home 4.6 accessDeniedTitle=Access denied 4.7 -accessDeniedSubTitle= 4.8 -userUnauthenticated= 4.9 -userNotAllowed= 4.10 +accessDeniedSubTitle=The resource requested is not available. 4.11 +userUnauthenticated=To access this resource, you must sign in with your account or contact an administrator MDWeb. 4.12 +userNotAllowed=You are not allowed to access this page. 4.13 header_menu_thesaurus_administration=Thesaurus
5.1 --- a/modules/web-applications/common/src/main/resources/org/mdweb/bundle/common/messages_fr.properties Mon Jan 23 16:51:47 2012 +0100 5.2 +++ b/modules/web-applications/common/src/main/resources/org/mdweb/bundle/common/messages_fr.properties Tue Jan 24 10:23:45 2012 +0100 5.3 @@ -55,8 +55,8 @@ 5.4 recordSetdetail = Choisissez un jeu d'enregistrements pour votre fiche. Le choix du jeu d\u00e9terminera la visiblit\u00e9 de votre fiche lors des recherches dans le catalogue. Jeu interne signifie que votre fiche ne sera pas incluse dans la recherche des m\u00e9tadonn\u00e9es, et inversement le jeu public indique que votre fiche sera visible. 5.5 header_menu_connectedas=Connect\u00e9(e) en tant que 5.6 header_menu_home=Accueil 5.7 -accessDeniedTitle= 5.8 -accessDeniedSubTitle= 5.9 -userUnauthenticated= 5.10 -userNotAllowed= 5.11 +accessDeniedTitle=Acc\u00e8s refus\u00e9 5.12 +accessDeniedSubTitle=La ressource demand\u00e9e n'est pas accessible. 5.13 +userUnauthenticated=Pour acc\u00e9der \u00e0 cette ressource, il vous faut vous connecter avec votre compte ou contacter un administrateur MDWeb. 5.14 +userNotAllowed=Vous n'\u00eates pas autoris\u00e9 \u00e0 acc\u00e9der \u00e0 cette page. 5.15 header_menu_thesaurus_administration=Thesaurus
6.1 --- a/modules/web-applications/common/src/main/resources/org/mdweb/bundle/common/messages_it.properties Mon Jan 23 16:51:47 2012 +0100 6.2 +++ b/modules/web-applications/common/src/main/resources/org/mdweb/bundle/common/messages_it.properties Tue Jan 24 10:23:45 2012 +0100 6.3 @@ -34,8 +34,4 @@ 6.4 warningFormChanged=Hai inserito i nuovi dati in questa pagina. Se si lascia la pagina senza salvare i dati, le modifiche andranno perse. 6.5 header_menu_connectedas=Connected as 6.6 header_menu_home=Casa 6.7 -accessDeniedTitle= 6.8 -accessDeniedSubTitle= 6.9 -userUnauthenticated= 6.10 -userNotAllowed= 6.11 header_menu_thesaurus_administration=Thesaurus
7.1 --- a/modules/web-applications/common/src/main/resources/org/mdweb/bundle/common/messages_pt.properties Mon Jan 23 16:51:47 2012 +0100 7.2 +++ b/modules/web-applications/common/src/main/resources/org/mdweb/bundle/common/messages_pt.properties Tue Jan 24 10:23:45 2012 +0100 7.3 @@ -34,8 +34,4 @@ 7.4 warningFormChanged=Voc\u00ea inseriu novos dados sobre esta p\u00e1gina. Se voc\u00ea sair desta p\u00e1gina sem salvar seus dados, as altera\u00e7\u00f5es ser\u00e3o perdidas. 7.5 header_menu_connectedas=Connected as 7.6 header_menu_home=Casa 7.7 -accessDeniedTitle= 7.8 -accessDeniedSubTitle= 7.9 -userUnauthenticated= 7.10 -userNotAllowed= 7.11 header_menu_thesaurus_administration=Thesaurus
8.1 --- a/modules/web-applications/configuration/core/src/main/resources/org/mdweb/bundle/config/messages.properties Mon Jan 23 16:51:47 2012 +0100 8.2 +++ b/modules/web-applications/configuration/core/src/main/resources/org/mdweb/bundle/config/messages.properties Tue Jan 24 10:23:45 2012 +0100 8.3 @@ -109,11 +109,6 @@ 8.4 customizeReset=Reset default theme 8.5 customizeButton=Save Theme 8.6 8.7 -message_accessDenied_h1 = Access denied 8.8 -message_accessDenied_p1 = The resource requested is not available. 8.9 -message_accessDenied_denied = To access this resource, you must sign in with your account or contact an administrator MDWeb. 8.10 -message_accessDenied_notAllowed = You are not allowed to access this page. 8.11 - 8.12 # Bbox configuration 8.13 bboxConfigTabTitle=Background map configuration 8.14 bboxConfigTitle=Configure initial extent
9.1 --- a/modules/web-applications/configuration/core/src/main/resources/org/mdweb/bundle/config/messages_fr.properties Mon Jan 23 16:51:47 2012 +0100 9.2 +++ b/modules/web-applications/configuration/core/src/main/resources/org/mdweb/bundle/config/messages_fr.properties Tue Jan 24 10:23:45 2012 +0100 9.3 @@ -99,10 +99,6 @@ 9.4 customizeReset=Revenir au th\u00e8me par d\u00e9faut 9.5 customizeButton=Enregistrer le th\u00e8me 9.6 9.7 -message_accessDenied_h1 = Acc\u00e8s refus\u00e9 9.8 -message_accessDenied_p1 = La ressource demand\u00e9e n'est pas accessible. 9.9 -message_accessDenied_denied = Pour acc\u00e9der \u00e0 cette ressource, il vous faut vous connecter avec votre compte ou contacter un administrateur MDWeb. 9.10 -message_accessDenied_notAllowed = Vous n'\u00eates pas autoris\u00e9 \u00e0 acc\u00e9der \u00e0 cette page. 9.11 9.12 # Bbox configuration 9.13 bboxConfigTabTitle=Configuration du fond de cartes
10.1 --- a/modules/web-applications/configuration/gui2/src/main/webapp/configuration/parts/accessDenied.xhtml Mon Jan 23 16:51:47 2012 +0100 10.2 +++ b/modules/web-applications/configuration/gui2/src/main/webapp/configuration/parts/accessDenied.xhtml Tue Jan 24 10:23:45 2012 +0100 10.3 @@ -12,16 +12,16 @@ 10.4 10.5 <h:panelGroup layout="block" style="padding: 5px; font-size: 25px; font-weight: bold;"> 10.6 <h:graphicImage value="/configuration/resources/img/accessDenied.gif" width="25px"/> 10.7 - <h:outputText value="#{msgsconfig.message_accessDenied_h1}" /> 10.8 + <h:outputText value="#{msgsUI.accessDeniedTitle}" /> 10.9 </h:panelGroup> 10.10 10.11 <h:panelGroup layout="block" style="padding : 5px;"> 10.12 - <h:outputText value="#{msgsconfig.message_accessDenied_p1}" /> 10.13 + <h:outputText value="#{msgsUI.accessDeniedSubTitle}" /> 10.14 </h:panelGroup> 10.15 10.16 <h:panelGroup layout="block" style="padding : 5px;"> 10.17 - <h:outputText value="#{msgsconfig.message_accessDenied_denied}" rendered="#{!bean_common.sessionIdentBean.userAuthenticated}" /> 10.18 - <h:outputText value=" #{msgsconfig.message_accessDenied_notAllowed}" rendered="#{!mdw:isAllowedTo('configure' , bean_common)}" /> 10.19 + <h:outputText value="#{msgsUI.userUnauthenticated}" rendered="#{!bean_common.sessionIdentBean.userAuthenticated}" /> 10.20 + <h:outputText value=" #{msgsUI.userNotAllowed}" rendered="#{!mdw:isAllowedTo('configure' , bean_common)}" /> 10.21 </h:panelGroup> 10.22 </h:panelGroup> 10.23 </ui:composition> 10.24 \ No newline at end of file
11.1 --- a/modules/web-applications/edit/core/src/main/resources/org/mdweb/bundle/edition/dashboard_ui/messages.properties Mon Jan 23 16:51:47 2012 +0100 11.2 +++ b/modules/web-applications/edit/core/src/main/resources/org/mdweb/bundle/edition/dashboard_ui/messages.properties Tue Jan 24 10:23:45 2012 +0100 11.3 @@ -7,10 +7,6 @@ 11.4 # Shared labels 11.5 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - # 11.6 application_title = MDweb Edition Module 11.7 -message_accessDenied_h1 = Access denied 11.8 -message_accessDenied_p1 = The resource requested is not available. 11.9 -message_accessDenied_denied = To access this resource, you must sign in with your account or contact an administrator MDWeb. 11.10 -message_accessDenied_notAllowed = You are not allowed to access this page. 11.11 11.12 label_ButtonsSelect = Select : 11.13 label_ButtonsSelectAll = All
12.1 --- a/modules/web-applications/edit/core/src/main/resources/org/mdweb/bundle/edition/dashboard_ui/messages_fr.properties Mon Jan 23 16:51:47 2012 +0100 12.2 +++ b/modules/web-applications/edit/core/src/main/resources/org/mdweb/bundle/edition/dashboard_ui/messages_fr.properties Tue Jan 24 10:23:45 2012 +0100 12.3 @@ -7,10 +7,6 @@ 12.4 # Shared labels 12.5 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - # 12.6 application_title = MDweb Module d'Edition 12.7 -message_accessDenied_h1 = Acc\u00e8s refus\u00e9 12.8 -message_accessDenied_p1 = La ressource demand\u00e9e n'est pas accessible. 12.9 -message_accessDenied_denied = Pour acc\u00e9der \u00e0 cette ressource, il vous faut vous connecter avec votre compte ou contacter un administrateur MDWeb. 12.10 -message_accessDenied_notAllowed = Vous n'\u00eates pas autoris\u00e9 \u00e0 acc\u00e9der \u00e0 cette page. 12.11 12.12 label_ButtonsSelect = S\u00e9lectionner : 12.13 label_ButtonsSelectAll = Toutes
13.1 --- a/modules/web-applications/edit/gui2/src/main/webapp/edit/parts/accessDenied.xhtml Mon Jan 23 16:51:47 2012 +0100 13.2 +++ b/modules/web-applications/edit/gui2/src/main/webapp/edit/parts/accessDenied.xhtml Tue Jan 24 10:23:45 2012 +0100 13.3 @@ -12,16 +12,16 @@ 13.4 13.5 <h:panelGroup layout="block" style="padding: 5px; font-size: 25px; font-weight: bold;"> 13.6 <h:graphicImage value="/edit/resources/img/images/accessDenied.gif" width="25px"/> 13.7 - <h:outputText value="#{msgdashboard.message_accessDenied_h1}" /> 13.8 + <h:outputText value="#{msgsUI.accessDeniedTitle}" /> 13.9 </h:panelGroup> 13.10 13.11 <h:panelGroup layout="block" style="padding : 5px;"> 13.12 - <h:outputText value="#{msgdashboard.message_accessDenied_p1}" /> 13.13 + <h:outputText value="#{msgsUI.accessDeniedSubTitle}" /> 13.14 </h:panelGroup> 13.15 13.16 <h:panelGroup layout="block" style="padding : 5px;"> 13.17 - <h:outputText value="#{msgdashboard.message_accessDenied_denied}" rendered="#{!bean_common.sessionIdentBean.userAuthenticated}" /> 13.18 - <h:outputText value=" #{msgdashboard.message_accessDenied_notAllowed}" rendered="#{!mdw:isAllowedTo('edit' , bean_common)}" /> 13.19 + <h:outputText value="#{msgsUI.userUnauthenticated}" rendered="#{!bean_common.sessionIdentBean.userAuthenticated}" /> 13.20 + <h:outputText value=" #{msgsUI.userNotAllowed}" rendered="#{!mdw:isAllowedTo('edit' , bean_common)}" /> 13.21 </h:panelGroup> 13.22 </h:panelGroup> 13.23 </ui:composition>