demus/openhab-core
1
0
Fork 0
mirror of https://github.com/danieldemus/openhab-core.git synced 2025-01-25 11:45:49 +01:00
Code Issues 1 Packages Projects Releases Wiki Activity

only show spinner if package selection hasn't been skipped and thus UIs are expected to be installed (#97)

Browse Source 
Signed-off-by: Kai Kreuzer <kai@openhab.org>
This commit is contained in:
Kai Kreuzer 2016-12-20 18:43:45 +01:00 committed by GitHub
parent a72b1c9af2
commit 4089e5d828
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
bundles/org.openhab.ui.dashboard/src/main/java/org/openhab/ui/dashboard/internal/DashboardServlet.java
View File

@ -77,9 +77,14 @@ public class DashboardServlet extends HttpServlet {
}
resp.setContentType("text/html;charset=UTF-8");
if (tiles.size() == 0) {
entries.append(
"&nbsp;&nbsp;&nbsp;&nbsp;<div class=\"spinner spinner--steps\"><img src=\"img/spinner.svg\"></div>&nbsp;&nbsp;");
entries.append("Please stand by while UIs are being installed. This can take several minutes.");
if ("minimal".equals(getPackage())) {
entries.append("&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;");
entries.append("No user interfaces installed.");
} else {
entries.append(
"&nbsp;&nbsp;&nbsp;&nbsp;<div class=\"spinner spinner--steps\"><img src=\"img/spinner.svg\"></div>&nbsp;&nbsp;");
entries.append("Please stand by while UIs are being installed. This can take several minutes.");
}
}
resp.getWriter().append(indexTemplate.replace("<!--entries-->", entries.toString()));
resp.getWriter().close();
@ -112,14 +117,18 @@ public class DashboardServlet extends HttpServlet {
}
private boolean isSetup() {
return getPackage() != null;
}
private String getPackage() {
try {
Configuration cfg = configurationAdmin.getConfiguration(OpenHAB.ADDONS_SERVICE_PID);
if (cfg != null && cfg.getProperties() != null && cfg.getProperties().get(OpenHAB.CFG_PACKAGE) != null) {
return true;
return cfg.getProperties().get(OpenHAB.CFG_PACKAGE).toString();
}
} catch (IOException e) {
logger.error("Error while accessing the configuration admin: {}", e.getMessage());
}
return false;
return null;
}
}