Commit 11f3358f authored by egon w. stemle's avatar egon w. stemle Committed by merlin Project User
Browse files

Fix http/https 'Mixed Content' warning

parent 4d95eab6
......@@ -239,8 +239,8 @@ function make_select($prefix, $name, $options, $selected, $trans, $long = 0) {
<div id="se111"></div>
<p><a href="#se111" onClick="toggle('#keyb','#img111')"><?php echo "Keyboard"; ?> <img id="img111" src="img/toggle-expand.png"></a>
<div id="keyb" class="content">
<iframe src="http://www.virtualkeyboard.ws/plugin.shtml?lang=9" frameborder="0" marginheight="0" marginwidth="0" scrolling="yes" width="350" height="480" style="border:thin outset">
Free virtual keyboard plugin from <a href="http://www.virtualkeyboard.ws" target="_blank">virtualkeyboard.ws</a></iframe>
<iframe src="//www.virtualkeyboard.ws/plugin.shtml?lang=9" frameborder="0" marginheight="0" marginwidth="0" scrolling="yes" width="350" height="480" style="border:thin outset">
Free virtual keyboard plugin from <a href="//www.virtualkeyboard.ws" target="_blank">virtualkeyboard.ws</a></iframe>
</div>
<div id="se1"></div>
......
......@@ -97,8 +97,8 @@ require('F_searchmenu.php');
<p><input type="text" name="word" size="29" maxlength="100" /><input type="hidden" name="curscr" value="F_showkwic.php"><input type="hidden" name="setpage" value="1"><input class="bt" type="submit" value="<?php echo $trans['search_word'][$_SESSION['lang']]; ?>" /> <a href="#se111" onClick="toggle('#keyb','#img111')"><img src="img/1423252054_keyboard.png"> <img id="img111" src="img/toggle-expand.png"></a></p>
<div id="se111"></div>
<div id="keyb" class="content">
<iframe src="http://www.virtualkeyboard.ws/plugin.shtml?lang=9" frameborder="0" marginheight="0" marginwidth="0" scrolling="yes" width="350" height="480" style="border:thin outset">
Free virtual keyboard plugin from <a href="http://www.virtualkeyboard.ws" target="_blank">virtualkeyboard.ws</a></iframe>
<iframe src="//www.virtualkeyboard.ws/plugin.shtml?lang=9" frameborder="0" marginheight="0" marginwidth="0" scrolling="yes" width="350" height="480" style="border:thin outset">
Free virtual keyboard plugin from <a href="//www.virtualkeyboard.ws" target="_blank">virtualkeyboard.ws</a></iframe>
</div>
<div class="Table">
<div class="Row">
......@@ -143,4 +143,4 @@ require($current_script);
</div>
<!--MAIN PART END-->
</div>
\ No newline at end of file
</div>
......@@ -6,7 +6,7 @@
// ANNIS installation -- called from script 'F_openannis_wide.php'
//$annis_server = "http://sdcsfe03.eurac.edu/annis/";
$annis_server = "http://merlin-platform.eu/annis/";
$annis_server = "https://merlin-platform.eu/annis/";
// SOLR installation -- called from scripts 'F_showkwic.php', 'F_showdocuments.php' and 'F_showstatistics.php'.
$solr_server = "http://sdcsfe03.eurac.edu/solr/final/";
......@@ -39,7 +39,7 @@
<link rel="stylesheet" href="css/style.css" type="text/css" />
<link rel="shortcut icon" href="favicon.ico" type="image/x-icon" />
<link rel='shortlink' href='http://www.merlin-platform.eu' />
<script src="http://code.jquery.com/jquery-1.8.0.min.js" ></script>
<script src="//code.jquery.com/jquery-1.8.0.min.js" ></script>
<script type="text/javascript" src="js/jquery.atooltip.js"></script>
<script type="text/javascript" src="js/utils_MERLIN.js"></script>
</head>
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment