Skip to content
This repository was archived by the owner on Jan 23, 2025. It is now read-only.

Dev to master #64

Merged
merged 3 commits into from
Dec 5, 2022
Merged

Dev to master #64

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f85e4d5
fix: back to settings profile page
dedywahyudi Oct 4, 2022
d818ac5
fix: add payment settings button
dedywahyudi Oct 7, 2022
c399f59
Merge pull request #63 from topcoder-platform/reskin-payment
dedywahyudi Dec 1, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 8 additions & 3 deletions src/main/com/topcoder/web/tc/view/pacts/client/PaymentHistory.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -215,8 +215,13 @@

<div align="left" class="page-header">
<% if(isNewStyle) { %>
<div style="float:right; padding-top:12px;" class="how-to-get-paid">
<A class="informationLink" href="https://www.topcoder.com/thrive/articles/Payment%20Policies%20and%20Instructions">How to get paid?</A>
<div class="page-header-right">
<div class="how-to-get-paid">
<A class="informationLink" href="https://www.topcoder.com/thrive/articles/Payment%20Policies%20and%20Instructions">How to get paid?</A>
</div>
<div class="payment-settings-btn">
<a href="https://<%=ApplicationServer.SERVER_NAME%>/settings/payment">Payment Settings</a>
</div>
</div>
<% } else { %>
<div style="float:right;" class="how-to-get-paid">
Expand All @@ -225,7 +230,7 @@
<% } %>

<c:if test="${isReskin}">
<a href="https://<%=ApplicationServer.SERVER_NAME%>/challenges" class="back-btn">
<a href="https://<%=ApplicationServer.SERVER_NAME%>/settings/payment" class="back-btn">
<i class="arrow-prev-icon"></i>
</a>
</c:if>
Expand Down
22 changes: 14 additions & 8 deletions src/main/com/topcoder/web/tc/view/pacts/client/PaymentStatusSummary.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,18 +63,24 @@
</jsp:include>

<div align="left" class="page-header">
<c:if test="${isReskin}">
<div class="page-header-right">
<div class="how-to-get-paid">
<A class="informationLink" href="https://www.topcoder.com/thrive/articles/Payment%20Policies%20and%20Instructions">How to get paid?</A>
</div>
<div class="payment-settings-btn">
<a href="https://<%=ApplicationServer.SERVER_NAME%>/settings/payment">Payment Settings</a>
</div>
</div>
</c:if>
<c:if test="${!isReskin}">
<div style="float:right;" class="how-to-get-paid">
<c:if test="${isReskin}">
<A href="https://www.topcoder.com/thrive/articles/Payment%20Policies%20and%20Instructions">How to get paid?</A>
</c:if>

<c:if test="${!isReskin}">
<A href="https://www.topcoder.com/thrive/articles/Payment%20Policies%20and%20Instructions"><img src="/i/pacts/howToGetPaid.png" alt="How to get paid" /></A>
</c:if>
<A href="https://www.topcoder.com/thrive/articles/Payment%20Policies%20and%20Instructions"><img src="/i/pacts/howToGetPaid.png" alt="How to get paid" /></A>
</div>
</c:if>

<c:if test="${isReskin}">
<a href="https://<%=ApplicationServer.SERVER_NAME%>/challenges" class="back-btn">
<a href="https://<%=ApplicationServer.SERVER_NAME%>/settings/payment" class="back-btn">
<i class="arrow-prev-icon"></i>
</a>
</c:if>
Expand Down