Skip to content

Commit

Permalink
Merge pull request #725 from WildMeOrg/logo-update
Browse files Browse the repository at this point in the history
Logo update
  • Loading branch information
naknomum authored Sep 4, 2024
2 parents d2bf1a0 + 159a43d commit f56b7b2
Show file tree
Hide file tree
Showing 12 changed files with 12 additions and 12 deletions.
2 changes: 1 addition & 1 deletion src/main/webapp/contactus.jsp
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
<p>The following logos may be used in conjunction with our project.</p>

<h3>Wild Me</h3>
<p><img src="images/WildMe-Logo-04.png" width="500px" height="*" /></p>
<p><img src="images/WildMe-Logo-100x100.png" width="500px" height="*" /></p>

<h3>Wildbook&reg;</h3>
<p><img src="images/WildBook_logo_300dpi-04.png" width="500px" height="*" /></p>
Expand Down
4 changes: 2 additions & 2 deletions src/main/webapp/encounters/encounter.jsp
Original file line number Diff line number Diff line change
Expand Up @@ -1541,7 +1541,7 @@ if(CommonConfiguration.showProperty("showCountry",context)){
<div style="background-color: #E8E8E8;padding-left: 10px;padding-right: 10px;padding-top: 10px;padding-bottom: 10px;">
<!-- START IDENTITY ATTRIBUTE -->
<% if ((isOwner || encounterCanBeEditedByAnyLoggedInUser) && CommonConfiguration.isCatalogEditable(context)) { %>
<h2><img align="absmiddle" src="../images/wild-me-logo-only-100-100.png" width="40px" height="40px" /> <%=encprops.getProperty("identity") %>
<h2><img align="absmiddle" src="../images/WildMe-Logo-100x100.png" width="40px" height="40px" /> <%=encprops.getProperty("identity") %>
<button class="btn btn-md" type="button" name="button" id="editIdentity">Edit</button>
<button class="btn btn-md" type="button" name="button" id="closeEditIdentity" style="display:none;">Close Edit</button>
</h2>
Expand Down Expand Up @@ -1591,7 +1591,7 @@ if(CommonConfiguration.showProperty("showCountry",context)){
}
else {
%>
<h2><img align="absmiddle" src="../images/wild-me-logo-only-100-100.png" width="40px" height="40px" /> <%=encprops.getProperty("identity") %></h2>
<h2><img align="absmiddle" src="../images/WildMe-Logo-100x100.png" width="40px" height="40px" /> <%=encprops.getProperty("identity") %></h2>
<%
}
%>
Expand Down
2 changes: 1 addition & 1 deletion src/main/webapp/encounters/encounterCR.jsp
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ td.measurement{
position: absolute !important;
top: 0px !important;
left: 0px !important;
z-index: 1 !imporant;
z-index: 1 !important;
width: 100% !important;
height: 100% !important;
margin-top: 0px !important;
Expand Down
Binary file added src/main/webapp/images/WildMe-Logo-100x100.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Binary file removed src/main/webapp/images/wild-me-logo-only-100-100.png
Binary file not shown.
Binary file removed src/main/webapp/images/wildbookIntelligentAgent.gif
Binary file not shown.
2 changes: 1 addition & 1 deletion src/main/webapp/individualDistanceSearchResults.jsp
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,7 @@
<div class="container maincontent">


<h1><img src="images/wild-me-logo-only-100-100.png" width="35"
<h1><img src="images/WildMe-Logo-100x100.png" width="35"
align="absmiddle"/>
<%=props.getProperty("title")%> <a href="individuals.jsp?number=<%=individualDistanceSearchID %>"><%=individualDistanceSearchID %></a>
</h1>
Expand Down
2 changes: 1 addition & 1 deletion src/main/webapp/individualSearch.jsp
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ context=ServletUtilities.getContext(request);
position: absolute !important;
top: 0px !important;
left: 0px !important;
z-index: 1 !imporant;
z-index: 1 !important;
width: 100% !important;
height: 100% !important;
margin-top: 0px !important;
Expand Down
4 changes: 2 additions & 2 deletions src/main/webapp/occurrenceSearch.jsp
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ context=ServletUtilities.getContext(request);
position: absolute !important;
top: 0px !important;
left: 0px !important;
z-index: 1 !imporant;
z-index: 1 !important;
width: 100% !important;
height: 100% !important;
margin-top: 0px !important;
Expand Down Expand Up @@ -119,7 +119,7 @@ context=ServletUtilities.getContext(request);
<h1 class="intro"><strong><span class="para">
<img src="images/wild-me-logo-only-100-100.png" width="50" align="absmiddle"/></span></strong>
<img src="images/WildMe-Logo-100x100.png" width="50" align="absmiddle"/></span></strong>
<%=titleString%>
</h1>
</p>
Expand Down
2 changes: 1 addition & 1 deletion src/main/webapp/submit.jsp
Original file line number Diff line number Diff line change
Expand Up @@ -217,7 +217,7 @@ function doAjaxForProject(requestJSON,userId){
position: absolute !important;
top: 0px !important;
left: 0px !important;
z-index: 1 !imporant;
z-index: 1 !important;
width: 100% !important;
height: 100% !important;
margin-top: 0px !important;
Expand Down
6 changes: 3 additions & 3 deletions src/main/webapp/surveys/surveySearch.jsp
Original file line number Diff line number Diff line change
Expand Up @@ -112,12 +112,12 @@ context=ServletUtilities.getContext(request);
position: absolute !important;
top: 0px !important;
left: 0px !important;
z-index: 1 !imporant;
z-index: 1 !important;
width: 100% !important;
height: 100% !important;
margin-top: 0px !important;
margin-bottom: 8px !important;
</style>
}</style>

<script>
function resetMap() {
Expand Down Expand Up @@ -146,7 +146,7 @@ String formAction="surveySearchResults.jsp";


<h1 class="intro"><strong><span class="para">
<img src="../images/wild-me-logo-only-100-100.png" width="50" align="absmiddle"/></span></strong>
<img src="../images/WildMe-Logo-100x100.png" width="50" align="absmiddle"/></span></strong>
<%=titleString%>
</h1>
</p>
Expand Down

0 comments on commit f56b7b2

Please sign in to comment.