diff --git a/bbb-lti/build.gradle b/bbb-lti/build.gradle index 7330fef2d55c1c723290119846bb6f27fdf171c0..9cc4ea4acbf418ccd498c9dbfe676715b19fe667 100644 --- a/bbb-lti/build.gradle +++ b/bbb-lti/build.gradle @@ -52,8 +52,15 @@ task copyWebInf(type: Copy) { from("src/main/webapp") } +// Task that creates the index file which lists all extra libs +task copyViews(type: Copy) { + into("${project.buildDir}/resources/main/grails-app/views") + from("grails-app/views") +} + // make processResources depends on copyWebInf task processResources.dependsOn copyWebInf +copyWebInf.dependsOn copyViews repositories { jcenter() diff --git a/bbb-lti/grails-app/i18n/messages.properties b/bbb-lti/grails-app/i18n/messages.properties index f62a2931473c42d59a43425a0046a8488b47eb9c..17d5b5edb66c2aeb2b3fc6d916bc18e9ce7fe2ac 100644 --- a/bbb-lti/grails-app/i18n/messages.properties +++ b/bbb-lti/grails-app/i18n/messages.properties @@ -83,3 +83,6 @@ tool.view.actions=Actions tool.view.dateFormat=E, MM dd, yyyy HH:mm:ss Z tool.error.general=Connection could not be established. +tool.view.recording.format.screenshare=Screenshare +tool.view.recording.format.podcast=Podcast +tool.view.recording.format.notes=Shared Notes \ 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 e1442fa84d478f588c0a4b96420ae898ef3d0d3c..f63e5446b4543dbb81166049da41326c847e0293 100644 --- a/bbb-lti/grails-app/views/tool/error.gsp +++ b/bbb-lti/grails-app/views/tool/error.gsp @@ -2,10 +2,10 @@ <head> <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/> <title>Error</title> - <asset:stylesheet src="bootstrap.css"/> - <asset:stylesheet src="tool.css"/> - <asset:javascript src="jquery.js"/> - <asset:javascript src="bootstrap.js"/> + <asset:stylesheet src="/lti/${assetPath(src: 'bootstrap.css')}"/> + <asset:stylesheet src="/lti/${assetPath(src: 'tool.css')}"/> + <asset:javascript src="/lti/${assetPath(src: 'jquery.js')}"/> + <asset:javascript src="/lti/${assetPath(src: 'bootstrap.js')}"/> </head> <body> <div class="body"> diff --git a/bbb-lti/grails-app/views/tool/index.gsp b/bbb-lti/grails-app/views/tool/index.gsp index 183e1c163cb75944b4f62ecabec5469076a9375b..4d2b78cb463671ff7bfeb7e540e616d7a0e565e4 100644 --- a/bbb-lti/grails-app/views/tool/index.gsp +++ b/bbb-lti/grails-app/views/tool/index.gsp @@ -1,18 +1,17 @@ <html> <head> <title><g:message code="tool.view.title" /></title> - <link rel="shortcut icon" href="${assetPath(src: 'favicon.ico')}" type="image/x-icon"> - <asset:stylesheet src="bootstrap.css"/> - <asset:stylesheet src="dataTables.bootstrap.min.css"/> - <asset:stylesheet src="tool.css"/> - <asset:javascript src="jquery.js"/> - <asset:javascript src="jquery.dataTables.min.js"/> - <asset:javascript src="dataTables.bootstrap.min.js"/> - <asset:javascript src="dataTables.plugin.datetime.js"/> - <asset:javascript src="moment-with-locales.min.js"/> - <asset:javascript src="bootstrap.js"/> - <asset:javascript src="bootstrap-confirmation.min.js"/> - <asset:javascript src="tool.js"/> + <link rel="shortcut icon" type="image/x-icon" href="/lti/${assetPath(src: 'favicon.ico')}"> + <link rel="stylesheet" type="text/css" href="/lti/${assetPath(src: 'bootstrap.css')}" /> + <link rel="stylesheet" type="text/css" href="/lti/${assetPath(src: 'tool.css')}" /> + <script type="text/javascript" src="/lti/${assetPath(src: 'jquery.js')}"></script> + <script type="text/javascript" src="/lti/${assetPath(src: 'jquery.dataTables.min.js')}"></script> + <script type="text/javascript" src="/lti/${assetPath(src: 'dataTables.bootstrap.min.js')}"></script> + <script type="text/javascript" src="/lti/${assetPath(src: 'dataTables.plugin.datetime.js')}"></script> + <script type="text/javascript" src="/lti/${assetPath(src: 'moment-with-locales.min.js')}"></script> + <script type="text/javascript" src="/lti/${assetPath(src: 'bootstrap.js')}"></script> + <script type="text/javascript" src="/lti/${assetPath(src: 'bootstrap-confirmation.min.js')}"></script> + <script type="text/javascript" src="/lti/${assetPath(src: 'tool.js')}"></script> </head> <body> <h1 style="margin-left:20px; text-align: center;"><a title="<g:message code="tool.view.join" />" class="btn btn-primary btn-large" href="${createLink(controller:'tool', action:'join', id: '0')}"><g:message code="tool.view.join" /></a></h1> @@ -52,7 +51,9 @@ <g:if test="${r.published}"> <div> <g:each in="${r.thumbnails}" var="thumbnail"> - <img src="${thumbnail.content}" class="thumbnail"></img> + <g:each in="${thumbnail.content}" var="thumbnail_url"> + <img src="${thumbnail_url}" class="thumbnail"/> + </g:each> </g:each> </div> </g:if> @@ -62,10 +63,10 @@ <g:if test="${ismoderator}"> <td class="cell c6 lastcol" style="text-align:center;"> <g:if test="${r.published}"> - <a title="<g:message code="tool.view.recording.unpublish" />" class="btn btn-default btn-sm glyphicon glyphicon-eye-open" name="unpublish_recording" type="submit" value="${r.recordID}" href="${createLink(controller:'tool',action:'publish',id: '0')}?bbb_recording_published=${r.published}&bbb_recording_id=${r.recordID}"></a> + <a title="<g:message code="tool.view.recording.unpublish" />" class="btn btn-default btn-sm glyphicon glyphicon-eye-open" name="unpublish_recording" type="submit" value="${r.recordID}" href="${createLink(controller:'tool',action:'publish',id: '0')}?bbb_recording_published=${r.published}&bbb_recording_id=${r.recordID}"><g:message code="tool.view.recording.unpublish" /></a> </g:if> <g:else> - <a title="<g:message code="tool.view.recording.publish" />" class="btn btn-default btn-sm glyphicon glyphicon-eye-close" name="publish_recording" type="submit" value="${r.recordID}" href="${createLink(controller:'tool',action:'publish',id: '0')}?bbb_recording_published=${r.published}&bbb_recording_id=${r.recordID}"></a> + <a title="<g:message code="tool.view.recording.publish" />" class="btn btn-default btn-sm glyphicon glyphicon-eye-close" name="publish_recording" type="submit" value="${r.recordID}" href="${createLink(controller:'tool',action:'publish',id: '0')}?bbb_recording_published=${r.published}&bbb_recording_id=${r.recordID}"><g:message code="tool.view.recording.publish" /></a> </g:else> <a title="<g:message code="tool.view.recording.delete" />" class="btn btn-danger btn-sm glyphicon glyphicon-trash" name="delete_recording" value="${r.recordID}" data-toggle="confirmation" @@ -75,6 +76,7 @@ data-btn-cancel-label="<g:message code="tool.view.recording.delete.confirmation.no" />" data-placement="left" href="${createLink(controller:'tool',action:'delete',id: '0')}?bbb_recording_id=${r.recordID}"> + <g:message code="tool.view.recording.delete" /> </a> </td> </g:if>