From 5841de6e48f4de11179219159f8f9d30d345a8cf Mon Sep 17 00:00:00 2001 From: Andrew Cobby Date: Wed, 10 Oct 2012 20:04:28 +1100 Subject: [PATCH] Update img src to use CDN --- templates/emails/budget-saved.twig | 6 +++--- templates/index.twig | 9 ++++++++- templates/intro-modal.twig | 17 +++++++++-------- templates/javascript.twig | 2 +- templates/js-templates/other-budget.twig | 2 +- templates/more-info/defence.twig | 2 +- templates/more-info/foreignAid.twig | 2 +- templates/more-info/immigration.twig | 2 +- templates/more-info/industryAssistance.twig | 2 +- templates/more-info/privateEducation.twig | 2 +- templates/more-info/publicEducation.twig | 2 +- templates/sidepanes/share-budget.twig | 2 +- web/index_dev.php | 3 ++- 13 files changed, 31 insertions(+), 22 deletions(-) diff --git a/templates/emails/budget-saved.twig b/templates/emails/budget-saved.twig index 85d47cc..433387c 100644 --- a/templates/emails/budget-saved.twig +++ b/templates/emails/budget-saved.twig @@ -14,7 +14,7 @@ - The Global Mail - www.theglobalmail.org | Independent Journalism for Independent Minds + The Global Mail - www.theglobalmail.org | Independent Journalism for Independent Minds @@ -39,7 +39,7 @@ - + @@ -47,7 +47,7 @@ - +

Why did I receive this email? Someone, hopefully you, created a budget and used your email address in the process. Don't worry, you will only receive this email once.

diff --git a/templates/index.twig b/templates/index.twig index d9cc7f5..af2802b 100644 --- a/templates/index.twig +++ b/templates/index.twig @@ -10,7 +10,14 @@ - Your Federal Budget 2012 + You Spend 2012 + + + + + + + {% endif %} - + \ No newline at end of file diff --git a/templates/js-templates/other-budget.twig b/templates/js-templates/other-budget.twig index 661166f..70d1f76 100644 --- a/templates/js-templates/other-budget.twig +++ b/templates/js-templates/other-budget.twig @@ -20,7 +20,7 @@ - + diff --git a/templates/more-info/defence.twig b/templates/more-info/defence.twig index ea79544..0f37f4e 100644 --- a/templates/more-info/defence.twig +++ b/templates/more-info/defence.twig @@ -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.

- +

Related stories

diff --git a/templates/more-info/foreignAid.twig b/templates/more-info/foreignAid.twig index 6961f94..9e0c774 100644 --- a/templates/more-info/foreignAid.twig +++ b/templates/more-info/foreignAid.twig @@ -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 ‘soft power’ 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.

- +

Related stories

diff --git a/templates/more-info/immigration.twig b/templates/more-info/immigration.twig index 7a762b6..ff4eeef 100644 --- a/templates/more-info/immigration.twig +++ b/templates/more-info/immigration.twig @@ -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.

- +

Related stories

diff --git a/templates/more-info/industryAssistance.twig b/templates/more-info/industryAssistance.twig index b01cb82..7e8ffde 100644 --- a/templates/more-info/industryAssistance.twig +++ b/templates/more-info/industryAssistance.twig @@ -19,7 +19,7 @@ In addition to the $362 million being spent on “Resources Related Initiati In total, that’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.

- +

Related stories

diff --git a/templates/more-info/privateEducation.twig b/templates/more-info/privateEducation.twig index d1ebd46..d277b72 100644 --- a/templates/more-info/privateEducation.twig +++ b/templates/more-info/privateEducation.twig @@ -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.

- +

Related stories

diff --git a/templates/more-info/publicEducation.twig b/templates/more-info/publicEducation.twig index 830f54b..d8af48e 100644 --- a/templates/more-info/publicEducation.twig +++ b/templates/more-info/publicEducation.twig @@ -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.

- +

Related stories

diff --git a/templates/sidepanes/share-budget.twig b/templates/sidepanes/share-budget.twig index 90b88e2..bd320b1 100644 --- a/templates/sidepanes/share-budget.twig +++ b/templates/sidepanes/share-budget.twig @@ -14,7 +14,7 @@ - +
diff --git a/web/index_dev.php b/web/index_dev.php index bbd5a49..592f914 100644 --- a/web/index_dev.php +++ b/web/index_dev.php @@ -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');