Skip to content

Commit

Permalink
#1 Remove Dojo dependencies (work in progress)
Browse files Browse the repository at this point in the history
  • Loading branch information
ldhasson-hmhn committed May 3, 2023
1 parent a7704cd commit d53a4c0
Show file tree
Hide file tree
Showing 20 changed files with 68 additions and 10,133 deletions.
7 changes: 0 additions & 7 deletions .project
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,4 @@
<natures>
<nature>org.eclipse.jdt.core.javanature</nature>
</natures>
<linkedResources>
<link>
<name>WebContent/static/floria.v2.0.OLD</name>
<type>2</type>
<locationURI>PARENT-2-PROJECT_LOC/CapsicoBase/CapsicoWebStatic/WebContent/floria.v2.0</locationURI>
</link>
</linkedResources>
</projectDescription>
129 changes: 64 additions & 65 deletions WebContent/error.jsp
Original file line number Diff line number Diff line change
@@ -1,65 +1,64 @@
<%@page language="java" contentType="text/html; charset=ISO-8859-1" pageEncoding="ISO-8859-1"%>
<%@page import="tilda.utils.HttpStatus"%>
<%@page import="tilda.utils.TextUtil"%>
<%@page import="java.util.Enumeration"%>

<%
HttpStatus Status = HttpStatus.parse((Integer) request.getAttribute("javax.servlet.error.status_code"));
String StatusMessage = (String) request.getAttribute("javax.servlet.error.message");
String PageTitle=Status._Code == HttpStatus.Unauthorized._Code ? "CapsicoHealth Login" : "CapsicoHealth error: "+Status._Code;
%>
<link rel="stylesheet" href="/static/dojo-release-1.16.4/dijit/themes/claro/claro.css"/>
<link rel="stylesheet" href="/static/css/dojoSimple.css"/>
<link rel="stylesheet" href="/static/css/tilda.css"/>

<STYLE>
.elegantShadow {
color: #131313;
letter-spacing: .1em;
font-family: "Avant Garde", Avantgarde, "Century Gothic", CenturyGothic, "AppleGothic", sans-serif;
font-size: 50px;
padding: 5px 10px 10px 20px;
margin: 10px 20px 10px 20px;
text-align: center;
text-transform: uppercase;
text-rendering: optimizeLegibility;
text-shadow: -1px -1px 0 #666, -2px 2px 1px #aaa, -3px 3px 1px #eee;
}
#ERR_MSG {
font-weight: normal;
text-transform: none;
letter-spacing: -1px;
font-size: 40%;
text-shadow: none;
}
</STYLE>

<DIV id="LogginBackground" class="fullCenter" style="width: 100%; height: 100%; overflow: hidden; z-index: 5;"></DIV>
<DIV id="LogginButton" class="fullCenter" style="width: 100%; height: 100%; font-size: 150%; overflow: hidden; z-index: 10;" >
<DIV class="fullCenter capsicoLogo">
<DIV class="elegantShadow">
<%
Throwable T = (Throwable) request.getAttribute("javax.servlet.error.exception");
if (T != null && TextUtil.isNullOrEmpty(T.getMessage()) == false)
out.println("<!-- "+T.getMessage()+" -->");
if (Status._Code == HttpStatus.Unauthorized._Code) { %>
Session Timeout
<DIV id="ERR_MSG">You were inactive for more than 20 minutes</DIV>
</DIV>
<CENTER><BUTTON class="buttonLogin" onClick="dojoSimple.PopupLogin.show(false, function() { document.location.reload();})" style="font-size: 75%; font-weight: bold;">Login again</BUTTON></CENTER>
</DIV>
<% } else if (Status._Code == HttpStatus.ResourceNotFound._Code) { %>
Page not found
<DIV id="ERR_MSG">You have reached this page in error or do not have access<BR>Use your browser's Back button</DIV>
</DIV>
</DIV>
<% } else { %>
<%=Status._Message%>
<DIV id="ERR_MSG"><%=StatusMessage%></DIV>
</DIV>
<CENTER style="position: relative; top: -15px;">&#x26a0; <%=Status._Code%></CENTER>
</DIV>
<% } %>
</DIV>
<%@page language="java" contentType="text/html; charset=ISO-8859-1" pageEncoding="ISO-8859-1"%>
<%@page import="tilda.utils.HttpStatus"%>
<%@page import="tilda.utils.TextUtil"%>
<%@page import="java.util.Enumeration"%>

<%
HttpStatus Status = HttpStatus.parse((Integer) request.getAttribute("javax.servlet.error.status_code"));
String StatusMessage = (String) request.getAttribute("javax.servlet.error.message");
String PageTitle=Status._Code == HttpStatus.Unauthorized._Code ? "CapsicoHealth Login" : "CapsicoHealth error: "+Status._Code;
%>
<link rel="stylesheet" href="/static/css/dojoSimple.css"/>
<link rel="stylesheet" href="/static/css/tilda.css"/>

<STYLE>
.elegantShadow {
color: #131313;
letter-spacing: .1em;
font-family: "Avant Garde", Avantgarde, "Century Gothic", CenturyGothic, "AppleGothic", sans-serif;
font-size: 50px;
padding: 5px 10px 10px 20px;
margin: 10px 20px 10px 20px;
text-align: center;
text-transform: uppercase;
text-rendering: optimizeLegibility;
text-shadow: -1px -1px 0 #666, -2px 2px 1px #aaa, -3px 3px 1px #eee;
}
#ERR_MSG {
font-weight: normal;
text-transform: none;
letter-spacing: -1px;
font-size: 40%;
text-shadow: none;
}
</STYLE>

<DIV id="LogginBackground" class="fullCenter" style="width: 100%; height: 100%; overflow: hidden; z-index: 5;"></DIV>
<DIV id="LogginButton" class="fullCenter" style="width: 100%; height: 100%; font-size: 150%; overflow: hidden; z-index: 10;" >
<DIV class="fullCenter capsicoLogo">
<DIV class="elegantShadow">
<%
Throwable T = (Throwable) request.getAttribute("javax.servlet.error.exception");
if (T != null && TextUtil.isNullOrEmpty(T.getMessage()) == false)
out.println("<!-- "+T.getMessage()+" -->");
if (Status._Code == HttpStatus.Unauthorized._Code) { %>
Session Timeout
<DIV id="ERR_MSG">You were inactive for more than 20 minutes</DIV>
</DIV>
<CENTER><BUTTON class="buttonLogin" onClick="FloriaLogin.PopupLogin.show(false, function() { document.location.reload();})" style="font-size: 75%; font-weight: bold;">Login again</BUTTON></CENTER>
</DIV>
<% } else if (Status._Code == HttpStatus.ResourceNotFound._Code) { %>
Page not found
<DIV id="ERR_MSG">You have reached this page in error or do not have access<BR>Use your browser's Back button</DIV>
</DIV>
</DIV>
<% } else { %>
<%=Status._Message%>
<DIV id="ERR_MSG"><%=StatusMessage%></DIV>
</DIV>
<CENTER style="position: relative; top: -15px;">&#x26a0; <%=Status._Code%></CENTER>
</DIV>
<% } %>
</DIV>
20 changes: 2 additions & 18 deletions WebContent/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,9 @@
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
<title>TIDE: Tilda Workbench</title>
<link rel="stylesheet" href="/static/dojo-release-1.16.4/dijit/themes/claro/claro.css"/>
<link rel="stylesheet" href="/static/css/dojoSimple.css"/>
<link rel="stylesheet" href="/static/css/tilda.css"/>

<link rel="stylesheet" href="/static/js/style.css"/>
</head>
<body class="claro">

Expand Down Expand Up @@ -53,20 +52,6 @@

</div>


<SCRIPT> var djConfig = { isDebug: false, locale: 'en-us', parseOnLoad: false, disableFlashStorage:true, parseWidgets:false, baseUrl: "/static/",
packages: [ { name: "dojo", location: "dojo-release-1.16.4/dojo" },
{ name: "dijit", location: "dojo-release-1.16.4/dijit" },
{ name: "dojox", location: "dojo-release-1.16.4/dojox" },
{ name: "floria", location: "floria.v2.0" },
{ name: "js", location: "js" },
{ name: "vs", location: 'https://unpkg.com/monaco-editor@latest/min/vs' },
{ name: "json", location: "json" }
]
};
window.CapsicoDojoSimpleLibJS = "floria.v2.0/dojoSimple";
</SCRIPT>
<script src="/static/dojo-release-1.16.4/dojo/dojo.js"></script>
<SCRIPT type="module">
import { projects } from "/static/js/module-projects.js";
window.TILDA_GLOBAL = {
Expand All @@ -79,10 +64,9 @@

</SCRIPT>
<script src="https://cdn.jsdelivr.net/npm/sceditor@3/minified/sceditor.min.js"></script>
<script type="text/javascript" src="/static/js/index.js"></script>
<script src="https://code.jquery.com/jquery-3.5.0.min.js"></script>
<script src="https://cdn.jsdelivr.net/npm/monaco-editor@latest/min/vs/loader.js"></script>
<link type="text/css" rel="stylesheet" href="/static/js/style.css"/>
<script type="text/javascript" src="/static/js/index.js"></script>



Expand Down
Loading

0 comments on commit d53a4c0

Please sign in to comment.