Changeset 35319

Timestamp:

2021-08-23T12:24:30+12:00 (3 years ago)

Author:

kjdon

Message:

changed http links to google apis to https - otherwise get mixed content errors if your greenstone3 site is https.

Location:

main/trunk/greenstone3/web/interfaces/default/transform/layouts

Files:

• formatmanager.xsl (modified) (2 diffs)
• header.xsl (modified) (1 diff)

main/trunk/greenstone3/web/interfaces/default/transform/layouts/formatmanager.xsl

@@ -23 +23 @@
         <!-- Sam2's div code -->
 
-        <script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.7.1/jquery.min.js"><xsl:text> </xsl:text></script>
+        <script type="text/javascript" src="https://ajax.googleapis.com/ajax/libs/jquery/1.7.1/jquery.min.js"><xsl:text> </xsl:text></script>
         <!--<script type="text/javascript" src="interfaces/default/js/jquery-1.4.2.js"><xsl:text> </xsl:text></script>-->
         <!-- XML parsing doesn't seem to work properly jquery so jquery.xml.js is a fix for this -->
@@ -82 +82 @@
         </style>
 
-        <link rel="stylesheet" type="text/css" href="http://ajax.googleapis.com/ajax/libs/jqueryui/1.7.1/themes/base/jquery-ui.css"/> 
+        <link rel="stylesheet" type="text/css" href="https://ajax.googleapis.com/ajax/libs/jqueryui/1.7.1/themes/base/jquery-ui.css"/> 
 
         <table width="100%" border="1"> 

main/trunk/greenstone3/web/interfaces/default/transform/layouts/header.xsl

@@ -752 +752 @@
   <xsl:template name="map-scripts">
     <meta content="initial-scale=1.0, user-scalable=no" name="viewport"/>
-    <script src="http://maps.googleapis.com/maps/api/js?key=AIzaSyCofVTps3xHfMvIcTMHqYMMxe3xXfkAxnI&amp;libraries=drawing" type="text/javascript"><xsl:text> </xsl:text></script>
+    <script src="https://maps.googleapis.com/maps/api/js?key=AIzaSyCofVTps3xHfMvIcTMHqYMMxe3xXfkAxnI&amp;libraries=drawing" type="text/javascript"><xsl:text> </xsl:text></script>
     <script src="interfaces/{$interface_name}/js/map-scripts-shapes-util.js" type="text/javascript"><xsl:text> </xsl:text></script>
     <script src="interfaces/{$interface_name}/js/map-scripts.js" type="text/javascript"><xsl:text> </xsl:text></script>