From e1e7e2c740165d78d59bdde73004d883eae17c7b Mon Sep 17 00:00:00 2001 From: "david.anderson" Date: Wed, 13 Apr 2016 22:20:27 +0200 Subject: [PATCH] Making the detail page look a little nicer --- .../WEB-INF/jsp/common/style-includes.jsp | 17 ++- .../WEB-INF/jsp/money-tracker/detail.jsp | 122 ++++++++++++++---- .../webapp/WEB-INF/jsp/money-tracker/list.jsp | 78 ++++++----- 3 files changed, 154 insertions(+), 63 deletions(-) diff --git a/money-tracker-online/src/main/webapp/WEB-INF/jsp/common/style-includes.jsp b/money-tracker-online/src/main/webapp/WEB-INF/jsp/common/style-includes.jsp index 5214a1b..31a599f 100644 --- a/money-tracker-online/src/main/webapp/WEB-INF/jsp/common/style-includes.jsp +++ b/money-tracker-online/src/main/webapp/WEB-INF/jsp/common/style-includes.jsp @@ -5,6 +5,7 @@ + @@ -13,6 +14,18 @@ background-color:#EEE; } + .push-top-soft{ + padding-top:5px; + } + + .push-bottom-soft{ + padding-bottom:5px; + } + + .push-bottom-hard{ + padding-bottom:10px; + } + .pageHeading{ padding-bottom: 10px; } @@ -22,6 +35,8 @@ } .striped-list .row.listing-item:nth-child(even){ - background-color:gray; + background-color:whitesmoke; + padding-top:5px; + padding-bottom:5px; } \ No newline at end of file diff --git a/money-tracker-online/src/main/webapp/WEB-INF/jsp/money-tracker/detail.jsp b/money-tracker-online/src/main/webapp/WEB-INF/jsp/money-tracker/detail.jsp index 6707199..d8feb41 100644 --- a/money-tracker-online/src/main/webapp/WEB-INF/jsp/money-tracker/detail.jsp +++ b/money-tracker-online/src/main/webapp/WEB-INF/jsp/money-tracker/detail.jsp @@ -4,45 +4,113 @@ - <%@include file="../common/style-includes.jsp"%> + <%@include file="../common/style-includes.jsp" %> -
-
-
- Tracker Breakdown -
-
-
+
+ <%----%> -
- Starting Amount: ${tracker.moneyForTheMonth} -
-
- Total spent: ${tracker.moneyForTheMonth - tracker.totalRemaining} -
-
- Balance: ${tracker.totalRemaining} +
+ +
+
+
+
+
Home
+
+
Total Remaining:
+
${tracker.totalRemaining}
+
+
+
-
- ">Add Transaction +
+
+
+
+
Total Spent:
+
${tracker.moneyForTheMonth - tracker.totalRemaining}
+
+
+
Initial Amount:
+
${tracker.moneyForTheMonth}
+
+
+
-
- Transaction Breakdown: - -
${transactionListing.key} - Total Spent: ${tracker.getMoneySpentOn(transactionListing.key)}
-
    - -
  • ${transaction.amount}
    • +
    +
    +
    +
    + + + +
    +
    + + Show Transaction History + +
    +
    + + + +
    +
    + +
+
+
+
- +
+
+
+
+ ">Add Transaction +
+
+
+
+ +
+ +
+ + \ No newline at end of file diff --git a/money-tracker-online/src/main/webapp/WEB-INF/jsp/money-tracker/list.jsp b/money-tracker-online/src/main/webapp/WEB-INF/jsp/money-tracker/list.jsp index d770cdb..c70c0c0 100644 --- a/money-tracker-online/src/main/webapp/WEB-INF/jsp/money-tracker/list.jsp +++ b/money-tracker-online/src/main/webapp/WEB-INF/jsp/money-tracker/list.jsp @@ -5,59 +5,67 @@ <%@include file="../common/style-includes.jsp" %> + -
- +
+ -
+
-
-
-

Your Money Trackers

-
-
-
- Date Created -
-
- Starting Amount -
-
- Total Remaining -
+
+
+

Your Money Trackers

+ +
+
+
+ Date Created +
+
+ Starting Amount +
+
+ Total Remaining
- +
+ +
-
-
- ${tracker.dateTimeCreated} -
-
- ${tracker.moneyForTheMonth} -
-
- ${tracker.totalRemaining} -
+ +
+ ${tracker.dateTimeCreated} +
+
+ ${tracker.moneyForTheMonth} +
+
+ ${tracker.totalRemaining}
- -
- -
-
- New Tracker
+ +
+ + +
+
+ New Tracker
-
+
+ \ No newline at end of file