Changeset 49


Ignore:
Timestamp:
Nov 5, 2009, 2:38:35 PM (10 years ago)
Author:
duh
Message:
Location:
trunk/grails-app
Files:
18 added
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/grails-app/conf/NimbleConfig.groovy

    r48 r49  
    1717
    1818nimble {
    19     // define layout
    2019    layout {
    21         application = 'main'
    22         administration = 'main'
     20        application = "main"
     21        administration = "main"
    2322    }
    2423    organization {
  • trunk/grails-app/views/layouts/main.gsp

    r46 r49  
    77  <link rel="stylesheet" href="${resource(dir:'css',file:'login_panel.css')}" />
    88  <link rel="shortcut icon" href="${resource(dir:'images',file:'favicon.ico')}" type="image/x-icon" />
    9   <g:javascript library="jquery" />
     9  <!--
     10    we'd rather like to use this tag, as this tag uses the proper jquery version
     11    as maintained by the jquery plugin. However, nimble is conflicting at this
     12    moment and tries to fetch jquery from it's plugin resource location (which
     13    you can see in the HTML rendered version of this layout in the nimble views.
     14    So for now we will use the hardcoded javascript tag instead and comment out:
     15    <g:javascript library="jquery" />
     16    @see http://jira.codehaus.org/browse/GRAILSPLUGINS-1658
     17    @see http://github.com/intient/nimble/issues#issue/55
     18  //-->
     19  <script type="text/javascript" src="/gscf/js/jquery/jquery-1.3.2.js"></script>
     20  <!-- /jquery //-->
     21  <!-- layouthead //-->
    1022  <g:layoutHead />
     23  <!-- /layouthead //-->
    1124  <script type="text/javascript" src="${resource(dir:'js', file:'login_panel.js')}"></script>
    1225  <script type="text/javascript" src="${resource(dir:'js', file:'topnav.js')}"></script>
Note: See TracChangeset for help on using the changeset viewer.