From 6644a261557ef1fc4fb148d256320bfc1dea4654 Mon Sep 17 00:00:00 2001 From: jfederico <jesus@123it.ca> Date: Tue, 23 Aug 2016 17:25:27 -0400 Subject: [PATCH] bbb-lti: Fixed issues on error page --- bbb-lti/grails-app/i18n/messages.properties | 4 +++- bbb-lti/grails-app/i18n/messages_es.properties | 4 +++- bbb-lti/grails-app/i18n/messages_fr.properties | 4 +++- bbb-lti/grails-app/views/tool/error.gsp | 16 +++++++++++++--- 4 files changed, 22 insertions(+), 6 deletions(-) diff --git a/bbb-lti/grails-app/i18n/messages.properties b/bbb-lti/grails-app/i18n/messages.properties index 85504815a9..3cb07b7ac0 100644 --- a/bbb-lti/grails-app/i18n/messages.properties +++ b/bbb-lti/grails-app/i18n/messages.properties @@ -36,4 +36,6 @@ tool.view.publishRecording=Publish tool.view.unpublishRecording=Unpublish tool.view.deleteRecording=Delete tool.view.deleteRecordingConfirmation=Are you sure to permanently delete this recording? -tool.view.dateFormat=E, MMM dd, yyyy HH:mm:ss Z \ No newline at end of file +tool.view.dateFormat=E, MMM dd, yyyy HH:mm:ss Z + +tool.error.general=Connection could not be established. \ No newline at end of file diff --git a/bbb-lti/grails-app/i18n/messages_es.properties b/bbb-lti/grails-app/i18n/messages_es.properties index 3a25095aec..2d60f902ba 100644 --- a/bbb-lti/grails-app/i18n/messages_es.properties +++ b/bbb-lti/grails-app/i18n/messages_es.properties @@ -34,4 +34,6 @@ tool.view.publishRecording=Mostrar tool.view.unpublishRecording=Esconder tool.view.deleteRecording=Borrar tool.view.deleteRecordingConfirmation=Esta seguro de borrar permanentemente esta grabación? -tool.view.dateFormat=E, MMM dd, yyyy HH:mm:ss Z \ No newline at end of file +tool.view.dateFormat=E, MMM dd, yyyy HH:mm:ss Z + +tool.error.general=No pudo estableserce la conexión. \ No newline at end of file diff --git a/bbb-lti/grails-app/i18n/messages_fr.properties b/bbb-lti/grails-app/i18n/messages_fr.properties index b5fe87d102..293a609635 100644 --- a/bbb-lti/grails-app/i18n/messages_fr.properties +++ b/bbb-lti/grails-app/i18n/messages_fr.properties @@ -32,4 +32,6 @@ tool.view.publishRecording=Publier tool.view.unpublishRecording=Dépublier tool.view.deleteRecording=Supprimer tool.view.deleteRecordingConfirmation=Veillez à supprimer définitivement cet enregistrement? -tool.view.dateFormat=E, MMM dd, yyyy HH:mm:ss Z \ No newline at end of file +tool.view.dateFormat=E, MMM dd, yyyy HH:mm:ss Z + +tool.error.general=Pas possible établir la connection. \ No newline at end of file diff --git a/bbb-lti/grails-app/views/tool/error.gsp b/bbb-lti/grails-app/views/tool/error.gsp index 6fdf7f7095..8b462bde32 100644 --- a/bbb-lti/grails-app/views/tool/error.gsp +++ b/bbb-lti/grails-app/views/tool/error.gsp @@ -4,16 +4,26 @@ <title>Error</title> <asset:stylesheet src="bootstrap.css"/> <asset:stylesheet src="tool.css"/> + <asset:javascript src="jquery-1.12.3.min.js"/> <asset:javascript src="bootstrap.js"/> -</head> + </head> <body> <div class="body"> + <br/><br/> + <div class="container"> <g:if test="${ (resultMessageKey == 'InvalidEPortfolioUserId')}"> - <div>${resultMessage}</div> + <div class="alert alert-warning"> + <a href="#" class="close" data-dismiss="alert" aria-label="close">×</a> + ${resultMessage} + </div> </g:if> <g:else> - <div>Connection could not be established.</div> + <div class="alert alert-danger"> + <a href="#" class="close" data-dismiss="alert" aria-label="close">×</a> + <g:message code="tool.error.general" /> + </div> </g:else> + </div> </div> <!-- { "error": { -- GitLab