mirror of
https://github.com/firefly-iii/firefly-iii.git
synced 2025-10-03 19:16:51 +00:00
Some database and css fixes. [skip ci]
This commit is contained in:
@@ -71,16 +71,16 @@ class Journal extends Twig_Extension
|
|||||||
|
|
||||||
switch ($type) {
|
switch ($type) {
|
||||||
case 'Withdrawal':
|
case 'Withdrawal':
|
||||||
$txt = '<span class="glyphicon glyphicon-arrow-left" title="' . trans('firefly.withdrawal') . '"></span>';
|
$txt = '<i class="fa fa-long-arrow-left fa-fw" title="' . trans('firefly.withdrawal') . '"></i>';
|
||||||
break;
|
break;
|
||||||
case 'Deposit':
|
case 'Deposit':
|
||||||
$txt = '<span class="glyphicon glyphicon-arrow-right" title="' . trans('firefly.deposit') . '"></span>';
|
$txt = '<i class="fa fa-long-arrow-right fa-fw" title="' . trans('firefly.deposit') . '"></i>';
|
||||||
break;
|
break;
|
||||||
case 'Transfer':
|
case 'Transfer':
|
||||||
$txt = '<i class="fa fa-fw fa-exchange" title="' . trans('firefly.transfer') . '"></i>';
|
$txt = '<i class="fa fa-fw fa-exchange" title="' . trans('firefly.transfer') . '"></i>';
|
||||||
break;
|
break;
|
||||||
case 'Opening balance':
|
case 'Opening balance':
|
||||||
$txt = '<span class="glyphicon glyphicon-ban-circle" title="' . trans('firefly.openingBalance') . '"></span>';
|
$txt = '<i class="fa-fw fa fa-ban" title="' . trans('firefly.openingBalance') . '"></i>';
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
$txt = '';
|
$txt = '';
|
||||||
|
@@ -1,6 +1,7 @@
|
|||||||
<?php
|
<?php
|
||||||
|
|
||||||
use Illuminate\Database\Migrations\Migration;
|
use Illuminate\Database\Migrations\Migration;
|
||||||
|
use Illuminate\Database\Schema\Blueprint;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Class ChangesForV3451
|
* Class ChangesForV3451
|
||||||
@@ -14,14 +15,12 @@ class ChangesForV3451 extends Migration
|
|||||||
*/
|
*/
|
||||||
public function down()
|
public function down()
|
||||||
{
|
{
|
||||||
DB::statement('UPDATE `piggy_banks` SET `reminder_skip` = 0 WHERE `reminder_skip` IS NULL;');
|
|
||||||
DB::statement('ALTER TABLE `piggy_banks` MODIFY `reminder_skip` SMALLINT UNSIGNED NOT NULL;');
|
|
||||||
|
|
||||||
DB::statement('UPDATE `piggy_banks` SET `remind_me` = 0 WHERE `remind_me` IS NULL;');
|
|
||||||
DB::statement('ALTER TABLE `piggy_banks` MODIFY `remind_me` TINYINT UNSIGNED NOT NULL;');
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
//$table->smallInteger('reminder_skip')->unsigned();
|
||||||
|
//$table->boolean('remind_me');
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Run the migrations.
|
* Run the migrations.
|
||||||
*
|
*
|
||||||
@@ -30,11 +29,6 @@ class ChangesForV3451 extends Migration
|
|||||||
public function up()
|
public function up()
|
||||||
{
|
{
|
||||||
|
|
||||||
DB::statement('ALTER TABLE `piggy_banks` MODIFY `reminder_skip` SMALLINT UNSIGNED NULL;');
|
|
||||||
DB::statement('ALTER TABLE `piggy_banks` MODIFY `remind_me` TINYINT UNSIGNED NULL;');
|
|
||||||
|
|
||||||
//'reminder_skip'
|
|
||||||
//'remind_me'
|
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@@ -263,6 +263,8 @@ class TestDataSeeder extends Seeder
|
|||||||
'targetamount' => 2000,
|
'targetamount' => 2000,
|
||||||
'startdate' => $this->som,
|
'startdate' => $this->som,
|
||||||
'targetdate' => null,
|
'targetdate' => null,
|
||||||
|
'reminder_skip' => 0,
|
||||||
|
'remind_me' => 0,
|
||||||
'order' => 0,
|
'order' => 0,
|
||||||
]
|
]
|
||||||
);
|
);
|
||||||
@@ -277,6 +279,8 @@ class TestDataSeeder extends Seeder
|
|||||||
'targetamount' => 2000,
|
'targetamount' => 2000,
|
||||||
'startdate' => $this->som,
|
'startdate' => $this->som,
|
||||||
'targetdate' => $end,
|
'targetdate' => $end,
|
||||||
|
'reminder_skip' => 0,
|
||||||
|
'remind_me' => 0,
|
||||||
'order' => 0,
|
'order' => 0,
|
||||||
]
|
]
|
||||||
);
|
);
|
||||||
@@ -298,6 +302,8 @@ class TestDataSeeder extends Seeder
|
|||||||
'targetamount' => 1000,
|
'targetamount' => 1000,
|
||||||
'startdate' => $this->som,
|
'startdate' => $this->som,
|
||||||
'targetdate' => $nextYear,
|
'targetdate' => $nextYear,
|
||||||
|
'reminder_skip' => 0,
|
||||||
|
'remind_me' => 0,
|
||||||
'order' => 0,
|
'order' => 0,
|
||||||
]
|
]
|
||||||
);
|
);
|
||||||
@@ -308,6 +314,8 @@ class TestDataSeeder extends Seeder
|
|||||||
'targetamount' => 1000,
|
'targetamount' => 1000,
|
||||||
'startdate' => $this->som,
|
'startdate' => $this->som,
|
||||||
'targetdate' => null,
|
'targetdate' => null,
|
||||||
|
'reminder_skip' => 0,
|
||||||
|
'remind_me' => 0,
|
||||||
'order' => 0,
|
'order' => 0,
|
||||||
]
|
]
|
||||||
);
|
);
|
||||||
@@ -422,7 +430,8 @@ class TestDataSeeder extends Seeder
|
|||||||
$user = User::whereEmail('thegrumpydictator@gmail.com')->first();
|
$user = User::whereEmail('thegrumpydictator@gmail.com')->first();
|
||||||
|
|
||||||
Tag::create(
|
Tag::create(
|
||||||
['tag' => 'TagOne', 'tagMode' => 'nothing', 'user_id' => $user->id]);
|
['tag' => 'TagOne', 'tagMode' => 'nothing', 'user_id' => $user->id]
|
||||||
|
);
|
||||||
|
|
||||||
Tag::create(['tag' => 'TagTwo', 'tagMode' => 'nothing', 'user_id' => $user->id]);
|
Tag::create(['tag' => 'TagTwo', 'tagMode' => 'nothing', 'user_id' => $user->id]);
|
||||||
Tag::create(['tag' => 'TagThree', 'tagMode' => 'nothing', 'user_id' => $user->id]);
|
Tag::create(['tag' => 'TagThree', 'tagMode' => 'nothing', 'user_id' => $user->id]);
|
||||||
|
13
public/bootstrap/css/bootstrap.min.css
vendored
Normal file → Executable file
13
public/bootstrap/css/bootstrap.min.css
vendored
Normal file → Executable file
File diff suppressed because one or more lines are too long
11
public/bootstrap/js/bootstrap.min.js
vendored
Normal file → Executable file
11
public/bootstrap/js/bootstrap.min.js
vendored
Normal file → Executable file
File diff suppressed because one or more lines are too long
Reference in New Issue
Block a user