diff --git a/app/femr/business/services/system/UpdatesService.java b/app/femr/business/services/system/UpdatesService.java index 7ac00bb9d..969a88066 100644 --- a/app/femr/business/services/system/UpdatesService.java +++ b/app/femr/business/services/system/UpdatesService.java @@ -272,7 +272,7 @@ public ServiceResponse> downloadPackages(String la List optimizedLanguages = getOptimizedLanguages(); for (ILanguageCode optLang : optimizedLanguages) { System.out.println("Updating " + optLang.getCode() + " and " + langCode); - ProcessBuilder pb = new ProcessBuilder("python", + ProcessBuilder pb = new ProcessBuilder("python3", "translator/optimizeLanguage.py", langCode, optLang.getCode()); Process p = pb.start(); BufferedReader bfr = new BufferedReader(new InputStreamReader(p.getInputStream(), "UTF-8")); @@ -291,7 +291,7 @@ public ServiceResponse> initializeLanguages() { ServiceResponse> response = new ServiceResponse<>(); try { languagesRepository.delete(languagesRepository.findAll(LanguageCode.class)); - ProcessBuilder pb = new ProcessBuilder("python", "translator/libargos.py"); + ProcessBuilder pb = new ProcessBuilder("python3", "translator/libargos.py"); Process p = pb.start(); BufferedReader bfr = new BufferedReader(new InputStreamReader(p.getInputStream(), "UTF-8")); String line; diff --git a/app/femr/ui/controllers/BackEndControllerHelper.java b/app/femr/ui/controllers/BackEndControllerHelper.java index c9e8292f8..b16f1c28b 100644 --- a/app/femr/ui/controllers/BackEndControllerHelper.java +++ b/app/femr/ui/controllers/BackEndControllerHelper.java @@ -9,7 +9,7 @@ public class BackEndControllerHelper { public static void executePythonScript(String absPath) { try { - ProcessBuilder pb = new ProcessBuilder("python", absPath); + ProcessBuilder pb = new ProcessBuilder("python3", absPath); pb.start(); } catch (NullPointerException e) { System.out.println("The python script does not exist or could not be opened."); @@ -27,7 +27,7 @@ public static ArrayList executeSpeedTestScript(String absPath) { if(absPath.equals("/usr/src/speedtest/sptest.py")){ pb = new ProcessBuilder("python3", absPath); }else{ - pb = new ProcessBuilder("python", absPath); + pb = new ProcessBuilder("python3", absPath); } Process p = pb.start(); BufferedReader bfr = new BufferedReader(new InputStreamReader(p.getInputStream(), "UTF-8")); diff --git a/app/femr/ui/views/layouts/main.scala.html b/app/femr/ui/views/layouts/main.scala.html index 86f9ee6b8..64cad059e 100644 --- a/app/femr/ui/views/layouts/main.scala.html +++ b/app/femr/ui/views/layouts/main.scala.html @@ -5,33 +5,44 @@ search: Html = Html(""), assets: AssetsFinder)(content: Html) @import femr.ui.views.html.partials.footer -@import femr.ui.views.html.partials.header +@import femr.ui.views.html.partials.sidebar - + @title | fEMR + + + + + @styles - - @header(currentUser, assets) + +
+ @sidebar(currentUser, search, assets) - @outsideContainerTop +
+ @outsideContainerTop -
- @search +
+
+ @content +
+
- @content - - @footer(currentUser, assets) +
+ @footer(currentUser, assets) +
+
@outsideContainerBottom diff --git a/app/femr/ui/views/partials/footer.scala.html b/app/femr/ui/views/partials/footer.scala.html index a66a838d1..9d96ca975 100644 --- a/app/femr/ui/views/partials/footer.scala.html +++ b/app/femr/ui/views/partials/footer.scala.html @@ -24,46 +24,18 @@ } }); -