Skip to content

Commit 05235aa

Browse files
JasonWildMeJasonWildMe
authored
Merge pull request #1347 from abdulrahmanelnory1/ncaquariums
Remove adoption reference from SAS homepage
2 parents 77ce3d9 + 9cbab9c commit 05235aa

File tree

7 files changed

+17
-73
lines changed

7 files changed

+17
-73
lines changed

‎src/main/webapp/adoptionform.jsp‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@
108108
109109
String servletURL = " ../AdoptionAction"; %>
110110

111-
<link rel="stylesheet" href="css/createadoption.css">
111+
<%-- <link rel="stylesheet" href="css/createadoption.css">--%>
112112
<%
113113
if(Util.stringExists(donorboxId) && Util.stringExists(shark)){ //TODO I could cross check this against the donorbox api (for an additional $17/month), but I don't think warranted. As is, an evil user could just but an id in the url and pass this check. But, let's not over-engineer. Who is trying to hoodwink a non-profit just to be able to nickname an animal?
114114
%>
@@ -199,10 +199,10 @@
199199
}
200200
else{
201201
%>
202-
<script type="text/javascript">
203-
//redirect to payment page
204-
window.location.href = "/createadoption.jsp";
205-
</script>
202+
<%-- <script type="text/javascript">--%>
203+
<%-- //redirect to payment page--%>
204+
<%-- window.location.href = "/createadoption.jsp";--%>
205+
<%-- </script>--%>
206206
<%
207207
}
208208
%>

‎src/main/webapp/adoptions/emailAlterAdoption.jsp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ context=ServletUtilities.getContext(request);
6060

6161

6262
<jsp:include page="../header.jsp" flush="true" />
63-
<link rel="stylesheet" href="css/createadoption.css">
63+
<%--<link rel="stylesheet" href="css/createadoption.css">--%>
6464

6565
<div class="container maincontent">
6666
<form id="adoption-form" action="../AdoptionAction" method="post" enctype="multipart/form-data" name="adoption_submission" target="_self" dir="ltr" lang="en">

‎src/main/webapp/confirmSubmit.jsp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -159,9 +159,9 @@ new_message.append("<html><body>");
159159

160160
<hr>
161161
<p>You can adopt a sand tiger shark and give it a nickname. To search for adoptable sharks and select one or more sharks to adopt, click the button below. </p>
162-
<a href="adoptananimal.jsp">
163-
<button class="large heroBtn">Adopt a shark<span class="button-icon" aria-hidden="true"></button>
164-
</a>
162+
<%--<a href="adoptananimal.jsp">--%>
163+
<%-- <button class="large heroBtn">Adopt a shark<span class="button-icon" aria-hidden="true"></button>--%>
164+
<%--</a>--%>
165165
<%
166166
167167

‎src/main/webapp/header.jsp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ if(request.getUserPrincipal()!=null){
170170

171171
<!-- <link href="<%=urlLoc %>/tools/timePicker/jquery.ptTimeSelect.css" rel="stylesheet" type="text/css"/> -->
172172
<link rel="stylesheet" href="<%=urlLoc %>/tools/jquery-ui/css/themes/smoothness/jquery-ui.css" type="text/css" />
173-
<link rel="stylesheet" href="<%=urlLoc %>/css/createadoption.css">
173+
<%-- <link rel="stylesheet" href="<%=urlLoc %>/css/createadoption.css">--%>
174174
<link rel="stylesheet" href="<%=urlLoc %>/css/multipleSubmit.css">
175175

176176

@@ -406,7 +406,7 @@ if(request.getUserPrincipal()!=null){
406406
<%
407407
if(CommonConfiguration.allowAdoptions(context)){
408408
%>
409-
<a id="adoption-header-link" href="<%=urlLoc%>/adoptananimal.jsp"><button name='adopt an animal' class='large adopt'><span><%=props.getProperty("adoptAnAnimal") %>&nbsp</span></button></a>
409+
<%-- <a id="adoption-header-link" href="<%=urlLoc%>/adoptananimal.jsp"><button name='adopt an animal' class='large adopt'><span><%=props.getProperty("adoptAnAnimal") %>&nbsp</span></button></a>--%>
410410
<%
411411
}
412412
%>
@@ -612,7 +612,7 @@ if(request.getUserPrincipal()!=null){
612612
<%
613613
if(CommonConfiguration.getProperty("allowAdoptions", context).equals("true")){
614614
%>
615-
<li><a href="<%=urlLoc %>/adoptananimal.jsp"><%=props.getProperty("adoptions")%></a></li>
615+
<%-- <li><a href="<%=urlLoc %>/adoptananimal.jsp"><%=props.getProperty("adoptions")%></a></li>--%>
616616
<%
617617
}
618618
%>
@@ -735,7 +735,7 @@ if(request.getUserPrincipal()!=null){
735735
<%
736736
if(CommonConfiguration.getProperty("allowAdoptions", context).equals("true")){
737737
%>
738-
<li><a href="<%=urlLoc %>/adoptananimal.jsp"><%=props.getProperty("adoptions")%></a></li>
738+
<%-- <li><a href="<%=urlLoc %>/adoptananimal.jsp"><%=props.getProperty("adoptions")%></a></li>--%>
739739
<%
740740
}
741741
%>

‎src/main/webapp/index.jsp‎

Lines changed: 0 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -470,9 +470,6 @@ finally{
470470
<a href="submit.jsp">
471471
<button class="large">Share My Images<span class="button-icon" aria-hidden="true"></button>
472472
</a>
473-
<a href="adoptananimal.jsp">
474-
<button class="large heroBtn">Adopt a shark<span class="button-icon" aria-hidden="true"></button>
475-
</a>
476473
<br>
477474
</div>
478475
</div>
@@ -748,59 +745,6 @@ finally{
748745
<div id="map_canvas" style="width: 100% !important; height: 510px; margin: 0 auto;"></div>
749746
</div>
750747
751-
<div class="container-fluid">
752-
<section class="container main-section">
753-
<h2 class="section-header">How can I help?</h2>
754-
<p class="lead text-center">If you don't have any images to share, there are other ways to help</p>
755-
756-
<section class="adopt-section row">
757-
758-
<!-- Complete text body for adoption section in index properties file -->
759-
<div class=" col-xs-12 col-sm-6 col-md-6 col-lg-6">
760-
<h3 class="uppercase">Adopt a Sand Tiger Shark</h3>
761-
<ul>
762-
<li>Support sand tiget shar research programs</li>
763-
<li>Receive email updates when we resight your adopted animal</li>
764-
<li>Display your photo and a quote on the animal's page in our database</li>
765-
</ul>
766-
<a href="http://"+<%=CommonConfiguration.getURLLocation(request)%>+"adoptananimal.jsp" title="">Learn more about adopting an individual animal in our study</a>
767-
</div>
768-
<%
769-
myShepherd.beginDBTransaction();
770-
try{
771-
Adoption adopt=myShepherd.getRandomAdoptionWithPhotoAndStatement();
772-
if(adopt!=null){
773-
%>
774-
<div class="adopter-badge focusbox col-xs-12 col-sm-6 col-md-6 col-lg-6">
775-
<div class="focusbox-inner" style="overflow: hidden;">
776-
<%
777-
String profilePhotoURL="/"+CommonConfiguration.getDataDirectoryName(context)+"/adoptions/"+adopt.getID()+"/thumb.jpg";
778-
%>
779-
<img src="cust/mantamatcher/img/individual_placeholder_image.jpg" data-src="<%=profilePhotoURL %>" alt="" class="pull-right round lazyload">
780-
<h2><small>Meet an adopter:</small><%=adopt.getAdopterName() %></h2>
781-
<%
782-
if(adopt.getAdopterQuote()!=null){
783-
%>
784-
<blockquote>
785-
<%=adopt.getAdopterQuote() %>
786-
</blockquote>
787-
<%
788-
}
789-
%>
790-
</div>
791-
</div>
792-
793-
<%
794-
}
795-
}
796-
catch(Exception e){e.printStackTrace();}
797-
finally{myShepherd.rollbackDBTransaction();}
798-
799-
%>
800-
</section>
801-
<hr />
802-
</section>
803-
</div>
804748
<%
805749
//}
806750

‎src/main/webapp/individualAdoptionEmbed.jsp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -163,9 +163,9 @@ context=ServletUtilities.getContext(request);
163163
}
164164
%>
165165
</div>
166-
<div style="float:left; margin: 5px;">
167-
<a href="createadoption.jsp?number=<%=name%>"><button class="btn btn-md">Adopt an Animal<span class="button-icon" aria-hidden="true"></button></a>
168-
</div>
166+
<%--<div style="float:left; margin: 5px;">--%>
167+
<%--<a href="createadoption.jsp?number=<%=name%>"><button class="btn btn-md">Adopt an Animal<span class="button-icon" aria-hidden="true"></button></a>--%>
168+
<%--</div>--%>
169169
<p>&nbsp;</p>
170170
171171

‎src/main/webapp/oneTimeDonation.jsp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ context=ServletUtilities.getContext(request);
5757
%>
5858

5959
<jsp:include page="header.jsp" flush="true"/>
60-
<link rel="stylesheet" href="css/createadoption.css">
60+
<%--<link rel="stylesheet" href="css/createadoption.css">--%>
6161
<div class="container maincontent">
6262
<section class="centered">
6363
<h2>Thank you for your support!</h2>

0 commit comments

Comments
 (0)