alahouze/accountant
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Use initial angular interpolation delimiters.

Browse Source
This commit is contained in:
Alexis Lahouze 2015-07-19 15:12:17 +02:00
parent 7d63176e7e
commit 28ab2fd7f3
9 changed files with 36 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
accountant/frontend/static/js/app.js
View File

@ -20,10 +20,7 @@ var accountantApp = angular.module("accountantApp", [
"highcharts-ng" "highcharts-ng"
]) ])
.config(function($interpolateProvider, $httpProvider, $routeProvider, $locationProvider) { .config(function($httpProvider, $routeProvider, $locationProvider) {
$interpolateProvider.startSymbol('[[');
$interpolateProvider.endSymbol(']]');
$httpProvider.interceptors.push(function($q) { $httpProvider.interceptors.push(function($q) {
return { return {
"response": function(response) { "response": function(response) {

2
accountant/frontend/static/templates/account_edit.html
View File

@ -16,7 +16,7 @@
--> -->
<!-- Dialog header with title --> <!-- Dialog header with title -->
<div class="modal-header"> <div class="modal-header">
<h3>&Eacute;diter le compte [[account.name]]</h3> <h3>&Eacute;diter le compte {{account.name}}</h3>
</div> </div>
<!-- Dialog body --> <!-- Dialog body -->

4
accountant/frontend/static/templates/account_remove.html
View File

@ -16,12 +16,12 @@
--> -->
<!-- Dialog header with title --> <!-- Dialog header with title -->
<div class="modal-header"> <div class="modal-header">
<h3>Supprimer le compte [[account.name]]</h3> <h3>Supprimer le compte {{account.name}}</h3>
</div> </div>
<!-- Dialog body --> <!-- Dialog body -->
<div class="modal-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> </div>
<!-- Dialog footer with buttons --> <!-- Dialog footer with buttons -->

18
accountant/frontend/static/templates/accounts.html
View File

@ -60,11 +60,11 @@
</td> </td>
</tr> </tr>
<tr id="account_[[account.id]]" class="form-inline" ng-if="!account.edit" ng-repeat-start="account in accounts"> <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><a href="account/{{ account.id }}/entries">{{ account.name }}</a></td>
<td>[[ account.current ]]</td> <td>{{ account.current }}</td>
<td>[[ account.pointed ]]</td> <td>{{ account.pointed }}</td>
<td>[[ account.authorized_overdraft ]]</td> <td>{{ account.authorized_overdraft }}</td>
<td> <td>
<div class="btn-group"> <div class="btn-group">
<button class="btn btn-xs btn-success" <button class="btn btn-xs btn-success"
@ -78,20 +78,20 @@
</button> </button>
<a class="btn btn-xs btn-default" <a class="btn btn-xs btn-default"
href="account/[[ account.id ]]/scheduler"> href="account/{{ account.id }}/scheduler">
<span class="fa fa-clock-o"></span> <span class="fa fa-clock-o"></span>
</a> </a>
</div> </div>
</td> </td>
</tr> </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> <td>
<input type="text" class="form-control" ng-model="account.name" /> <input type="text" class="form-control" ng-model="account.name" />
</td> </td>
<td>[[ account.current ]]</td> <td>{{ account.current }}</td>
<td>[[ account.pointed ]]</td> <td>{{ account.pointed }}</td>
<td> <td>
<input type="text" class="form-control" <input type="text" class="form-control"

16
accountant/frontend/static/templates/entries.html
View File

@ -85,7 +85,7 @@
</tr> </tr>
<!-- Row for an editing entry. --> <!-- 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-class="entryRowClass(entry)" ng-repeat-start="entry in entries"
ng-if="isEditing(entry)"> ng-if="isEditing(entry)">
<td class="col-md-1"> <td class="col-md-1">
@ -101,7 +101,7 @@
</td> </td>
<td class="col-md-1" ng-class="entryValueClass(entry.sold)"> <td class="col-md-1" ng-class="entryValueClass(entry.sold)">
<small>[[entry.sold]]</small> <small>{{entry.sold}}</small>
</td> </td>
<td class="col-md-3"> <td class="col-md-3">
@ -128,27 +128,27 @@
</tr> </tr>
<!-- Row for a displayed entry. --> <!-- Row for a displayed entry. -->
<tr id="entry_[[entry.id]]" <tr id="entry_{{entry.id}}"
ng-class="entryRowClass(entry)" ng-repeat-end ng-class="entryRowClass(entry)" ng-repeat-end
ng-if="isDisplaying(entry)"> ng-if="isDisplaying(entry)">
<td class="col-md-1"> <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>
<td> <td>
<small><span>[[entry.label]]</span></small> <small><span>{{entry.label}}</span></small>
</td> </td>
<td class="col-md-1"> <td class="col-md-1">
<small><span>[[entry.value]]</span></small> <small><span>{{entry.value}}</span></small>
</td> </td>
<td class="col-md-1" ng-class="entryValueClass(entry.sold)"> <td class="col-md-1" ng-class="entryValueClass(entry.sold)">
<small>[[entry.sold]]</small> <small>{{entry.sold}}</small>
</td> </td>
<td class="col-md-3"> <td class="col-md-3">
<small><span>[[entry.category]]</span></small> <small><span>{{entry.category}}</span></small>
</td> </td>
<td class="col-md-2"> <td class="col-md-2">

2
accountant/frontend/static/templates/operation_remove.html
View File

@ -16,7 +16,7 @@
--> -->
<!-- Dialog header with title --> <!-- Dialog header with title -->
<div class="modal-header"> <div class="modal-header">
<h3>Supprimer l'op&eacute;ration [[operation.label]]</h3> <h3>Supprimer l'op&eacute;ration {{operation.label}}</h3>
</div> </div>
<!-- Dialog body --> <!-- Dialog body -->

4
accountant/frontend/templates/remove_entry.html → accountant/frontend/static/templates/remove_entry.html
View File

@ -20,12 +20,12 @@
<!-- Dialog header with title --> <!-- Dialog header with title -->
<div class="modal-header"> <div class="modal-header">
<button class="close" ng-click="hideRemoveEntryPopup()" aria-hidden="true">&times;</button> <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> </div>
<!-- Dialog body --> <!-- Dialog body -->
<div class="modal-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> </div>
<!-- Dialog footer with buttons --> <!-- Dialog footer with buttons -->

18
accountant/frontend/static/templates/scheduler.html
View File

@ -76,22 +76,22 @@
</td> </td>
</tr> </tr>
<tr id="operation_[[operation.id]]" class="form-inline" <tr id="operation_{{operation.id}}" class="form-inline"
ng-repeat-start="operation in operations" ng-repeat-start="operation in operations"
ng-if="isDisplaying(operation)"> 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> <td>
<div class="btn-group"> <div class="btn-group">
@ -106,7 +106,7 @@
</td> </td>
</tr> </tr>
<tr id="operation_[[operation.id]]" class="form-inline" <tr id="operation_{{operation.id}}" class="form-inline"
ng-repeat-end ng-repeat-end
ng-if="isEditing(operation)"> ng-if="isEditing(operation)">
<td> <td>

33
accountant/frontend/templates/layout.html
View File

@ -1,4 +1,4 @@
{# <!--
This file is part of Accountant. This file is part of Accountant.
Accountant is free software: you can redistribute it and/or modify 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 You should have received a copy of the GNU Affero General Public License
along with Accountant. If not, see <http://www.gnu.org/licenses/>. 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> <!DOCTYPE html>
<html lang="fr" ng-app="accountantApp"> <html lang="fr" ng-app="accountantApp">
<head> <head>
@ -44,33 +44,6 @@
<div class="navbar-header"> <div class="navbar-header">
<a class="navbar-brand" href="/">&nbsp;Accountant</a> <a class="navbar-brand" href="/">&nbsp;Accountant</a>
</div> </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> </div>
</nav> </nav>