Changeset 711 for trunk

Timestamp:

Nov 20, 2010, 5:15:10 PM (14 years ago)

Author:

gav

Message:

Make prototype javascript library available in main layout.

Location:

trunk/grails-app/views

Files:

• layouts/main.gsp (modified) (1 diff)
• shared/_pictureHead.gsp (modified) (1 diff)

trunk/grails-app/views/layouts/main.gsp

@@ -5 +5 @@
         <link rel="stylesheet" href="${resource(dir:'css',file:'main.css')}" />
         <link rel="shortcut icon" href="${resource(dir:'images',file:'gnuMimsIcon.ico')}" type="image/x-icon" />
-        <g:layoutHead />
+        <g:javascript library="prototype/prototype" />
+        <g:javascript library="prototype/effects" />
+        <g:javascript library="application" />
+        <g:javascript src="overlayPane.js" />
+        <jsUtil:resources />
+        <gnuMims:resources />
+        <nav:resources override="true"/>
         <g:helpBalloons icon="${resource(plugin:'help-balloons', dir:'images', file:'balloon-icon.gif')}"
                                         button="${resource(plugin:'help-balloons', dir:'images', file:'balloon-button.png')}"
                                         balloonPrefix="${resource(plugin:'help-balloons', dir:'images')}/balloon-"/>
-        <nav:resources override="true"/>
-        <g:javascript library="application" />
-        <g:javascript library="prototype/effects" />
-        <g:javascript src="overlayPane.js" />
-        <jsUtil:resources />
-        <gnuMims:resources />
+        <g:layoutHead />
     </head>
 

trunk/grails-app/views/shared/_pictureHead.gsp

@@ -1 +1 @@
 
 <link rel="stylesheet" href="${resource(dir:'css',file:'lightbox.css')}" />
-<g:javascript library="prototype/prototype" />
 <g:javascript library="lightbox" />
 <script type="text/javascript"> document.observe("dom:loaded", Lightbox.onload); </script>