From 28ab2fd7f348df31aff445724a3aef6752e588b5 Mon Sep 17 00:00:00 2001 From: Alexis Lahouze Date: Sun, 19 Jul 2015 15:12:17 +0200 Subject: [PATCH] Use initial angular interpolation delimiters. --- accountant/frontend/static/js/app.js | 5 +-- .../static/templates/account_edit.html | 2 +- .../static/templates/account_remove.html | 4 +-- .../frontend/static/templates/accounts.html | 18 +++++----- .../frontend/static/templates/entries.html | 16 ++++----- .../static/templates/operation_remove.html | 2 +- .../{ => static}/templates/remove_entry.html | 4 +-- .../frontend/static/templates/scheduler.html | 18 +++++----- accountant/frontend/templates/layout.html | 33 ++----------------- 9 files changed, 36 insertions(+), 66 deletions(-) rename accountant/frontend/{ => static}/templates/remove_entry.html (91%) diff --git a/accountant/frontend/static/js/app.js b/accountant/frontend/static/js/app.js index 933d8e2..a36c78c 100644 --- a/accountant/frontend/static/js/app.js +++ b/accountant/frontend/static/js/app.js @@ -20,10 +20,7 @@ var accountantApp = angular.module("accountantApp", [ "highcharts-ng" ]) -.config(function($interpolateProvider, $httpProvider, $routeProvider, $locationProvider) { - $interpolateProvider.startSymbol('[['); - $interpolateProvider.endSymbol(']]'); - +.config(function($httpProvider, $routeProvider, $locationProvider) { $httpProvider.interceptors.push(function($q) { return { "response": function(response) { diff --git a/accountant/frontend/static/templates/account_edit.html b/accountant/frontend/static/templates/account_edit.html index eb25b5d..98dff7e 100644 --- a/accountant/frontend/static/templates/account_edit.html +++ b/accountant/frontend/static/templates/account_edit.html @@ -16,7 +16,7 @@ --> diff --git a/accountant/frontend/static/templates/account_remove.html b/accountant/frontend/static/templates/account_remove.html index 30f4090..1d4ad55 100644 --- a/accountant/frontend/static/templates/account_remove.html +++ b/accountant/frontend/static/templates/account_remove.html @@ -16,12 +16,12 @@ --> diff --git a/accountant/frontend/static/templates/accounts.html b/accountant/frontend/static/templates/accounts.html index 18193ee..83efe71 100644 --- a/accountant/frontend/static/templates/accounts.html +++ b/accountant/frontend/static/templates/accounts.html @@ -60,11 +60,11 @@ - - [[ account.name ]] - [[ account.current ]] - [[ account.pointed ]] - [[ account.authorized_overdraft ]] + + {{ account.name }} + {{ account.current }} + {{ account.pointed }} + {{ account.authorized_overdraft }}
- + - [[ account.current ]] - [[ account.pointed ]] + {{ account.current }} + {{ account.pointed }} - @@ -101,7 +101,7 @@ - [[entry.sold]] + {{entry.sold}} @@ -128,27 +128,27 @@ - - [[entry.operation_date | date:"yyyy-MM-dd"]] + {{entry.operation_date | date:"yyyy-MM-dd"}} - [[entry.label]] + {{entry.label}} - [[entry.value]] + {{entry.value}} - [[entry.sold]] + {{entry.sold}} - [[entry.category]] + {{entry.category}} diff --git a/accountant/frontend/static/templates/operation_remove.html b/accountant/frontend/static/templates/operation_remove.html index f465d7d..e3e4a83 100644 --- a/accountant/frontend/static/templates/operation_remove.html +++ b/accountant/frontend/static/templates/operation_remove.html @@ -16,7 +16,7 @@ --> diff --git a/accountant/frontend/templates/remove_entry.html b/accountant/frontend/static/templates/remove_entry.html similarity index 91% rename from accountant/frontend/templates/remove_entry.html rename to accountant/frontend/static/templates/remove_entry.html index ff1fef0..42b2024 100644 --- a/accountant/frontend/templates/remove_entry.html +++ b/accountant/frontend/static/templates/remove_entry.html @@ -20,12 +20,12 @@ diff --git a/accountant/frontend/static/templates/scheduler.html b/accountant/frontend/static/templates/scheduler.html index f994cef..3d51da0 100644 --- a/accountant/frontend/static/templates/scheduler.html +++ b/accountant/frontend/static/templates/scheduler.html @@ -76,22 +76,22 @@ - - [[operation.start_date]] + {{operation.start_date}} - [[operation.stop_date]] + {{operation.stop_date}} - [[operation.day]] + {{operation.day}} - [[operation.frequency]] + {{operation.frequency}} - [[operation.label]] + {{operation.label}} - [[operation.value]] + {{operation.value}} - [[operation.category]] + {{operation.category}}
@@ -106,7 +106,7 @@ - diff --git a/accountant/frontend/templates/layout.html b/accountant/frontend/templates/layout.html index f7fd81d..df59a4a 100644 --- a/accountant/frontend/templates/layout.html +++ b/accountant/frontend/templates/layout.html @@ -1,4 +1,4 @@ -{# + + @@ -44,33 +44,6 @@ - - -