Skip to content
This repository was archived by the owner on Sep 7, 2018. It is now read-only.

Commit 7f516b4

Browse files
author
Thomas Heniart
authored
Merge pull request #15 from titomheniart/dashboard
Dashboard
2 parents 8c12684 + 5525069 commit 7f516b4

14,790 files changed

Lines changed: 559356 additions & 1724100 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎Ease/WebContent/WEB-INF/tags/EmailInput.tag‎

Lines changed: 0 additions & 75 deletions
This file was deleted.

‎Ease/WebContent/WEB-INF/tags/catalog/catalogApp.tag‎

Lines changed: 0 additions & 31 deletions
This file was deleted.

‎Ease/WebContent/WEB-INF/tags/dashboard/app.tag‎

Lines changed: 0 additions & 93 deletions
This file was deleted.

‎Ease/WebContent/WEB-INF/tags/dashboard/hiddenProfile.tag‎

Lines changed: 0 additions & 16 deletions
This file was deleted.

‎Ease/WebContent/WEB-INF/tags/dashboard/profile.tag‎

Lines changed: 0 additions & 62 deletions
This file was deleted.

‎Ease/WebContent/WEB-INF/web.xml‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,14 @@
101101
<servlet-name>equipe.jsp</servlet-name>
102102
<url-pattern>/equipe/*</url-pattern>
103103
</servlet-mapping>
104+
<servlet>
105+
<servlet-name>landing</servlet-name>
106+
<jsp-file>/landingPage.jsp</jsp-file>
107+
</servlet>
108+
<servlet-mapping>
109+
<servlet-name>landing</servlet-name>
110+
<url-pattern>/discover</url-pattern>
111+
</servlet-mapping>
104112
<servlet>
105113
<servlet-name>privacy.jsp</servlet-name>
106114
<jsp-file>/privacy.jsp</jsp-file>

‎Ease/WebContent/admin.jsp‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,11 @@
22
<%@ page language="java" contentType="text/html; charset=UTF-8"
33
pageEncoding="UTF-8" %>
44
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
5-
<%@ page import="com.Ease.Dashboard.User.User" %>
65
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/xhtml1-transitional.dtd">
76
<html xmlns="http://w3.org/1999/xhtml">
87
<head>
9-
<% User user = (User) (session.getAttribute("user")); %>
108
<%
11-
if (session.getAttribute("user") == null || !((User) session.getAttribute("user")).isAdmin()) {
9+
if (session.getAttribute("is_admin") == null || !((Boolean) session.getAttribute("is_admin"))) {
1210
%>
1311
<script>
1412
window.location.replace("index.jsp");

‎Ease/WebContent/contact.jsp‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,11 @@
3333
<script src="/jsMinified.v00022/tracker.js"></script>
3434

3535
<link rel="stylesheet" href="semantic/dist/semantic.min.css">
36-
<link rel="stylesheet" href="/cssMinified.v00020/default_style.css"/>
37-
<link rel="stylesheet" href="/cssMinified.v00020/bootstrap.css"/>
38-
<link rel="stylesheet" href="/cssMinified.v00020/landingPage.css"/>
39-
<link rel="stylesheet" href="/cssMinified.v00020/teamBody.css"/>
40-
<link rel="stylesheet" href="/cssMinified.v00020/lib/fonts/font-awesome-4.2.0/css/font-awesome.min.css"/>
36+
<link rel="stylesheet" href="/cssMinified.v00028/default_style.css"/>
37+
<link rel="stylesheet" href="/cssMinified.v00028/bootstrap.css"/>
38+
<link rel="stylesheet" href="/cssMinified.v00028/landingPage.css"/>
39+
<link rel="stylesheet" href="/cssMinified.v00028/teamBody.css"/>
40+
<link rel="stylesheet" href="/cssMinified.v00028/lib/fonts/font-awesome-4.2.0/css/font-awesome.min.css"/>
4141
<script type="text/javascript">$crisp = [];
4242
CRISP_WEBSITE_ID = "6e9fe14b-66f7-487c-8ac9-5912461be78a";
4343
(function () {

‎Ease/WebContent/css/lib/loading.min.css‎

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)