Skip to content

Commit

Permalink
Merge pull request #13 from Foaly42/#10-ajax.googleapis.com-mixed-con…
Browse files Browse the repository at this point in the history
…tent

fix jquery mixed content blocked
  • Loading branch information
jens-maus authored Nov 29, 2020
2 parents c62f473 + 7df4bd4 commit 2c60848
Show file tree
Hide file tree
Showing 6 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion dev/edit_area/template.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<title>EditArea</title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<meta http-equiv="X-UA-Compatible" content="IE=EmulateIE7"/>
<link id="theme" type="text/css" href="http://ajax.googleapis.com/ajax/libs/jqueryui/1.9.1/themes/overcast/jquery-ui.css" rel="stylesheet">
<link id="theme" type="text/css" href="https://ajax.googleapis.com/ajax/libs/jqueryui/1.9.1/themes/overcast/jquery-ui.css" rel="stylesheet">
<link type="text/css" href="../css/hq-webui.css" rel="stylesheet">


Expand Down
2 changes: 1 addition & 1 deletion ui/backup.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<meta http-equiv="X-UA-Compatible" content="IE=edge"/>
<meta charset="ISO-8859-1">
<title>HQ WebUI</title>
<script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.7.2/jquery.min.js"></script>
<script type="text/javascript" src="https://ajax.googleapis.com/ajax/libs/jquery/1.7.2/jquery.min.js"></script>
<script type="text/javascript" src="js/lostorage.min.js"></script>
<style type="text/css">
body { font-size: 0.8em; font-family: sans-serif; background-color: #e9e9e9; color: #222; }
Expand Down
2 changes: 1 addition & 1 deletion ui/cache.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<meta http-equiv="X-UA-Compatible" content="IE=edge"/>
<meta charset="ISO-8859-1">
<title>HQ WebUI</title>
<script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.7.2/jquery.min.js"></script>
<script type="text/javascript" src="https://ajax.googleapis.com/ajax/libs/jquery/1.7.2/jquery.min.js"></script>
<script type="text/javascript" src="js/lostorage.min.js"></script>
<style type="text/css">
body { font-size: 0.8em; font-family: sans-serif; background-color: #e9e9e9; color: #222; }
Expand Down
2 changes: 1 addition & 1 deletion ui/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<head>
<meta charset="ISO-8859-1">
<title>HQ WebUI</title>
<link id="theme" type="text/css" href="http://ajax.googleapis.com/ajax/libs/jqueryui/1.9.1/themes/redmond/jquery-ui.css" rel="stylesheet">
<link id="theme" type="text/css" href="https://ajax.googleapis.com/ajax/libs/jqueryui/1.9.1/themes/redmond/jquery-ui.css" rel="stylesheet">
<link type="text/css" href="css/ui.jqgrid.css" rel="stylesheet">
<link type="text/css" href="css/jquery.multiselect.css" rel="stylesheet">
<!--<link rel="stylesheet" href="css/jquery.jsonview.css" type="text/css" media="screen" title="no title" charset="utf-8">-->
Expand Down
6 changes: 3 additions & 3 deletions ui/index.min.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@
<head>
<meta charset="ISO-8859-1">
<title>HQ WebUI</title>
<link id="theme" type="text/css" href="http://ajax.googleapis.com/ajax/libs/jqueryui/1.9.1/themes/redmond/jquery-ui.css" rel="stylesheet">
<link id="theme" type="text/css" href="https://ajax.googleapis.com/ajax/libs/jqueryui/1.9.1/themes/redmond/jquery-ui.css" rel="stylesheet">
<link type="text/css" href="css/ui.jqgrid.css" rel="stylesheet">
<link type="text/css" href="css/jquery.multiselect.css" rel="stylesheet">
<link rel="stylesheet" href="css/jquery.jsonview.css" type="text/css" media="screen" title="no title" charset="utf-8">
<script language="javascript" type="text/javascript" src="edit_area/edit_area_full.js"></script>
<link type="text/css" href="css/hq-webui.css" rel="stylesheet">
<script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.7.2/jquery.min.js"></script>
<script type="text/javascript" src="https://ajax.googleapis.com/ajax/libs/jquery/1.7.2/jquery.min.js"></script>
<script type="text/javascript" src="js/lostorage.min.js"></script>
<script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jqueryui/1.9.1/jquery-ui.min.js"></script>
<script type="text/javascript" src="https://ajax.googleapis.com/ajax/libs/jqueryui/1.9.1/jquery-ui.min.js"></script>
<script type="text/javascript" src="js/i18n/grid.locale-de.js"></script>
<script type="text/javascript" src="js/jquery.jqGrid.min.js"></script>
<script type="text/javascript" src="js/jquery.multiselect.min.js"></script>
Expand Down
2 changes: 1 addition & 1 deletion ui/js/config.js
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ var hqConf = {

// jQuery UI Theme
themeDefault: "redmond",
themeUrl: "http://ajax.googleapis.com/ajax/libs/jqueryui/1.9.1/themes/",
themeUrl: "https://ajax.googleapis.com/ajax/libs/jqueryui/1.9.1/themes/",
themeSuffix: "/jquery-ui.css",

// Geräte-Bildchen anzeigen
Expand Down

0 comments on commit 2c60848

Please sign in to comment.