Skip to content

Commit 8ae7a53

Browse files
pjewaldpjewald
committed
Clean up various warning messages.
1 parent b23dcce commit 8ae7a53

File tree

2 files changed

+91
-44
lines changed

2 files changed

+91
-44
lines changed

‎src/main/webapp/WEB-INF/includes/pageparts/menu.jsp

Lines changed: 65 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,30 @@
1+
<%--
2+
~ Copyright (c) 2019 Parallax Inc.
3+
~
4+
~ Permission is hereby granted, free of charge, to any person obtaining a copy of this software
5+
~ and associated documentation files (the “Software”), to deal in the Software without
6+
~ restriction, including without limitation the rights to use, copy, modify, merge, publish,
7+
~ distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the
8+
~ Software is furnished to do so, subject to the following conditions:
9+
~
10+
~ The above copyright notice and this permission notice shall be included in all copies or
11+
~ substantial portions of the Software.
12+
~
13+
~ THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
14+
~ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
15+
~ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
16+
~ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
17+
~ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
18+
~ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
19+
~ SOFTWARE.
20+
--%>
21+
122
<%--
223
Document : menu
324
Created on : 4-nov-2015, 20:39:22
425
Author : Michel
26+
27+
Display the horizontal menu across the top of the banner
528
--%>
629
<%@page contentType="text/html" pageEncoding="UTF-8"%>
730
<%@ include file="/WEB-INF/includes/include.jsp"%>
@@ -18,51 +41,53 @@
1841
</div>
1942
<div class="collapse navbar-collapse" id="navbar-collapse">
2043
<%-- Projects and privacy notice links --%>
21-
<span>
22-
<ul class="nav navbar-nav">
23-
<li>
24-
<a href="<url:getUrl url="/projects.jsp"/>"><fmt:message key="menu.community_projects" /></a>
25-
</li>
26-
<%-- Include the user projects if the user is logged in --%>
27-
<shiro:authenticated>
28-
<li>
29-
<a href="<url:getUrl url="/my/projects.jsp"/>"><fmt:message key="menu.my_projects" /></a>
30-
</li>
31-
</shiro:authenticated>
32-
<li>
33-
<a href="<url:getUrl url="/projectcreate.jsp?lang=PROPC"/>"><fmt:message key="menu.newproject.title" /></a>
34-
</li>
35-
<li>
36-
<a href="<url:getUrl url="/privacy-policy"/>"><fmt:message key="menu.privacy" /></a>
37-
</li>
38-
</ul>
39-
</span>
40-
<%-- Register / Login --%>
41-
<span>
42-
<ul class="nav navbar-nav navbar-right">
43-
<%-- Menu items for an anonymous user --%>
44-
<shiro:notAuthenticated>
45-
<li>
46-
<a href="<url:getUrl url="/login.jsp"/>"><fmt:message key="menu.login_and_register" /></a>
47-
</li>
48-
</shiro:notAuthenticated>
49-
<%-- Menu items for an authenticated user --%>
50-
<shiro:authenticated>
51-
<li class="dropdown">
52-
<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true"><shiro:principal></shiro:principal> <span class="caret"></span></a>
53-
<ul class="dropdown-menu">
54-
<li><a href="<url:getUrl url="/profile"/>"><fmt:message key="menu.profile" /></a></li>
55-
<!-- <li><a href="<url:getUrl url="/public/profile"/>"><fmt:message key="menu.public-profile" /></a></li> -->
56-
<li><a href="<url:getUrl url="/logout"/>"><fmt:message key="logout" /></a></li>
57-
</ul>
58-
</li>
44+
<ul class="nav navbar-nav">
45+
<li>
46+
<a href="<url:getUrl url="/projects.jsp"/>"><fmt:message key="menu.community_projects" /></a>
47+
</li>
48+
49+
<%-- Include the user projects if the user is logged in --%>
50+
<shiro:authenticated>
51+
<li>
52+
<a href="<url:getUrl url="/my/projects.jsp"/>"><fmt:message key="menu.my_projects" /></a>
53+
</li>
54+
</shiro:authenticated>
55+
56+
<li>
57+
<a href="<url:getUrl url="/projectcreate.jsp?lang=PROPC"/>"><fmt:message key="menu.newproject.title" /></a>
58+
</li>
59+
<li>
60+
<a href="<url:getUrl url="/privacy-policy"/>"><fmt:message key="menu.privacy" /></a>
61+
</li>
62+
</ul>
63+
64+
<%-- Register / Login / Help --%>
65+
<ul class="nav navbar-nav navbar-right">
66+
<%-- Menu items for an anonymous user --%>
67+
<shiro:notAuthenticated>
68+
<li>
69+
<a href="<url:getUrl url="/login.jsp"/>"><fmt:message key="menu.login_and_register" /></a>
70+
</li>
71+
</shiro:notAuthenticated>
72+
73+
<%-- Menu items for an authenticated user --%>
74+
<shiro:authenticated>
75+
<li class="dropdown">
76+
<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true">
77+
<%-- Display logged in user email address --%>
78+
<shiro:principal>&nbsp;</shiro:principal><span class="caret"></span></a>
79+
<ul class="dropdown-menu">
80+
<li><a href="<url:getUrl url="/profile"/>"><fmt:message key="menu.profile" /></a></li>
81+
<%-- <li><a href="<url:getUrl url="/public/profile"/>"><fmt:message key="menu.public-profile" /></a></li> --%>
82+
<li><a href="<url:getUrl url="/logout"/>"><fmt:message key="logout" /></a></li>
83+
</ul>
84+
</li>
5985
</shiro:authenticated>
6086

6187
<%-- Help link to the Learn reference section --%>
62-
<%-- <li><a href="<url:getUrl url="/public/help"/>" target="_blank"><fmt:message key="menu.help" /></a></li> --%>
6388
<li><a href="https://learn.parallax.com/ab-blocks" target="_blank"><fmt:message key="menu.help" /></a></li>
6489

65-
<%--
90+
<%-- Set the launguage for the site
6691
<li class="navbar-text">
6792
<form style="margin-bottom: 0;">
6893
<select id="language" name="language" onchange="submit()">
@@ -72,7 +97,6 @@
7297
</li>
7398
--%>
7499
</ul>
75-
</span>
76100
</div>
77101
</div>
78102

‎src/main/webapp/WEB-INF/servlet/index.jsp

Lines changed: 26 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,30 @@
1+
<%--
2+
~ Copyright (c) 2019 Parallax Inc.
3+
~
4+
~ Permission is hereby granted, free of charge, to any person obtaining a copy of this software
5+
~ and associated documentation files (the “Software”), to deal in the Software without
6+
~ restriction, including without limitation the rights to use, copy, modify, merge, publish,
7+
~ distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the
8+
~ Software is furnished to do so, subject to the following conditions:
9+
~
10+
~ The above copyright notice and this permission notice shall be included in all copies or
11+
~ substantial portions of the Software.
12+
~
13+
~ THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
14+
~ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
15+
~ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
16+
~ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
17+
~ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
18+
~ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
19+
~ SOFTWARE.
20+
--%>
21+
122
<%--
223
Document : login
324
Created on : 24-mei-2015, 18:41:02
425
Author : Michel
26+
27+
This is the site home page
528
--%>
629
<%@page contentType="text/html" pageEncoding="UTF-8"%>
730
<%@ include file="/WEB-INF/includes/include.jsp"%>
@@ -22,22 +45,22 @@
2245
<link type="text/css" rel="stylesheet" href="<url:getCdnUrl url="/style.css"/>" />
2346
<link rel="stylesheet" href="<url:getCdnUrl url="/lib/bootstrap/core/css/bootstrap.min.css"/>" />
2447
<link rel="stylesheet" href="<url:getCdnUrl url="/lib/bootstrap/plugins/bootstrap-table.min.css"/>" />
48+
<title>BlocklyProp</title>
2549
<script src="<url:getCdnUrl url="/lib/jquery-1.11.3.min.js"/>" ></script>
2650
<script src="<url:getCdnUrl url="/lib/bootstrap/core/js/bootstrap.min.js"/>"></script>
2751
<script src="<url:getCdnUrl url="/authenticate.js"/>" ></script>
2852
</head>
2953
<body>
30-
3154
<%@ include file="/WEB-INF/includes/pageparts/menu.jsp"%>
32-
3355
<div class="container">
3456
<!-- Splash image -->
3557
<div class="jumbotron">
3658
<div class="logo">
3759
<h1 id="BlocklyProp">BlocklyProp</h1>
3860
</div>
3961
<p><strong>Blockly for Propeller Multicore:</strong>&nbsp;Making amazing projects and learning to code just became easier</p>
40-
<p><img class="cdn full-width" border="0" src="<url:getCdnUrl url="/images/home-banner.png"/>"></p>
62+
<p><img class="cdn full-width" border="0" src="<url:getCdnUrl url="/images/home-banner.png"/>"
63+
alt="Home page banner image"></p>
4164
</div>
4265
<h2 class="pad-latest-projects"><fmt:message key="home.latest_projects.title" /></h2>
4366
<hr>

0 commit comments

Comments
 (0)