Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

changes to web UI javascript #240

Merged
merged 3 commits into from
Oct 18, 2024
Merged

changes to web UI javascript #240

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d40796f
changes to web UI javascript
costateixeira Oct 13, 2024
46df00a
Merge branch 'HealthIntersections:master' into master
costateixeira Oct 13, 2024
fca10db
Merge branch 'HealthIntersections:master' into master
costateixeira Oct 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 16 additions & 16 deletions library/ftx/ftx_sct_analysis.pas
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -341,15 +341,15 @@ function TSnomedAnalysis.generate(params : THTTPParameters): TFslNameBuffer;
b.appendLine('');
b.appendLine('');
b.appendLine(' <!-- Bootstrap core CSS -->');
b.appendLine(' <link rel="stylesheet" href="/dist/css/bootstrap.css"/>');
b.appendLine(' <link rel="stylesheet" href="/assets/css/bootstrap.css"/>');
b.appendLine(' <link rel="stylesheet" href="/assets/css/bootstrap-fhir.css"/>');
b.appendLine('');
b.appendLine(' <!-- Project extras -->');
b.appendLine(' <link rel="stylesheet" href="/assets/css/project.css"/>');
b.appendLine(' <link rel="stylesheet" href="/assets/css/pygments-manni.css"/>');
b.appendLine('');
b.appendLine(' <!-- FHIR Server stuff -->');
b.appendLine(' <link rel="stylesheet" href="/css/tags.css"/>');
b.appendLine(' <link rel="stylesheet" href="/assets/css/tags.css"/>');
b.appendLine('');
b.appendLine(' <!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->');
b.appendLine(' <!-- [if lt IE 9]>');
Expand All @@ -363,20 +363,20 @@ function TSnomedAnalysis.generate(params : THTTPParameters): TFslNameBuffer;
b.appendLine(' <link sizes="72x72" rel="apple-touch-icon-precomposed" href="/assets/ico/apple-touch-icon-72-precomposed.png"/>');
b.appendLine(' <link rel="apple-touch-icon-precomposed" href="/assets/ico/apple-touch-icon-57-precomposed.png"/>');
b.appendLine(' <link rel="shortcut icon" href="/assets/ico/favicon.png"/>');
b.appendLine('<script type="text/javascript" src="/js/json2.js"></script>');
b.appendLine('<script type="text/javascript" src="/js/statuspage.js"></script>');
b.appendLine('<script type="text/javascript" src="/js/jquery-1.6.2.min.js"></script>');
b.appendLine('<script type="text/javascript" src="/js/jquery-ui-1.8.16.custom.min.js"></script>');
b.appendLine('<link rel="stylesheet" href="/css/jquery.ui.all.css">');
b.appendLine('<script src="/js/jquery-1.6.2.js"></script>');
b.appendLine('<script src="/js/jquery.ui.core.js"></script>');
b.appendLine('<script src="/js/jquery.ui.widget.js"></script>');
b.appendLine('<script src="/js/jquery.ui.mouse.js"></script>');
b.appendLine('<script src="/js/jquery.ui.resizable.js"></script>');
b.appendLine('<script src="/js/jquery.ui.draggable.js"></script>');
b.appendLine('<script type="text/javascript" src="/js/jtip.js"></script>');
b.appendLine('<script type="text/javascript" src="/js/jcookie.js"></script>');
b.appendLine('<script type="text/javascript" src="/js/fhir-gw.js"></script>');
b.appendLine('<script type="text/javascript" src="/assets/js/json2.js"></script>');
b.appendLine('<script type="text/javascript" src="/assets/js/statuspage.js"></script>');
b.appendLine('<script type="text/javascript" src="/assets/js/jquery-1.6.2.min.js"></script>');
b.appendLine('<script type="text/javascript" src="/assets/js/jquery-ui-1.8.16.custom.min.js"></script>');
b.appendLine('<link rel="stylesheet" href="/assets/css/jquery.ui.all.css">');
b.appendLine('<script src="/assets/js/jquery-1.6.2.js"></script>');
b.appendLine('<script src="/assets/js/jquery.ui.core.js"></script>');
b.appendLine('<script src="/assets/js/jquery.ui.widget.js"></script>');
b.appendLine('<script src="/assets/js/jquery.ui.mouse.js"></script>');
b.appendLine('<script src="/assets/js/jquery.ui.resizable.js"></script>');
b.appendLine('<script src="/assets/js/jquery.ui.draggable.js"></script>');
b.appendLine('<script type="text/javascript" src="/assets/js/jtip.js"></script>');
b.appendLine('<script type="text/javascript" src="/assets/js/jcookie.js"></script>');
b.appendLine('<script type="text/javascript" src="/assets/js/fhir-gw.js"></script>');
b.appendLine('</head>');
b.appendLine('');
b.appendLine('<body>');
Expand Down
6 changes: 3 additions & 3 deletions server/html_builder.pas
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -668,7 +668,7 @@ class function TFHIRXhtmlComposer.Footer(factory : TFHIRFactory; base : string;
'================================================== -->'+#13#10+
' <!-- Placed at the end of the document so the pages load faster -->'+#13#10+
'<script src="/assets/js/jquery.js"/>'+#13#10+
'<script src="/dist/js/bootstrap.min.js"/>'+#13#10+
'<script src="/assets/js/bootstrap.min.js"/>'+#13#10+
'<script src="/assets/js/respond.min.js"/>'+#13#10+
''+#13#10+
'<script src="/assets/js/fhir.js"/>'+#13#10+
Expand Down Expand Up @@ -777,15 +777,15 @@ class function TFHIRXhtmlComposer.PageLinks: String;
''+#13#10+
''+#13#10+
' <!-- Bootstrap core CSS -->'+#13#10+
' <link rel="stylesheet" href="/dist/css/bootstrap.css"/>'+#13#10+
' <link rel="stylesheet" href="/assets/css/bootstrap.css"/>'+#13#10+
' <link rel="stylesheet" href="/assets/css/bootstrap-fhir.css"/>'+#13#10+
''+#13#10+
' <!-- Project extras -->'+#13#10+
' <link rel="stylesheet" href="/assets/css/project.css"/>'+#13#10+
' <link rel="stylesheet" href="/assets/css/pygments-manni.css"/>'+#13#10+
''+#13#10+
' <!-- FHIR Server stuff -->'+#13#10+
' <link rel="stylesheet" href="/css/tags.css"/>'+#13#10+
' <link rel="stylesheet" href="/assets/css/tags.css"/>'+#13#10+
''+#13#10+
' <!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->'+#13#10+
' <!-- [if lt IE 9]>'+#13#10+
Expand Down
0 server/web/dist/css/bootstrap.css → server/web/assets/css/bootstrap.css
View file
Open in desktop
File renamed without changes.
Loading
Loading