Skip to content

Commit 6890086

Browse files
committed
Merge pull request #757 from loostro/v1.1
Update FA to 4.0
2 parents 957febe + d16bb80 commit 6890086

27 files changed

+140
-143
lines changed

Generator/Action/Batch/DeleteAction.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ public function __construct($name, BaseBuilder $builder)
1616
{
1717
parent::__construct($name, 'batch');
1818

19-
$this->setIcon('glyphicon-remove');
19+
$this->setIcon('fa-times');
2020
$this->setLabel('action.batch.delete.label');
2121
$this->setConfirm('action.batch.delete.confirm');
2222
$this->setCsrfProtected(true);

Generator/Action/Generic/ExcelAction.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ public function __construct($name, BaseBuilder $builder)
1818
parent::__construct($name, 'generic');
1919

2020
$this->setClass('btn-primary');
21-
$this->setIcon('glyphicon-white glyphicon-print');
21+
$this->setIcon('fa-print');
2222
$this->setLabel('action.generic.excel');
2323
}
2424
}

Generator/Action/Generic/ListAction.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ public function __construct($name, BaseBuilder $builder)
1616
{
1717
parent::__construct($name, 'generic');
1818

19-
$this->setIcon('glyphicon-list-alt');
19+
$this->setIcon('fa-list-alt');
2020
$this->setLabel('action.generic.list');
2121
}
2222
}

Generator/Action/Generic/NewAction.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ public function __construct($name, BaseBuilder $builder)
1717
parent::__construct($name, 'generic');
1818

1919
$this->setClass('btn-primary');
20-
$this->setIcon('glyphicon-white glyphicon-plus');
20+
$this->setIcon('fa-plus');
2121
$this->setLabel('action.generic.new');
2222
}
2323
}

Generator/Action/Generic/SaveAction.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ public function __construct($name, BaseBuilder $builder)
1717

1818
$this->setSubmit(true);
1919
$this->setClass('btn-success');
20-
$this->setIcon('glyphicon-ok glyphicon-white');
20+
$this->setIcon('fa-check');
2121
$this->setLabel('action.generic.save');
2222
}
2323
}

Generator/Action/Generic/SaveAndAddAction.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ public function __construct($name, BaseBuilder $builder)
1717

1818
$this->setSubmit(true);
1919
$this->setClass('btn-primary');
20-
$this->setIcon('glyphicon-plus glyphicon-white');
20+
$this->setIcon('fa-check');
2121
$this->setLabel('action.generic.save-and-add');
2222
}
2323
}

Generator/Action/Generic/SaveAndListAction.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ public function __construct($name, BaseBuilder $builder)
1717

1818
$this->setSubmit(true);
1919
$this->setClass('btn-info');
20-
$this->setIcon('glyphicon-list-alt glyphicon-white');
20+
$this->setIcon('fa-check');
2121
$this->setLabel('action.generic.save-and-list');
2222
}
2323
}

Generator/Action/Object/DeleteAction.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ public function __construct($name, BaseBuilder $builder)
1717
{
1818
parent::__construct($name, 'object');
1919

20-
$this->setIcon('glyphicon-remove');
20+
$this->setIcon('fa-times');
2121
$this->setLabel('action.object.delete.label');
2222
$this->setConfirm('action.object.delete.confirm');
2323
$this->setCsrfProtected(true);

Generator/Action/Object/EditAction.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ public function __construct($name, BaseBuilder $builder)
1616
{
1717
parent::__construct($name, 'object');
1818

19-
$this->setIcon('glyphicon-edit');
19+
$this->setIcon('fa-edit');
2020
$this->setLabel('action.object.edit.label');
2121

2222
$this->setRoute($builder->getBaseActionsRoute().'_edit');

Generator/Action/Object/ShowAction.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ public function __construct($name, BaseBuilder $builder)
1616
{
1717
parent::__construct($name, 'object');
1818

19-
$this->setIcon('glyphicon-eye-open');
19+
$this->setIcon('fa-eye');
2020
$this->setLabel('action.object.show.label');
2121

2222
$this->setRoute($builder->getBaseActionsRoute().'_show');

0 commit comments

Comments
 (0)