Revision: 19112
http://sourceforge.net/p/gate/code/19112
Author: ian_roberts
Date: 2016-02-04 18:08:15 +0000 (Thu, 04 Feb 2016)
Log Message:
-----------
Move to proper resource module definition instead of a load of ad hoc resources.
Modified Paths:
--------------
mimir/trunk/build.xml
mimir/trunk/mimir-cloud/grails-app/views/layouts/mimir.gsp
mimir/trunk/mimir-web/grails-app/views/layouts/mimir.gsp
Added Paths:
-----------
mimir/trunk/mimir-web/grails-app/conf/MimirWebResources.groovy
Modified: mimir/trunk/build.xml
===================================================================
--- mimir/trunk/build.xml 2016-02-04 13:46:47 UTC (rev 19111)
+++ mimir/trunk/build.xml 2016-02-04 18:08:15 UTC (rev 19112)
@@ -109,6 +109,10 @@
<delete file="${grails-plugin.dir}/plugin.xml" />
<resolve-groovy-templates dir="${grails-plugin.dir}" />
+
+ <grails dir="${grails-plugin.dir}">
+ <arg value="refresh-dependencies" />
+ </grails>
<trycatch>
<try>
Modified: mimir/trunk/mimir-cloud/grails-app/views/layouts/mimir.gsp
===================================================================
--- mimir/trunk/mimir-cloud/grails-app/views/layouts/mimir.gsp 2016-02-04
13:46:47 UTC (rev 19111)
+++ mimir/trunk/mimir-cloud/grails-app/views/layouts/mimir.gsp 2016-02-04
18:08:15 UTC (rev 19112)
@@ -2,15 +2,8 @@
<html>
<head>
<title><g:layoutTitle default="Mimir" /></title>
- <link rel="stylesheet" href="${resource(dir:'css',file:'mimir.css',
plugin:'mimir-web')}" />
- <%-- The query string is ignored but causes the browsers to refresh
the
- cached version. The query value should be changed whenever the
- favicon changes. --%>
- <link rel="shortcut icon"
href="${resource(dir:'images',file:'mimir-favicon.ico',plugin:'mimir-web')}?v=1"
type="image/x-icon" />
- <link rel="apple-touch-icon"
href="${resource(dir: 'images', file:
'mimir-apple-touch-icon.png',plugin:'mimir-web')}?v=1">
- <link rel="apple-touch-icon" sizes="114x114"
href="${resource(dir: 'images', file:
'mimir-apple-touch-icon-retina.png',plugin:'mimir-web')}?v=1">
+ <r:require module="mimirWeb" />
<g:layoutHead />
- <g:javascript src="application.js" />
<r:layoutResources/>
<%-- Add any custom CSS content provided by the page. --%>
<style type="text/css">
Added: mimir/trunk/mimir-web/grails-app/conf/MimirWebResources.groovy
===================================================================
--- mimir/trunk/mimir-web/grails-app/conf/MimirWebResources.groovy
(rev 0)
+++ mimir/trunk/mimir-web/grails-app/conf/MimirWebResources.groovy
2016-02-04 18:08:15 UTC (rev 19112)
@@ -0,0 +1,9 @@
+modules = {
+ mimirLayout {
+ resource url:[plugin:'mimir-web', dir:'css', file:'mimir.css']
+ resource url:[plugin:'mimir-web', dir:'images', file:'mimir-favicon.ico'],
attrs:[type:'ico']
+ resource url:[plugin:'mimir-web', dir:'images',
file:'mimir-apple-touch-icon.png'], attrs:[rel:'apple-touch-icon']
+ resource url:[plugin:'mimir-web', dir:'images',
file:'mimir-apple-touch-icon-retina.png'], attrs:[rel:'apple-touch-icon',
sizes:'114x114']
+ resource url:[plugin:'mimir-web', dir:'js', file:'application.js']
+ }
+}
Property changes on:
mimir/trunk/mimir-web/grails-app/conf/MimirWebResources.groovy
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Id
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: mimir/trunk/mimir-web/grails-app/views/layouts/mimir.gsp
===================================================================
--- mimir/trunk/mimir-web/grails-app/views/layouts/mimir.gsp 2016-02-04
13:46:47 UTC (rev 19111)
+++ mimir/trunk/mimir-web/grails-app/views/layouts/mimir.gsp 2016-02-04
18:08:15 UTC (rev 19112)
@@ -2,15 +2,8 @@
<html>
<head>
<title><g:layoutTitle default="Mimir" /></title>
- <link rel="stylesheet" href="${resource(dir:'css',file:'mimir.css')}"
/>
- <%-- The query string is ignored but causes the browsers to refresh
the
- cached version. The query value should be changed whenever the
- favicon changes. --%>
- <link rel="shortcut icon"
href="${resource(dir:'images',file:'mimir-favicon.ico')}?v=1"
type="image/x-icon" />
- <link rel="apple-touch-icon"
href="${resource(dir: 'images', file: 'mimir-apple-touch-icon.png')}?v=1">
- <link rel="apple-touch-icon" sizes="114x114"
href="${resource(dir: 'images', file:
'mimir-apple-touch-icon-retina.png')}?v=1">
+ <r:require module="mimirLayout" />
<g:layoutHead />
- <g:javascript src="application.js" />
<r:layoutResources/>
<%-- Add any custom CSS content provided by the page. --%>
<style type="text/css">
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Site24x7 APM Insight: Get Deep Visibility into Application Performance
APM + Mobile APM + RUM: Monitor 3 App instances at just $35/Month
Monitor end-to-end web transactions and take corrective actions now
Troubleshoot faster and improve end-user experience. Signup Now!
http://pubads.g.doubleclick.net/gampad/clk?id=272487151&iu=/4140
_______________________________________________
GATE-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/gate-cvs
