NIHVIVO-1384 Finish conversion of scripts.add() calls.

This commit is contained in:
rjy7 2011-03-08 16:21:49 +00:00
parent f0e93c468b
commit 7fe85d267b

View file

@ -42,8 +42,8 @@ we will default to using the stable version unless the request comes from IE 9 i
we will use rev 293 (dev build version) of the flot & excanvas files.
-->
<!--[if IE]><script type="text/javascript" src="${urls.base}/js/visualization/entitycomparison/jquery_plugins/flot/r293/excanvas.min.js"></script><![endif]-->
${scripts.add('<script type="text/javascript" src="${urls.base}/js/visualization/entitycomparison/jquery_plugins/flot/r293/jquery.flot.min.js"></script>',
${scripts.add('<!--[if IE]><script type="text/javascript" src="${urls.base}/js/visualization/entitycomparison/jquery_plugins/flot/r293/excanvas.min.js"></script><![endif]-->',
'<script type="text/javascript" src="${urls.base}/js/visualization/entitycomparison/jquery_plugins/flot/r293/jquery.flot.min.js"></script>',
'<script type="text/javascript" src="${urls.base}/js/visualization/entitycomparison/jquery_plugins/fliptext/jquery.mb.flipText.js"></script>',
'<script type="text/javascript" src="${urls.base}/js/jquery_plugins/jquery.blockUI.min.js"></script>',
'<script type="text/javascript" src="${urls.base}/js/jquery_plugins/jquery.dataTables.min.js"></script>',
@ -57,11 +57,10 @@ ${stylesheets.add('<link rel="stylesheet" href="${urls.base}/js/jquery-ui/css/sm
'<link rel="stylesheet" href="${urls.base}/js/visualization/entitycomparison/jquery_plugins/datatable/demo_table.css" />',
'<link rel="stylesheet" href="${urls.base}/css/visualization/entitycomparison/layout.css" />',
'<link rel="stylesheet" href="${urls.base}/css/visualization/visualization.css" />',
'<link rel="stylesheet" href="${urls.base}/css/jquery_plugins/ui.notify.css" />')}
<!--[if IE]><link href="${urls.base}/css/visualization/entitycomparison/layout-ie.css" rel="stylesheet" type="text/css" /><![endif]-->
<!--[if lt IE 8]><link href="${urls.base}/css/visualization/entitycomparison/layout-ie-67.css" rel="stylesheet" type="text/css" /><![endif]-->
'<link rel="stylesheet" href="${urls.base}/css/jquery_plugins/ui.notify.css" />',
'<!--[if IE]><link href="${urls.base}/css/visualization/entitycomparison/layout-ie.css" rel="stylesheet" type="text/css" /><![endif]-->',
'<!--[if lt IE 8]><link href="${urls.base}/css/visualization/entitycomparison/layout-ie-67.css" rel="stylesheet" type="text/css" /><![endif]-->')}
<#-- variables passed from server-side code -->
<script language="JavaScript" type="text/javascript">