ziver/hal
1
1
Fork 0
Code Pull requests Releases Activity

moved web resources to resource folder

Browse source
This commit is contained in:
Ziver Koc 2016-02-27 02:24:09 +01:00
parent bf799fa74d
commit 3904ef857d
50 changed files with 13 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/se/hal/HalServer.java
View file

@ -86,7 +86,7 @@ public class HalServer {
new UserConfigHttpPage(),
};
HttpServer http = new HttpServer(HalContext.getIntegerProperty("http_port"));
http.setDefaultPage(new HttpFilePage(FileUtil.find("web-resource/")));
http.setDefaultPage(new HttpFilePage(FileUtil.find("resource/web/")));
http.setPage("/", pages[0]);
http.setPage(HalAlertManager.getInstance().getUrl(), HalAlertManager.getInstance());
for(HalHttpPage page : pages){

2
src/se/hal/intf/HalHttpPage.java
View file

@ -18,7 +18,7 @@ import java.util.Map;
* Created by Ziver on 2015-12-10.
*/
public abstract class HalHttpPage implements HttpPage{
private static final String TEMPLATE = "web-resource/main_index.tmpl";
private static final String TEMPLATE = "resource/web/main_index.tmpl";
private static HalNavigation rootNav = new HalNavigation();
private static HalNavigation userNav = new HalNavigation();

2
src/se/hal/page/EventConfigHttpPage.java
View file

@ -14,7 +14,7 @@ import zutil.ui.Configurator.ConfigurationParam;
import java.util.Map;
public class EventConfigHttpPage extends HalHttpPage {
private static final String TEMPLATE = "web-resource/event_config.tmpl";
private static final String TEMPLATE = "resource/web/event_config.tmpl";
private class EventDataParams{
public Class clazz;

4
src/se/hal/page/EventOverviewHttpPage.java
View file

@ -18,8 +18,8 @@ import java.util.Map;
public class EventOverviewHttpPage extends HalHttpPage {
private static final int HISTORY_LIMIT = 200;
private static final String OVERVIEW_TEMPLATE = "web-resource/event_overview.tmpl";
private static final String DETAIL_TEMPLATE = "web-resource/event_detail.tmpl";
private static final String OVERVIEW_TEMPLATE = "resource/web/event_overview.tmpl";
private static final String DETAIL_TEMPLATE = "resource/web/event_detail.tmpl";
public EventOverviewHttpPage(){

2
src/se/hal/page/HalAlertManager.java
View file

@ -17,7 +17,7 @@ import java.util.logging.Logger;
*/
public class HalAlertManager implements HttpPage {
private static final Logger logger = LogUtil.getLogger();
private static final String TMPL_PATH = "web-resource/main_alerts.tmpl";
private static final String TMPL_PATH = "resource/web/main_alerts.tmpl";
private static final String PAGE_NAME = "alert";
private static HalAlertManager instance;

2
src/se/hal/page/PCHeatMapHttpPage.java
View file

@ -7,7 +7,7 @@ import zutil.parser.Templator;
import java.util.Map;
public class PCHeatMapHttpPage extends HalHttpPage {
private static final String TEMPLATE = "web-resource/pc_heatmap.tmpl";
private static final String TEMPLATE = "resource/web/pc_heatmap.tmpl";
public PCHeatMapHttpPage() {

2
src/se/hal/page/PCOverviewHttpPage.java
View file

@ -17,7 +17,7 @@ import java.util.List;
import java.util.Map;
public class PCOverviewHttpPage extends HalHttpPage {
private static final String TEMPLATE = "web-resource/pc_overview.tmpl";
private static final String TEMPLATE = "resource/web/pc_overview.tmpl";
public PCOverviewHttpPage() {
super("Power;Challenge", "pc_overview");

2
src/se/hal/page/SensorConfigHttpPage.java
View file

@ -14,7 +14,7 @@ import zutil.ui.Configurator.ConfigurationParam;
import java.util.Map;
public class SensorConfigHttpPage extends HalHttpPage {
private static final String TEMPLATE = "web-resource/sensor_config.tmpl";
private static final String TEMPLATE = "resource/web/sensor_config.tmpl";
private class SensorDataParams{
public Class clazz;

4
src/se/hal/page/SensorOverviewHttpPage.java
View file

@ -18,8 +18,8 @@ import java.util.Map;
public class SensorOverviewHttpPage extends HalHttpPage {
private static final int HISTORY_LIMIT = 200;
private static final String OVERVIEW_TEMPLATE = "web-resource/sensor_overview.tmpl";
private static final String DETAIL_TEMPLATE = "web-resource/sensor_detail.tmpl";
private static final String OVERVIEW_TEMPLATE = "resource/web/sensor_overview.tmpl";
private static final String DETAIL_TEMPLATE = "resource/web/sensor_detail.tmpl";
public SensorOverviewHttpPage(){

2
src/se/hal/page/UserConfigHttpPage.java
View file

@ -10,7 +10,7 @@ import zutil.parser.Templator;
import java.util.Map;
public class UserConfigHttpPage extends HalHttpPage {
private static final String TEMPLATE = "web-resource/user_config.tmpl";
private static final String TEMPLATE = "resource/web/user_config.tmpl";
public UserConfigHttpPage() {