Merge pull request #240 from costateixeira/master

changes to web UI javascript
HealthIntersections · Oct 18, 2024 · 2977bd6 · 2977bd6
2 parents c00439a + fca10db
commit 2977bd6
Show file tree

Hide file tree

Showing 33 changed files with 12,087 additions and 12,689 deletions.
diff --git a/library/ftx/ftx_sct_analysis.pas b/library/ftx/ftx_sct_analysis.pas
@@ -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]>');
@@ -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>');

diff --git a/server/html_builder.pas b/server/html_builder.pas
@@ -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+
@@ -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+

diff --git a/server/web/dist/css/bootstrap.css → server/web/assets/css/bootstrap.css b/server/web/dist/css/bootstrap.css → server/web/assets/css/bootstrap.css