From 28ab2fd7f348df31aff445724a3aef6752e588b5 Mon Sep 17 00:00:00 2001
From: Alexis Lahouze <xals@lahouze.org>
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 @@
 -->
 <!-- Dialog header with title -->
 <div class="modal-header">
-  <h3>&Eacute;diter le compte [[account.name]]</h3>
+  <h3>&Eacute;diter le compte {{account.name}}</h3>
 </div>
 
 <!-- Dialog body -->
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 @@
 -->
 <!-- Dialog header with title -->
 <div class="modal-header">
-  <h3>Supprimer le compte [[account.name]]</h3>
+  <h3>Supprimer le compte {{account.name}}</h3>
 </div>
 
 <!-- Dialog body -->
 <div class="modal-body">
-  <p>Confirmez-vous la suppression du compte [[account.name]] ?</p>
+  <p>Confirmez-vous la suppression du compte {{account.name}} ?</p>
 </div>
 
 <!-- Dialog footer with buttons -->
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 @@
         </td>
       </tr>
 
-      <tr id="account_[[account.id]]" class="form-inline" ng-if="!account.edit" ng-repeat-start="account in accounts">
-        <td><a href="account/[[ account.id ]]/entries">[[ account.name ]]</a></td>
-        <td>[[ account.current ]]</td>
-        <td>[[ account.pointed ]]</td>
-        <td>[[ account.authorized_overdraft ]]</td>
+      <tr id="account_{{account.id}}" class="form-inline" ng-if="!account.edit" ng-repeat-start="account in accounts">
+        <td><a href="account/{{ account.id }}/entries">{{ account.name }}</a></td>
+        <td>{{ account.current }}</td>
+        <td>{{ account.pointed }}</td>
+        <td>{{ account.authorized_overdraft }}</td>
         <td>
           <div class="btn-group">
             <button class="btn btn-xs btn-success"
@@ -78,20 +78,20 @@
             </button>
 
             <a class="btn btn-xs btn-default"
-              href="account/[[ account.id ]]/scheduler">
+              href="account/{{ account.id }}/scheduler">
               <span class="fa fa-clock-o"></span>
             </a>
           </div>
         </td>
       </tr>
 
-      <tr id="account_[[account.id]]" class="form-inline" ng-if="account.edit" ng-repeat-end>
+      <tr id="account_{{account.id}}" class="form-inline" ng-if="account.edit" ng-repeat-end>
         <td>
           <input type="text" class="form-control" ng-model="account.name" />
         </td>
 
-        <td>[[ account.current ]]</td>
-        <td>[[ account.pointed ]]</td>
+        <td>{{ account.current }}</td>
+        <td>{{ account.pointed }}</td>
 
         <td>
           <input type="text" class="form-control"
diff --git a/accountant/frontend/static/templates/entries.html b/accountant/frontend/static/templates/entries.html
index 24ddcc3..5caf851 100644
--- a/accountant/frontend/static/templates/entries.html
+++ b/accountant/frontend/static/templates/entries.html
@@ -85,7 +85,7 @@
       </tr>
 
       <!-- Row for an editing entry. -->
-      <tr id="entry_[[entry.id]]" class="form-inline"
+      <tr id="entry_{{entry.id}}" class="form-inline"
         ng-class="entryRowClass(entry)" ng-repeat-start="entry in entries"
         ng-if="isEditing(entry)">
         <td class="col-md-1">
@@ -101,7 +101,7 @@
         </td>
         
         <td class="col-md-1" ng-class="entryValueClass(entry.sold)">
-          <small>[[entry.sold]]</small>
+          <small>{{entry.sold}}</small>
         </td>
 
         <td class="col-md-3">
@@ -128,27 +128,27 @@
       </tr>
 
       <!-- Row for a displayed entry. -->
-      <tr id="entry_[[entry.id]]"
+      <tr id="entry_{{entry.id}}"
         ng-class="entryRowClass(entry)" ng-repeat-end
         ng-if="isDisplaying(entry)">
         <td class="col-md-1">
-          <small><span>[[entry.operation_date | date:"yyyy-MM-dd"]]</span></small>
+          <small><span>{{entry.operation_date | date:"yyyy-MM-dd"}}</span></small>
         </td>
         
         <td>
-          <small><span>[[entry.label]]</span></small>
+          <small><span>{{entry.label}}</span></small>
         </td>
         
         <td class="col-md-1">
-          <small><span>[[entry.value]]</span></small>
+          <small><span>{{entry.value}}</span></small>
         </td>
         
         <td class="col-md-1" ng-class="entryValueClass(entry.sold)">
-          <small>[[entry.sold]]</small>
+          <small>{{entry.sold}}</small>
         </td>
 
         <td class="col-md-3">
-          <small><span>[[entry.category]]</span></small>
+          <small><span>{{entry.category}}</span></small>
         </td>
 
         <td class="col-md-2">
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 @@
 -->
 <!-- Dialog header with title -->
 <div class="modal-header">
-  <h3>Supprimer l'op&eacute;ration [[operation.label]]</h3>
+  <h3>Supprimer l'op&eacute;ration {{operation.label}}</h3>
 </div>
 
 <!-- Dialog body -->
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 @@
       <!-- Dialog header with title -->
       <div class="modal-header">
         <button class="close" ng-click="hideRemoveEntryPopup()" aria-hidden="true">&times;</button>
-        <h4 class="modal-title" id="remove_entry_header">Supprimer l'entr&eacute;e #[[removingEntry.id]]</h4>
+        <h4 class="modal-title" id="remove_entry_header">Supprimer l'entr&eacute;e #{{removingEntry.id}}</h4>
       </div>
 
       <!-- Dialog body -->
       <div class="modal-body">
-        <p>Confirmez-vous la suppression de l'entr&eacute;e « [[ removingEntry.label ]] » ?</p>
+        <p>Confirmez-vous la suppression de l'entr&eacute;e « {{ removingEntry.label }} » ?</p>
       </div>
 
       <!-- Dialog footer with buttons -->
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 @@
         </td>
       </tr>
 
-      <tr id="operation_[[operation.id]]" class="form-inline"
+      <tr id="operation_{{operation.id}}" class="form-inline"
           ng-repeat-start="operation in operations"
           ng-if="isDisplaying(operation)">
-        <td>[[operation.start_date]]</td>
+        <td>{{operation.start_date}}</td>
 
-        <td>[[operation.stop_date]]</td>
+        <td>{{operation.stop_date}}</td>
 
-        <td>[[operation.day]]</td>
+        <td>{{operation.day}}</td>
 
-        <td>[[operation.frequency]]</td>
+        <td>{{operation.frequency}}</td>
 
-        <td>[[operation.label]]</td>
+        <td>{{operation.label}}</td>
 
-        <td>[[operation.value]]</td>
+        <td>{{operation.value}}</td>
 
-        <td>[[operation.category]]</td>
+        <td>{{operation.category}}</td>
 
         <td>
           <div class="btn-group">
@@ -106,7 +106,7 @@
         </td>
       </tr>
 
-      <tr id="operation_[[operation.id]]" class="form-inline"
+      <tr id="operation_{{operation.id}}" class="form-inline"
           ng-repeat-end
           ng-if="isEditing(operation)">
         <td>
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 @@
-{#
+<!--
     This file is part of Accountant.
 
     Accountant is free software: you can redistribute it and/or modify
@@ -13,8 +13,8 @@
 
     You should have received a copy of the GNU Affero General Public License
     along with Accountant.  If not, see <http://www.gnu.org/licenses/>.
-#}
-{# vim: set tw=80 ts=2 sw=2 sts=2: #}
+-->
+<!-- vim: set tw=80 ts=2 sw=2 sts=2: -->
 <!DOCTYPE html>
 <html lang="fr" ng-app="accountantApp">
   <head>
@@ -44,33 +44,6 @@
         <div class="navbar-header">
           <a class="navbar-brand" href="/">&nbsp;Accountant</a>
         </div>
-
-        <!-- Menu and accounts -->
-        <ul class="nav navbar-nav">
-
-          <!-- Account selection -->
-          <li class="dropdown">
-            <a href="#" class="dropdown-toggle" data-toggle="dropdown"
-              role="button" aria-haspopup="true" aria-expanded="false">
-              [[selectedAccount.name]]&nbsp;(<span
-                ng-class="valueClass(selectedAccount, selectedAccount.current)">[[selectedAccount.current]]</span>&nbsp;/&nbsp;<span
-                ng-class="valueClass(selectedAccount,
-                selectedAccount.pointed)">[[selectedAccount.pointed]]</span>)
-              <span class="caret"></span>
-            </a>
-
-            <ul class="dropdown-menu">
-              <li ng-class="accountClass(account)" ng-repeat="account in accounts">
-                <a ng-click="selectAccount(account)" href="#">
-                  [[account.name]]
-                  (<span ng-class="valueClass(account,
-                    account.current)">[[account.current]]</span>&nbsp;/&nbsp;<span
-                    ng-class="valueClass(account,
-                    account.pointed)">[[account.pointed]]</span>)</a>
-              </li>
-            </ul>
-          </li>
-        </ul><!-- nav -->
       </div>
     </nav>