Ignore:
Timestamp:
Nov 9, 2011, 1:34:09 PM (5 years ago)
Author:
s.h.sikkema@…
Message:
  • Merged assay export and galaxy assay fetch code - now possible to select fetched data in galaxy
  • removed unused assay methods and gsps generated by grails
  • getUser now returns displayName instead of username in case of shibboleth users
File:
1 copied

Legend:

Unmodified
Added
Removed
  • trunk/grails-app/views/layouts/galaxy.gsp

    r2059 r2095  
    66        <title><g:layoutTitle default="${grailsApplication.config.application.title}"/></title>
    77        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
    8         <meta property="og:title" content="${grailsApplication.config.application.title}"/>
    9         <meta property="og:description" content="A generic tool for planning scientific studies, and capturing study meta-data, integrating with analysis platform(s) / LIMS systems and searching relevant studies."/>
    10         <meta property="og:type" content="non_profit"/>
    11         <meta property="og:image" content="${resource(dir: 'images', file: 'facebookLike.png', absolute: true)}"/>
    12         <meta property="fb:admins" content="721482421"/>
    13         <link rel="shortcut icon" href="${resource(dir: 'images', file: 'favicon.ico')}" type="image/x-icon"/>
    148        <g:javascript library="jquery" plugin="jquery"/>
    159        <script type="text/javascript">var baseUrl = '${resource(dir: '')}';</script>
    1610        <script src="${createLinkTo(dir: 'js', file: 'jquery-ui-1.8.13.custom.min.js')}" type="text/javascript"></script>
    1711        <link rel="stylesheet" href="${createLinkTo(dir: 'css/cupertino', file: 'jquery-ui-1.8.13.custom.css')}"/>
    18         <g:if env="production"><script src="http://connect.facebook.net/en_US/all.js#xfbml=1"></script></g:if>
    19         <g:if env="development">
    20                 <link rel="stylesheet" href="${resource(dir: 'css', file: 'default.css')}"/>
    21                 <link rel="stylesheet" href="${resource(dir: 'css', file: session.style + '.css')}"/>
    22                 <link rel="stylesheet" href="${resource(dir: 'css', file: 'login_panel.css')}"/>
    23                 <script type="text/javascript" src="${resource(dir: 'js', file: 'disableKeys.js')}"></script>
    24                 <script type="text/javascript" src="${resource(dir: 'js', file: 'login_panel.js')}"></script>
    25                 <script type="text/javascript" src="${resource(dir: 'js', file: 'topnav.js')}"></script>
    26                 <script type="text/javascript" src="${resource(dir: 'js', file: 'paginate.js')}"></script>
    27                 <script type="text/javascript" src="${resource(dir: 'js', file: 'removeWebflowExecutionFromMenu.min.js')}"></script>
    28         </g:if>
    29         <g:else>
    30                 <link rel="stylesheet" href="${resource(dir: 'css', file: 'default.min.css')}"/>
    31                 <link rel="stylesheet" href="${resource(dir: 'css', file: session.style + '.min.css')}"/>
    32                 <link rel="stylesheet" href="${resource(dir: 'css', file: 'login_panel.min.css')}"/>
    33                 <script type="text/javascript" src="${resource(dir: 'js', file: 'disableKeys.min.js')}"></script>
    34                 <script type="text/javascript" src="${resource(dir: 'js', file: 'login_panel.min.js')}"></script>
    35                 <script type="text/javascript" src="${resource(dir: 'js', file: 'topnav.min.js')}"></script>
    36                 <script type="text/javascript" src="${resource(dir: 'js', file: 'paginate.min.js')}"></script>
    37                 <script type="text/javascript" src="${resource(dir: 'js', file: 'removeWebflowExecutionFromMenu.js')}"></script>
    38         </g:else>
     12        <link rel="stylesheet" href="${resource(dir: 'css', file: 'default.css')}"/>
     13        <link rel="stylesheet" href="${resource(dir: 'css', file: 'login_panel.css')}"/>
     14
     15        <style type="text/css">
     16        body {
     17                background: none;
     18        }
     19        .container {
     20                margin: 20px;
     21        }
     22        </style>
     23
     24
    3925        <g:layoutHead/>
    4026</head>
     
    4228<g:render template="/common/login_panel"/>
    4329<div class="container">
    44         <div id="header">
    45                 <g:render template="/common/topnav"/>
    46                 <g:render template="/common/info"/>
    47         </div>
    48         <div id="content"><g:layoutBody/></div>
    49         <g:if env="production">
    50         <g:if test="${facebookLikeUrl}">
    51         <div id="facebookConnect">
    52                 <fb:like href="${resource(absolute: true)}${facebookLikeUrl}" show_faces="true" width="450" action="recommend" font="arial"></fb:like>
    53         </div>
    54         </g:if>
    55         </g:if>
     30        <g:layoutBody/>
    5631        <div id="footer">
    5732                Copyright © 2008 - <g:formatDate format="yyyy" date="${new Date()}"/> NuGO, NMC and NBIC. All rights reserved. For more information go to <a href="http://dbnp.org">http://dbnp.org</a>.
Note: See TracChangeset for help on using the changeset viewer.