Skip to content

Commit

Permalink
Update img src to use CDN
Browse files Browse the repository at this point in the history
  • Loading branch information
Andrew Cobby committed Oct 10, 2012
1 parent f8c09f2 commit 5841de6
Show file tree
Hide file tree
Showing 13 changed files with 31 additions and 22 deletions.
6 changes: 3 additions & 3 deletions templates/emails/budget-saved.twig
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<tr>
<td align="center" cellpadding="0" cellspacing="0">
<a href="http://www.theglobalmail.org/">
<img src="{{ app.config.appUrl}}img/email/email-hdr.png" border="0" width="630" height="116" alt="The Global Mail - www.theglobalmail.org | Independent Journalism for Independent Minds" style="margin-top:15px;">
<img src="{{ app.config.assetHost }}/img/email/email-hdr.png" border="0" width="630" height="116" alt="The Global Mail - www.theglobalmail.org | Independent Journalism for Independent Minds" style="margin-top:15px;">
</a>
</td>
</tr>
Expand All @@ -39,15 +39,15 @@
</tr>
<tr>
<td align="center" cellpadding="0" cellspacing="0">
<img src="{{ app.config.appUrl }}img/email/email-icons.png">
<img src="{{ app.config.assetHost }}/img/email/email-icons.png">
</td>
</tr>
</table>
</td>
</tr>
<tr>
<td align="center" cellpadding="0" cellspacing="0">
<img src="{{ app.config.appUrl }}img/email/email-shadow.png" style="width:100%;" height="45" width="100%">
<img src="{{ app.config.assetHost }}/img/email/email-shadow.png" style="width:100%;" height="45" width="100%">
<p style="color: #7f7f7f; font-family: 'Cambria',Georgia,'Times New Roman',Times,serif;width:75%;">Why did I receive this email? Someone, hopefully you, <a href="{{ app.config.appUrl }}budget/{{ budget.getId }}" style="color:#0073b4;">created a budget</a> and used your email address in the process. Don't worry, you will only receive this email once.</p>
</td>
</tr>
Expand Down
9 changes: 8 additions & 1 deletion templates/index.twig
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,14 @@
<script type="text/javascript">try{Typekit.load();}catch(e){}</script>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
<title>Your Federal Budget 2012</title>
<title>You Spend 2012</title>

<meta name="description" value="Where do your tax dollars go? And how would YOU remix the Budget? Take on the Treasurer with this new interactive tool">

<meta property="og:title" content="You Spend 2012">
<meta property="og:type" content="website">
<meta property="og:url" content="">
<meta property="og:image" content="">

<script type="text/javascript">
Expand Down
17 changes: 9 additions & 8 deletions templates/intro-modal.twig
Original file line number Diff line number Diff line change
@@ -1,18 +1,19 @@
<div class="modal hide fade intro" id="intro-modal">
<div class="modal-body">
<div class="left">
<h1>How would you spend your tax dollars?</h1>
<img class="author" src="/img/author-mikeseccome.png">
<h3 class="story-detail-byline"><em>By</em> <a href="/reporters/mike-seccombe/1/">Mike Seccombe</a><span class="date"><img src="/img/ico-date.png" width="15" height="15" style="padding-right: 8px; padding-bottom: 4px">October 11, 2012</span>

</h3>
<h1>How would you spend your tax dollars?</h1>
<img class="author" src="{{app.config.assetHost}}/img/author-mikeseccome.png">
<h3 class="story-detail-byline">
<em>By</em> <a href="/reporters/mike-seccombe/1/">Mike Seccombe</a><span class="date"><img src="{{app.config.assetHost}}/img/ico-date.png" width="15" height="15" style="padding-right: 8px; padding-bottom: 4px">October 11, 2012</span>
</h3>
</div>

<div class="right">
<p>Ever wondered exactly how much of your tax is spent in particular areas? We’ve chosen six of the most controversial funding areas to highlight what the government spends, and to let you tell us how those dollars should be distributed.</p>

<button type="button" class="btn btn-primary btn-block" data-dismiss="modal">
Start your budget <div class="pull-right">&gt;</div>
</button>
Start your budget <div class="pull-right">&gt;</div>
</button>
</div>

</div>
</div>
2 changes: 1 addition & 1 deletion templates/javascript.twig
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,4 @@
<script async src="{{app.config.assetHost}}/build/budget-{{app.config.buildId}}.min.js"></script>
{% endif %}

<script src="http://s7.addthis.com/js/250/addthis_widget.js#pubid=ra-5004ac3e48e805cd&async=true"></script>
<script src="http://s7.addthis.com/js/250/addthis_widget.js#pubid=ra-5004ac3e48e805cd&async=true"></script>
2 changes: 1 addition & 1 deletion templates/js-templates/other-budget.twig
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<a class="addthis_button_twitter" data-bypass="true"></a>
<a class="addthis_button_facebook" data-bypass="true"></a>
<a class="addthis_button_email" data-bypass="true"></a>
<img src="/img/google_plusone.png" class="googleplusone">
<img src="{{ app.config.assetHost }}/img/google_plusone.png" class="googleplusone">
</div>
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion templates/more-info/defence.twig
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ Then there was another $130 million for peacekeeping operations in East Timor an
Against this were cost savings, noted in the forward estimates from the cancellation or deferral of various spending items, the largest being $900 million from a two-year delay in acquiring 12 new F35 joint strike fighters from America, whose development is, in any case, delayed.</p>
</div>
<div class="right">
<img src="/img/graphic-defence.png">
<img src="{{ app.config.assetHost }}/img/graphic-defence.png">
<div class="related">
<h3>Related stories</h3>
<div class="story">
Expand Down
2 changes: 1 addition & 1 deletion templates/more-info/foreignAid.twig
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ Nonetheless, the amount devoted to aid has increased significantly over the past
Foreign aid, apart from its humanitarian value, is also seen as a means of exercising &#8216;soft power&#8217; in the world and particularly in our region. On the other hand, the accepted political wisdom is that there are few if any votes in aid.</p>
</div>
<div class="right">
<img src="/img/graphic-foreign.png">
<img src="{{ app.config.assetHost }}/img/graphic-foreign.png">
<div class="related">
<h3>Related stories</h3>
<div class="story">
Expand Down
2 changes: 1 addition & 1 deletion templates/more-info/immigration.twig
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ In other words, if the changes to the asylum policy work, they will almost trebl
Other facts to bear in mind while budgeting for asylum seekers: historically 70 to 97 per cent of them are ultimately determined to be genuine refugees, meaning they are allowed to stay in Australia; and most come from Iraq or Afghanistan, where wars in which we are or were involved have contributed to the problem.</p>
</div>
<div class="right">
<img src="/img/graphic-immigration.png">
<img src="{{ app.config.assetHost }}/img/graphic-immigration.png">
<div class="related">
<h3>Related stories</h3>
<div class="story">
Expand Down
2 changes: 1 addition & 1 deletion templates/more-info/industryAssistance.twig
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ In addition to the $362 million being spent on &#8220;Resources Related Initiati
In total, that&rsquo;s more than $6.5 billion this year, spent subsidising activities which generate greenhouse gases. In comparison, the government allocated $293 million to the development of other non-fossil fuel energy sources through the Australian Renewable Energy Agency.</p>
</div>
<div class="right">
<img src="/img/graphic-industry.png">
<img src="{{ app.config.assetHost }}/img/graphic-industry.png">
<div class="related">
<h3>Related stories</h3>
<div class="story">
Expand Down
2 changes: 1 addition & 1 deletion templates/more-info/privateEducation.twig
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ But the federal government continues to spend disproportionately on non-governme
This year the federal government has budgeted $8.3 billion for non-government schools.</p>
</div>
<div class="right">
<img src="/img/graphic-private-ed.png">
<img src="{{ app.config.assetHost }}/img/graphic-private-ed.png">
<div class="related">
<h3>Related stories</h3>
<div class="story">
Expand Down
2 changes: 1 addition & 1 deletion templates/more-info/publicEducation.twig
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ In terms of both recurrent and capital spending, the federal education budget is
But Australian spending on schools is low at all levels of government, in comparison with most developed countries — about three per cent of GDP, compared with an OECD average of 3.5 per cent.</p>
</div>
<div class="right">
<img src="/img/graphic-public-ed.png">
<img src="{{ app.config.assetHost }}/img/graphic-public-ed.png">
<div class="related">
<h3>Related stories</h3>
<div class="story">
Expand Down
2 changes: 1 addition & 1 deletion templates/sidepanes/share-budget.twig
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<a class="addthis_button_twitter"></a>
<a class="addthis_button_facebook"></a>
<a class="addthis_button_email"></a>
<img src="/img/google_plusone.png" class="googleplusone">
<img src="{{ app.config.assetHost }}/img/google_plusone.png" class="googleplusone">
</div>

<hr>
Expand Down
3 changes: 2 additions & 1 deletion web/index_dev.php
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,8 @@
'categories' => Util::loadJSONFile(__DIR__ . '/../resources/categories.json'),
'dbname' => 'budget2012',
'db' => "mongodb://localhost:27017",
'dbOptions' => array()
'dbOptions' => array(),
'assetHost' => ''
];

$fileConfig = Util::loadJSONFile(__DIR__ . '/../resources/config.json');
Expand Down

0 comments on commit 5841de6

Please sign in to comment.