Commit 8e1d79da authored by Jasper Koehorst's avatar Jasper Koehorst
Browse files

./ for js path and temp disable html image

parent 1110932a
Pipeline #35996 canceled with stage
...@@ -14,7 +14,7 @@ import javax.servlet.http.Cookie; ...@@ -14,7 +14,7 @@ import javax.servlet.http.Cookie;
@PageTitle("Logging out") @PageTitle("Logging out")
@Route(value = "logout", layout = MainView.class) @Route(value = "logout", layout = MainView.class)
@CssImport("styles/views/empty/empty-view.css") @CssImport("./styles/views/empty/empty-view.css")
public class LogoutView extends VerticalLayout { public class LogoutView extends VerticalLayout {
public static final Logger logger = Logger.getLogger(TemplateView.class); public static final Logger logger = Logger.getLogger(TemplateView.class);
public LogoutView(){ public LogoutView(){
......
...@@ -18,7 +18,7 @@ import org.irods.jargon.core.pub.domain.UserGroup; ...@@ -18,7 +18,7 @@ import org.irods.jargon.core.pub.domain.UserGroup;
@PageTitle("User overview") @PageTitle("User overview")
@Route(value = "user", layout = MainView.class) @Route(value = "user", layout = MainView.class)
@CssImport("styles/views/empty/empty-view.css") @CssImport("./styles/views/empty/empty-view.css")
public class UserView extends VerticalLayout implements BeforeEnterObserver { public class UserView extends VerticalLayout implements BeforeEnterObserver {
public UserView() { public UserView() {
......
...@@ -52,7 +52,7 @@ import static nl.fairbydesign.backend.irods.Data.downloadFile; ...@@ -52,7 +52,7 @@ import static nl.fairbydesign.backend.irods.Data.downloadFile;
@Route(value = "browser", layout = MainView.class) @Route(value = "browser", layout = MainView.class)
@PageTitle("Browser") @PageTitle("Browser")
@CssImport("styles/views/empty/empty-view.css") @CssImport("./styles/views/empty/empty-view.css")
public class BrowserView extends Div { public class BrowserView extends Div {
private IRODSFileFactory fileFactory; private IRODSFileFactory fileFactory;
private List<Item> filesAndFolders = new ArrayList<>(); private List<Item> filesAndFolders = new ArrayList<>();
......
...@@ -35,7 +35,7 @@ import java.util.HashMap; ...@@ -35,7 +35,7 @@ import java.util.HashMap;
*/ */
@Route(value = "config", layout = MainView.class) @Route(value = "config", layout = MainView.class)
@PageTitle("Config view") @PageTitle("Config view")
@CssImport("styles/views/empty/empty-view.css") @CssImport("./styles/views/empty/empty-view.css")
public class Config extends Div { public class Config extends Div {
public static final Logger logger = Logger.getLogger(Config.class); public static final Logger logger = Logger.getLogger(Config.class);
private ArrayList<TextField> fields = new ArrayList<>(); private ArrayList<TextField> fields = new ArrayList<>();
......
...@@ -34,7 +34,8 @@ import nl.fairbydesign.backend.data.objects.*; ...@@ -34,7 +34,8 @@ import nl.fairbydesign.backend.data.objects.*;
import nl.fairbydesign.backend.metadata.Metadata; import nl.fairbydesign.backend.metadata.Metadata;
import nl.fairbydesign.backend.parsers.ExcelGenerator; import nl.fairbydesign.backend.parsers.ExcelGenerator;
import nl.fairbydesign.views.main.MainView; import nl.fairbydesign.views.main.MainView;
import org.apache.log4j.Logger; import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.vaadin.olli.FileDownloadWrapper; import org.vaadin.olli.FileDownloadWrapper;
import java.io.File; import java.io.File;
...@@ -57,7 +58,7 @@ import static nl.fairbydesign.backend.parsers.ExcelGenerator.makeAssaySheetOnly; ...@@ -57,7 +58,7 @@ import static nl.fairbydesign.backend.parsers.ExcelGenerator.makeAssaySheetOnly;
@CssImport("./styles/views/empty/empty-view.css") @CssImport("./styles/views/empty/empty-view.css")
public class TemplateView extends Div { public class TemplateView extends Div {
public static final Logger logger = Logger.getLogger(TemplateView.class); public static final Logger logger = LogManager.getLogger(TemplateView.class);
private final Button buttonDownload; private final Button buttonDownload;
// Obtain the metadata information which is loaded on startup // Obtain the metadata information which is loaded on startup
......
...@@ -35,7 +35,7 @@ import java.util.Set; ...@@ -35,7 +35,7 @@ import java.util.Set;
@Route(value = "archive", layout = MainView.class) @Route(value = "archive", layout = MainView.class)
@PageTitle("Archiving view") @PageTitle("Archiving view")
@CssImport("styles/views/empty/empty-view.css") @CssImport("./styles/views/empty/empty-view.css")
public class Archive extends Div { public class Archive extends Div {
public static final Logger logger = Logger.getLogger(Archive.class); public static final Logger logger = Logger.getLogger(Archive.class);
......
...@@ -33,7 +33,7 @@ import static nl.fairbydesign.backend.irods.Data.getJobInformation; ...@@ -33,7 +33,7 @@ import static nl.fairbydesign.backend.irods.Data.getJobInformation;
@Route(value = "dashboard", layout = MainView.class) @Route(value = "dashboard", layout = MainView.class)
@PageTitle("Dashboard") @PageTitle("Dashboard")
@CssImport("styles/views/empty/empty-view.css") @CssImport("./styles/views/empty/empty-view.css")
public class DashboardView extends Div { public class DashboardView extends Div {
private TextField pathBar; private TextField pathBar;
private Grid<Item> browserGrid; private Grid<Item> browserGrid;
......
...@@ -47,7 +47,7 @@ import java.util.HashSet; ...@@ -47,7 +47,7 @@ import java.util.HashSet;
@Route(value = "export", layout = MainView.class) @Route(value = "export", layout = MainView.class)
@PageTitle("Export module") @PageTitle("Export module")
@CssImport("styles/views/empty/empty-view.css") @CssImport("./styles/views/empty/empty-view.css")
public class Export extends Div { public class Export extends Div {
public static final Logger logger = LogManager.getLogger(Export.class); public static final Logger logger = LogManager.getLogger(Export.class);
......
...@@ -40,7 +40,7 @@ import static nl.fairbydesign.backend.irods.Data.uploadIrodsFile; ...@@ -40,7 +40,7 @@ import static nl.fairbydesign.backend.irods.Data.uploadIrodsFile;
// TEMP SOLUTION, should be behind a management login... // TEMP SOLUTION, should be behind a management login...
@Route(value = "management", layout = MainView.class) @Route(value = "management", layout = MainView.class)
@PageTitle("Management") @PageTitle("Management")
@CssImport("styles/views/empty/empty-view.css") @CssImport("./styles/views/empty/empty-view.css")
public class managementView extends VerticalLayout { public class managementView extends VerticalLayout {
public static final String VIEW_NAME = "Admin"; public static final String VIEW_NAME = "Admin";
......
...@@ -15,4 +15,4 @@ ...@@ -15,4 +15,4 @@
<p>The metadata schema is based on the ISA Standard which is a combination of the Just Enough Results Model (JERM) and the Minimum Information About a Plant Phenotyping Experiment (MIAPPE).&nbsp;</p> <p>The metadata schema is based on the ISA Standard which is a combination of the Just Enough Results Model (JERM) and the Minimum Information About a Plant Phenotyping Experiment (MIAPPE).&nbsp;</p>
<p>For selection of metadata a package subsystem is used that is based on the <em>Minimum Information about any (x) Sequence (MIxS)</em> standard from the Genomic Standards Consortium.</p> <p>For selection of metadata a package subsystem is used that is based on the <em>Minimum Information about any (x) Sequence (MIxS)</em> standard from the Genomic Standards Consortium.</p>
<p style="text-align:center;"><img src="images/frontpage.png" width="50%" class="center"></p> <!--<p style="text-align:center;"><img src="images/frontpage.png" width="50%" class="center"></p>-->
\ No newline at end of file \ No newline at end of file
...@@ -15,4 +15,4 @@ ...@@ -15,4 +15,4 @@
<p>The metadata schema is based on the ISA Standard which is a combination of the Just Enough Results Model (JERM) and the Minimum Information About a Plant Phenotyping Experiment (MIAPPE).&nbsp;</p> <p>The metadata schema is based on the ISA Standard which is a combination of the Just Enough Results Model (JERM) and the Minimum Information About a Plant Phenotyping Experiment (MIAPPE).&nbsp;</p>
<p>For selection of metadata a package subsystem is used that is based on the <em>Minimum Information about any (x) Sequence (MIxS)</em> standard from the Genomic Standards Consortium.</p> <p>For selection of metadata a package subsystem is used that is based on the <em>Minimum Information about any (x) Sequence (MIxS)</em> standard from the Genomic Standards Consortium.</p>
<p style="text-align:center;"><img src="images/frontpage.png" width="50%" class="center"></p> <!--<p style="text-align:center;"><img src="images/frontpage.png" width="50%" class="center"></p>-->
\ No newline at end of file \ No newline at end of file
...@@ -15,4 +15,4 @@ ...@@ -15,4 +15,4 @@
<p>The metadata schema is based on the ISA Standard which is a combination of the Just Enough Results Model (JERM) and the Minimum Information About a Plant Phenotyping Experiment (MIAPPE).&nbsp;</p> <p>The metadata schema is based on the ISA Standard which is a combination of the Just Enough Results Model (JERM) and the Minimum Information About a Plant Phenotyping Experiment (MIAPPE).&nbsp;</p>
<p>For selection of metadata a package subsystem is used that is based on the <em>Minimum Information about any (x) Sequence (MIxS)</em> standard from the Genomic Standards Consortium.</p> <p>For selection of metadata a package subsystem is used that is based on the <em>Minimum Information about any (x) Sequence (MIxS)</em> standard from the Genomic Standards Consortium.</p>
<p style="text-align:center;"><img src="images/frontpage.png" width="50%" class="center"></p> <!--<p style="text-align:center;"><img src="images/frontpage.png" width="50%" class="center"></p>-->
\ No newline at end of file \ No newline at end of file
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment