Skip to content

Commit

Permalink
Merge pull request #76 from ZihengSun/master
Browse files Browse the repository at this point in the history 
New Interface Design, Less Popup Windows, glamorized History Charts and Tables
  • Loading branch information
@ZihengSun
ZihengSun authored Jul 1, 2020
2 parents e9ba4fc + dfcfab5 commit 1d31df8
Show file tree
Hide file tree
Showing 135 changed files with 2,460 additions and 2,154 deletions.
2 changes: 1 addition & 1 deletion WebContent/WEB-INF/spring-webmvc-servlet.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd
http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc.xsd">

<context:component-scan base-package="edu.gmu.csiss.earthcube.cyberconnector.web"/>
<context:component-scan base-package="gw.web"/>

<mvc:annotation-driven/>

Expand Down
8 changes: 4 additions & 4 deletions WebContent/WEB-INF/spring-websocket-servlet.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,13 @@
</websocket:handshake-interceptors>
</websocket:handlers>
<bean id="jupyterhandler" class="edu.gmu.csiss.earthcube.cyberconnector.ws.JupyterHandler"/> -->
<bean id="jupyterhandler" class="gw.ws.JupyterHandler"/> -->

<bean id="shellsocket" class="edu.gmu.csiss.earthcube.cyberconnector.ssh.ShellSocket"/>
<bean id="shellsocket" class="gw.ssh.ShellSocket"/>

<bean id="tasksocket" class="edu.gmu.csiss.earthcube.cyberconnector.tasks.TaskSocket"/>
<bean id="tasksocket" class="gw.tasks.TaskSocket"/>

<!-- <bean id="jupytersocket" class="edu.gmu.csiss.earthcube.cyberconnector.web.JupyterSocket"/> -->
<!-- <bean id="jupytersocket" class="gw.web.JupyterSocket"/> -->

<websocket:handlers>

Expand Down
5 changes: 3 additions & 2 deletions WebContent/WEB-INF/views/geoweaver-ssh.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@


<script src="../geoweaver/ssh/sockjs.js" th:src="@{../geoweaver/ssh/sockjs.js}"></script>
<script src="https://code.jquery.com/jquery-3.2.1.min.js"></script>
<!-- <script src="https://code.jquery.com/jquery-3.2.1.min.js"></script> -->
<script src="../geoweaver/js/jquery-3.2.1.min.js"></script>

<!-- <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery.terminal/1.23.2/js/jquery.terminal.min.js"></script>
<link href="https://cdnjs.cloudflare.com/ajax/libs/jquery.terminal/1.23.2/css/jquery.terminal.min.css" rel="stylesheet"/> -->
Expand Down Expand Up @@ -76,7 +77,7 @@ <h1 id="title">Geoweaver Web-based SSH</h1>

/*]]>*/
</script>
<script src="../geoweaver/js/edu.gmu.csiss.geoweaver.sshterm.js" ></script>
<script src="../geoweaver/js/gw.sshterm.js" ></script>


</body>
Expand Down
81 changes: 52 additions & 29 deletions WebContent/WEB-INF/views/geoweaver.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@

<link href="../css/bootstrap-dialog.min.css" rel="stylesheet"/>

<link href="https://cdnjs.cloudflare.com/ajax/libs/bootstrap-colorpicker/2.5.3/css/bootstrap-colorpicker.min.css" rel="stylesheet" />
<!-- <link href="https://cdnjs.cloudflare.com/ajax/libs/bootstrap-colorpicker/2.5.3/css/bootstrap-colorpicker.min.css" rel="stylesheet" /> -->
<link href="../geoweaver/css/bootstrap-colorpicker.min.css" rel="stylesheet" />

<link href="../css/font-awesome.css" rel="stylesheet" />

Expand All @@ -29,9 +30,11 @@
<link rel="stylesheet" href="../geoweaver/codemirror/theme/yonce.css">
<link rel="stylesheet" href="../geoweaver/codemirror/theme/zenburn.css">

<link href="https://danielmg.org/assets/demo/uploader/css/jquery.dm-uploader.min.css?v=v10" rel="stylesheet" />
<!-- <link href="https://danielmg.org/assets/demo/uploader/css/jquery.dm-uploader.min.css?v=v10" rel="stylesheet" /> -->
<link rel="stylesheet" href="../geoweaver/css/jquery.dm-uploader.min.css" />

<link href="https://danielmg.org/assets/demo/uploader/css/main.css?v=v10" rel="stylesheet" />
<!-- <link href="https://danielmg.org/assets/demo/uploader/css/main.css?v=v10" rel="stylesheet" /> -->
<link rel="stylesheet" href="../geoweaver/css/main.css" />

<link rel="stylesheet" href="../geoweaver/css/prism.css" />

Expand All @@ -41,6 +44,8 @@

<link rel="stylesheet" href="../css/imageviewer.css" />

<link rel="stylesheet" href="../geoweaver/css/Chart.min.css" />

<style type="text/css">
/* Style the tab */
.tab {
Expand Down Expand Up @@ -78,6 +83,13 @@
/* border: 1px solid #ccc; */
border-top: none;
}

#process-history-chart-container {

width: 200px;
height: 100px;

}

</style>

Expand All @@ -91,13 +103,21 @@

<script type="text/javascript" src="../js/imageviewer.min.js"></script>

<script src="https://danielmg.org/assets/demo/uploader/js/jquery.dm-uploader.min.js?v=v10"></script>
<!-- <script src="https://danielmg.org/assets/demo/uploader/js/jquery.dm-uploader.min.js?v=v10"></script>
<script src="https://danielmg.org/assets/demo/uploader/js/ui-main.js?v=v10"></script>
<script src="https://danielmg.org/assets/demo/uploader/js/ui-multiple.js?v=v10"></script>
<script src="https://danielmg.org/assets/demo/uploader/js/configs/no-queue.js?v=v10"></script>
<script src="https://danielmg.org/assets/demo/uploader/js/configs/no-queue.js?v=v10"></script> -->

<script type="text/javascript" src="../geoweaver/js/jquery.dm-uploader.min.js"></script>

<script type="text/javascript" src="../geoweaver/js/ui-main.js"></script>

<script type="text/javascript" src="../geoweaver/js/ui-multiple.js"></script>

<script type="text/javascript" src="../geoweaver/js/no-queue.js"></script>

<script type="text/javascript" src="../geoweaver/codemirror/lib/codemirror.js"></script>

Expand All @@ -113,6 +133,7 @@

<script type="text/javascript" src="../geoweaver/js/jsframe.js" ></script>

<script type="text/javascript" src="../geoweaver/js/Chart.min.js"></script>

</head>

Expand Down Expand Up @@ -165,10 +186,10 @@
</a>
<a
data-toggle="tooltip" title="Information"
style="float: right; width: 100px;text-align: center;margin-top: 9px;padding-top: 5px;transition: all 0.3s ease;color: white;font-size: 16px;" href="javascript:edu.gmu.csiss.geoweaver.tutorial.showDialog()">
style="float: right; width: 100px;text-align: center;margin-top: 9px;padding-top: 5px;transition: all 0.3s ease;color: white;font-size: 16px;" href="javascript:gw.tutorial.showDialog()">
<i class="fa fa-book" alt="tutorial" > Tutorial</i>
</a>
<a style="float: right; width: 80px;text-align: center;margin-top: 9px;padding-top: 5px;transition: all 0.3s ease;color: white;font-size: 16px;" href="javascript:edu.gmu.csiss.geoweaver.about.showDialog()">
<a style="float: right; width: 80px;text-align: center;margin-top: 9px;padding-top: 5px;transition: all 0.3s ease;color: white;font-size: 16px;" href="javascript:gw.about.showDialog()">
<i class="fa fa-info" alt="info" id="toolbar-info"> Info</i>
</a>
</div>
Expand Down Expand Up @@ -250,17 +271,18 @@ <h2>Please select a process on the right panel!</h2>
</div>

<div id="main-workflow-info" class="tabcontent" style="height:100%; left:0; margin:0; padding: 0;">
<div id="main-workflow-content" style="overflow-y: scroll; padding: 5px; ">
<div id="main-workflow-content" style="height:100%; overflow-y: scroll; padding-bottom: 5px; ">
<h2>Please select a workflow on the right panel!</h2>
</div>
</div>

<div id="main-console" class="tabcontent" style="height:100%; left:0; margin:0;">
<div id="main-console-content" style="height:100%; overflow-y: scroll; padding: 0; margin-bottom: 5px;">
<h2>logging information and errors</h2>
<div id="log-window">

</div>
</div>
</div>

<div id="workspace" class="tabcontent" style="height:100%; margin: 0;padding: 0;">
Expand Down Expand Up @@ -386,13 +408,13 @@ <h2>logging information and errors</h2>
</li> -->

<li>
<a href="javascript:edu.gmu.csiss.geoweaver.tutorial.showDialog()">
<a href="javascript:gw.tutorial.showDialog()">
<i class="fa fa-book fa-lg"></i> Tutorial
</a>
</li>

<li>
<a href="javascript:edu.gmu.csiss.geoweaver.about.showDialog()">
<a href="javascript:gw.about.showDialog()">
<i class="fa fa-info fa-lg"></i> About
</a>
</li>
Expand Down Expand Up @@ -427,24 +449,25 @@ <h2>logging information and errors</h2>
<script src="../geoweaver/js/prism.min.js"></script>
<script src="../geoweaver/js/notebook.js" ></script>
<script src="../geoweaver/js/d3.min.js"></script>
<script src="../geoweaver/js/edu.gmu.csiss.geoweaver.js"></script>
<script src="../geoweaver/js/edu.gmu.csiss.geoweaver.tutorial.js"></script>
<script src="../geoweaver/js/edu.gmu.csiss.geoweaver.about.js"></script>
<script src="../geoweaver/js/edu.gmu.csiss.geoweaver.workspace.js"></script>
<script src="../geoweaver/js/edu.gmu.csiss.geoweaver.ssh.js"></script>
<script src="../geoweaver/js/edu.gmu.csiss.geoweaver.fileupload.js"></script>
<script src="../geoweaver/js/edu.gmu.csiss.geoweaver.filebrowser.js"></script>
<script src="../geoweaver/js/edu.gmu.csiss.geoweaver.host.js"></script>
<script src="../geoweaver/js/edu.gmu.csiss.geoweaver.result.js"></script>
<script src="../geoweaver/js/edu.gmu.csiss.geoweaver.process.js"></script>
<script src="../geoweaver/js/edu.gmu.csiss.geoweaver.workflow.js"></script>
<script src="../geoweaver/js/edu.gmu.csiss.geoweaver.monitor.js"></script>
<script src="../geoweaver/js/edu.gmu.csiss.geoweaver.search.js"></script>
<script src="../geoweaver/js/edu.gmu.csiss.geoweaver.settings.js"></script>
<script src="../geoweaver/js/edu.gmu.csiss.geoweaver.toolbar.js"></script>
<script src="../geoweaver/js/edu.gmu.csiss.geoweaver.menu.js"></script>
<script src="../geoweaver/js/edu.gmu.csiss.geoweaver.general.js"></script>
<script src="../geoweaver/js/edu.gmu.csiss.geoweaver.main.js"></script>
<script src="../geoweaver/js/gw.js"></script>
<script src="../geoweaver/js/gw.general.js"></script>
<script src="../geoweaver/js/gw.tutorial.js"></script>
<script src="../geoweaver/js/gw.about.js"></script>
<script src="../geoweaver/js/gw.chart.js"></script>
<script src="../geoweaver/js/gw.workspace.js"></script>
<script src="../geoweaver/js/gw.ssh.js"></script>
<script src="../geoweaver/js/gw.fileupload.js"></script>
<script src="../geoweaver/js/gw.filebrowser.js"></script>
<script src="../geoweaver/js/gw.host.js"></script>
<script src="../geoweaver/js/gw.result.js"></script>
<script src="../geoweaver/js/gw.process.js"></script>
<script src="../geoweaver/js/gw.workflow.js"></script>
<script src="../geoweaver/js/gw.monitor.js"></script>
<script src="../geoweaver/js/gw.search.js"></script>
<script src="../geoweaver/js/gw.settings.js"></script>
<script src="../geoweaver/js/gw.toolbar.js"></script>
<script src="../geoweaver/js/gw.menu.js"></script>
<script src="../geoweaver/js/gw.main.js"></script>

<script>

Expand Down
16 changes: 8 additions & 8 deletions WebContent/WEB-INF/web.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,55 +5,55 @@
<!--
<servlet>
<servlet-name>GetInputDetailsServlet</servlet-name>
<servlet-class>edu.gmu.csiss.earthcube.cyberconnector.servlet.GetInputDetailsServlet</servlet-class>
<servlet-class>gw.servlet.GetInputDetailsServlet</servlet-class>
</servlet>
<servlet-mapping>
<servlet-name>GetInputDetailsServlet</servlet-name>
<url-pattern>/GetInputDetailsServlet</url-pattern>
</servlet-mapping>
<servlet>
<servlet-name>FetchProductListServlet</servlet-name>
<servlet-class>edu.gmu.csiss.earthcube.cyberconnector.servlet.FetchProductListServlet</servlet-class>
<servlet-class>gw.servlet.FetchProductListServlet</servlet-class>
</servlet>
<servlet-mapping>
<servlet-name>FetchProductListServlet</servlet-name>
<url-pattern>/FetchProductListServlet</url-pattern>
</servlet-mapping>
<servlet>
<servlet-name>OrderCheckingServlet</servlet-name>
<servlet-class>edu.gmu.csiss.earthcube.cyberconnector.servlet.OrderCheckingServlet</servlet-class>
<servlet-class>gw.servlet.OrderCheckingServlet</servlet-class>
</servlet>
<servlet-mapping>
<servlet-name>OrderCheckingServlet</servlet-name>
<url-pattern>/OrderCheckingServlet</url-pattern>
</servlet-mapping>
<servlet>
<servlet-name>ServiceUnregistrationServlet</servlet-name>
<servlet-class>edu.gmu.csiss.earthcube.cyberconnector.servlet.ServiceUnregistrationServlet</servlet-class>
<servlet-class>gw.servlet.ServiceUnregistrationServlet</servlet-class>
</servlet>
<servlet-mapping>
<servlet-name>ServiceUnregistrationServlet</servlet-name>
<url-pattern>/ServiceUnregistrationServlet</url-pattern>
</servlet-mapping>
<servlet>
<servlet-name>ServiceRegisterServlet</servlet-name>
<servlet-class>edu.gmu.csiss.earthcube.cyberconnector.servlet.ServiceRegisterServlet</servlet-class>
<servlet-class>gw.servlet.ServiceRegisterServlet</servlet-class>
</servlet>
<servlet-mapping>
<servlet-name>ServiceRegisterServlet</servlet-name>
<url-pattern>/ServiceRegisterServlet</url-pattern>
</servlet-mapping>
<servlet>
<servlet-name>MetadataQueryServlet</servlet-name>
<servlet-class>edu.gmu.csiss.earthcube.cyberconnector.servlet.MetadataQueryServlet</servlet-class>
<servlet-class>gw.servlet.MetadataQueryServlet</servlet-class>
</servlet>
<servlet-mapping>
<servlet-name>MetadataQueryServlet</servlet-name>
<url-pattern>/MetadataQueryServlet</url-pattern>
</servlet-mapping>
<servlet>
<servlet-name>VirtualProductQueryServlet</servlet-name>
<servlet-class>edu.gmu.csiss.earthcube.cyberconnector.servlet.VirtualProductQueryServlet</servlet-class>
<servlet-class>gw.servlet.VirtualProductQueryServlet</servlet-class>
</servlet>
<servlet-mapping>
<servlet-name>VirtualProductQueryServlet</servlet-name>
Expand All @@ -62,7 +62,7 @@
-->
<servlet>
<servlet-name>FileUploadServlet</servlet-name>
<servlet-class>edu.gmu.csiss.earthcube.cyberconnector.servlet.FileUploadServlet</servlet-class>
<servlet-class>gw.servlet.FileUploadServlet</servlet-class>
<init-param>
<param-name>filepath</param-name>
<param-value>uploadFile</param-value>
Expand Down
1 change: 1 addition & 0 deletions WebContent/geoweaver/css/Chart.min.css
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 1d31df8

Please sign in to comment.