Merge pull request #7600 from firefly-iii/upgrade-html

Upgrade html

.env.example

@@ -163,9 +163,8 @@ SEND_ERROR_MESSAGE=true
 # These messages contain (sensitive) transaction information:
 SEND_REPORT_JOURNALS=true
 
-# Set this value to true if you want to set the location
+# Set this value to true if you want to set the location of certain things, like transactions.
-# of certain things, like transactions. Since this involves an external service, it's optional
+# Since this involves an external service, it's optional and disabled by default.
-# and disabled by default.
 ENABLE_EXTERNAL_MAP=false
 
 # Set this value to true if you want Firefly III to download currency exchange rates

app/Support/ExpandedForm.php

@@ -176,7 +176,7 @@ class ExpandedForm
         $options         = $this->expandOptionArray($name, $label, $options);
         $classes         = $this->getHolderClasses($name);
         $value           = $this->fillFieldValue($name, $value);
-        $options['step'] = '1';
+        $options['step'] = $options['step'] ?? '1';
         try {
             $html = view('form.integer', compact('classes', 'name', 'label', 'value', 'options'))->render();
         } catch (Throwable $e) {
@@ -242,65 +242,6 @@ class ExpandedForm
         return $selectList;
     }
 
-    /**
-     * @param  string  $name
-     * @param  mixed  $value
-     * @param  array|null  $options
-     *
-     * @return string
-     * @throws FireflyException
-     */
-    public function nonSelectableAmount(string $name, $value = null, array $options = null): string
-    {
-        $label            = $this->label($name, $options);
-        $options          = $this->expandOptionArray($name, $label, $options);
-        $classes          = $this->getHolderClasses($name);
-        $value            = $this->fillFieldValue($name, $value);
-        $options['step']  = 'any';
-        $selectedCurrency = $options['currency'] ?? Amt::getDefaultCurrency();
-        unset($options['currency'], $options['placeholder']);
-
-        // make sure value is formatted nicely:
-        if (null !== $value && '' !== $value) {
-            //            $value = round((float)$value, $selectedCurrency->decimal_places);
-        }
-        try {
-            $html = view('form.non-selectable-amount', compact('selectedCurrency', 'classes', 'name', 'label', 'value', 'options'))->render();
-        } catch (Throwable $e) {
-            Log::debug(sprintf('Could not render nonSelectableAmount(): %s', $e->getMessage()));
-            $html = 'Could not render nonSelectableAmount.';
-            throw new FireflyException($html, 0, $e);
-        }
-
-        return $html;
-    }
-
-    /**
-     * @param  string  $name
-     * @param  mixed  $value
-     * @param  array|null  $options
-     *
-     * @return string
-     * @throws FireflyException
-     */
-    public function number(string $name, $value = null, array $options = null): string
-    {
-        $label           = $this->label($name, $options);
-        $options         = $this->expandOptionArray($name, $label, $options);
-        $classes         = $this->getHolderClasses($name);
-        $value           = $this->fillFieldValue($name, $value);
-        $options['step'] = 'any';
-        unset($options['placeholder']);
-        try {
-            $html = view('form.number', compact('classes', 'name', 'label', 'value', 'options'))->render();
-        } catch (Throwable $e) {
-            Log::debug(sprintf('Could not render number(): %s', $e->getMessage()));
-            $html = 'Could not render number.';
-            throw new FireflyException($html, 0, $e);
-        }
-
-        return $html;
-    }
 
     /**
      * @param  null  $value

composer.json

@@ -93,7 +93,6 @@
     "laravel/sanctum": "^3.2",
     "laravel/slack-notification-channel": "^2.4",
     "laravel/ui": "^4.2",
-    "laravelcollective/html": "6.*",
     "league/commonmark": "2.*",
     "league/csv": "^9.7",
     "league/fractal": "0.*",
@@ -103,6 +102,7 @@
     "psr/log": "<4",
     "ramsey/uuid": "^4.7",
     "rcrowe/twigbridge": "^0.14",
+    "spatie/laravel-html": "^3.2",
     "spatie/laravel-ignition": "^2",
     "spatie/period": "^2.4",
     "symfony/http-client": "^6.2",

composer.lock

@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "cc2447110d1ddec300550e2e41634217",
+    "content-hash": "4f792c06cb58d42c0cb6a8d027aefbf7",
     "packages": [
         {
             "name": "bacon/bacon-qr-code",
@@ -472,16 +472,16 @@
         },
         {
             "name": "doctrine/dbal",
-            "version": "3.6.2",
+            "version": "3.6.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/doctrine/dbal.git",
-                "reference": "b4bd1cfbd2b916951696d82e57d054394d84864c"
+                "reference": "9a747d29e7e6b39509b8f1847e37a23a0163ea6a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/dbal/zipball/b4bd1cfbd2b916951696d82e57d054394d84864c",
+                "url": "https://api.github.com/repos/doctrine/dbal/zipball/9a747d29e7e6b39509b8f1847e37a23a0163ea6a",
-                "reference": "b4bd1cfbd2b916951696d82e57d054394d84864c",
+                "reference": "9a747d29e7e6b39509b8f1847e37a23a0163ea6a",
                 "shasum": ""
             },
             "require": {
@@ -494,12 +494,12 @@
                 "psr/log": "^1|^2|^3"
             },
             "require-dev": {
-                "doctrine/coding-standard": "11.1.0",
+                "doctrine/coding-standard": "12.0.0",
                 "fig/log-test": "^1",
                 "jetbrains/phpstorm-stubs": "2022.3",
-                "phpstan/phpstan": "1.10.9",
+                "phpstan/phpstan": "1.10.14",
                 "phpstan/phpstan-strict-rules": "^1.5",
-                "phpunit/phpunit": "9.6.6",
+                "phpunit/phpunit": "9.6.7",
                 "psalm/plugin-phpunit": "0.18.4",
                 "squizlabs/php_codesniffer": "3.7.2",
                 "symfony/cache": "^5.4|^6.0",
@@ -564,7 +564,7 @@
             ],
             "support": {
                 "issues": "https://github.com/doctrine/dbal/issues",
-                "source": "https://github.com/doctrine/dbal/tree/3.6.2"
+                "source": "https://github.com/doctrine/dbal/tree/3.6.3"
             },
             "funding": [
                 {
@@ -580,29 +580,33 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-04-14T07:25:38+00:00"
+            "time": "2023-06-01T05:46:46+00:00"
         },
         {
             "name": "doctrine/deprecations",
-            "version": "v1.1.0",
+            "version": "v1.1.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/doctrine/deprecations.git",
-                "reference": "8cffffb2218e01f3b370bf763e00e81697725259"
+                "reference": "612a3ee5ab0d5dd97b7cf3874a6efe24325efac3"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/deprecations/zipball/8cffffb2218e01f3b370bf763e00e81697725259",
+                "url": "https://api.github.com/repos/doctrine/deprecations/zipball/612a3ee5ab0d5dd97b7cf3874a6efe24325efac3",
-                "reference": "8cffffb2218e01f3b370bf763e00e81697725259",
+                "reference": "612a3ee5ab0d5dd97b7cf3874a6efe24325efac3",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.1|^8.0"
+                "php": "^7.1 || ^8.0"
             },
             "require-dev": {
                 "doctrine/coding-standard": "^9",
-                "phpunit/phpunit": "^7.5|^8.5|^9.5",
+                "phpstan/phpstan": "1.4.10 || 1.10.15",
-                "psr/log": "^1|^2|^3"
+                "phpstan/phpstan-phpunit": "^1.0",
+                "phpunit/phpunit": "^7.5 || ^8.5 || ^9.5",
+                "psalm/plugin-phpunit": "0.18.4",
+                "psr/log": "^1 || ^2 || ^3",
+                "vimeo/psalm": "4.30.0 || 5.12.0"
             },
             "suggest": {
                 "psr/log": "Allows logging deprecations via PSR-3 logger implementation"
@@ -621,9 +625,9 @@
             "homepage": "https://www.doctrine-project.org/",
             "support": {
                 "issues": "https://github.com/doctrine/deprecations/issues",
-                "source": "https://github.com/doctrine/deprecations/tree/v1.1.0"
+                "source": "https://github.com/doctrine/deprecations/tree/v1.1.1"
             },
-            "time": "2023-05-29T18:55:17+00:00"
+            "time": "2023-06-03T09:27:29+00:00"
         },
         {
             "name": "doctrine/event-manager",
@@ -1937,16 +1941,16 @@
         },
         {
             "name": "laravel/framework",
-            "version": "v10.13.0",
+            "version": "v10.13.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laravel/framework.git",
-                "reference": "7322723585103082758d74917db62980684845cb"
+                "reference": "c1569099594168870cb4bdabfbaa35e5d172310b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laravel/framework/zipball/7322723585103082758d74917db62980684845cb",
+                "url": "https://api.github.com/repos/laravel/framework/zipball/c1569099594168870cb4bdabfbaa35e5d172310b",
-                "reference": "7322723585103082758d74917db62980684845cb",
+                "reference": "c1569099594168870cb4bdabfbaa35e5d172310b",
                 "shasum": ""
             },
             "require": {
@@ -2133,7 +2137,7 @@
                 "issues": "https://github.com/laravel/framework/issues",
                 "source": "https://github.com/laravel/framework"
             },
-            "time": "2023-05-30T14:46:25+00:00"
+            "time": "2023-06-02T13:13:10+00:00"
         },
         {
             "name": "laravel/passport",
@@ -2462,79 +2466,6 @@
             },
             "time": "2023-05-09T19:47:28+00:00"
         },
-        {
-            "name": "laravelcollective/html",
-            "version": "v6.4.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/LaravelCollective/html.git",
-                "reference": "64ddfdcaeeb8d332bd98bef442bef81e39c3910b"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/LaravelCollective/html/zipball/64ddfdcaeeb8d332bd98bef442bef81e39c3910b",
-                "reference": "64ddfdcaeeb8d332bd98bef442bef81e39c3910b",
-                "shasum": ""
-            },
-            "require": {
-                "illuminate/http": "^6.0|^7.0|^8.0|^9.0|^10.0",
-                "illuminate/routing": "^6.0|^7.0|^8.0|^9.0|^10.0",
-                "illuminate/session": "^6.0|^7.0|^8.0|^9.0|^10.0",
-                "illuminate/support": "^6.0|^7.0|^8.0|^9.0|^10.0",
-                "illuminate/view": "^6.0|^7.0|^8.0|^9.0|^10.0",
-                "php": ">=7.2.5"
-            },
-            "require-dev": {
-                "illuminate/database": "^6.0|^7.0|^8.0|^9.0|^10.0",
-                "mockery/mockery": "~1.0",
-                "phpunit/phpunit": "~8.5|^9.5.10"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "6.x-dev"
-                },
-                "laravel": {
-                    "providers": [
-                        "Collective\\Html\\HtmlServiceProvider"
-                    ],
-                    "aliases": {
-                        "Form": "Collective\\Html\\FormFacade",
-                        "Html": "Collective\\Html\\HtmlFacade"
-                    }
-                }
-            },
-            "autoload": {
-                "files": [
-                    "src/helpers.php"
-                ],
-                "psr-4": {
-                    "Collective\\Html\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Adam Engebretson",
-                    "email": "adam@laravelcollective.com"
-                },
-                {
-                    "name": "Taylor Otwell",
-                    "email": "taylorotwell@gmail.com"
-                }
-            ],
-            "description": "HTML and Form Builders for the Laravel Framework",
-            "homepage": "https://laravelcollective.com",
-            "support": {
-                "issues": "https://github.com/LaravelCollective/html/issues",
-                "source": "https://github.com/LaravelCollective/html"
-            },
-            "abandoned": "spatie/laravel-html",
-            "time": "2023-04-25T02:46:11+00:00"
-        },
         {
             "name": "lcobucci/clock",
             "version": "3.1.0",
@@ -5720,6 +5651,84 @@
             ],
             "time": "2023-05-25T10:19:32+00:00"
         },
+        {
+            "name": "spatie/laravel-html",
+            "version": "3.2.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/spatie/laravel-html.git",
+                "reference": "bf7bdb55cc5ce15c4ec8134aa1df709c0397c397"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/spatie/laravel-html/zipball/bf7bdb55cc5ce15c4ec8134aa1df709c0397c397",
+                "reference": "bf7bdb55cc5ce15c4ec8134aa1df709c0397c397",
+                "shasum": ""
+            },
+            "require": {
+                "illuminate/http": "^9.0|^8.0|^10.0",
+                "illuminate/support": "^9.0|^8.0|^10.0",
+                "php": "^8.0"
+            },
+            "require-dev": {
+                "mockery/mockery": "^1.3",
+                "orchestra/testbench": "^7.0|^6.23|^8.0",
+                "pestphp/pest": "^1.22"
+            },
+            "type": "library",
+            "extra": {
+                "laravel": {
+                    "providers": [
+                        "Spatie\\Html\\HtmlServiceProvider"
+                    ],
+                    "aliases": {
+                        "Html": "Spatie\\Html\\Facades\\Html"
+                    }
+                }
+            },
+            "autoload": {
+                "files": [
+                    "src/helpers.php"
+                ],
+                "psr-4": {
+                    "Spatie\\Html\\": "src"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian De Deyne",
+                    "email": "sebastian@spatie.be",
+                    "homepage": "https://spatie.be",
+                    "role": "Developer"
+                },
+                {
+                    "name": "Freek Van der Herten",
+                    "email": "freek@spatie.be",
+                    "homepage": "https://spatie.be",
+                    "role": "Developer"
+                }
+            ],
+            "description": "A fluent html builder",
+            "homepage": "https://github.com/spatie/laravel-html",
+            "keywords": [
+                "html",
+                "spatie"
+            ],
+            "support": {
+                "source": "https://github.com/spatie/laravel-html/tree/3.2.1"
+            },
+            "funding": [
+                {
+                    "url": "https://spatie.be/open-source/support-us",
+                    "type": "custom"
+                }
+            ],
+            "time": "2023-01-24T23:47:16+00:00"
+        },
         {
             "name": "spatie/laravel-ignition",
             "version": "2.1.3",
@@ -10440,16 +10449,16 @@
         },
         {
             "name": "phpunit/phpunit",
-            "version": "10.1.3",
+            "version": "10.2.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/phpunit.git",
-                "reference": "2379ebafc1737e71cdc84f402acb6b7f04198b9d"
+                "reference": "3aad97fde1f3e490e2b316ba56bc4680310e3c3f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/2379ebafc1737e71cdc84f402acb6b7f04198b9d",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/3aad97fde1f3e490e2b316ba56bc4680310e3c3f",
-                "reference": "2379ebafc1737e71cdc84f402acb6b7f04198b9d",
+                "reference": "3aad97fde1f3e490e2b316ba56bc4680310e3c3f",
                 "shasum": ""
             },
             "require": {
@@ -10489,7 +10498,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-main": "10.1-dev"
+                    "dev-main": "10.2-dev"
                 }
             },
             "autoload": {
@@ -10521,7 +10530,7 @@
             "support": {
                 "issues": "https://github.com/sebastianbergmann/phpunit/issues",
                 "security": "https://github.com/sebastianbergmann/phpunit/security/policy",
-                "source": "https://github.com/sebastianbergmann/phpunit/tree/10.1.3"
+                "source": "https://github.com/sebastianbergmann/phpunit/tree/10.2.0"
             },
             "funding": [
                 {
@@ -10537,7 +10546,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-05-11T05:16:22+00:00"
+            "time": "2023-06-02T05:42:13+00:00"
         },
         {
             "name": "sebastian/cli-parser",

config/app.php

@@ -140,8 +140,7 @@ return [
         'URL'           => Illuminate\Support\Facades\URL::class,
         'Validator'     => Illuminate\Support\Facades\Validator::class,
         'View'          => Illuminate\Support\Facades\View::class,
-        'Form'          => Collective\Html\FormFacade::class,
+        'Html'          => Spatie\Html\Facades\Html::class,
-        'Html'          => Collective\Html\HtmlFacade::class,
         'Preferences'   => Preferences::class,
         'FireflyConfig' => FireflyConfig::class,
         'Navigation'    => Navigation::class,

config/firefly.php

@@ -118,7 +118,6 @@ return [
 
     // tokens and keys
     'fixer_api_key'                => env('FIXER_API_KEY', ''),
-    'mapbox_api_key'               => env('MAPBOX_API_KEY', ''),
     'ipinfo_token'                 => env('IPINFO_TOKEN', ''),
     'static_cron_token'            => envNonEmpty('STATIC_CRON_TOKEN'),
 

config/twigbridge.php

@@ -171,7 +171,7 @@ return [
             'Steam',
             'Config',
             'Request',
-            'Form'          => ['is_safe' => ['input', 'select', 'checkbox', 'model', 'open', 'radio', 'textarea', 'file']],
+            'Html',
             'ExpandedForm'  => [
                 'is_safe' => [
                     'date',

public/v1/js/ff/accounts/show.js

@@ -67,30 +67,6 @@ $(function () {
         );
     }
 
-    if (doPlaceMarker === true) {
-        /*
-         Create new map:
-         */
-
-        // make map:
-        var mymap = L.map('location_map', {
-            zoomControl: false,
-            touchZoom: false,
-            doubleClickZoom: false,
-            scrollWheelZoom: false,
-            boxZoom: false,
-            dragging: false
-        }).setView([latitude, longitude], zoomLevel);
-
-        L.tileLayer('https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png?access_token={accessToken}', {
-            attribution: '&copy; <a href="https://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors',
-            maxZoom: 18,
-            id: 'mapbox/streets-v11',
-            accessToken: mapboxToken
-        }).addTo(mymap);
-        L.marker([latitude, longitude]).addTo(mymap);
-    }
-
 });
 
 function sortStop(event, ui) {

public/v1/js/ff/tags/create-edit.js

@@ -17,7 +17,6 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
-/** global: zoomLevel, latitude, longitude, google, apiKey, doPlaceMarker, Modernizr */
 
 $(function () {
     "use strict";

public/v1/js/ff/tags/show.js

@@ -18,35 +18,10 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-/** global: zoomLevel, latitude, longitude, L, mapboxToken, doPlaceMarker */
-
 /*
  Some vars as prep for the map:
  */
 $(function () {
     "use strict";
-    if (doPlaceMarker === true) {
-        /*
-         Create new map:
-         */
-
-        // make map:
-        var mymap = L.map('location_map', {
-            zoomControl: false,
-            touchZoom: false,
-            doubleClickZoom: false,
-            scrollWheelZoom: false,
-            boxZoom: false,
-            dragging: false
-        }).setView([latitude, longitude], zoomLevel);
-
-        L.tileLayer('https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png?access_token={accessToken}', {
-            attribution: '&copy; <a href="https://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors',
-            maxZoom: 18,
-            id: 'mapbox/streets-v11',
-            accessToken: mapboxToken
-        }).addTo(mymap);
-        L.marker([latitude, longitude]).addTo(mymap);
-    }
 
 });

resources/views/accounts/create.twig

@@ -9,7 +9,8 @@
         var mapboxToken = "{{ config('firefly.mapbox_api_key') }}";
     </script>
 
-    <form action="{{ route('accounts.store') }}" method="post" id="store" class="form-horizontal" enctype="multipart/form-data">
+    <form action="{{ route('accounts.store') }}" method="post" id="store" class="form-horizontal"
+          enctype="multipart/form-data">
         <input type="hidden" name="_token" value="{{ csrf_token() }}"/>
         <input type="hidden" name="objectType" value="{{ objectType }}"/>
         <input type="hidden" name="active" value="1"/>
@@ -58,7 +59,6 @@
                         {# only correct way to do active checkbox #}
                         {{ ExpandedForm.checkbox('include_net_worth', 1) }}
                         {{ ExpandedForm.textarea('notes',null,{helpText: trans('firefly.field_supports_markdown')}) }}
-                        {{ ExpandedForm.location('location', null, {locations: locations}) }}
                         {{ ExpandedForm.file('attachments[]', {'multiple': 'multiple','helpText': trans('firefly.upload_max_file_size', {'size': uploadSize|filesize}) }) }}
                     </div>
                 </div>
@@ -88,14 +88,15 @@
         var iAmOwed = '{{ 'i_am_owed_amount'|_|escape('js') }}';
         var iOwe = '{{ 'i_owe_amount'|_|escape('js') }}';
     </script>
-    <script src="v1/lib/leaflet/leaflet.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>
+    <script type="text/javascript" src="v1/js/lib/modernizr-custom.js?v={{ FF_VERSION }}"
-    <script type="text/javascript" src="v1/js/lib/modernizr-custom.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>
+            nonce="{{ JS_NONCE }}"></script>
     <script type="text/javascript" src="v1/js/lib/jquery-ui.min.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>
     <script type="text/javascript" src="v1/js/ff/accounts/create.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>
 {% endblock %}
 
 {% block styles %}
-    <link href="v1/css/jquery-ui/jquery-ui.structure.min.css?v={{ FF_VERSION }}" type="text/css" rel="stylesheet" media="all" nonce="{{ JS_NONCE }}">
+    <link href="v1/css/jquery-ui/jquery-ui.structure.min.css?v={{ FF_VERSION }}" type="text/css" rel="stylesheet"
-    <link href="v1/css/jquery-ui/jquery-ui.theme.min.css?v={{ FF_VERSION }}" type="text/css" rel="stylesheet" media="all" nonce="{{ JS_NONCE }}">
+          media="all" nonce="{{ JS_NONCE }}">
-    <link rel="stylesheet" href="v1/lib/leaflet/leaflet.css?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}">
+    <link href="v1/css/jquery-ui/jquery-ui.theme.min.css?v={{ FF_VERSION }}" type="text/css" rel="stylesheet"
+          media="all" nonce="{{ JS_NONCE }}">
 {% endblock %}

resources/views/accounts/delete.twig

@@ -6,7 +6,8 @@
 
 {% block content %}
 
-    <form method="POST" action="{{ route('accounts.destroy',account.id) }}" accept-charset="UTF-8" class="form-horizontal" id="destroy">
+    <form method="POST" action="{{ route('accounts.destroy',account.id) }}" accept-charset="UTF-8"
+          class="form-horizontal" id="destroy">
         <input name="_token" type="hidden" value="{{ csrf_token() }}">
         <div class="row">
             <div class="col-lg-6 col-lg-offset-3 col-md-12 col-sm-12">
@@ -39,7 +40,7 @@
                             </p>
 
                             <p>
-                                {{ Form.select('move_account_before_delete', accountList, null, {class: 'form-control'}) }}
+                                {{ Html.select('move_account_before_delete', accountList, null).class('form-control') }}
                             </p>
                         {% else %}
                             <input type="hidden" name="move_account_before_delete" value="0"/>
@@ -47,7 +48,8 @@
 
                     </div>
                     <div class="box-footer">
-                        <input type="submit" name="submit" value="{{ trans('form.deletePermanently') }}" class="btn pull-right btn-danger"/>
+                        <input type="submit" name="submit" value="{{ trans('form.deletePermanently') }}"
+                               class="btn pull-right btn-danger"/>
                         <a href="{{ URL.previous() }}" class="btn-default btn">{{ trans('form.cancel') }}</a>
                     </div>
                 </div>

resources/views/accounts/edit.twig

@@ -11,12 +11,11 @@
         var mapboxToken = "{{ config('firefly.mapbox_api_key') }}";
     </script>
 
-    {{ Form.model(account, {
+    <form method="post" action="{{ route('accounts.update',account.id) }}" class="form-horizontal"
-        'class': 'form-horizontal',
+          accept-charset="UTF-8"
-        'id': 'update',
+          enctype="multipart/form-data">
-        'url': route('accounts.update',account.id),
+        <input type="hidden" name="_token" value="{{ csrf_token() }}"/>
-        'enctype': 'multipart/form-data'
+
-    } ) }}
         <input type="hidden" name="id" value="{{ account.id }}"/>
         <input type="hidden" name="objectType" value="{{ objectType }}"/>
 
@@ -74,7 +73,6 @@
                         {{ ExpandedForm.checkbox('active', 1) }}
                         {# only correct way to do active checkbox #}
 
-                    {{ ExpandedForm.location('location', null, {locations: locations}) }}
                         {{ ExpandedForm.file('attachments[]', {'multiple': 'multiple','helpText': trans('firefly.upload_max_file_size', {'size': uploadSize|filesize}) }) }}
 
                     </div>
@@ -119,14 +117,15 @@
         var iAmOwed = '{{ 'i_am_owed_amount'|_|escape('js') }}';
         var iOwe = '{{ 'i_owe_amount'|_|escape('js') }}';
     </script>
-    <script src="v1/lib/leaflet/leaflet.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>
+    <script type="text/javascript" src="v1/js/lib/modernizr-custom.js?v={{ FF_VERSION }}"
-    <script type="text/javascript" src="v1/js/lib/modernizr-custom.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>
+            nonce="{{ JS_NONCE }}"></script>
     <script type="text/javascript" src="v1/js/lib/jquery-ui.min.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>
     <script type="text/javascript" src="v1/js/ff/accounts/edit.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>
 {% endblock %}
 
 {% block styles %}
-    <link href="v1/css/jquery-ui/jquery-ui.structure.min.css?v={{ FF_VERSION }}" type="text/css" rel="stylesheet" media="all" nonce="{{ JS_NONCE }}">
+    <link href="v1/css/jquery-ui/jquery-ui.structure.min.css?v={{ FF_VERSION }}" type="text/css" rel="stylesheet"
-    <link href="v1/css/jquery-ui/jquery-ui.theme.min.css?v={{ FF_VERSION }}" type="text/css" rel="stylesheet" media="all" nonce="{{ JS_NONCE }}">
+          media="all" nonce="{{ JS_NONCE }}">
-    <link rel="stylesheet" href="v1/lib/leaflet/leaflet.css?v={{ FF_VERSION }}"  nonce="{{ JS_NONCE }}">
+    <link href="v1/css/jquery-ui/jquery-ui.theme.min.css?v={{ FF_VERSION }}" type="text/css" rel="stylesheet"
+          media="all" nonce="{{ JS_NONCE }}">
 {% endblock %}

resources/views/accounts/reconcile/edit.twig

@@ -1,119 +1 @@
-{% extends './layout/default' %}
+TODO REMOVE ME
-
-{% block breadcrumbs %}
-    {{ Breadcrumbs.render(Route.getCurrentRoute.getName, journal) }}
-{% endblock %}
-
-{% block content %}
-    <form method="POST" action="{{ route('accounts.reconcile.update',journal.id) }}" accept-charset="UTF-8" class="form-horizontal" id="update"
-          enctype="multipart/form-data">
-
-        <input name="_token" type="hidden" value="{{ csrf_token() }}">
-        <input type="hidden" name="id" value="{{ journal.id }}"/>
-
-        {% if errors.all|length > 0 %}
-            <div class="row">
-                <div class="col-lg-12">
-                    <h3 class="text-danger">{{ 'errors'|_ }}</h3>
-                    <ul>
-                        {% for err in errors.all %}
-                            <li class="text-danger">{{ err }}</li>
-                        {% endfor %}
-                    </ul>
-                </div>
-            </div>
-        {% endif %}
-
-
-        <div class="row">
-            <div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
-                <div class="box box-primary">
-                    <div class="box-header with-border">
-                        <h3 class="box-title">{{ 'mandatoryFields'|_ }}</h3>
-                    </div>
-                    <div class="box-body">
-                        {# ALWAYS AVAILABLE #}
-                        {{ ExpandedForm.staticText('description',journal.description) }}
-
-                        {# ALWAYS SHOW AMOUNT #}
-                        {{ ExpandedForm.nonSelectableAmount('amount',data.amount, {'currency' : data.currency}) }}
-
-                        {# ALWAYS SHOW DATE #}
-                        {{ ExpandedForm.staticText('date',journal.date.isoFormat(monthAndDayFormat)) }}
-                    </div>
-                </div>
-
-            </div>
-            <div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
-                <div class="box">
-                    <div class="box-header with-border">
-                        <h3 class="box-title">{{ 'optionalFields'|_ }}</h3>
-                    </div>
-                    <div class="box-body">
-                        {# category always #}
-                        {{ ExpandedForm.text('category',data.category) }}
-
-                        {# tags #}
-                        {{ ExpandedForm.text('tags') }}
-                    </div>
-                </div>
-
-                {# box for attachments #}
-                {% if optionalFields.attachments %}
-                    <div class="box">
-                        <div class="box-header with-border">
-                            <h3 class="box-title">{{ 'optional_field_attachments'|_ }}</h3>
-                        </div>
-                        <div class="box-body">
-                            {% if optionalFields.attachments %}
-                                {# attachments #}
-                                {{ ExpandedForm.file('attachments[]', {'multiple': 'multiple','helpText': trans('firefly.upload_max_file_size', {'size': uploadSize|filesize}) }) }}
-                            {% endif %}
-                        </div>
-                    </div>
-                {% endif %}
-            </div>
-        </div>
-        <div class="row">
-            <div class="col-lg-6 col-md-6 col-sm-12">
-                {# panel for options #}
-                <div class="box">
-                    <div class="box-header with-border">
-                        <h3 class="box-title">{{ 'options'|_ }}</h3>
-                    </div>
-                    <div class="box-body">
-                        {{ ExpandedForm.optionsList('update','transaction') }}
-                    </div>
-                    <div class="box-footer">
-                        <button type="submit" class="pull-right btn btn-success">{{ ('update_reconciliation')|_ }}</button>
-                    </div>
-                </div>
-            </div>
-        </div>
-
-    </form>
-
-
-{% endblock %}
-{% block scripts %}
-    <script type="text/javascript" nonce="{{ JS_NONCE }}">
-        var what = "{{ what }}";
-    </script>
-    <script type="text/javascript" src="v1/js/lib/typeahead/typeahead.bundle.min.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>
-    <script type="text/javascript" src="v1/js/ff/common/autocomplete.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>
-    <script type="text/javascript" src="v1/js/lib/bootstrap-tagsinput.min.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>
-    <script type="text/javascript" src="v1/js/lib/jquery-ui.min.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>
-    <script type="text/javascript" src="v1/js/lib/modernizr-custom.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>
-    <script type="text/javascript" src="v1/jscript/accounts?ext=.js&amp;v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>
-    <script type="text/javascript" src="v1/jscript/currencies?ext=.js&amp;v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>
-    <script type="text/javascript">
-        var journal = {{ journal.toArray()|json_encode|raw }};
-        var journalData = {{ data|json_encode|raw }};
-    </script>
-    <script type="text/javascript" src="v1/js/ff/accounts/edit-reconciliation.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>
-{% endblock %}
-{% block styles %}
-    <link href="v1/css/bootstrap-tagsinput.css?v={{ FF_VERSION }}" type="text/css" rel="stylesheet"  media="all" nonce="{{ JS_NONCE }}">
-    <link href="v1/css/jquery-ui/jquery-ui.structure.min.css?v={{ FF_VERSION }}" type="text/css" rel="stylesheet"  media="all" nonce="{{ JS_NONCE }}">
-    <link href="v1/css/jquery-ui/jquery-ui.theme.min.css?v={{ FF_VERSION }}" type="text/css" rel="stylesheet"  media="all" nonce="{{ JS_NONCE }}">
-{% endblock %}

resources/views/accounts/show.twig

@@ -17,10 +17,13 @@
                     </h3>
                     <div class="box-tools pull-right">
                         <div class="btn-group">
-                            <button class="btn btn-box-tool dropdown-toggle" data-toggle="dropdown"><span class="fa fa-ellipsis-v"></span></button>
+                            <button class="btn btn-box-tool dropdown-toggle" data-toggle="dropdown"><span
+                                        class="fa fa-ellipsis-v"></span></button>
                             <ul class="dropdown-menu" role="menu">
-                                <li><a href="{{ route('accounts.edit', account.id) }}"><span class="fa fa-pencil fa-fw"></span> {{ 'edit'|_ }}</a></li>
+                                <li><a href="{{ route('accounts.edit', account.id) }}"><span
-                                <li><a href="{{ route('accounts.delete', account.id) }}"><span class="fa fa-trash fa-fw"></span> {{ 'delete'|_ }}</a></li>
+                                                class="fa fa-pencil fa-fw"></span> {{ 'edit'|_ }}</a></li>
+                                <li><a href="{{ route('accounts.delete', account.id) }}"><span
+                                                class="fa fa-trash fa-fw"></span> {{ 'delete'|_ }}</a></li>
                             </ul>
                         </div>
                     </div>
@@ -133,7 +136,8 @@
         <div class="{% if periods|length > 0 %}col-lg-10 col-md-8 col-sm-12{% else %}col-lg-12 col-md-12 col-sm-12{% endif %}">
             <div class="box">
                 <div class="box-header with-border">
-                    <h3 class="box-title">{{ 'transactions'|_ }} ({{ formatAmountBySymbol(balance, currency.symbol, currency.decimal_places, true)|raw }})</h3>
+                    <h3 class="box-title">{{ 'transactions'|_ }}
+                        ({{ formatAmountBySymbol(balance, currency.symbol, currency.decimal_places, true)|raw }})</h3>
                 </div>
                 <div class="box-body">
                     {% if account.accountType.type == 'Asset account' %}
@@ -168,15 +172,11 @@
 
 {% block scripts %}
     <script type="text/javascript" nonce="{{ JS_NONCE }}">
-        var doPlaceMarker = false;
         // location stuff
         {% if location %}
         var latitude = {{ location.latitude|default("52.3167") }};
         var longitude = {{ location.longitude|default("5.5500") }};
         var zoomLevel = {{ location.zoom_level|default("6") }};
-            doPlaceMarker = true;
-            // token for Mapbox:
-            var mapboxToken = "{{ config('firefly.mapbox_api_key') }}";
         {% endif %}
 
         var showAll = true;
@@ -207,13 +207,16 @@
     {% if location %}
         <script src="v1/lib/leaflet/leaflet.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>
     {% endif %}
-    <script type="text/javascript" src="v1/js/lib/Chart.bundle.min.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>
+    <script type="text/javascript" src="v1/js/lib/Chart.bundle.min.js?v={{ FF_VERSION }}"
-    <script type="text/javascript" src="v1/js/lib/chartjs-plugin-annotation.min.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>
+            nonce="{{ JS_NONCE }}"></script>
+    <script type="text/javascript" src="v1/js/lib/chartjs-plugin-annotation.min.js?v={{ FF_VERSION }}"
+            nonce="{{ JS_NONCE }}"></script>
     <script type="text/javascript" src="v1/js/ff/charts.defaults.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>
     <script type="text/javascript" src="v1/js/ff/charts.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>
 
     <script src="v1/js/lib/jquery-ui.min.js?v={{ FF_VERSION }}" type="text/javascript" nonce="{{ JS_NONCE }}"></script>
-    <script src="v1/js/lib/jquery.color-2.1.2.min.js?v={{ FF_VERSION }}" type="text/javascript" nonce="{{ JS_NONCE }}"></script>
+    <script src="v1/js/lib/jquery.color-2.1.2.min.js?v={{ FF_VERSION }}" type="text/javascript"
+            nonce="{{ JS_NONCE }}"></script>
     <script src="v1/js/ff/accounts/show.js?v={{ FF_VERSION }}" type="text/javascript" nonce="{{ JS_NONCE }}"></script>
     {# required for groups.twig #}
     <script type="text/javascript" src="v1/js/ff/list/groups.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>

resources/views/admin/link/delete.twig

@@ -6,7 +6,8 @@
 
 {% block content %}
 
-    <form method="POST" action="{{ route('admin.links.destroy',linkType.id) }}" accept-charset="UTF-8" class="form-horizontal" id="destroy">
+    <form method="POST" action="{{ route('admin.links.destroy',linkType.id) }}" accept-charset="UTF-8"
+          class="form-horizontal" id="destroy">
         <input name="_token" type="hidden" value="{{ csrf_token() }}">
         <div class="row">
             <div class="col-lg-6 col-lg-offset-3 col-md-12 col-sm-12">
@@ -34,7 +35,7 @@
                             </p>
 
                             <p>
-                                {{ Form.select('move_link_type_before_delete', moveTo, null, {class: 'form-control'}) }}
+                                {{ Html.select('move_link_type_before_delete', moveTo).class('form-control') }}
                             </p>
                         {% else %}
                             <input type="hidden" name="move_link_type_before_delete" value="0"/>
@@ -42,7 +43,8 @@
 
                     </div>
                     <div class="box-footer">
-                        <input type="submit" name="submit" value="{{ trans('form.deletePermanently') }}" class="btn pull-right btn-danger"/>
+                        <input type="submit" name="submit" value="{{ trans('form.deletePermanently') }}"
+                               class="btn pull-right btn-danger"/>
                         <a href="{{ URL.previous() }}" class="btn-default btn">{{ trans('form.cancel') }}</a>
                     </div>
                 </div>

resources/views/admin/link/edit.twig

@@ -6,7 +6,9 @@
 
 {% block content %}
 
-    {{ Form.model(linkType, {'class' : 'form-horizontal','id' : 'update','url' : route('admin.links.update', linkType.id) } ) }}
+    <form method="post" action="{{ route('admin.links.update', linkType.id) }}" class="form-horizontal"
+          accept-charset="UTF-8"
+          enctype="multipart/form-data">
         <input type="hidden" name="id" value="{{ linkType.id }}"/>
         <input name="_token" type="hidden" value="{{ csrf_token() }}">
         <div class="row">

resources/views/admin/users/edit.twig

@@ -5,8 +5,10 @@
 {% endblock %}
 {% block content %}
 
-
+    <form method="post" action="{{ route('admin.users.update',user.id) }}" class="form-horizontal"
-    {{ Form.model(user, {'class' : 'form-horizontal','id' : 'update','url' : route('admin.users.update',user.id) } ) }}
+          accept-charset="UTF-8"
+          enctype="multipart/form-data">
+        <input type="hidden" name="_token" value="{{ csrf_token() }}"/>
 
         <input type="hidden" name="id" value="{{ user.id }}"/>
 

resources/views/bills/edit.twig

@@ -6,8 +6,9 @@
 
 {% block content %}
 
-    {{ Form.model(bill, {'class' : 'form-horizontal','enctype': 'multipart/form-data','id' : 'update','url' : route('bills.update', bill.id)}) }}
+    <form method="post" action="{{ route('bills.update', bill.id) }}" class="form-horizontal" accept-charset="UTF-8"
-
+          enctype="multipart/form-data">
+        <input type="hidden" name="_token" value="{{ csrf_token() }}"/>
         <input type="hidden" name="id" value="{{ bill.id }}"/>
 
         <div class="row">
@@ -74,17 +75,24 @@
 
 {% endblock %}
 {% block styles %}
-    <link href="v1/css/bootstrap-tagsinput.css?v={{ FF_VERSION }}" type="text/css" rel="stylesheet"  media="all" nonce="{{ JS_NONCE }}">
+    <link href="v1/css/bootstrap-tagsinput.css?v={{ FF_VERSION }}" type="text/css" rel="stylesheet" media="all"
-    <link href="v1/css/jquery-ui/jquery-ui.structure.min.css?v={{ FF_VERSION }}" type="text/css" rel="stylesheet"  media="all" nonce="{{ JS_NONCE }}">
+          nonce="{{ JS_NONCE }}">
-    <link href="v1/css/jquery-ui/jquery-ui.theme.min.css?v={{ FF_VERSION }}" type="text/css" rel="stylesheet"  media="all" nonce="{{ JS_NONCE }}">
+    <link href="v1/css/jquery-ui/jquery-ui.structure.min.css?v={{ FF_VERSION }}" type="text/css" rel="stylesheet"
+          media="all" nonce="{{ JS_NONCE }}">
+    <link href="v1/css/jquery-ui/jquery-ui.theme.min.css?v={{ FF_VERSION }}" type="text/css" rel="stylesheet"
+          media="all" nonce="{{ JS_NONCE }}">
 {% endblock %}
 {% block scripts %}
-    <script type="text/javascript" src="v1/js/lib/bootstrap-tagsinput.min.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>
+    <script type="text/javascript" src="v1/js/lib/bootstrap-tagsinput.min.js?v={{ FF_VERSION }}"
-    <script type="text/javascript" src="v1/js/lib/modernizr-custom.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>
+            nonce="{{ JS_NONCE }}"></script>
+    <script type="text/javascript" src="v1/js/lib/modernizr-custom.js?v={{ FF_VERSION }}"
+            nonce="{{ JS_NONCE }}"></script>
     <script type="text/javascript" src="v1/js/lib/jquery-ui.min.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>
     <script type="text/javascript" src="v1/js/ff/accounts/edit.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>
 
     {# auto complete for object groups #}
-    <script type="text/javascript" src="v1/js/lib/typeahead/typeahead.bundle.min.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>
+    <script type="text/javascript" src="v1/js/lib/typeahead/typeahead.bundle.min.js?v={{ FF_VERSION }}"
-    <script type="text/javascript" src="v1/js/ff/object-groups/create-edit.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>
+            nonce="{{ JS_NONCE }}"></script>
+    <script type="text/javascript" src="v1/js/ff/object-groups/create-edit.js?v={{ FF_VERSION }}"
+            nonce="{{ JS_NONCE }}"></script>
 {% endblock %}

resources/views/budgets/edit.twig

@@ -5,7 +5,9 @@
 {% endblock %}
 
 {% block content %}
-    {{ Form.model(budget, {'class' : 'form-horizontal','enctype': 'multipart/form-data','id' : 'update','url' : route('budgets.update',budget.id) } ) }}
+    <form method="post" action="{{ route('budgets.update',budget.id) }}" class="form-horizontal" accept-charset="UTF-8"
+          enctype="multipart/form-data">
+        <input type="hidden" name="_token" value="{{ csrf_token() }}"/>
         <input type="hidden" name="id" value="{{ budget.id }}"/>
         <div class="row">
             <div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">

resources/views/categories/edit.twig

@@ -5,7 +5,12 @@
 {% endblock %}
 
 {% block content %}
-    {{ Form.model(category, {'class' : 'form-horizontal','enctype': 'multipart/form-data','id' : 'update','url' : route('categories.update',category.id)}) }}
+
+    <form method="post" action="{{ route('categories.update',category.id) }}" class="form-horizontal"
+          accept-charset="UTF-8"
+          enctype="multipart/form-data">
+        <input type="hidden" name="_token" value="{{ csrf_token() }}"/>
+
         <input type="hidden" name="id" value="{{ category.id }}"/>
         <div class="row">
             <div class="col-lg-6 col-md-6 col-sm-12">

resources/views/currencies/edit.twig

@@ -5,7 +5,10 @@
 {% endblock %}
 
 {% block content %}
-    {{ Form.model(currency, {'class' : 'form-horizontal','id' : 'update','url' : route('currencies.update',currency.id)}) }}
+    <form method="post" action="{{ route('currencies.update',currency.id) }}" class="form-horizontal"
+          accept-charset="UTF-8"
+          enctype="multipart/form-data">
+        <input type="hidden" name="_token" value="{{ csrf_token() }}"/>
 
         <input type="hidden" name="id" value="{{ currency.id }}"/>
         <div class="row">

resources/views/form/amount-no-currency.twig

@@ -1,7 +1,7 @@
 <div class="{{ classes }}" id="{{ name }}_holder">
     <label for="{{ options.id }}" class="col-sm-4 control-label">{{ label }}</label>
     <div class="col-sm-8">
-        {{ Form.input('number', name, value, options) }}
+        {{ Html.input('number', name, value).class('form-control').attribute('step','any').attribute('autocomplete','off').attribute('spellcheck','false').attribute('placeholder',options.placeholder) }}
         {% include 'form.help' %}
         {% include 'form.feedback' %}
     </div>

resources/views/form/amount-small.twig

@@ -1,24 +1 @@
-<div class="input-group">
+TODO REPLACE ME
-    <div class="input-group-btn">
-        <button type="button"
-                class="btn btn-default dropdown-toggle currency-dropdown" id="currency_dropdown_{{ name }}" data-toggle="dropdown"
-                aria-expanded="false">
-            <span id="currency_select_symbol_{{ name }}">{{ defaultCurrency.symbol|raw }}</span> <span class="caret"></span>
-        </button>
-        <ul class="dropdown-menu currency-dropdown-menu" role="menu">
-            {% for currency in currencies %}
-                <li>
-                    <a href="#"
-                       class="currency-option"
-                       data-id="{{ currency.id }}"
-                       data-name="{{ name }}"
-                       data-currency="{{ currency.code }}"
-                       data-symbol="{{ currency.symbol|raw }}">{{ currency.name }}</a></li>
-            {% endfor %}
-        </ul>
-    </div>
-    {{ Form.input('number', name, value, options) }}
-
-
-</div>
-<input type="hidden" name="amount_currency_id_{{ name }}" value="{{ defaultCurrency.id }}"/>

resources/views/form/amount.twig

@@ -1,33 +1 @@
-<div class="{{ classes }}" id="{{ name }}_holder">
+TODO REPLACE ME
-    <label for="{{ options.id }}" class="col-sm-4 control-label">{{ label }}</label>
-
-    <div class="col-sm-8">
-        <div class="input-group">
-            <div class="input-group-btn">
-                <button type="button"
-                        class="btn btn-default dropdown-toggle currency-dropdown" id="currency_dropdown_{{ name }}" data-toggle="dropdown"
-                        aria-expanded="false">
-                    <span id="currency_select_symbol_{{ name }}">{{ defaultCurrency.symbol|raw }}</span> <span class="caret"></span>
-                </button>
-                <ul class="dropdown-menu currency-dropdown-menu" role="menu">
-                    {% for currency in currencies %}
-                        <li>
-                            <a href="#"
-                               class="currency-option"
-                               data-id="{{ currency.id }}"
-                               data-name="{{ name }}"
-                               data-currency="{{ currency.code }}"
-                               data-symbol="{{ currency.symbol|raw }}">{{ currency.name }}</a></li>
-                    {% endfor %}
-                </ul>
-            </div>
-            {{ Form.input('number', name, value, options) }}
-
-
-        </div>
-
-        {% include 'form.feedback' %}
-    </div>
-    <!-- Going to put in this value: {{ defaultCurrency.id }} -->
-    <input type="hidden" name="amount_currency_id_{{ name }}" value="{{ defaultCurrency.id }}" data-backup="{{ defaultCurrency.id }}"/>
-</div>

resources/views/form/assetAccountCheckList.twig

@@ -8,9 +8,9 @@
                 <div class="checkbox" style="margin-left:2em;">
                     <label>
                         {% if account in selected or (selected|length == 0 and options.select_all == true) %}
-                            {{ Form.checkbox(name~'[]', id, true, options) }}
+                            {{ Html.checkbox(name~'[]',true).id(id) }}
                         {% else %}
-                            {{ Form.checkbox(name~'[]', id, false, options) }}
+                            {{ Html.checkbox(name~'[]',false).id(id) }}
                         {% endif %}
                         {{ account|escape }}
                     </label>

resources/views/form/balance.twig

@@ -5,9 +5,11 @@
         <div class="input-group">
             <div class="input-group-btn">
                 <button type="button"
-                        class="btn btn-default dropdown-toggle currency-dropdown" id="currency_dropdown_{{ name }}" data-toggle="dropdown"
+                        class="btn btn-default dropdown-toggle currency-dropdown" id="currency_dropdown_{{ name }}"
+                        data-toggle="dropdown"
                         aria-expanded="false">
-                    <span id="currency_select_symbol_{{ name }}">{{ defaultCurrency.symbol|raw }}</span> <span class="caret"></span>
+                    <span id="currency_select_symbol_{{ name }}">{{ defaultCurrency.symbol|raw }}</span> <span
+                            class="caret"></span>
                 </button>
                 <ul class="dropdown-menu currency-dropdown-menu" role="menu">
                     {% for currency in currencies %}
@@ -21,8 +23,7 @@
                     {% endfor %}
                 </ul>
             </div>
-            {{ Form.input('number', name, value, options) }}
+            {{ Html.input('number', name, value).class('form-control').attribute('step','any') }}
-
 
         </div>
 

resources/views/form/checkbox.twig

@@ -10,7 +10,7 @@
     <div class="{% if options.small %}col-sm-4{% else %}col-sm-8{% endif %}">
         <div class="checkbox">
             <label>
-                {{ Form.checkbox(name, value, options.checked, options) }}
+                {{ Html.checkbox(name, options.checked, value) }}
             </label>
         </div>
         {% include 'form.help' %}

resources/views/form/date.twig

@@ -6,7 +6,7 @@
             <div class="input-group-addon">
                 <span class="fa fa-calendar"></span>
             </div>
-            {{ Form.input('date', name, value, options) }}
+            {{ Html.input('date', name, value).class('form-control').attribute('autocomplete','off').attribute('spellcheck','false') }}
         </div>
         {% include 'form.help' %}
         {% include 'form.feedback' %}

resources/views/form/file.twig

@@ -2,7 +2,7 @@
     <label for="{{ options.id }}" class="col-sm-4 control-label">{{ label }}</label>
 
     <div class="col-sm-8">
-        {{ Form.file(name, options) }}
+        {{ Html.input('file',name).attribute('multiple','multiple').class('form-control') }}
         {% include 'form.help' %}
         {% include 'form.feedback' %}
     </div>

resources/views/form/integer.twig

@@ -2,7 +2,7 @@
     <label for="{{ options.id }}" class="col-sm-4 control-label">{{ label }}</label>
 
     <div class="col-sm-8">
-        {{ Form.input('number', name, value, options) }}
+        {{ Html.input('number', name, value).attribute('step',options.step).attribute('autocomplete','off').attribute('spellcheck', 'false').class('form-control').attribute('placeholder',options.placeholder) }}
         {% include 'form.help' %}
         {% include 'form.feedback' %}
     </div>

resources/views/form/location.twig

@@ -1,114 +1 @@
-<div class="{{ classes }}" id="{{ name }}_holder">
+TODO REMOVE ME 3
-    <label for="{{ options.id }}" class="col-sm-4 control-label">{{ label }}</label>
-    <div class="col-sm-8">
-        {% if config('firefly.mapbox_api_key') == '' %}
-            <p class="text-danger">
-                {{ trans('firefly.mapbox_api_key')|raw }}
-            </p>
-        {% else %}
-            <div id="{{ name }}_map" style="width:100%;height:300px;"></div>
-            <div id="{{ name }}_map_canvas"></div>
-            <p class="help-block">
-                {{ 'press_object_location'|_ }}
-                <button class="btn btn-default btn-xs" type="button" id="{{ name }}_clear_location">{{ 'clear_location'|_ }}</button>
-            </p>
-            {# latitude #}
-            <input type="hidden" name="{{ name }}_latitude" value="{{ options.locations[name].latitude|default('52.3167') }}"/>
-
-            {# longitude #}
-            <input type="hidden" name="{{ name }}_longitude" value="{{ options.locations[name].longitude|default('5.5500') }}"/>
-
-            {# zoomlevel #}
-            <input type="hidden" name="{{ name }}_zoom_level" value="{{ options.locations[name].zoom_level|default('6') }}"/>
-
-            {# has location set? #}
-            <input type="hidden" name="{{ name }}_has_location" value="{{ options.locations[name].has_location|default('false') }}"/>
-            {% include 'form.feedback' %}
-        {% endif %}
-    </div>
-</div>
-
-{% if config('firefly.mapbox_api_key') != '' %}
-    {% set latitudevar = name~'_latitude' %}
-    {% set longitudevar = name~'_longitude' %}
-    {% set zoomlevelvar = name~'_zoom_level' %}
-    {% set haslocationvar = name~'_has_location' %}
-    {% set clearvar = name~'_clear_location' %}
-
-    <script type="text/javascript" nonce="{{ JS_NONCE }}">
-        var mymap;
-        var marker;
-        if (typeof locations.{{ name }}.latitude === 'undefined') {
-            locations.{{ name }}.latitude = '52.3167';
-        }
-        if (typeof locations.{{ name }}.longitude === 'undefined') {
-            locations.{{ name }}.longitude = '5.5500';
-        }
-        if (typeof locations.{{ name }}.zoom_level === 'undefined') {
-            locations.{{ name }}.zoom_level = '6';
-        }
-
-        if (typeof mapboxToken === 'undefined') {
-            var mapboxToken = 'invalid';
-        }
-        window.onload = function () {
-            document.getElementById('{{ clearvar }}').addEventListener('click', function () {
-                if (typeof marker !== 'undefined') {
-                    marker.remove();
-                    $('input[name="{{ haslocationvar }}"]').val('false');
-                    $('input[name="{{ latitudevar }}"]').val('');
-                    $('input[name="{{ longitudevar }}"]').val('');
-                    $('input[name="{{ zoomlevelvar }}"]').val('');
-                }
-            });
-        };
-
-
-        // set location thing:
-        function setObjectLocation(e) {
-            if (typeof e.latlng !== 'undefined') {
-                console.log('Set object location: lat(' + e.latlng.lat + '), long(' + e.latlng.lng + '), zoom (' + mymap.getZoom() + ')');
-                $('input[name="{{ latitudevar }}"]').val(e.latlng.lat);
-                $('input[name="{{ longitudevar }}"]').val(e.latlng.lng);
-                $('input[name="{{ haslocationvar }}"]').val('true');
-            }
-            if (typeof e.latlng === 'undefined') {
-                console.log('Set object zoom level to ' + mymap.getZoom());
-            }
-            $('input[name="{{ zoomlevelvar }}"]').val(mymap.getZoom());
-
-
-            // remove existing marker:
-            if (typeof marker !== 'undefined' && typeof e.latlng !== 'undefined') {
-                marker.remove();
-            }
-            if (typeof e.latlng !== 'undefined') {
-                // new marker
-                marker = L.marker({lat: e.latlng.lat, lng: e.latlng.lng}).addTo(mymap);
-            }
-        }
-
-
-        document.addEventListener("DOMContentLoaded", function () {
-            "use strict";
-
-            // make map:
-            mymap = L.map('{{ name }}_map').setView({lat: locations.{{ name }}.latitude, lng: locations.{{ name }}.longitude}, locations.{{ name }}.zoom_level);
-
-            L.tileLayer('https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png?access_token={accessToken}', {
-                attribution: '&copy; <a href="https://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors',
-                maxZoom: 18,
-                id: 'mapbox.streets',
-                accessToken: mapboxToken
-            }).addTo(mymap);
-
-            mymap.on('contextmenu', setObjectLocation);
-            mymap.on('zoomend', setObjectLocation);
-
-            // add marker
-            if (typeof locations.{{ name }}.has_location !== 'undefined' && locations.{{ name }}.has_location === true) {
-                marker = L.marker({lat: locations.{{ name }}.latitude, lng: locations.{{ name }}.longitude}).addTo(mymap);
-            }
-        });
-    </script>
-{% endif %}

resources/views/form/non-selectable-amount.twig

@@ -1,11 +1 @@
-<div class="{{ classes }}" id="{{ name }}_holder">
+TODO REMOVE ME 1
-    <label for="{{ options.id }}" class="col-sm-4 control-label">{{ label }}</label>
-
-    <div class="col-sm-8">
-        <div class="input-group">
-            <span class="input-group-addon non-selectable-currency-symbol">{{ selectedCurrency.symbol }}</span>
-            {{ Form.input('number', name, value, options) }}
-        </div>
-        {% include 'form.feedback' %}
-    </div>
-</div>

resources/views/form/number.twig

@@ -1,9 +1 @@
-<div class="{{ classes }}" id="{{ name }}_holder">
+TODO REMOVE ME
-    <label for="{{ options.id }}" class="col-sm-4 control-label">{{ label }}</label>
-
-    <div class="col-sm-8">
-        {{ Form.input('number', name, value, options) }}
-        {% include 'form.help' %}
-        {% include 'form.feedback' %}
-    </div>
-</div>

resources/views/form/object_group.twig

@@ -2,7 +2,7 @@
     <label for="{{ options.id }}" class="col-sm-4 control-label">{{ label }}</label>
 
     <div class="col-sm-8">
-        {{ Form.input('text', name, value, options) }}
+        {{ Html.input('text', name, value).class('form-control').attribute('autocomplete','off').attribute('spellcheck','false').attribute('placeholder',options.placeholder) }}
         {% include 'form.help' %}
         {% include 'form.feedback' %}
     </div>

resources/views/form/options.twig

@@ -7,7 +7,7 @@
         <div class="col-sm-8">
             <div class="checkbox">
                 <label>
-                    {{ Form.checkbox('create_another', '1', false, {'id': name ~ '_return_to_form'}) }}
+                    {{ Html.checkbox('create_another', false).id(name ~ '_return_to_form') }}
                     {{ trans('form.returnHereExplanation') }}
 
                 </label>
@@ -24,7 +24,7 @@
 
         <div class="col-sm-8">
             <div class="checkbox"><label>
-                    {{ Form.checkbox('return_to_edit', '1', null, {'id': name ~ '_return_to_edit'}) }}
+                    {{ Html.checkbox('return_to_edit', null).id(name ~ '_return_to_edit') }}
                     {{ trans('form.returnHereUpdateExplanation') }}
                 </label>
             </div>

resources/views/form/password.twig

@@ -2,7 +2,7 @@
     <label for="{{ options.id }}" class="col-sm-4 control-label">{{ label }}</label>
 
     <div class="col-sm-8">
-        {{ Form.input('password', name, value, options) }}
+        {{ Html.input('password', name, value).class('form-control').attribute('placeholder',options.placeholder).attribute('autocomplete','off').attribute('spellcheck','false') }}
         {% include 'form.help' %}
         {% include 'form.feedback' %}
     </div>

resources/views/form/percentage.twig

@@ -3,7 +3,7 @@
 
     <div class="col-sm-8">
         <div class="input-group">
-            {{ Form.input('number', name, value, options) }}
+            {{ Html.input('number', name, value).attribute('step',options.step).attribute('autocomplete','off').attribute('spellcheck', 'false').class('form-control').attribute('placeholder',options.placeholder) }}
             <div class="input-group-addon">%</div>
         </div>
         {% include 'form.help' %}

resources/views/form/select.twig

@@ -2,7 +2,7 @@
     <label for="{{ options.id }}" class="col-sm-4 control-label">{{ label }}</label>
 
     <div class="col-sm-8">
-        {{ Form.select(name, list, selected , options ) }}
+        {{ Html.select(name, list, selected).class('form-control').attribute('autocomplete','off').attribute('spellcheck','false').attribute('placeholder',options.placeholder) }}
         {% include 'form.help' %}
         {% include 'form.feedback' %}
 

resources/views/form/tags.twig

@@ -1,8 +1 @@
-<div class="{{ classes }}" id="{{ name }}_holder">
+TODO REMOVE ME
-    <label for="{{ options.id }}" class="col-sm-4 control-label">{{ label }}</label>
-
-    <div class="col-sm-8">
-        {{ Form.input('text', name, value, options) }}
-        {% include 'form.feedback' %}
-    </div>
-</div>

resources/views/form/text.twig

@@ -2,7 +2,7 @@
     <label for="{{ options.id }}" class="col-sm-4 control-label">{{ label }}</label>
 
     <div class="col-sm-8">
-        {{ Form.input('text', name, value, options) }}
+        {{ Html.input('text', name, value).class('form-control').attribute('autocomplete','off').attribute('spellcheck','false').attribute('placeholder',options.placeholder) }}
         {% include 'form.help' %}
         {% include 'form.feedback' %}
     </div>

resources/views/form/textarea.twig

@@ -2,7 +2,7 @@
     <label for="{{ options.id }}" class="col-sm-4 control-label">{{ label }}</label>
 
     <div class="col-sm-8">
-        {{ Form.textarea(name, value, options) }}
+        {{ Html.textarea(name, value).attribute('rows', options.rows).class('form-control').attribute('autocomplete','off').attribute('spellcheck','false').attribute('placeholder',options.placeholder) }}
         {% include 'form.help' %}
         {% include 'form.feedback' %}
     </div>

resources/views/new-user/index.twig

@@ -34,19 +34,21 @@
                             {{ 'savings_balance_text'|_ }}
                         </p>
 
-                        {{ ExpandedForm.number('savings_balance',0) }}
+                        {{ ExpandedForm.integer('savings_balance',0, {"step": "any"}) }}
 
                         <p>
                             {{ 'set_preferred_language'|_ }}
                         </p>
                         <div id="language_holder" class="form-group">
-                            <label for="language_holder_select" class="col-sm-4 control-label">{{ 'language'|_ }}</label>
+                            <label for="language_holder_select"
+                                   class="col-sm-4 control-label">{{ 'language'|_ }}</label>
                             <div class="col-sm-8">
                                 <select class="form-control" id="lang_holder" name="language">
                                     {% for key, lang in Config.get('firefly.languages') %}
                                         <option {% if language == key %}
                                             selected
-                                        {% endif %} value="{{ key }}">{{ lang.name_locale }} ({{ lang.name_english }})</option>
+                                        {% endif %} value="{{ key }}">{{ lang.name_locale }} ({{ lang.name_english }})
+                                        </option>
 
                                     {% endfor %}
                                 </select>

resources/views/object-groups/edit.twig

@@ -5,7 +5,10 @@
 {% endblock %}
 
 {% block content %}
-    {{ Form.model(objectGroup, {'class' : 'form-horizontal','enctype': 'multipart/form-data','id' : 'update','url' : route('object-groups.update',objectGroup.id)}) }}
+    <form method="post" action="{{ route('object-groups.update',objectGroup.id) }}" class="form-horizontal"
+          accept-charset="UTF-8"
+          enctype="multipart/form-data">
+        <input type="hidden" name="_token" value="{{ csrf_token() }}"/>
 
         <input type="hidden" name="id" value="{{ objectGroup.id }}"/>
 
@@ -44,15 +47,21 @@
     </form>
 {% endblock %}
 {% block scripts %}
-    <script type="text/javascript" src="v1/js/lib/modernizr-custom.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>
+    <script type="text/javascript" src="v1/js/lib/modernizr-custom.js?v={{ FF_VERSION }}"
+            nonce="{{ JS_NONCE }}"></script>
     <script type="text/javascript" src="v1/js/lib/jquery-ui.min.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>
-    <script type="text/javascript" src="v1/js/ff/piggy-banks/create.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>
+    <script type="text/javascript" src="v1/js/ff/piggy-banks/create.js?v={{ FF_VERSION }}"
+            nonce="{{ JS_NONCE }}"></script>
     {# auto complete for object groups #}
-    <script type="text/javascript" src="v1/js/lib/typeahead/typeahead.bundle.min.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>
+    <script type="text/javascript" src="v1/js/lib/typeahead/typeahead.bundle.min.js?v={{ FF_VERSION }}"
-    <script type="text/javascript" src="v1/js/ff/object-groups/create-edit.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>
+            nonce="{{ JS_NONCE }}"></script>
+    <script type="text/javascript" src="v1/js/ff/object-groups/create-edit.js?v={{ FF_VERSION }}"
+            nonce="{{ JS_NONCE }}"></script>
 {% endblock %}
 
 {% block styles %}
-    <link href="v1/css/jquery-ui/jquery-ui.structure.min.css?v={{ FF_VERSION }}" type="text/css" rel="stylesheet"  media="all" nonce="{{ JS_NONCE }}">
+    <link href="v1/css/jquery-ui/jquery-ui.structure.min.css?v={{ FF_VERSION }}" type="text/css" rel="stylesheet"
-    <link href="v1/css/jquery-ui/jquery-ui.theme.min.css?v={{ FF_VERSION }}" type="text/css" rel="stylesheet"  media="all" nonce="{{ JS_NONCE }}">
+          media="all" nonce="{{ JS_NONCE }}">
+    <link href="v1/css/jquery-ui/jquery-ui.theme.min.css?v={{ FF_VERSION }}" type="text/css" rel="stylesheet"
+          media="all" nonce="{{ JS_NONCE }}">
 {% endblock %}

resources/views/piggy-banks/edit.twig

@@ -5,7 +5,10 @@
 {% endblock %}
 
 {% block content %}
-    {{ Form.model(piggyBank, {'class' : 'form-horizontal','enctype': 'multipart/form-data','id' : 'update','url' : route('piggy-banks.update',piggyBank.id)}) }}
+    <form method="post" action="{{ route('piggy-banks.update',piggyBank.id) }}" class="form-horizontal"
+          accept-charset="UTF-8"
+          enctype="multipart/form-data">
+        <input type="hidden" name="_token" value="{{ csrf_token() }}"/>
 
         <input type="hidden" name="repeats" value="0"/>
         <input type="hidden" name="id" value="{{ piggyBank.id }}"/>
@@ -63,15 +66,21 @@
     </form>
 {% endblock %}
 {% block scripts %}
-    <script type="text/javascript" src="v1/js/lib/modernizr-custom.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>
+    <script type="text/javascript" src="v1/js/lib/modernizr-custom.js?v={{ FF_VERSION }}"
+            nonce="{{ JS_NONCE }}"></script>
     <script type="text/javascript" src="v1/js/lib/jquery-ui.min.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>
-    <script type="text/javascript" src="v1/js/ff/piggy-banks/create.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>
+    <script type="text/javascript" src="v1/js/ff/piggy-banks/create.js?v={{ FF_VERSION }}"
+            nonce="{{ JS_NONCE }}"></script>
     {# auto complete for object groups #}
-    <script type="text/javascript" src="v1/js/lib/typeahead/typeahead.bundle.min.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>
+    <script type="text/javascript" src="v1/js/lib/typeahead/typeahead.bundle.min.js?v={{ FF_VERSION }}"
-    <script type="text/javascript" src="v1/js/ff/object-groups/create-edit.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>
+            nonce="{{ JS_NONCE }}"></script>
+    <script type="text/javascript" src="v1/js/ff/object-groups/create-edit.js?v={{ FF_VERSION }}"
+            nonce="{{ JS_NONCE }}"></script>
 {% endblock %}
 
 {% block styles %}
-    <link href="v1/css/jquery-ui/jquery-ui.structure.min.css?v={{ FF_VERSION }}" type="text/css" rel="stylesheet"  media="all" nonce="{{ JS_NONCE }}">
+    <link href="v1/css/jquery-ui/jquery-ui.structure.min.css?v={{ FF_VERSION }}" type="text/css" rel="stylesheet"
-    <link href="v1/css/jquery-ui/jquery-ui.theme.min.css?v={{ FF_VERSION }}" type="text/css" rel="stylesheet"  media="all" nonce="{{ JS_NONCE }}">
+          media="all" nonce="{{ JS_NONCE }}">
+    <link href="v1/css/jquery-ui/jquery-ui.theme.min.css?v={{ FF_VERSION }}" type="text/css" rel="stylesheet"
+          media="all" nonce="{{ JS_NONCE }}">
 {% endblock %}

resources/views/recurring/create.twig

@@ -4,7 +4,8 @@
 {% endblock %}
 {% block content %}
 
-    <form action="{{ route('recurring.store') }}" method="post" id="store" class="form-horizontal" enctype="multipart/form-data">
+    <form action="{{ route('recurring.store') }}" method="post" id="store" class="form-horizontal"
+          enctype="multipart/form-data">
         <input type="hidden" name="_token" value="{{ csrf_token() }}"/>
         {# row with recurrence information #}
         <div class="row">
@@ -20,15 +21,16 @@
                         {{ preFilled.first_date.format('Y-m-d') }}
                         {{ ExpandedForm.date('first_date',null, {helpText: trans('firefly.help_first_date'), min: preFilled.first_date}) }}
                         {{ ExpandedForm.select('repetition_type', [], null, {helpText: trans('firefly.change_date_other_options')}) }}
-                        {{ ExpandedForm.number('skip', 0) }}
+                        {{ ExpandedForm.integer('skip',0) }}
                         {{ ExpandedForm.select('weekend', weekendResponses, null, {helpText: trans('firefly.help_weekend')}) }}
                         {{ ExpandedForm.select('repetition_end', repetitionEnds) }}
                         {{ ExpandedForm.date('repeat_until',null) }}
-                        {{ ExpandedForm.number('repetitions',null) }}
+                        {{ ExpandedForm.integer('repetitions',null) }}
 
                         {# calendar in popup #}
                         <div class="form-group" id="calendar_holder">
-                            <label for="ffInput_calendar" class="col-sm-4 control-label">{{ trans('form.calendar') }}</label>
+                            <label for="ffInput_calendar"
+                                   class="col-sm-4 control-label">{{ trans('form.calendar') }}</label>
 
                             <div class="col-sm-8">
                                 <p class="form-control-static" id="ffInput_calendar">
@@ -75,9 +77,12 @@
 
                             <div class="col-sm-8">
                                 <div class="btn-group btn-group-sm">
-                                    <a href="#" class="btn btn-default switch-button" data-value="withdrawal">{{ 'withdrawal'|_ }}</a>
+                                    <a href="#" class="btn btn-default switch-button"
-                                    <a href="#" class="btn btn-default switch-button" data-value="deposit">{{ 'deposit'|_ }}</a>
+                                       data-value="withdrawal">{{ 'withdrawal'|_ }}</a>
-                                    <a href="#" class="btn btn-default switch-button" data-value="transfer">{{ 'transfer'|_ }}</a>
+                                    <a href="#" class="btn btn-default switch-button"
+                                       data-value="deposit">{{ 'deposit'|_ }}</a>
+                                    <a href="#" class="btn btn-default switch-button"
+                                       data-value="transfer">{{ 'transfer'|_ }}</a>
                                 </div>
                             </div>
                         </div>
@@ -200,24 +205,34 @@
     </div>
 {% endblock %}
 {% block scripts %}
-    <script type="text/javascript" src="v1/js/lib/modernizr-custom.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>
+    <script type="text/javascript" src="v1/js/lib/modernizr-custom.js?v={{ FF_VERSION }}"
-    <script type="text/javascript" src="v1/js/lib/typeahead/typeahead.bundle.min.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>
+            nonce="{{ JS_NONCE }}"></script>
-    <script type="text/javascript" src="v1/js/ff/common/autocomplete.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>
+    <script type="text/javascript" src="v1/js/lib/typeahead/typeahead.bundle.min.js?v={{ FF_VERSION }}"
-    <script type="text/javascript" src="v1/js/lib/bootstrap-tagsinput.min.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>
+            nonce="{{ JS_NONCE }}"></script>
+    <script type="text/javascript" src="v1/js/ff/common/autocomplete.js?v={{ FF_VERSION }}"
+            nonce="{{ JS_NONCE }}"></script>
+    <script type="text/javascript" src="v1/js/lib/bootstrap-tagsinput.min.js?v={{ FF_VERSION }}"
+            nonce="{{ JS_NONCE }}"></script>
     <script type="text/javascript" src="v1/js/lib/jquery-ui.min.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>
-    <script type="text/javascript" src="v1/lib/fc/fullcalendar.min.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>
+    <script type="text/javascript" src="v1/lib/fc/fullcalendar.min.js?v={{ FF_VERSION }}"
+            nonce="{{ JS_NONCE }}"></script>
     <script type="text/javascript" nonce="{{ JS_NONCE }}">
         var transactionType = "{{ preFilled.transaction_type }}";
         var suggestUrl = "{{ route('recurring.suggest') }}";
         var eventsUrl = "{{ route('recurring.events') }}";
         var oldRepetitionType = "{{ oldRepetitionType }}";
     </script>
-    <script type="text/javascript" src="v1/js/ff/recurring/create.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>
+    <script type="text/javascript" src="v1/js/ff/recurring/create.js?v={{ FF_VERSION }}"
+            nonce="{{ JS_NONCE }}"></script>
 {% endblock %}
 
 {% block styles %}
-    <link href="v1/css/bootstrap-tagsinput.css?v={{ FF_VERSION }}" type="text/css" rel="stylesheet"  media="all" nonce="{{ JS_NONCE }}">
+    <link href="v1/css/bootstrap-tagsinput.css?v={{ FF_VERSION }}" type="text/css" rel="stylesheet" media="all"
-    <link href="v1/css/jquery-ui/jquery-ui.structure.min.css?v={{ FF_VERSION }}" type="text/css" rel="stylesheet"  media="all" nonce="{{ JS_NONCE }}">
+          nonce="{{ JS_NONCE }}">
-    <link href="v1/css/jquery-ui/jquery-ui.theme.min.css?v={{ FF_VERSION }}" type="text/css" rel="stylesheet"  media="all" nonce="{{ JS_NONCE }}">
+    <link href="v1/css/jquery-ui/jquery-ui.structure.min.css?v={{ FF_VERSION }}" type="text/css" rel="stylesheet"
-    <link href="v1/lib/fc/fullcalendar.min.css?v={{ FF_VERSION }}" type="text/css" rel="stylesheet"  media="all" nonce="{{ JS_NONCE }}">
+          media="all" nonce="{{ JS_NONCE }}">
+    <link href="v1/css/jquery-ui/jquery-ui.theme.min.css?v={{ FF_VERSION }}" type="text/css" rel="stylesheet"
+          media="all" nonce="{{ JS_NONCE }}">
+    <link href="v1/lib/fc/fullcalendar.min.css?v={{ FF_VERSION }}" type="text/css" rel="stylesheet" media="all"
+          nonce="{{ JS_NONCE }}">
 {% endblock %}

resources/views/recurring/edit.twig

@@ -4,8 +4,11 @@
 {% endblock %}
 {% block content %}
 
-    {{ Form.model(recurrence, {'class' : 'form-horizontal','enctype': 'multipart/form-data','id' : 'update','url' : route('recurring.update', recurrence.id)}) }}
+    <form method="post" action="{{ route('recurring.update', recurrence.id) }}" class="form-horizontal"
+          accept-charset="UTF-8"
+          enctype="multipart/form-data">
         <input type="hidden" name="_token" value="{{ csrf_token() }}"/>
+
         {# row with recurrence information #}
         <div class="row">
 
@@ -20,15 +23,16 @@
                         {{ ExpandedForm.text('title') }}
                         {{ ExpandedForm.date('first_date',array.first_date, {helpText: trans('firefly.help_first_date_no_past')}) }}
                         {{ ExpandedForm.select('repetition_type', [], null, {helpText: trans('firefly.change_date_other_options')}) }}
-                        {{ ExpandedForm.number('skip', array.repetitions[0].skip) }}
+                        {{ ExpandedForm.integer('skip', array.repetitions[0].skip) }}
                         {{ ExpandedForm.select('weekend', weekendResponses, array.repetitions[0].weekend, {helpText: trans('firefly.help_weekend')}) }}
                         {{ ExpandedForm.select('repetition_end', repetitionEnds, repetitionEnd) }}
                         {{ ExpandedForm.date('repeat_until',array.repeat_until) }}
-                        {{ ExpandedForm.number('repetitions', array.nr_of_repetitions) }}
+                        {{ ExpandedForm.integer('repetitions', array.nr_of_repetitions) }}
 
                         {# calendar in popup #}
                         <div class="form-group" id="calendar_holder">
-                            <label for="ffInput_calendar" class="col-sm-4 control-label">{{ trans('form.calendar') }}</label>
+                            <label for="ffInput_calendar"
+                                   class="col-sm-4 control-label">{{ trans('form.calendar') }}</label>
 
                             <div class="col-sm-8">
                                 <p class="form-control-static" id="ffInput_calendar">
@@ -75,9 +79,12 @@
 
                             <div class="col-sm-8">
                                 <div class="btn-group btn-group-sm">
-                                    <a href="#" class="btn btn-default switch-button" data-value="withdrawal">{{ 'withdrawal'|_ }}</a>
+                                    <a href="#" class="btn btn-default switch-button"
-                                    <a href="#" class="btn btn-default switch-button" data-value="deposit">{{ 'deposit'|_ }}</a>
+                                       data-value="withdrawal">{{ 'withdrawal'|_ }}</a>
-                                    <a href="#" class="btn btn-default switch-button" data-value="transfer">{{ 'transfer'|_ }}</a>
+                                    <a href="#" class="btn btn-default switch-button"
+                                       data-value="deposit">{{ 'deposit'|_ }}</a>
+                                    <a href="#" class="btn btn-default switch-button"
+                                       data-value="transfer">{{ 'transfer'|_ }}</a>
                                 </div>
                             </div>
                         </div>
@@ -197,12 +204,17 @@
     </div>
 {% endblock %}
 {% block scripts %}
-    <script type="text/javascript" src="v1/js/lib/modernizr-custom.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>
+    <script type="text/javascript" src="v1/js/lib/modernizr-custom.js?v={{ FF_VERSION }}"
-    <script type="text/javascript" src="v1/js/lib/typeahead/typeahead.bundle.min.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>
+            nonce="{{ JS_NONCE }}"></script>
-    <script type="text/javascript" src="v1/js/ff/common/autocomplete.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>
+    <script type="text/javascript" src="v1/js/lib/typeahead/typeahead.bundle.min.js?v={{ FF_VERSION }}"
-    <script type="text/javascript" src="v1/js/lib/bootstrap-tagsinput.min.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>
+            nonce="{{ JS_NONCE }}"></script>
+    <script type="text/javascript" src="v1/js/ff/common/autocomplete.js?v={{ FF_VERSION }}"
+            nonce="{{ JS_NONCE }}"></script>
+    <script type="text/javascript" src="v1/js/lib/bootstrap-tagsinput.min.js?v={{ FF_VERSION }}"
+            nonce="{{ JS_NONCE }}"></script>
     <script type="text/javascript" src="v1/js/lib/jquery-ui.min.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>
-    <script type="text/javascript" src="v1/lib/fc/fullcalendar.min.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>
+    <script type="text/javascript" src="v1/lib/fc/fullcalendar.min.js?v={{ FF_VERSION }}"
+            nonce="{{ JS_NONCE }}"></script>
     <script type="text/javascript" nonce="{{ JS_NONCE }}">
         var transactionType = "{{ preFilled.transaction_type }}";
         var suggestUrl = "{{ route('recurring.suggest') }}";
@@ -213,8 +225,12 @@
 {% endblock %}
 
 {% block styles %}
-    <link href="v1/css/bootstrap-tagsinput.css?v={{ FF_VERSION }}" type="text/css" rel="stylesheet"  media="all" nonce="{{ JS_NONCE }}">
+    <link href="v1/css/bootstrap-tagsinput.css?v={{ FF_VERSION }}" type="text/css" rel="stylesheet" media="all"
-    <link href="v1/css/jquery-ui/jquery-ui.structure.min.css?v={{ FF_VERSION }}" type="text/css" rel="stylesheet"  media="all" nonce="{{ JS_NONCE }}">
+          nonce="{{ JS_NONCE }}">
-    <link href="v1/css/jquery-ui/jquery-ui.theme.min.css?v={{ FF_VERSION }}" type="text/css" rel="stylesheet"  media="all" nonce="{{ JS_NONCE }}">
+    <link href="v1/css/jquery-ui/jquery-ui.structure.min.css?v={{ FF_VERSION }}" type="text/css" rel="stylesheet"
-    <link href="v1/lib/fc/fullcalendar.min.css?v={{ FF_VERSION }}" type="text/css" rel="stylesheet"  media="all" nonce="{{ JS_NONCE }}">
+          media="all" nonce="{{ JS_NONCE }}">
+    <link href="v1/css/jquery-ui/jquery-ui.theme.min.css?v={{ FF_VERSION }}" type="text/css" rel="stylesheet"
+          media="all" nonce="{{ JS_NONCE }}">
+    <link href="v1/lib/fc/fullcalendar.min.css?v={{ FF_VERSION }}" type="text/css" rel="stylesheet" media="all"
+          nonce="{{ JS_NONCE }}">
 {% endblock %}

resources/views/rules/rule-group/edit.twig

@@ -5,7 +5,11 @@
 {% endblock %}
 
 {% block content %}
-    {{ Form.model(ruleGroup, {'class' : 'form-horizontal','id' : 'update','url' : route('rule-groups.update',ruleGroup.id) } ) }}
+    <form method="post" action="{{ route('rule-groups.update',ruleGroup.id) }}" class="form-horizontal"
+          accept-charset="UTF-8"
+          enctype="multipart/form-data">
+        <input type="hidden" name="_token" value="{{ csrf_token() }}"/>
+
         <input type="hidden" name="id" value="{{ ruleGroup.id }}"/>
         <div class="row">
             <div class="col-lg-6 col-md-12 col-sm-6">
@@ -56,5 +60,6 @@
 
 {% endblock %}
 {% block scripts %}
-    <script type="text/javascript" src="v1/js/ff/rule-groups/edit.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>
+    <script type="text/javascript" src="v1/js/ff/rule-groups/edit.js?v={{ FF_VERSION }}"
+            nonce="{{ JS_NONCE }}"></script>
 {% endblock %}

resources/views/rules/rule-group/select-transactions.twig

@@ -6,7 +6,8 @@
 
 {% block content %}
 
-    <form method="POST" action="{{ route('rule-groups.execute', ruleGroup.id) }}" accept-charset="UTF-8" class="form-horizontal" id="execute-rule-group">
+    <form method="POST" action="{{ route('rule-groups.execute', ruleGroup.id) }}" accept-charset="UTF-8"
+          class="form-horizontal" id="execute-rule-group">
         <input name="_token" type="hidden" value="{{ csrf_token() }}">
 
         <div class="row">
@@ -31,7 +32,8 @@
                         </div>
                     </div>
                     <div class="box-footer">
-                        <input type="submit" name="submit" value="{{ 'execute'|_ }}" id="do-execute-button" class="btn btn-success pull-right"/>
+                        <input type="submit" name="submit" value="{{ 'execute'|_ }}" id="do-execute-button"
+                               class="btn btn-success pull-right"/>
                     </div>
                 </div>
             </div>
@@ -39,12 +41,16 @@
     </form>
 {% endblock %}
 {% block scripts %}
-    <script type="text/javascript" src="v1/js/lib/modernizr-custom.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>
+    <script type="text/javascript" src="v1/js/lib/modernizr-custom.js?v={{ FF_VERSION }}"
+            nonce="{{ JS_NONCE }}"></script>
     <script type="text/javascript" src="v1/js/lib/jquery-ui.min.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>
-    <script type="text/javascript" src="v1/js/ff/rules/select-transactions.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>
+    <script type="text/javascript" src="v1/js/ff/rules/select-transactions.js?v={{ FF_VERSION }}"
+            nonce="{{ JS_NONCE }}"></script>
 {% endblock %}
 
 {% block styles %}
-    <link href="v1/css/jquery-ui/jquery-ui.structure.min.css?v={{ FF_VERSION }}" type="text/css" rel="stylesheet"  media="all" nonce="{{ JS_NONCE }}">
+    <link href="v1/css/jquery-ui/jquery-ui.structure.min.css?v={{ FF_VERSION }}" type="text/css" rel="stylesheet"
-    <link href="v1/css/jquery-ui/jquery-ui.theme.min.css?v={{ FF_VERSION }}" type="text/css" rel="stylesheet"  media="all" nonce="{{ JS_NONCE }}">
+          media="all" nonce="{{ JS_NONCE }}">
+    <link href="v1/css/jquery-ui/jquery-ui.theme.min.css?v={{ FF_VERSION }}" type="text/css" rel="stylesheet"
+          media="all" nonce="{{ JS_NONCE }}">
 {% endblock %}

resources/views/rules/rule/edit.twig

@@ -5,7 +5,10 @@
 {% endblock %}
 
 {% block content %}
-    {{ Form.model(rule, {'class' : 'form-horizontal','id' : 'store','url' : route('rules.update', rule.id)}) }}
+
+    <form method="post" action="{{ route('rules.update', rule.id) }}" class="form-horizontal" accept-charset="UTF-8"
+          enctype="multipart/form-data">
+        <input type="hidden" name="_token" value="{{ csrf_token() }}"/>
         <input type="hidden" name="id" value="{{ rule.id }}"/>
         <div class="row">
             <div class="col-lg-6 col-md-6 col-sm-12">
@@ -66,7 +69,8 @@
                         <p>
                             <br/>
                             <a href="#" class="btn btn-default add_rule_trigger">{{ 'add_rule_trigger'|_ }}</a>
-                        <a href="#" class="btn btn-default test_rule_triggers"><span class="fa fa-flask"></span> {{ 'test_rule_triggers'|_ }}</a>
+                            <a href="#" class="btn btn-default test_rule_triggers"><span
+                                        class="fa fa-flask"></span> {{ 'test_rule_triggers'|_ }}</a>
                         </p>
                     </div>
                 </div>
@@ -129,12 +133,14 @@
 
 {% endblock %}
 {% block scripts %}
-    <script type="text/javascript" src="v1/js/lib/typeahead/typeahead.bundle.min.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>
+    <script type="text/javascript" src="v1/js/lib/typeahead/typeahead.bundle.min.js?v={{ FF_VERSION }}"
+            nonce="{{ JS_NONCE }}"></script>
     <script type="text/javascript" nonce="{{ JS_NONCE }}">
         var triggerCount = {{ triggerCount }};
         var actionCount = {{ actionCount }};
         var testRuleTriggersText = '{{ 'test_rule_triggers'|_|escape('js') }}';
     </script>
-    <script type="text/javascript" src="v1/js/ff/rules/create-edit.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>
+    <script type="text/javascript" src="v1/js/ff/rules/create-edit.js?v={{ FF_VERSION }}"
+            nonce="{{ JS_NONCE }}"></script>
 
 {% endblock %}

resources/views/tags/create.twig

@@ -10,7 +10,8 @@
         var locations = {{ locations|json_encode|raw }};
         var mapboxToken = "{{ config('firefly.mapbox_api_key') }}";
     </script>
-    <form method="POST" action="{{ route('tags.store') }}" accept-charset="UTF-8" class="form-horizontal" id="store" enctype="multipart/form-data">
+    <form method="POST" action="{{ route('tags.store') }}" accept-charset="UTF-8" class="form-horizontal" id="store"
+          enctype="multipart/form-data">
         <input name="_token" type="hidden" value="{{ csrf_token() }}">
         <div class="row">
             <div class="col-lg-5 col-md-5 col-sm-12">
@@ -33,7 +34,6 @@
                     <div class="box-body">
                         {{ ExpandedForm.date('date') }}
                         {{ ExpandedForm.textarea('description') }}
-                        {{ ExpandedForm.location('location', null, {locations: locations}) }}
                         {{ ExpandedForm.file('attachments[]', {'multiple': 'multiple','helpText': trans('firefly.upload_max_file_size', {'size': uploadSize|filesize}) }) }}
                     </div>
                 </div>
@@ -61,13 +61,14 @@
     </form>
 {% endblock %}
 {% block scripts %}
-    <script src="v1/lib/leaflet/leaflet.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>
+    <script type="text/javascript" src="v1/js/lib/modernizr-custom.js?v={{ FF_VERSION }}"
-    <script type="text/javascript" src="v1/js/lib/modernizr-custom.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>
+            nonce="{{ JS_NONCE }}"></script>
     <script type="text/javascript" src="v1/js/lib/jquery-ui.min.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>
     <script src="v1/js/ff/tags/create-edit.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>
 {% endblock %}
 {% block styles %}
-    <link rel="stylesheet" href="v1/lib/leaflet/leaflet.css?v={{ FF_VERSION }}"/>
+    <link href="v1/css/jquery-ui/jquery-ui.structure.min.css?v={{ FF_VERSION }}" type="text/css" rel="stylesheet"
-    <link href="v1/css/jquery-ui/jquery-ui.structure.min.css?v={{ FF_VERSION }}" type="text/css" rel="stylesheet"  media="all" nonce="{{ JS_NONCE }}">
+          media="all" nonce="{{ JS_NONCE }}">
-    <link href="v1/css/jquery-ui/jquery-ui.theme.min.css?v={{ FF_VERSION }}" type="text/css" rel="stylesheet"  media="all" nonce="{{ JS_NONCE }}">
+    <link href="v1/css/jquery-ui/jquery-ui.theme.min.css?v={{ FF_VERSION }}" type="text/css" rel="stylesheet"
+          media="all" nonce="{{ JS_NONCE }}">
 {% endblock %}

resources/views/tags/edit.twig

@@ -11,8 +11,10 @@
         var mapboxToken = "{{ config('firefly.mapbox_api_key') }}";
     </script>
 
-    {{ Form.model(tag, {'class' : 'form-horizontal','enctype': 'multipart/form-data','id' : 'update','url' : route('tags.update',tag.id)}) }}
 
+    <form method="post" action="{{ route('tags.update',tag.id) }}" class="form-horizontal" accept-charset="UTF-8"
+          enctype="multipart/form-data">
+        <input type="hidden" name="_token" value="{{ csrf_token() }}"/>
         <input type="hidden" name="id" value="{{ tag.id }}"/>
 
         <div class="row">
@@ -36,7 +38,6 @@
                     <div class="box-body">
                         {{ ExpandedForm.date('date', tag.date.format('Y-m-d')) }}
                         {{ ExpandedForm.textarea('description', tag.description) }}
-                    {{ ExpandedForm.location('location', null, {locations: locations}) }}
                         {{ ExpandedForm.file('attachments[]', {'multiple': 'multiple','helpText': trans('firefly.upload_max_file_size', {'size': uploadSize|filesize}) }) }}
                     </div>
                 </div>
@@ -66,13 +67,14 @@
 
 {% endblock %}
 {% block scripts %}
-    <script src="v1/lib/leaflet/leaflet.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>
+    <script type="text/javascript" src="v1/js/lib/modernizr-custom.js?v={{ FF_VERSION }}"
-    <script type="text/javascript" src="v1/js/lib/modernizr-custom.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>
+            nonce="{{ JS_NONCE }}"></script>
     <script type="text/javascript" src="v1/js/lib/jquery-ui.min.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>
     <script src="v1/js/ff/tags/create-edit.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>
 {% endblock %}
 {% block styles %}
-    <link rel="stylesheet" href="v1/lib/leaflet/leaflet.css?v={{ FF_VERSION }}"/>
+    <link href="v1/css/jquery-ui/jquery-ui.structure.min.css?v={{ FF_VERSION }}" type="text/css" rel="stylesheet"
-    <link href="v1/css/jquery-ui/jquery-ui.structure.min.css?v={{ FF_VERSION }}" type="text/css" rel="stylesheet"  media="all" nonce="{{ JS_NONCE }}">
+          media="all" nonce="{{ JS_NONCE }}">
-    <link href="v1/css/jquery-ui/jquery-ui.theme.min.css?v={{ FF_VERSION }}" type="text/css" rel="stylesheet"  media="all" nonce="{{ JS_NONCE }}">
+    <link href="v1/css/jquery-ui/jquery-ui.theme.min.css?v={{ FF_VERSION }}" type="text/css" rel="stylesheet"
+          media="all" nonce="{{ JS_NONCE }}">
 {% endblock %}

resources/views/tags/show.twig

@@ -297,9 +297,6 @@
         var latitude = {{ location.latitude|default("52.3167") }};
         var longitude = {{ location.longitude|default("5.5500") }};
         var zoomLevel = {{ location.zoom_level|default("6") }};
-        var doPlaceMarker = true;
-        // token for Mapbox:
-        var mapboxToken = "{{ config('firefly.mapbox_api_key') }}";
         {% endif %}
     </script>
     <script src="v1/lib/leaflet/leaflet.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>

resources/views/transactions/convert.twig

@@ -5,7 +5,8 @@
 {% endblock %}
 
 {% block content %}
-    <form method="POST" action="{{ route('transactions.convert.index.post', [destinationType.type|lower, group.id]) }}" accept-charset="UTF-8"
+    <form method="POST" action="{{ route('transactions.convert.index.post', [destinationType.type|lower, group.id]) }}"
+          accept-charset="UTF-8"
           class="form-horizontal"
           enctype="multipart/form-data">
         <input name="_token" type="hidden" value="{{ csrf_token() }}">
@@ -71,7 +72,7 @@
                                         {% if sourceType.type == 'Withdrawal' and destinationType.type == 'Deposit' %}
                                             {# NEW DESTINATION = Asset, SOURCE MUST BE [Revenue, Cash, Loan, Debt, Mortgage] #}
                                             {% if transaction.source_type == 'Asset account' %}
-                                                {{ Form.select('source_id['~transaction.transaction_journal_id~']', validDepositSources, null, {class: 'form-control'}) }}
+                                                {{ Html.select('source_id['~transaction.transaction_journal_id~']', validDepositSources).class('form-control') }}
                                             {% endif %}
 
                                             {# NEW DESTINATION = [Loan, Debt, Mortgage], SOURCE MUST BE [Revenue] #}
@@ -96,7 +97,9 @@
                                             <a href="{{ route('accounts.show', [transaction.source_id]) }}"
                                                title="{{ transaction.source_iban|default(transaction.source_name) }}">{{ transaction.source_name }}</a>
                                             {# hide source in hidden input #}
-                                            <input type="hidden" name="source_id[{{ transaction.transaction_journal_id }}]" value="{{ transaction.source_id }}">
+                                            <input type="hidden"
+                                                   name="source_id[{{ transaction.transaction_journal_id }}]"
+                                                   value="{{ transaction.source_id }}">
                                         {% endif %}
 
                                         {# THREE: DEPOSIT TO WITHDRAWAL #}
@@ -105,19 +108,21 @@
                                                title="{{ transaction.destination_iban|default(transaction.destination_name) }}">{{ transaction.destination_name }}</a>
 
                                             {# hide new source in hidden input #}
-                                            <input type="hidden" name="source_id[{{ transaction.transaction_journal_id }}]" value="{{ transaction.destination_id }}">
+                                            <input type="hidden"
+                                                   name="source_id[{{ transaction.transaction_journal_id }}]"
+                                                   value="{{ transaction.destination_id }}">
                                         {% endif %}
 
                                         {# FOUR: DEPOSIT TO TRANSFER #}
                                         {% if sourceType.type == 'Deposit' and destinationType.type == 'Transfer' %}
                                             {# if new destination is asset, then asset #}
                                             {% if transaction.destination_type == 'Asset account' %}
-                                                {{ Form.select('source_id['~transaction.transaction_journal_id~']', assets,null, {class: 'form-control'}) }}
+                                                {{ Html.select('source_id['~transaction.transaction_journal_id~']', assets).class('form-control') }}
                                             {% endif %}
                                             {% if transaction.destination_type == 'Loan' or
                                                 transaction.destination_type == 'Debt' or
                                                 transaction.destination_type == 'Mortgage' %}
-                                                {{ Form.select('source_id['~transaction.transaction_journal_id~']', liabilities,null, {class: 'form-control'}) }}
+                                                {{ Html.select('source_id['~transaction.transaction_journal_id~']', liabilities).class('form-control') }}
                                             {% endif %}
 
                                             {# if new destination liability, then liability. #}
@@ -130,7 +135,9 @@
                                                title="{{ transaction.source_iban|default(transaction.source_name) }}">{{ transaction.source_name }}</a>
 
                                             {# hide source in hidden input #}
-                                            <input type="hidden" name="source_id[{{ transaction.transaction_journal_id }}]" value="{{ transaction.source_id }}">
+                                            <input type="hidden"
+                                                   name="source_id[{{ transaction.transaction_journal_id }}]"
+                                                   value="{{ transaction.source_id }}">
                                         {% endif %}
 
                                         {# SIX: TRANSFER TO DEPOSIT #}
@@ -138,7 +145,7 @@
                                             {# NEW DESTINATION = Asset, SOURCE MUST BE [Revenue, Cash, Loan, Debt, Mortgage] #}
                                             {% if
                                                 transaction.source_type == 'Asset account' %}
-                                                {{ Form.select('source_id['~transaction.transaction_journal_id~']', validDepositSources, null, {class: 'form-control'}) }}
+                                                {{ Html.select('source_id['~transaction.transaction_journal_id~']', validDepositSources).class('form-control') }}
                                             {% endif %}
                                             {# NEW DESTINATION = [Debt, Mortgage, Load], SOURCE MUST BE [Revenue] #}
                                             {% if
@@ -165,7 +172,9 @@
                                                title="{{ transaction.source_iban|default(transaction.source_name) }}">{{ transaction.source_name }}</a>
 
                                             {# hide destination in hidden input #}
-                                            <input type="hidden" name="destination_id[{{ transaction.transaction_journal_id }}]" value="{{ transaction.source_id }}">
+                                            <input type="hidden"
+                                                   name="destination_id[{{ transaction.transaction_journal_id }}]"
+                                                   value="{{ transaction.source_id }}">
                                         {% endif %}
 
                                         {# TWO: WITHDRAWAL TO TRANSFER #}
@@ -175,12 +184,12 @@
                                                 transaction.source_type == 'Loan' or
                                                 transaction.source_type == 'Debt' or
                                                 transaction.source_type == 'Mortgage' %}
-                                                {{ Form.select('destination_id['~transaction.transaction_journal_id~']', liabilities, null, {class: 'form-control'}) }}
+                                                {{ Html.select('destination_id['~transaction.transaction_journal_id~']', liabilities).class('form-control') }}
                                             {% endif %}
 
                                             {# if the source is an asset, destination can only be an asset. #}
                                             {% if transaction.source_type == 'Asset account' %}
-                                                {{ Form.select('destination_id['~transaction.transaction_journal_id~']', assets, null, {class: 'form-control'}) }}
+                                                {{ Html.select('destination_id['~transaction.transaction_journal_id~']', assets).class('form-control') }}
                                             {% endif %}
                                         {% endif %}
 
@@ -189,7 +198,7 @@
 
                                             {# if new source is Asset, destination must be [Expense, Loan, Debt or Mortgage] #}
                                             {% if transaction.destination_type == 'Asset account' %}
-                                                {{ Form.select('destination_id['~transaction.transaction_journal_id~']', validWithdrawalDests, null, {class: 'form-control'}) }}
+                                                {{ Html.select('destination_id['~transaction.transaction_journal_id~']', validWithdrawalDests).class('form-control') }}
                                             {% endif %}
                                             {% if transaction.destination_type == 'Loan' or
                                                 transaction.destination_type == 'Debt' or
@@ -213,14 +222,16 @@
                                                title="{{ transaction.destination_iban|default(transaction.destination_name) }}">{{ transaction.destination_name }}</a>
 
                                             {# hide destination in hidden input #}
-                                            <input type="hidden" name="destination_id[{{ transaction.transaction_journal_id }}]" value="{{ transaction.destination_id }}">
+                                            <input type="hidden"
+                                                   name="destination_id[{{ transaction.transaction_journal_id }}]"
+                                                   value="{{ transaction.destination_id }}">
                                         {% endif %}
 
                                         {# FIVE: TRANSFER TO WITHDRAWAL #}
                                         {% if sourceType.type == 'Transfer' and destinationType.type == 'Withdrawal' %}
 
                                             {% if transaction.source_type == 'Asset account' %}
-                                                {{ Form.select('destination_id['~transaction.transaction_journal_id~']', validWithdrawalDests, null, {class: 'form-control'}) }}
+                                                {{ Html.select('destination_id['~transaction.transaction_journal_id~']', validWithdrawalDests).class('form-control') }}
                                             {% endif %}
                                             {% if transaction.source_type == 'Loan' or
                                                 transaction.source_type == 'Debt' or
@@ -242,7 +253,9 @@
                                                title="{{ transaction.destination_iban|default(transaction.destination_name) }}">{{ transaction.destination_name }}</a>
 
                                             {# hide destination in hidden input #}
-                                            <input type="hidden" name="destination_id[{{ transaction.transaction_journal_id }}]" value="{{ transaction.destination_id }}">
+                                            <input type="hidden"
+                                                   name="destination_id[{{ transaction.transaction_journal_id }}]"
+                                                   value="{{ transaction.destination_id }}">
                                         {% endif %}
                                     </td>
                                     <td>
@@ -280,6 +293,8 @@
 
 {% endblock %}
 {% block scripts %}
-    <script type="text/javascript" src="v1/js/lib/typeahead/typeahead.bundle.min.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>
+    <script type="text/javascript" src="v1/js/lib/typeahead/typeahead.bundle.min.js?v={{ FF_VERSION }}"
-    <script type="text/javascript" src="v1/js/ff/transactions/convert.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>
+            nonce="{{ JS_NONCE }}"></script>
+    <script type="text/javascript" src="v1/js/ff/transactions/convert.js?v={{ FF_VERSION }}"
+            nonce="{{ JS_NONCE }}"></script>
 {% endblock %}