From c20e94b8a1046242ce72b4a9021023bb54bdf2b0 Mon Sep 17 00:00:00 2001
From: "Barbara B. Frosik" <bfrosik@aps.anl.gov>
Date: Mon, 9 Feb 2015 16:25:52 +0000
Subject: [PATCH]
---
.../web/templates/dmAdminOnlyTemplate.xhtml | 10 ----------
.../web/templates/dmRestrictedTemplate.xhtml | 10 ----------
2 files changed, 20 deletions(-)
delete mode 100644 src/java/DmWebPortal/web/templates/dmAdminOnlyTemplate.xhtml
delete mode 100644 src/java/DmWebPortal/web/templates/dmRestrictedTemplate.xhtml
diff --git a/src/java/DmWebPortal/web/templates/dmAdminOnlyTemplate.xhtml b/src/java/DmWebPortal/web/templates/dmAdminOnlyTemplate.xhtml
deleted file mode 100644
index 26a79979..00000000
--- a/src/java/DmWebPortal/web/templates/dmAdminOnlyTemplate.xhtml
+++ /dev/null
@@ -1,10 +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:ui="http://java.sun.com/jsf/facelets"
- xmlns:h="http://java.sun.com/jsf/html">
-
- <h:outputScript library="js/common" name="forwardNotLoggedin.js" rendered="#{!loginController.loggedIn}"/>
- <h:outputScript library="js/common" name="forwardNotAuthorized.js" rendered="#{!loginController.admin}"/>
- <ui:include src="/templates/contentViewTemplate4x3.xhtml"/>
-</html>
\ No newline at end of file
diff --git a/src/java/DmWebPortal/web/templates/dmRestrictedTemplate.xhtml b/src/java/DmWebPortal/web/templates/dmRestrictedTemplate.xhtml
deleted file mode 100644
index 72180d70..00000000
--- a/src/java/DmWebPortal/web/templates/dmRestrictedTemplate.xhtml
+++ /dev/null
@@ -1,10 +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:ui="http://java.sun.com/jsf/facelets"
- xmlns:h="http://java.sun.com/jsf/html">
-
- <h:outputScript library="js/common" name="forwardNotLoggedin.js" rendered="#{!loginController.loggedIn}"/>
- <h:outputScript library="js/common" name="forwardNotAuthorized.js" rendered="#{!loginController.admin and experimentController.isRestricted()}"/>
- <ui:include src="/templates/contentViewTemplate4x3.xhtml"/>
-</html>
\ No newline at end of file
--
GitLab