Moving templates in subfolder (#40)

This commit is contained in:
Francesco 2023-11-24 16:39:54 +01:00
parent f4dc649a3b
commit 3f7f60dd27
22 changed files with 15 additions and 15 deletions

View File

@ -61,7 +61,7 @@ public class GlobalController {
model.addAttribute("snapadmin_baseUrl", getBaseUrl()); model.addAttribute("snapadmin_baseUrl", getBaseUrl());
model.addAttribute("snapadmin_version", snapAdmin.getVersion()); model.addAttribute("snapadmin_version", snapAdmin.getVersion());
model.addAttribute("snapadmin_properties", props); model.addAttribute("snapadmin_properties", props);
return "other/error"; return "snapadmin/other/error";
} }
@ExceptionHandler(SnapAdminNotFoundException.class) @ExceptionHandler(SnapAdminNotFoundException.class)
@ -74,7 +74,7 @@ public class GlobalController {
model.addAttribute("snapadmin_version", snapAdmin.getVersion()); model.addAttribute("snapadmin_version", snapAdmin.getVersion());
model.addAttribute("snapadmin_properties", props); model.addAttribute("snapadmin_properties", props);
response.setStatus(404); response.setStatus(404);
return "other/error"; return "snapadmin/other/error";
} }
@ModelAttribute("snapadmin_version") @ModelAttribute("snapadmin_version")

View File

@ -134,7 +134,7 @@ public class SnapAdminController {
model.addAttribute("activePage", "entities"); model.addAttribute("activePage", "entities");
model.addAttribute("title", "Entities | Index"); model.addAttribute("title", "Entities | Index");
return "home"; return "snapadmin/home";
} }
/** /**
@ -222,7 +222,7 @@ public class SnapAdminController {
model.addAttribute("query", query); model.addAttribute("query", query);
model.addAttribute("sortOrder", sortOrder); model.addAttribute("sortOrder", sortOrder);
model.addAttribute("activeFilters", queryFilters); model.addAttribute("activeFilters", queryFilters);
return "model/list"; return "snapadmin/model/list";
} catch (InvalidPageException e) { } catch (InvalidPageException e) {
return "redirect:/" + properties.getBaseUrl() + "/model/" + className; return "redirect:/" + properties.getBaseUrl() + "/model/" + className;
@ -235,7 +235,7 @@ public class SnapAdminController {
model.addAttribute("query", query); model.addAttribute("query", query);
model.addAttribute("sortOrder", sortOrder); model.addAttribute("sortOrder", sortOrder);
model.addAttribute("activeFilters", queryFilters); model.addAttribute("activeFilters", queryFilters);
return "model/list"; return "snapadmin/model/list";
} }
} }
@ -252,7 +252,7 @@ public class SnapAdminController {
model.addAttribute("activePage", "entities"); model.addAttribute("activePage", "entities");
model.addAttribute("schema", schema); model.addAttribute("schema", schema);
return "model/schema"; return "snapadmin/model/schema";
} }
/** /**
@ -279,7 +279,7 @@ public class SnapAdminController {
model.addAttribute("activePage", "entities"); model.addAttribute("activePage", "entities");
model.addAttribute("schema", schema); model.addAttribute("schema", schema);
return "model/show"; return "snapadmin/model/show";
} }
@ -299,7 +299,7 @@ public class SnapAdminController {
model.addAttribute("activePage", "entities"); model.addAttribute("activePage", "entities");
model.addAttribute("create", true); model.addAttribute("create", true);
return "model/create"; return "snapadmin/model/create";
} }
@GetMapping("/model/{className}/edit/{id}") @GetMapping("/model/{className}/edit/{id}")
@ -327,7 +327,7 @@ public class SnapAdminController {
model.addAttribute("activePage", "entities"); model.addAttribute("activePage", "entities");
model.addAttribute("create", false); model.addAttribute("create", false);
return "model/create"; return "snapadmin/model/create";
} }
@PostMapping(value="/model/{className}/delete/{id}") @PostMapping(value="/model/{className}/delete/{id}")
@ -543,7 +543,7 @@ public class SnapAdminController {
model.addAttribute("title", "Action logs"); model.addAttribute("title", "Action logs");
model.addAttribute("schemas", snapAdmin.getSchemas()); model.addAttribute("schemas", snapAdmin.getSchemas());
model.addAttribute("searchRequest", searchRequest); model.addAttribute("searchRequest", searchRequest);
return "logs"; return "snapadmin/logs";
} }
@ -551,14 +551,14 @@ public class SnapAdminController {
public String settings(Model model) { public String settings(Model model) {
model.addAttribute("title", "Settings"); model.addAttribute("title", "Settings");
model.addAttribute("activePage", "settings"); model.addAttribute("activePage", "settings");
return "settings/settings"; return "snapadmin/settings/settings";
} }
@GetMapping("/help") @GetMapping("/help")
public String help(Model model) { public String help(Model model) {
model.addAttribute("title", "Help"); model.addAttribute("title", "Help");
model.addAttribute("activePage", "help"); model.addAttribute("activePage", "help");
return "help"; return "snapadmin/help";
} }
@GetMapping("/console/new") @GetMapping("/console/new")
@ -664,14 +664,14 @@ public class SnapAdminController {
model.addAttribute("title", "SQL Console | " + activeQuery.getTitle()); model.addAttribute("title", "SQL Console | " + activeQuery.getTitle());
double elapsedTime = (System.currentTimeMillis() - startTime) / 1000.0; double elapsedTime = (System.currentTimeMillis() - startTime) / 1000.0;
model.addAttribute("elapsedTime", new DecimalFormat("0.0#").format(elapsedTime)); model.addAttribute("elapsedTime", new DecimalFormat("0.0#").format(elapsedTime));
return "console"; return "snapadmin/console";
} }
@GetMapping("/settings/appearance") @GetMapping("/settings/appearance")
public String settingsAppearance(Model model) { public String settingsAppearance(Model model) {
model.addAttribute("activePage", "settings"); model.addAttribute("activePage", "settings");
return "settings/appearance"; return "snapadmin/settings/appearance";
} }
@GetMapping("/forbidden") @GetMapping("/forbidden")
@ -679,7 +679,7 @@ public class SnapAdminController {
model.addAttribute("error", "Forbidden"); model.addAttribute("error", "Forbidden");
model.addAttribute("status", "403"); model.addAttribute("status", "403");
model.addAttribute("message", "You don't have the privileges to perform this action"); model.addAttribute("message", "You don't have the privileges to perform this action");
return "other/error"; return "snapadmin/other/error";
} }
@PostMapping("/settings") @PostMapping("/settings")