litvinovg/vivo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Javascript loading improvements

Browse source
This commit is contained in:
Graham Triggs 2017-08-09 14:26:47 +01:00
parent 9a6442f5d1
commit 461edf0c20
9 changed files with 48 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
webapp/src/main/webapp/templates/freemarker/body/individual/individual--foaf-person-2column.ftl
View file

@ -198,13 +198,15 @@ ${headScripts.add('<script type="text/javascript" src="${urls.base}/js/tiny_mce/
'<script type="text/javascript" src="${urls.base}/js/json2.js"></script>', '<script type="text/javascript" src="${urls.base}/js/json2.js"></script>',
'<script type="text/javascript" src="${urls.base}/js/jquery_plugins/jquery.truncator.js"></script>')} '<script type="text/javascript" src="${urls.base}/js/jquery_plugins/jquery.truncator.js"></script>')}
${scripts.add('<script type="text/javascript" src="${urls.base}/js/individual/individualUriRdf.js"></script>', ${scripts.add('<script async type="text/javascript" src="${urls.base}/js/individual/individualUriRdf.js"></script>',
'<script type="text/javascript" src="${urls.base}/js/individual/individualQtipBubble.js"></script>', '<script async type="text/javascript" src="${urls.base}/js/individual/individualQtipBubble.js"></script>',
'<script type="text/javascript" src="${urls.base}/js/jquery-ui/js/jquery-ui-1.12.1.min.js"></script>', '<script async type="text/javascript" src="${urls.base}/js/jquery-ui/js/jquery-ui-1.12.1.min.js"></script>',
'<script type="text/javascript" src="${urls.base}/js/individual/individualUtils.js?vers=1.5.1"></script>', '<script async type="text/javascript" src="${urls.base}/js/individual/individualUtils.js?vers=1.5.1"></script>',
'<script type="text/javascript" src="${urls.base}/js/individual/moreLessController.js"></script>', '<script async type="text/javascript" src="${urls.base}/js/individual/moreLessController.js"></script>',
'<script type="text/javascript" src="${urls.base}/js/individual/individualProfilePageType.js"></script>', '<script async type="text/javascript" src="${urls.base}/js/individual/individualProfilePageType.js"></script>',
'<script type="text/javascript" src="${urls.base}/js/imageUpload/imageUploadUtils.js"></script>')} '<script async type="text/javascript" src="${urls.base}/js/imageUpload/imageUploadUtils.js"></script>',
'<script async type="text/javascript" src="https://d1bxh8uas1mnw7.cloudfront.net/assets/embed.js"></script>',
'<script async type="text/javascript" src="//cdn.plu.mx/widget-popup.js"></script>')}
<script type="text/javascript"> <script type="text/javascript">
i18n_confirmDelete = "${i18n().confirm_delete}"; i18n_confirmDelete = "${i18n().confirm_delete}";

16
webapp/src/main/webapp/templates/freemarker/body/individual/individual--foaf-person-quickview.ftl
View file

@ -259,13 +259,15 @@ ${headScripts.add('<script type="text/javascript" src="${urls.base}/js/tiny_mce/
'<script type="text/javascript" src="${urls.base}/js/json2.js"></script>', '<script type="text/javascript" src="${urls.base}/js/json2.js"></script>',
'<script type="text/javascript" src="${urls.base}/js/jquery_plugins/jquery.truncator.js"></script>')} '<script type="text/javascript" src="${urls.base}/js/jquery_plugins/jquery.truncator.js"></script>')}
${scripts.add('<script type="text/javascript" src="${urls.base}/js/individual/individualUriRdf.js"></script>', ${scripts.add('<script async type="text/javascript" src="${urls.base}/js/individual/individualUriRdf.js"></script>',
'<script type="text/javascript" src="${urls.base}/js/individual/individualQtipBubble.js"></script>', '<script async type="text/javascript" src="${urls.base}/js/individual/individualQtipBubble.js"></script>',
'<script type="text/javascript" src="${urls.base}/js/jquery-ui/js/jquery-ui-1.12.1.min.js"></script>', '<script async type="text/javascript" src="${urls.base}/js/jquery-ui/js/jquery-ui-1.12.1.min.js"></script>',
'<script type="text/javascript" src="${urls.base}/js/individual/individualUtils.js"></script>', '<script async type="text/javascript" src="${urls.base}/js/individual/individualUtils.js"></script>',
'<script type="text/javascript" src="${urls.base}/js/individual/moreLessController.js"></script>', '<script async type="text/javascript" src="${urls.base}/js/individual/moreLessController.js"></script>',
'<script type="text/javascript" src="${urls.base}/js/individual/individualProfilePageType.js"></script>', '<script async type="text/javascript" src="${urls.base}/js/individual/individualProfilePageType.js"></script>',
'<script type="text/javascript" src="${urls.base}/js/imageUpload/imageUploadUtils.js"></script>')} '<script async type="text/javascript" src="${urls.base}/js/imageUpload/imageUploadUtils.js"></script>',
'<script async type="text/javascript" src="https://d1bxh8uas1mnw7.cloudfront.net/assets/embed.js"></script>',
'<script async type="text/javascript" src="//cdn.plu.mx/widget-popup.js"></script>')}
<script type="text/javascript"> <script type="text/javascript">
i18n_confirmDelete = "${i18n().confirm_delete}"; i18n_confirmDelete = "${i18n().confirm_delete}";

4
webapp/src/main/webapp/templates/freemarker/body/individual/individual--foaf-person.ftl
View file

@ -21,8 +21,8 @@
<#include "individual-setup.ftl"> <#include "individual-setup.ftl">
${scripts.add('<script type="text/javascript" src="https://d1bxh8uas1mnw7.cloudfront.net/assets/embed.js"></script>')} ${scripts.add('<script async type="text/javascript" src="https://d1bxh8uas1mnw7.cloudfront.net/assets/embed.js"></script>')}
${scripts.add('<script type="text/javascript" src="//cdn.plu.mx/widget-popup.js"></script>')} ${scripts.add('<script async type="text/javascript" src="//cdn.plu.mx/widget-popup.js"></script>')}
<#-- <#--
First, check to see if profile page types are enabled. If not, get the 2 column template: First, check to see if profile page types are enabled. If not, get the 2 column template:

6
webapp/src/main/webapp/templates/freemarker/body/individual/individual.ftl
View file

@ -43,6 +43,6 @@ var i18nStrings = {
${stylesheets.add('<link rel="stylesheet" href="${urls.base}/css/individual/individual-vivo.css" />')} ${stylesheets.add('<link rel="stylesheet" href="${urls.base}/css/individual/individual-vivo.css" />')}
${headScripts.add('<script type="text/javascript" src="${urls.base}/js/jquery_plugins/jquery.truncator.js"></script>')} ${headScripts.add('<script type="text/javascript" src="${urls.base}/js/jquery_plugins/jquery.truncator.js"></script>')}
${scripts.add('<script type="text/javascript" src="${urls.base}/js/individual/individualUtils.js"></script>')} ${scripts.add('<script async type="text/javascript" src="${urls.base}/js/individual/individualUtils.js"></script>')}
${scripts.add('<script type="text/javascript" src="https://d1bxh8uas1mnw7.cloudfront.net/assets/embed.js"></script>')} ${scripts.add('<script async type="text/javascript" src="https://d1bxh8uas1mnw7.cloudfront.net/assets/embed.js"></script>')}
${scripts.add('<script type="text/javascript" src="//cdn.plu.mx/widget-popup.js"></script>')} ${scripts.add('<script async type="text/javascript" src="//cdn.plu.mx/widget-popup.js"></script>')}

2
webapp/src/main/webapp/templates/freemarker/body/partials/individual/individual-dept-active-grants.ftl
View file

@ -35,5 +35,5 @@
${stylesheets.add('<link rel="stylesheet" href="${urls.base}/css/menupage/pageList.css" />')} ${stylesheets.add('<link rel="stylesheet" href="${urls.base}/css/menupage/pageList.css" />')}
${scripts.add('<script type="text/javascript" src="${urls.base}/js/browserUtils.js"></script>')} ${scripts.add('<script async type="text/javascript" src="${urls.base}/js/browserUtils.js"></script>')}

32
webapp/src/main/webapp/themes/tenderfoot/templates/body/individual/individual--foaf-person.ftl
View file

@ -162,17 +162,25 @@
}; };
</script> </script>
${stylesheets.add('<link rel="stylesheet" href="${urls.base}/css/individual/individual.css" />', ${stylesheets.add(
'<link rel="stylesheet" href="${urls.base}/css/individual/individual-vivo.css" />', '<link rel="stylesheet" href="${urls.base}/css/individual/individual.css" />',
'<link rel="stylesheet" href="${urls.base}/js/jquery-ui/css/smoothness/jquery-ui-1.12.1.css" />', '<link rel="stylesheet" href="${urls.base}/css/individual/individual-vivo.css" />',
'<link rel="stylesheet" type="text/css" href="${urls.base}/css/jquery_plugins/qtip/jquery.qtip.min.css" />')} '<link rel="stylesheet" href="${urls.base}/js/jquery-ui/css/smoothness/jquery-ui-1.12.1.css" />',
'<link rel="stylesheet" type="text/css" href="${urls.base}/css/jquery_plugins/qtip/jquery.qtip.min.css" />'
)}
${headScripts.add('<script type="text/javascript" src="${urls.base}/js/tiny_mce/tiny_mce.js"></script>', ${headScripts.add(
'<script type="text/javascript" src="${urls.base}/js/jquery_plugins/qtip/jquery.qtip.min.js"></script>', '<script type="text/javascript" src="${urls.base}/js/tiny_mce/tiny_mce.js"></script>',
'<script type="text/javascript" src="${urls.base}/js/jquery_plugins/jquery.truncator.js"></script>')} '<script type="text/javascript" src="${urls.base}/js/jquery_plugins/qtip/jquery.qtip.min.js"></script>',
'<script type="text/javascript" src="${urls.base}/js/jquery_plugins/jquery.truncator.js"></script>'
)}
${scripts.add('<script type="text/javascript" src="${urls.base}/js/individual/individualUtils.js"></script>', ${scripts.add(
'<script type="text/javascript" src="${urls.base}/js/individual/individualQtipBubble.js"></script>', '<script async type="text/javascript" src="${urls.base}/js/jquery-ui/js/jquery-ui-1.12.1.min.js"></script>',
'<script type="text/javascript" src="${urls.base}/js/individual/individualUriRdf.js"></script>', '<script async type="text/javascript" src="${urls.base}/js/individual/individualUtils.js"></script>',
'<script type="text/javascript" src="${urls.base}/js/jquery-ui/js/jquery-ui-1.12.1.min.js"></script>', '<script async type="text/javascript" src="${urls.base}/js/individual/individualQtipBubble.js"></script>',
'<script type="text/javascript" src="${urls.base}/js/imageUpload/imageUploadUtils.js"></script>')} '<script async type="text/javascript" src="${urls.base}/js/individual/individualUriRdf.js"></script>',
'<script async type="text/javascript" src="${urls.base}/js/imageUpload/imageUploadUtils.js"></script>',
'<script async type="text/javascript" src="https://d1bxh8uas1mnw7.cloudfront.net/assets/embed.js"></script>',
'<script async type="text/javascript" src="//cdn.plu.mx/widget-popup.js"></script>'
)}

2
webapp/src/main/webapp/themes/tenderfoot/templates/page/page-home.ftl
View file

@ -21,7 +21,7 @@
<#if geoFocusMapsEnabled > <#if geoFocusMapsEnabled >
<#include "geoFocusMapScripts.ftl"> <#include "geoFocusMapScripts.ftl">
</#if> </#if>
<script type="text/javascript" src="${urls.base}/js/homePageUtils.js?version=x"></script> <script async type="text/javascript" src="${urls.base}/js/homePageUtils.js?version=x"></script>
</head> </head>
<body class="${bodyClasses!}" onload="${bodyOnload!}"> <body class="${bodyClasses!}" onload="${bodyOnload!}">

4
webapp/src/main/webapp/themes/wilma/templates/individual--foaf-person.ftl
View file

@ -176,8 +176,8 @@ ${scripts.add('<script type="text/javascript" src="${urls.base}/js/individual/in
'<script type="text/javascript" src="${urls.base}/js/individual/moreLessController.js"></script>', '<script type="text/javascript" src="${urls.base}/js/individual/moreLessController.js"></script>',
'<script type="text/javascript" src="${urls.base}/js/jquery-ui/js/jquery-ui-1.12.1.min.js"></script>', '<script type="text/javascript" src="${urls.base}/js/jquery-ui/js/jquery-ui-1.12.1.min.js"></script>',
'<script type="text/javascript" src="${urls.base}/js/imageUpload/imageUploadUtils.js"></script>', '<script type="text/javascript" src="${urls.base}/js/imageUpload/imageUploadUtils.js"></script>',
'<script type="text/javascript" src="https://d1bxh8uas1mnw7.cloudfront.net/assets/embed.js"></script>', '<script async type="text/javascript" src="https://d1bxh8uas1mnw7.cloudfront.net/assets/embed.js"></script>',
'<script type="text/javascript" src="//cdn.plu.mx/widget-popup.js"></script>')} '<script async type="text/javascript" src="//cdn.plu.mx/widget-popup.js"></script>')}
<script type="text/javascript"> <script type="text/javascript">
i18n_confirmDelete = "${i18n().confirm_delete}"; i18n_confirmDelete = "${i18n().confirm_delete}";

2
webapp/src/main/webapp/themes/wilma/templates/page-home.ftl
View file

@ -21,7 +21,7 @@
<#if geoFocusMapsEnabled > <#if geoFocusMapsEnabled >
<#include "geoFocusMapScripts.ftl"> <#include "geoFocusMapScripts.ftl">
</#if> </#if>
<script type="text/javascript" src="${urls.base}/js/homePageUtils.js?version=x"></script> <script async type="text/javascript" src="${urls.base}/js/homePageUtils.js?version=x"></script>
</head> </head>
<body class="${bodyClasses!}" onload="${bodyOnload!}"> <body class="${bodyClasses!}" onload="${bodyOnload!}">