Skip to content

Commit 64ae374

Browse files
Merge pull request #89 from deanblackborough/tweaks-and-fixes
Tweaks and fixes
2 parents 81c2646 + 8332932 commit 64ae374

File tree

10 files changed

+40
-54
lines changed

10 files changed

+40
-54
lines changed

resources/views/budget/account/create.blade.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@
105105
<p>In Budget Pro there is no limit to the number of accounts you can add.</p>
106106
<p>You have created <strong>{{ count($accounts) }}</strong>, the maximum for Budget is <strong>{{ $max_accounts }}</strong>.</p>
107107
<hr>
108-
<p class="mb-0"><a href="{{ route('version-compare') }}" title="Compare Budget to Budget Pro">Find out more</a>.</p>
108+
<p class="mb-0"><a href="https://budget-pro.costs-to-expect.com" target=_"blank" title="Compare Budget to Budget Pro">Find out more</a>.</p>
109109
</div>
110110
</div>
111111
</div>

resources/views/budget/account/set-balances.blade.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@
5757
<p>In Budget Pro you can have more than {{ $max_accounts }} accounts.</p>
5858
<p>You have created {{ count($accounts) }} accounts.</p>
5959
<hr>
60-
<p class="mb-0"><a href="{{ route('version-compare') }}" title="Compare Budget to Budget Pro">Find out more</a>.</p>
60+
<p class="mb-0"><a href="https://budget-pro.costs-to-expect.com" target=_"blank" title="Compare Budget to Budget Pro">Find out more</a>.</p>
6161
</div>
6262
</div>
6363
</div>

resources/views/budget/account/update.blade.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@
8686
<p>In Budget Pro you can have more than {{ $max_accounts }} accounts.</p>
8787
<p>You have created {{ count($accounts) }} accounts.</p>
8888
<hr>
89-
<p class="mb-0"><a href="{{ route('version-compare') }}" title="Compare Budget to Budget Pro">Find out more</a>.</p>
89+
<p class="mb-0"><a href="https://budget-pro.costs-to-expect.com" target=_"blank" title="Compare Budget to Budget Pro">Find out more</a>.</p>
9090
</div>
9191
</div>
9292
</div>

resources/views/budget/item/create-expense.blade.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -265,7 +265,7 @@
265265
<p>In Budget Pro you can have more than {{ $max_items }} items on your Budget.</p>
266266
<p>You can create another {{ $max_items - $number_of_items }} budget items.</p>
267267
<hr>
268-
<p class="mb-0"><a href="{{ route('version-compare') }}" title="Compare Budget to Budget Pro">Find out more</a>.</p>
268+
<p class="mb-0"><a href="https://budget-pro.costs-to-expect.com" target=_"blank" title="Compare Budget to Budget Pro">Find out more</a>.</p>
269269
</div>
270270
</div>
271271
@endif
@@ -276,7 +276,7 @@
276276
<p>In Budget Pro we are working on including additional frequency options, daily, weekly, fortnights etc.</p>
277277
<p>Additionally, we have more complicated exclusion options.</p>
278278
<hr>
279-
<p class="mb-0"><a href="{{ route('version-compare') }}" title="Compare Budget to Budget Pro">Find out more</a>.</p>
279+
<p class="mb-0"><a href="https://budget-pro.costs-to-expect.com" target=_"blank" title="Compare Budget to Budget Pro">Find out more</a>.</p>
280280
</div>
281281
</div>
282282
</div>

resources/views/budget/item/create-income.blade.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -257,7 +257,7 @@
257257
<p>In Budget Pro you can have more than {{ $max_items }} items on your Budget.</p>
258258
<p>You can create another {{ $max_items - $number_of_items }} budget items.</p>
259259
<hr>
260-
<p class="mb-0"><a href="{{ route('version-compare') }}" title="Compare Budget to Budget Pro">Find out more</a>.</p>
260+
<p class="mb-0"><a href="https://budget-pro.costs-to-expect.com" target=_"blank" title="Compare Budget to Budget Pro">Find out more</a>.</p>
261261
</div>
262262
</div>
263263
@endif
@@ -268,7 +268,7 @@
268268
<p>In Budget Pro we are working on including additional frequency options, daily, weekly, fortnights etc.</p>
269269
<p>Additionally, we have more complicated exclusion options.</p>
270270
<hr>
271-
<p class="mb-0"><a href="{{ route('version-compare') }}" title="Compare Budget to Budget Pro">Find out more</a>.</p>
271+
<p class="mb-0"><a href="https://budget-pro.costs-to-expect.com" target=_"blank" title="Compare Budget to Budget Pro">Find out more</a>.</p>
272272
</div>
273273
</div>
274274
</div>

resources/views/budget/item/create-saving.blade.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -276,7 +276,7 @@
276276
<p>In Budget Pro you can have more than {{ $max_items }} items on your Budget.</p>
277277
<p>You can create another {{ $max_items - $number_of_items }} budget items.</p>
278278
<hr>
279-
<p class="mb-0"><a href="{{ route('version-compare') }}" title="Compare Budget to Budget Pro">Find out more</a>.</p>
279+
<p class="mb-0"><a href="https://budget-pro.costs-to-expect.com" target=_"blank" title="Compare Budget to Budget Pro">Find out more</a>.</p>
280280
</div>
281281
</div>
282282
@endif
@@ -287,7 +287,7 @@
287287
<p>In Budget Pro we are working on including additional frequency options, daily, weekly, fortnights etc.</p>
288288
<p>Additionally, we have more complicated exclusion options.</p>
289289
<hr>
290-
<p class="mb-0"><a href="{{ route('version-compare') }}" title="Compare Budget to Budget Pro">Find out more</a>.</p>
290+
<p class="mb-0"><a href="https://budget-pro.costs-to-expect.com" target=_"blank" title="Compare Budget to Budget Pro">Find out more</a>.</p>
291291
</div>
292292
</div>
293293
</div>

resources/views/budget/item/list.blade.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@
7575
<h4 class="alert-heading">Budget Pro!</h4>
7676
<p>In Budget Pro there is not be a limit to the number of items you can create.</p>
7777
<hr>
78-
<p class="mb-0"><a href="{{ route('version-compare') }}" title="Compare Budget to Budget Pro">Find out more</a>.</p>
78+
<p class="mb-0"><a href="https://budget-pro.costs-to-expect.com" target=_"blank" title="Compare Budget to Budget Pro">Find out more</a>.</p>
7979
</div>
8080
</div>
8181
</div>

resources/views/budget/item/update.blade.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -278,7 +278,7 @@
278278
<p>In Budget Pro we plan to support multi-edit.</p>
279279
<p>You will be able to update all your budget items on a single page.</p>
280280
<hr>
281-
<p class="mb-0"><a href="{{ route('version-compare') }}" title="Compare Budget to Budget Pro">Find out more</a>.</p>
281+
<p class="mb-0"><a href="https://budget-pro.costs-to-expect.com" target=_"blank" title="Compare Budget to Budget Pro">Find out more</a>.</p>
282282
</div>
283283
</div>
284284
</div>

resources/views/components/offcanvas.blade.php

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -26,18 +26,6 @@
2626
</li>
2727
</ul>
2828
</li>
29-
<li class="nav-item">
30-
<h5>Budgeting</h5>
31-
32-
<ul class="navbar-nav justify-content-end flex-grow-1 ps-4 pe-3">
33-
<li class="nav-item">
34-
<a class="nav-link @if($active === 'what-is-budgeting') active @endif" href="{{ route('what-is-budgeting') }}" title="What is Budgeting?">What is Budgeting?</a>
35-
</li>
36-
<li class="nav-item">
37-
<a class="nav-link @if($active === 'how-to-start-budgeting') active @endif" href="{{ route('how-to-start-budgeting') }}" title="How to Start Budgeting?">How to Start Budgeting?</a>
38-
</li>
39-
</ul>
40-
</li>
4129
<li class="nav-item">
4230
<h5>Your Account</h5>
4331

resources/views/how-to-start-budgeting.blade.php

Lines changed: 29 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@
33
<head>
44
<meta charset="utf-8">
55
<meta name="viewport" content="width=device-width, initial-scale=1">
6-
<meta name="description" content="New to tracking your money? These are our step by step tips for getting your budgeting journey started . Calculate your income; list and label expenses">
6+
<meta name="description" content="Taking you through the simple steps you need to start budgeting. Understanding your net income and tracking your expenses is key to creating an effective budget">
77
<meta name="author" content="Dean Blackborough">
88
<title>How to start Budgeting?</title>
99
<link rel="icon" sizes="48x48" href="{{ asset('images/favicon.ico') }}">
1010
<link rel="icon" type="image/png" sizes="192x192" href="{{ asset('images/favicon.png') }}">
1111
<link href="{{ asset('css/app.css') }}" rel="stylesheet"/>
12-
<x-layout.open-graph title="How to start Budgeting?" description="New to tracking your money? These are our step by step tips for getting your budgeting journey started . Calculate your income; list and label expenses" />
13-
<x-layout.twitter-card title="How to start Budgeting?" description="New to tracking your money? These are our step by step tips for getting your budgeting journey started . Calculate your income; list and label expenses" />
12+
<x-layout.open-graph title="How to start Budgeting?" description="Taking you through the simple steps you need to start budgeting. Understanding your net income and tracking your expenses is key to creating an effective budget" />
13+
<x-layout.twitter-card title="How to start Budgeting?" description="Taking you through the simple steps you need to start budgeting. Understanding your net income and tracking your expenses is key to creating an effective budget" />
1414
</head>
1515
<body>
1616
<x-layout.navbar activeRoute="budgeting" />
@@ -63,57 +63,55 @@
6363
</div>
6464
<div class="prose prose-lg prose-indigo mx-auto mt-6 text-gray-500">
6565

66-
<h2>1. Know what your net income is</h2>
66+
<h2>Know what your net income is</h2>
6767

6868
<p>
69-
Seems simple, right? Just remember your net income is what you take home after tax and
70-
other costs such as pension contributions have been deducted. If you receive any benefits,
71-
remember to add these into the pot. If you’re one half of a couple, you’ll have extra
69+
Seems simple, right? Just remember your net income is what you take home after tax and
70+
other costs such as pension contributions have been deducted. If you receive any benefits,
71+
remember to add these into the pot. If you’re one half of a couple, you’ll have extra
7272
calculations to make.
7373
</p>
7474

75-
<h2>2. Start tracking your expenses</h2>
75+
<h2>Start tracking your expenses</h2>
7676

7777
<p>
78-
Before you even start a budget, you need to understand what you’re spending. It’s important that you
79-
track everything – even those coffees on the way to work! Keep a note of all your expenses –
80-
you can’t track expenses in your head!
81-
82-
</p>
83-
84-
<p>
85-
You might be surprised by how expenses add up! Track your spending for at least a month so that you
86-
have a good understanding of your expenses
78+
Before you even start a budget, you need to understand what you’re spending. It’s important that you
79+
track everything – even those coffees on the way to work! You might be surprised by how
80+
expenses add up. Track your spending for at least a month so that you have a good understanding of your expenses.
8781
</p>
8882

89-
<h2>3. List your expenses and label them</h2>
83+
<h2>List your expenses and label them</h2>
9084

9185
<p>
92-
Your expenses will fall into two categories: Fixed expenses are the ones which are always
93-
the same and must be paid. Variable expenses can change from month to month and are not
86+
Your expenses will fall into two categories: Fixed expenses are the ones which are always
87+
the same and must be paid. Variable expenses can change from month to month and are not
9488
strictly necessary – we call them the “fun stuff”!
9589
</p>
9690

97-
<h2>4. Choose your budgeting approach</h2>
91+
<h2>Choose your budgeting approach </h2>
9892

9993
<p>
100-
What works for one person, won’t work for everyone. There are
101-
<x-helper.control.link.text :route="route('what-is-budgeting')" label="several different ways of budgeting" />
102-
and it’s up to you to decide which approach suits you.
94+
What works for one person, won’t work for everyone. There are
95+
<x-helper.control.link.text :route="route('what-is-budgeting')" label="several different ways of budgeting" />
96+
and it’s up to you to decide which approach suits you. Our "What is Budgeting?"
97+
page outlines some of the different approaches to budgeting which might help you get
98+
started. <x-helper.control.link.text route="https://budget-pro.costs-to-expect.com/our-budgeting-story" label="Our Budgeting Story" :external="true" />
99+
over on Budget Pro might give you further tips and ideas.
103100
</p>
104101

105-
<h2>5. Start managing your money</h2>
102+
<h2>Start managing your money</h2>
106103

107104
<p>
108-
Ready for some more calculations? If the difference between your income and expenditure
109-
is making money tight, you may have to make adjustments to your spending habits –
110-
remember those variable expenses?!
105+
Ready for some more calculations? If the difference between your income and expenditure is
106+
making money tight, you may have to make adjustments to your spending habits – remember
107+
those variable expenses?!
111108
</p>
112109

113110
<p>
114-
Now you’re well on your way to having an effective budget and managing your money so that
115-
it works for you. If you’d like to use the Costs to Expect Budget App, check out
116-
our <x-helper.control.link.text :route="route('getting-started')" label="Getting started" /> page.
111+
Now you’re well on your way to having an effective budget and managing your money so that
112+
it works for you. This app allows you to create a free budget. If you’d like more advanced
113+
budgeting features, check out the <x-helper.control.link.text route="https://budget-pro.costs-to-expect.com/getting-started" label="Getting started page" :external="true" />
114+
over on our sister App, <x-helper.control.link.text route="https://budget-pro.costs-to-expect.com" label="Budget Pro" :external="true" />.
117115
</p>
118116

119117
</div>

0 commit comments

Comments
 (0)