From 4e08fd26ec19e73dc8fccf4b849a3d29b78297ee Mon Sep 17 00:00:00 2001
From: jfederico <jesus@123it.ca>
Date: Mon, 22 Aug 2016 15:44:24 -0400
Subject: [PATCH] bbb-tool: Changed the way the assets are rendered
---
bbb-lti/grails-app/views/error.gsp | 2 +-
bbb-lti/grails-app/views/layouts/main.gsp | 27 ++++++++++++-----------
bbb-lti/grails-app/views/tool/index.gsp | 4 ++--
3 files changed, 17 insertions(+), 16 deletions(-)
diff --git a/bbb-lti/grails-app/views/error.gsp b/bbb-lti/grails-app/views/error.gsp
index d85f57ba2b..95e11edffb 100644
--- a/bbb-lti/grails-app/views/error.gsp
+++ b/bbb-lti/grails-app/views/error.gsp
@@ -3,7 +3,7 @@
<head>
<title><g:if env="development">Grails Runtime Exception</g:if><g:else>Error</g:else></title>
<meta name="layout" content="main">
- <g:if env="development"><link rel="stylesheet" href="${resource(dir: 'css', file: 'errors.css')}" type="text/css"></g:if>
+ <g:if env="development"><asset:stylesheet src="errors.css"/></g:if>
</head>
<body>
<g:if env="development">
diff --git a/bbb-lti/grails-app/views/layouts/main.gsp b/bbb-lti/grails-app/views/layouts/main.gsp
index e69a980493..4acafbf502 100644
--- a/bbb-lti/grails-app/views/layouts/main.gsp
+++ b/bbb-lti/grails-app/views/layouts/main.gsp
@@ -9,24 +9,25 @@
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<title><g:message code="tool.view.title" /></title>
<meta name="viewport" content="width=device-width, initial-scale=1.0">
- <link rel="shortcut icon" href="${resource(dir: 'images', file: 'favicon.ico')}" type="image/x-icon">
- <link rel="apple-touch-icon" href="${resource(dir: 'images', file: 'apple-touch-icon.png')}">
- <link rel="apple-touch-icon" sizes="114x114" href="${resource(dir: 'images', file: 'apple-touch-icon-retina.png')}">
- <link rel="stylesheet" href="${resource(dir: 'css', file: 'main.css')}" type="text/css">
- <link rel="stylesheet" href="${resource(dir: 'css', file: 'mobile.css')}" type="text/css">
+ <link rel="shortcut icon" href="${assetPath(src: 'favicon.ico')}" type="image/x-icon">
+ <link rel="apple-touch-icon" href="${assetPath(src: 'apple-touch-icon.png')}">
+ <link rel="apple-touch-icon" sizes="114x114" href="${assetPath(src: 'apple-touch-icon-retina.png')}">
+ <asset:stylesheet src="main.css"/>
+ <asset:stylesheet src="mobile.css"/>
+ <asset:stylesheet src="application.css"/>
+ <asset:javascript src="application.js"/>
<g:layoutHead/>
<g:javascript library="application"/>
- <r:layoutResources />
</head>
<body>
- <div id="spinner" class="spinner" style="display:none;">
- <img src="${resource(dir:'images',file:'spinner.gif')}" alt="Spinner" />
- </div>
- <div class="logo" id="logo" role="banner"><img src="${resource(dir: 'images', file: 'bbb_logo.jpg')}" alt="<g:message code="tool.view.app" />" /></div>
- <g:layoutBody />
-
+ <div id="spinner" class="spinner" style="display:none;">
+ <asset:image src="spinner.gif" alt="Spinner"/>
+ </div>
+ <div class="logo" id="logo" role="banner">
+ <a href="http://bigbluebutton.org"><asset:image src="bbb_logo.jpg" alt="<g:message code="tool.view.app" />"/></a>
+ </div>
+ <g:layoutBody />
<div class="footer" role="contentinfo"></div>
<div id="spinner" class="spinner" style="display:none;"><g:message code="spinner.alt" default="Loading…"/></div>
- <r:layoutResources />
</body>
</html>
diff --git a/bbb-lti/grails-app/views/tool/index.gsp b/bbb-lti/grails-app/views/tool/index.gsp
index 08529c6af2..c7e730de1b 100644
--- a/bbb-lti/grails-app/views/tool/index.gsp
+++ b/bbb-lti/grails-app/views/tool/index.gsp
@@ -1,8 +1,8 @@
<html>
<head>
<title><g:message code="tool.view.title" /></title>
- <link rel="stylesheet" href="${resource(dir:'css',file:'bootstrap.css')}" />
- <link rel="shortcut icon" href="${resource(dir:'images',file:'favicon.ico')}" type="image/x-icon" />
+ <link rel="shortcut icon" href="${assetPath(src: 'favicon.ico')}" type="image/x-icon">
+ <asset:stylesheet src="bootstrap.css"/>
</head>
<body>
<!-- tool.index -->
--
GitLab