From 955b55f33358173153e88dd2987870fd82c2f938 Mon Sep 17 00:00:00 2001
From: Piotr Gawron <piotr.gawron@uni.lu>
Date: Tue, 17 Oct 2017 15:05:25 +0200
Subject: [PATCH] new admin panel
---
web/src/main/webapp/admin-new.xhtml | 64 -----------------------
web/src/main/webapp/admin.xhtml | 78 +++++++++++++++++++++--------
2 files changed, 57 insertions(+), 85 deletions(-)
delete mode 100644 web/src/main/webapp/admin-new.xhtml
diff --git a/web/src/main/webapp/admin-new.xhtml b/web/src/main/webapp/admin-new.xhtml
deleted file mode 100644
index 1cce7a8d8d..0000000000
--- a/web/src/main/webapp/admin-new.xhtml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml"
- xmlns:h="http://java.sun.com/jsf/html"
- xmlns:f="http://java.sun.com/jsf/core"
- xmlns:ui="http://java.sun.com/jsf/facelets"
- xmlns:p="http://primefaces.org/ui">
-
-<f:view contentType="text/html">
-<h:head>
- <script src="https://maps.google.com/maps/api/js?libraries=drawing&v=3.26" type="text/javascript"/>
-
- <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js" type="text/javascript"/>
- <script src="https://twitter.github.io/typeahead.js/releases/latest/typeahead.bundle.min.js" type="text/javascript"/>
-
- <script src="https://code.jquery.com/ui/1.12.1/jquery-ui.js"></script>
- <script src="https://cdn.datatables.net/1.10.13/js/jquery.dataTables.min.js"></script>
- <script src="https://cdnjs.cloudflare.com/ajax/libs/jstree/3.2.1/jstree.min.js"></script>
-
- <link rel="stylesheet" type="text/css" href="https://cdn.datatables.net/1.10.13/css/jquery.dataTables.min.css"/>
- <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/jstree/3.2.1/themes/default/style.min.css" />
-
- <link rel="shortcut icon" href="./resources/images/favicon.png" type="image/png" />
-
- <h:outputScript library="js" name="minerva.js" />
- <f:facet name="first">
- <link rel="stylesheet" type="text/css" href="https://code.jquery.com/ui/1.12.1/themes/base/jquery-ui.css"/>
- </f:facet>
-
- <script src="https://cdnjs.cloudflare.com/ajax/libs/spectrum/1.8.0/spectrum.min.js"></script>
- <link rel="stylesheet" type="text/css" href="https://cdnjs.cloudflare.com/ajax/libs/spectrum/1.8.0/spectrum.min.css"/>
- <script type="text/javascript">
-//<![CDATA[
-
-function initMap(){
- var element = document.getElementById('minervaAppDiv');
- return minerva.createAdmin({
- element : element,
- }).then(function(result){
- customMap = result;
- document.title = result.getProject().getName();
- }).catch(function(rejectReason){
- minerva.GuiConnector.alert(rejectReason);
- });
-}
-
-//]]>
- </script>
-</h:head>
-<h:body onload="initMap();" >
- <f:facet name="last">
- <h:outputStylesheet library="css" name="style.css"/>
- <h:outputStylesheet library="css" name="pileup.css"/>
- <h:outputStylesheet library="css" name="bootstrap.min.css"/>
- <h:outputStylesheet library="css" name="minerva.css" />
- </f:facet>
-
- <h:outputScript library="primefaces" name="jquery/jquery.js" target="head" />
- <div id="minervaAppDiv" style="height: 100%;width: 100%;margin: 0;"/>
-
-</h:body>
-</f:view>
-</html>
diff --git a/web/src/main/webapp/admin.xhtml b/web/src/main/webapp/admin.xhtml
index eb28880144..1cce7a8d8d 100644
--- a/web/src/main/webapp/admin.xhtml
+++ b/web/src/main/webapp/admin.xhtml
@@ -1,28 +1,64 @@
-<ui:composition template="/WEB-INF/components/admin/template.xhtml"
- xmlns="http://www.w3.org/1999/xhtml"
- xmlns:f="http://java.sun.com/jsf/core"
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"
xmlns:h="http://java.sun.com/jsf/html"
- xmlns:p="http://primefaces.org/ui"
- xmlns:cc="http://java.sun.com/jsf/composite/pfcomp"
- xmlns:ui="http://java.sun.com/jsf/facelets">
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:p="http://primefaces.org/ui">
+<f:view contentType="text/html">
<h:head>
- <ui:define name="title">
- Admin panel
- </ui:define>
- <h:outputStylesheet library="css" name="style.css"/>
- <h:outputStylesheet library="css" name="admin.css"/>
-</h:head>
+ <script src="https://maps.google.com/maps/api/js?libraries=drawing&v=3.26" type="text/javascript"/>
- <ui:param name="access" value="true"/>
+ <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js" type="text/javascript"/>
+ <script src="https://twitter.github.io/typeahead.js/releases/latest/typeahead.bundle.min.js" type="text/javascript"/>
- <ui:define name="content">
-
- <div class="welcomeBox">
- <div class="welcomeBigText"><i class="fa fa-check-square-o welcomeIcon"></i> Authorization complete</div>
- <div class="welcomeAdditionlInfo">Use main menu to start managing.</div>
- </div>
+ <script src="https://code.jquery.com/ui/1.12.1/jquery-ui.js"></script>
+ <script src="https://cdn.datatables.net/1.10.13/js/jquery.dataTables.min.js"></script>
+ <script src="https://cdnjs.cloudflare.com/ajax/libs/jstree/3.2.1/jstree.min.js"></script>
+
+ <link rel="stylesheet" type="text/css" href="https://cdn.datatables.net/1.10.13/css/jquery.dataTables.min.css"/>
+ <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/jstree/3.2.1/themes/default/style.min.css" />
- </ui:define>
-</ui:composition>
+ <link rel="shortcut icon" href="./resources/images/favicon.png" type="image/png" />
+
+ <h:outputScript library="js" name="minerva.js" />
+ <f:facet name="first">
+ <link rel="stylesheet" type="text/css" href="https://code.jquery.com/ui/1.12.1/themes/base/jquery-ui.css"/>
+ </f:facet>
+
+ <script src="https://cdnjs.cloudflare.com/ajax/libs/spectrum/1.8.0/spectrum.min.js"></script>
+ <link rel="stylesheet" type="text/css" href="https://cdnjs.cloudflare.com/ajax/libs/spectrum/1.8.0/spectrum.min.css"/>
+ <script type="text/javascript">
+//<![CDATA[
+
+function initMap(){
+ var element = document.getElementById('minervaAppDiv');
+ return minerva.createAdmin({
+ element : element,
+ }).then(function(result){
+ customMap = result;
+ document.title = result.getProject().getName();
+ }).catch(function(rejectReason){
+ minerva.GuiConnector.alert(rejectReason);
+ });
+}
+
+//]]>
+ </script>
+</h:head>
+<h:body onload="initMap();" >
+ <f:facet name="last">
+ <h:outputStylesheet library="css" name="style.css"/>
+ <h:outputStylesheet library="css" name="pileup.css"/>
+ <h:outputStylesheet library="css" name="bootstrap.min.css"/>
+ <h:outputStylesheet library="css" name="minerva.css" />
+ </f:facet>
+
+ <h:outputScript library="primefaces" name="jquery/jquery.js" target="head" />
+ <div id="minervaAppDiv" style="height: 100%;width: 100%;margin: 0;"/>
+</h:body>
+</f:view>
+</html>
--
GitLab