From a64ec3f9133c4d9efce381444bb5792745a837d1 Mon Sep 17 00:00:00 2001 From: "Timothy J. Warren" Date: Thu, 27 Oct 2022 11:55:16 -0400 Subject: [PATCH] Add start of CPU section --- src/Controller/CpuController.php | 56 ++++++++ src/Entity/Cpu.php | 86 +++++++++++- src/Entity/CpuCache.php | 56 ++++++++ src/Enum/CpuArchitectureEnum.php | 19 +++ src/Form/CpuType.php | 57 ++++++++ src/Migrations/Version20221027154708.php | 108 +++++++++++++++ templates/base.html.twig | 4 +- templates/brand/edit.html.twig | 7 +- templates/cpu/edit.html.twig | 30 +++++ templates/cpu/index.html.twig | 111 ++++++++++++++++ templates/cpu/new.html.twig | 23 ++++ templates/cpu/show.html.twig | 162 +++++++++++++++++++++++ templates/form.html.twig | 2 +- templates/fpu/edit.html.twig | 2 +- templates/fpu/index.html.twig | 4 +- templates/fpu/new.html.twig | 4 +- templates/fpu/show.html.twig | 4 +- 17 files changed, 716 insertions(+), 19 deletions(-) create mode 100644 src/Controller/CpuController.php create mode 100644 src/Entity/CpuCache.php create mode 100644 src/Enum/CpuArchitectureEnum.php create mode 100644 src/Form/CpuType.php create mode 100644 src/Migrations/Version20221027154708.php create mode 100644 templates/cpu/edit.html.twig create mode 100644 templates/cpu/index.html.twig create mode 100644 templates/cpu/new.html.twig create mode 100644 templates/cpu/show.html.twig diff --git a/src/Controller/CpuController.php b/src/Controller/CpuController.php new file mode 100644 index 0000000..c6385b2 --- /dev/null +++ b/src/Controller/CpuController.php @@ -0,0 +1,56 @@ +itemListView('cpus', []); + } + + #[Route('/new', name: 'app_cpu_new', methods: ['GET', 'POST'])] + public function new(Request $request): Response + { + return $this->itemCreate($request, 'cpu'); + } + + #[Route('/{id}', name: 'app_cpu_show', methods: ['GET'])] + public function show(Cpu $cpu): Response + { + return $this->itemView($cpu, 'cpu'); + } + + #[Route('/{id}/edit', name: 'app_cpu_edit', methods: ['GET', 'POST'])] + public function edit(Request $request, Cpu $cpu): Response + { + return $this->itemUpdate($request, $cpu, 'cpu'); + } + + #[Route('/{id}', name: 'app_cpu_delete', methods: ['POST'])] + public function delete(Request $request, Cpu $cpu): Response + { + return $this->deleteCSRF($request, $cpu); + } +} diff --git a/src/Entity/Cpu.php b/src/Entity/Cpu.php index a0762ae..405400b 100644 --- a/src/Entity/Cpu.php +++ b/src/Entity/Cpu.php @@ -2,34 +2,108 @@ namespace App\Entity; +use App\Enum\CpuArchitectureEnum; use Doctrine\Common\Collections\{Collection, ArrayCollection}; use Doctrine\ORM\Mapping as ORM; -#[ORM\Table(name: 'cpu', schema: 'collection')] +#[ORM\Table('cpu', schema: 'collection')] #[ORM\Entity] class Cpu { + use CpuCache; use GetSetTrait; - #[ORM\Column(name: 'id', type: 'integer', nullable: FALSE)] + #[ORM\Column('id', type: 'integer', nullable: FALSE)] #[ORM\Id] #[ORM\GeneratedValue(strategy: 'IDENTITY')] private int $id; #[ORM\ManyToOne(targetEntity: 'Brand', fetch: 'EAGER')] #[ORM\OrderBy(['name' => 'asc'])] - #[ORM\JoinColumn(name: 'brand_id', referencedColumnName: 'id', nullable: FALSE)] + #[ORM\JoinColumn('brand_id', referencedColumnName: 'id', nullable: FALSE)] private Brand $brand; + #[ORM\Column('architecture', type: 'string', enumType: CpuArchitectureEnum::class)] + private string $architecture; + /** * @var Collection */ #[ORM\ManyToMany(targetEntity: Socket::class)] - #[ORM\JoinTable(name: 'collection.cpu_socket_link')] - #[ORM\JoinColumn(name: 'socket_id', referencedColumnName: 'id')] - #[ORM\InverseJoinColumn(name: 'cpu_id', referencedColumnName: 'id')] + #[ORM\JoinTable('collection.cpu_socket_link')] + #[ORM\JoinColumn('socket_id', referencedColumnName: 'id')] + #[ORM\InverseJoinColumn('cpu_id', referencedColumnName: 'id')] #[ORM\OrderBy(['name' => 'asc'])] private Collection $sockets; + #[ORM\Column('product_line', type: 'string')] + private string $productLine; + + #[ORM\Column('model', type: 'string')] + private string $model; + + #[ORM\Column('part_number', type: 'string')] + private string $partNumber; + + #[ORM\Column('lot_number', type: 'string', nullable: TRUE, options: array( + 'comment' => 'The CPU lot number, such as s-spec for Intel CPUs' + ))] + private ?string $lotNumber; + + #[ORM\Column('micro_architecture', type: 'string')] + private string $microArchitecture = ''; + + #[ORM\Column('codename', type: 'string')] + private string $codeName = ''; + + #[ORM\Column('base_speed', type: 'integer', options: array( + 'comment' => 'The stock speed of the cpu in MHz' + ))] + private int $baseSpeed; + + #[ORM\Column('boost_speed', type: 'integer', nullable: true, options: array( + 'comment' => 'The max boost speed of the cpu in MHz, if applicable' + ))] + private ?int $boostSpeed; + + #[ORM\Column('cores', type: 'integer')] + private int $cores = 1; + + #[ORM\Column('threads', type: 'integer')] + private int $threads = 1; + + #[ORM\Column('igp', type: 'string', nullable: true, options: array( + 'comment' => 'The name of the integrated graphics processor' + ))] + private ?string $igp; + + #[ORM\Column('voltage', type: 'float', nullable: true)] + private ?float $voltage; + + #[ORM\Column('tdp', type: 'integer')] + private ?int $tdp; + + #[ORM\Column('process_node', type: 'integer', nullable: TRUE)] + private ?int $processNode; + + #[ORM\Column('count', type: 'integer')] + private int $count = 1; + + #[ORM\Column('usable', type: 'boolean', options: array( + 'comment' => 'Whether the chip is working, and can be used with other hardware I have' + ))] + private bool $usable = true; + + #[ORM\Column('received', type: 'boolean', options: array( + 'comment' => "Whether I have the chip in my possession (instead of in shipping)" + ))] + private bool $received = true; + + #[ORM\Column('link', type: 'string')] + private string $link; + + #[ORM\Column('notes', type: 'string')] + private string $notes = ''; + public function __construct() { $this->sockets = new ArrayCollection(); diff --git a/src/Entity/CpuCache.php b/src/Entity/CpuCache.php new file mode 100644 index 0000000..74934c4 --- /dev/null +++ b/src/Entity/CpuCache.php @@ -0,0 +1,56 @@ + 'The number of L1 caches on the package, usually the same as the number of cores' + ))] + private int $L1Count = 1; + + #[ORM\Column('l1_data_size', type: 'integer', nullable: true, options: array( + 'comment' => 'The size of each Level 1 data cache in KB' + ))] + private ?int $L1dSize; + + #[ORM\Column('l1_code_size', type: 'integer', nullable: true, options: array( + 'comment' => 'The size of each Level 1 instruction cache in KB' + ))] + private ?int $L1cSize; + + #[ORM\Column('l1_unified_size', type: 'integer', nullable: true, options: array( + 'comment' => 'The size of each Level 1 unified cache in KB' + ))] + private ?int $L1uSize; + + #[ORM\Column('l1_way', type: 'integer', nullable: true)] + private ?int $L1Way; + + #[ORM\Column('l2_count', type: 'integer', options: array( + 'comment' => 'The number of L2 caches on the package, usually the same as the number of cores' + ))] + private int $L2Count = 1; + + #[ORM\Column('l2_size', type: 'integer', nullable: true, options: array( + 'comment' => 'The size of each Level 2 cache in KB' + ))] + private ?int $L2Size; + + #[ORM\Column('l2_way', type: 'integer', nullable: true)] + private ?int $L2Way; + + #[ORM\Column('l3_count', type: 'integer', options: array( + 'comment' => 'The number of L3 caches on the package' + ))] + private int $L3Count = 0; + + #[ORM\Column('l3_size', type: 'integer', nullable: true, options: array( + 'comment' => 'The size of each Level 3 cache in KB' + ))] + private ?int $L3Size; + + #[ORM\Column('l3_way', type: 'integer', nullable: true)] + private ?int $L3Way; +} diff --git a/src/Enum/CpuArchitectureEnum.php b/src/Enum/CpuArchitectureEnum.php new file mode 100644 index 0000000..b4b0865 --- /dev/null +++ b/src/Enum/CpuArchitectureEnum.php @@ -0,0 +1,19 @@ +add('architecture') + ->add('productLine') + ->add('model') + ->add('partNumber') + ->add('lotNumber') + ->add('microArchitecture') + ->add('codeName') + ->add('baseSpeed') + ->add('boostSpeed') + ->add('cores') + ->add('threads') + ->add('igp') + ->add('voltage') + ->add('tdp') + ->add('processNode') + ->add('count') + ->add('usable') + ->add('received') + ->add('link') + ->add('notes') + ->add('L1Count') + ->add('L1dSize') + ->add('L1cSize') + ->add('L1uSize') + ->add('L1Way') + ->add('L2Count') + ->add('L2Size') + ->add('L2Way') + ->add('L3Count') + ->add('L3Size') + ->add('L3Way') + ->add('brand') + ->add('sockets') + ; + } + + public function configureOptions(OptionsResolver $resolver): void + { + $resolver->setDefaults([ + 'data_class' => Cpu::class, + ]); + } +} diff --git a/src/Migrations/Version20221027154708.php b/src/Migrations/Version20221027154708.php new file mode 100644 index 0000000..aa97cdd --- /dev/null +++ b/src/Migrations/Version20221027154708.php @@ -0,0 +1,108 @@ +addSql('ALTER TABLE collection.cpu ADD architecture VARCHAR(255) NOT NULL'); + $this->addSql('ALTER TABLE collection.cpu ADD product_line VARCHAR(255) NOT NULL'); + $this->addSql('ALTER TABLE collection.cpu ADD model VARCHAR(255) NOT NULL'); + $this->addSql('ALTER TABLE collection.cpu ADD part_number VARCHAR(255) NOT NULL'); + $this->addSql('ALTER TABLE collection.cpu ADD lot_number VARCHAR(255) DEFAULT NULL'); + $this->addSql('ALTER TABLE collection.cpu ADD micro_architecture VARCHAR(255) NOT NULL'); + $this->addSql('ALTER TABLE collection.cpu ADD codename VARCHAR(255) NOT NULL'); + $this->addSql('ALTER TABLE collection.cpu ADD base_speed INT NOT NULL'); + $this->addSql('ALTER TABLE collection.cpu ADD boost_speed INT DEFAULT NULL'); + $this->addSql('ALTER TABLE collection.cpu ADD cores INT NOT NULL'); + $this->addSql('ALTER TABLE collection.cpu ADD threads INT NOT NULL'); + $this->addSql('ALTER TABLE collection.cpu ADD igp VARCHAR(255) DEFAULT NULL'); + $this->addSql('ALTER TABLE collection.cpu ADD voltage DOUBLE PRECISION DEFAULT NULL'); + $this->addSql('ALTER TABLE collection.cpu ADD tdp INT NOT NULL'); + $this->addSql('ALTER TABLE collection.cpu ADD process_node INT DEFAULT NULL'); + $this->addSql('ALTER TABLE collection.cpu ADD count INT NOT NULL'); + $this->addSql('ALTER TABLE collection.cpu ADD usable BOOLEAN NOT NULL'); + $this->addSql('ALTER TABLE collection.cpu ADD received BOOLEAN NOT NULL'); + $this->addSql('ALTER TABLE collection.cpu ADD link VARCHAR(255) NOT NULL'); + $this->addSql('ALTER TABLE collection.cpu ADD notes VARCHAR(255) NOT NULL'); + $this->addSql('ALTER TABLE collection.cpu ADD l1_count INT NOT NULL'); + $this->addSql('ALTER TABLE collection.cpu ADD l1_data_size INT DEFAULT NULL'); + $this->addSql('ALTER TABLE collection.cpu ADD l1_code_size INT DEFAULT NULL'); + $this->addSql('ALTER TABLE collection.cpu ADD l1_unified_size INT DEFAULT NULL'); + $this->addSql('ALTER TABLE collection.cpu ADD l1_way INT DEFAULT NULL'); + $this->addSql('ALTER TABLE collection.cpu ADD l2_count INT NOT NULL'); + $this->addSql('ALTER TABLE collection.cpu ADD l2_size INT DEFAULT NULL'); + $this->addSql('ALTER TABLE collection.cpu ADD l2_way INT DEFAULT NULL'); + $this->addSql('ALTER TABLE collection.cpu ADD l3_count INT NOT NULL'); + $this->addSql('ALTER TABLE collection.cpu ADD l3_size INT DEFAULT NULL'); + $this->addSql('ALTER TABLE collection.cpu ADD l3_way INT DEFAULT NULL'); + $this->addSql('COMMENT ON COLUMN collection.cpu.lot_number IS \'The CPU lot number, such as s-spec for Intel CPUs\''); + $this->addSql('COMMENT ON COLUMN collection.cpu.base_speed IS \'The stock speed of the cpu in MHz\''); + $this->addSql('COMMENT ON COLUMN collection.cpu.boost_speed IS \'The max boost speed of the cpu in MHz, if applicable\''); + $this->addSql('COMMENT ON COLUMN collection.cpu.igp IS \'The name of the integrated graphics processor\''); + $this->addSql('COMMENT ON COLUMN collection.cpu.usable IS \'Whether the chip is working, and can be used with other hardware I have\''); + $this->addSql('COMMENT ON COLUMN collection.cpu.received IS \'Whether I have the chip in my possession (instead of in shipping)\''); + $this->addSql('COMMENT ON COLUMN collection.cpu.l1_count IS \'The number of L1 caches on the package, usually the same as the number of cores\''); + $this->addSql('COMMENT ON COLUMN collection.cpu.l1_data_size IS \'The size of each Level 1 data cache in KB\''); + $this->addSql('COMMENT ON COLUMN collection.cpu.l1_code_size IS \'The size of each Level 1 instruction cache in KB\''); + $this->addSql('COMMENT ON COLUMN collection.cpu.l1_unified_size IS \'The size of each Level 1 unified cache in KB\''); + $this->addSql('COMMENT ON COLUMN collection.cpu.l2_count IS \'The number of L2 caches on the package, usually the same as the number of cores\''); + $this->addSql('COMMENT ON COLUMN collection.cpu.l2_size IS \'The size of each Level 2 cache in KB\''); + $this->addSql('COMMENT ON COLUMN collection.cpu.l3_count IS \'The number of L3 caches on the package\''); + $this->addSql('COMMENT ON COLUMN collection.cpu.l3_size IS \'The size of each Level 3 cache in KB\''); + $this->addSql('ALTER TABLE collection.fpu ALTER series DROP NOT NULL'); + } + + public function down(Schema $schema): void + { + // this down() migration is auto-generated, please modify it to your needs + $this->addSql('CREATE SCHEMA public'); + $this->addSql('ALTER TABLE collection.cpu DROP architecture'); + $this->addSql('ALTER TABLE collection.cpu DROP product_line'); + $this->addSql('ALTER TABLE collection.cpu DROP model'); + $this->addSql('ALTER TABLE collection.cpu DROP part_number'); + $this->addSql('ALTER TABLE collection.cpu DROP lot_number'); + $this->addSql('ALTER TABLE collection.cpu DROP micro_architecture'); + $this->addSql('ALTER TABLE collection.cpu DROP codename'); + $this->addSql('ALTER TABLE collection.cpu DROP base_speed'); + $this->addSql('ALTER TABLE collection.cpu DROP boost_speed'); + $this->addSql('ALTER TABLE collection.cpu DROP cores'); + $this->addSql('ALTER TABLE collection.cpu DROP threads'); + $this->addSql('ALTER TABLE collection.cpu DROP igp'); + $this->addSql('ALTER TABLE collection.cpu DROP voltage'); + $this->addSql('ALTER TABLE collection.cpu DROP tdp'); + $this->addSql('ALTER TABLE collection.cpu DROP process_node'); + $this->addSql('ALTER TABLE collection.cpu DROP count'); + $this->addSql('ALTER TABLE collection.cpu DROP usable'); + $this->addSql('ALTER TABLE collection.cpu DROP received'); + $this->addSql('ALTER TABLE collection.cpu DROP link'); + $this->addSql('ALTER TABLE collection.cpu DROP notes'); + $this->addSql('ALTER TABLE collection.cpu DROP l1_count'); + $this->addSql('ALTER TABLE collection.cpu DROP l1_data_size'); + $this->addSql('ALTER TABLE collection.cpu DROP l1_code_size'); + $this->addSql('ALTER TABLE collection.cpu DROP l1_unified_size'); + $this->addSql('ALTER TABLE collection.cpu DROP l1_way'); + $this->addSql('ALTER TABLE collection.cpu DROP l2_count'); + $this->addSql('ALTER TABLE collection.cpu DROP l2_size'); + $this->addSql('ALTER TABLE collection.cpu DROP l2_way'); + $this->addSql('ALTER TABLE collection.cpu DROP l3_count'); + $this->addSql('ALTER TABLE collection.cpu DROP l3_size'); + $this->addSql('ALTER TABLE collection.cpu DROP l3_way'); + $this->addSql('ALTER TABLE collection.fpu ALTER series SET NOT NULL'); + } +} diff --git a/templates/base.html.twig b/templates/base.html.twig index 29fce87..d7b32d4 100644 --- a/templates/base.html.twig +++ b/templates/base.html.twig @@ -5,15 +5,15 @@ - {% block title %}Collection CRUD{% endblock %} + Collection CRUD - {% block title %}{% endblock %} {% block stylesheets %}{% endblock %} +
{% include 'header.html.twig' %}
- {% include 'header.html.twig' %} {% block body %}{% endblock %}
diff --git a/templates/brand/edit.html.twig b/templates/brand/edit.html.twig index c2a9a4a..2c299bb 100644 --- a/templates/brand/edit.html.twig +++ b/templates/brand/edit.html.twig @@ -3,7 +3,7 @@ {% block title %}Brands - Edit{% endblock %} {% block form %} -

Edit Brand

+

Edit Brand

    @@ -22,8 +22,9 @@ >Update {{ form_end(edit_form) }} -
    - + + +
diff --git a/templates/cpu/edit.html.twig b/templates/cpu/edit.html.twig new file mode 100644 index 0000000..4792039 --- /dev/null +++ b/templates/cpu/edit.html.twig @@ -0,0 +1,30 @@ +{% extends 'form.html.twig' %} + +{% block title %}Cpu - Edit{% endblock %} + +{% block form %} +

Edit Cpu

+ +
+ +
+ +
+ {{ form_start(edit_form) }} + {{ form_widget(edit_form) }} + + {{ form_end(edit_form) }} + +
+ + +
+
+{% endblock %} diff --git a/templates/cpu/index.html.twig b/templates/cpu/index.html.twig new file mode 100644 index 0000000..bb7adea --- /dev/null +++ b/templates/cpu/index.html.twig @@ -0,0 +1,111 @@ +{% extends 'base.html.twig' %} + +{% block title %}Cpu{% endblock %} + +{% block body %} +

Cpu

+ +
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {% for cpu in cpus %} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {% else %} + + + + {% endfor %} + +
 IdArchitectureProductLineModelPartNumberLotNumberMicroArchitectureCodeNameBaseSpeedBoostSpeedCoresThreadsIgpVoltageTdpProcessNodeCountUsableReceivedLinkNotesL1CountL1dSizeL1cSizeL1uSizeL1WayL2CountL2SizeL2WayL3CountL3SizeL3Way
+ + {{ cpu.id }}{{ cpu.architecture }}{{ cpu.productLine }}{{ cpu.model }}{{ cpu.partNumber }}{{ cpu.lotNumber }}{{ cpu.microArchitecture }}{{ cpu.codeName }}{{ cpu.baseSpeed }}{{ cpu.boostSpeed }}{{ cpu.cores }}{{ cpu.threads }}{{ cpu.igp }}{{ cpu.voltage }}{{ cpu.tdp }}{{ cpu.processNode }}{{ cpu.count }}{{ cpu.usable ? 'Yes' : 'No' }}{{ cpu.received ? 'Yes' : 'No' }}{{ cpu.link }}{{ cpu.notes }}{{ cpu.L1Count }}{{ cpu.L1dSize }}{{ cpu.L1cSize }}{{ cpu.L1uSize }}{{ cpu.L1Way }}{{ cpu.L2Count }}{{ cpu.L2Size }}{{ cpu.L2Way }}{{ cpu.L3Count }}{{ cpu.L3Size }}{{ cpu.L3Way }}
no records found
+{% endblock %} diff --git a/templates/cpu/new.html.twig b/templates/cpu/new.html.twig new file mode 100644 index 0000000..b977e43 --- /dev/null +++ b/templates/cpu/new.html.twig @@ -0,0 +1,23 @@ +{% extends 'form.html.twig' %} + +{% block title %}Cpu - New{% endblock %} + +{% block form %} +

Add Cpu

+ +
+ +
+ +
+ {{ form_start(form) }} + {{ form_widget(form) }} + + {{ form_end(form) }} +
+ +{% endblock %} diff --git a/templates/cpu/show.html.twig b/templates/cpu/show.html.twig new file mode 100644 index 0000000..6ddf56b --- /dev/null +++ b/templates/cpu/show.html.twig @@ -0,0 +1,162 @@ +{% extends 'form.html.twig' %} + +{% block title %}Cpu{% endblock %} + +{% block form %} +

Brand

+ +
+ + + +
+ + +
+ + +
+
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Id{{ cpu.id }}
Architecture{{ cpu.architecture }}
ProductLine{{ cpu.productLine }}
Model{{ cpu.model }}
PartNumber{{ cpu.partNumber }}
LotNumber{{ cpu.lotNumber }}
MicroArchitecture{{ cpu.microArchitecture }}
CodeName{{ cpu.codeName }}
BaseSpeed{{ cpu.baseSpeed }}
BoostSpeed{{ cpu.boostSpeed }}
Cores{{ cpu.cores }}
Threads{{ cpu.threads }}
Igp{{ cpu.igp }}
Voltage{{ cpu.voltage }}
Tdp{{ cpu.tdp }}
ProcessNode{{ cpu.processNode }}
Count{{ cpu.count }}
Usable{{ cpu.usable ? 'Yes' : 'No' }}
Received{{ cpu.received ? 'Yes' : 'No' }}
Link{{ cpu.link }}
Notes{{ cpu.notes }}
L1Count{{ cpu.L1Count }}
L1dSize{{ cpu.L1dSize }}
L1cSize{{ cpu.L1cSize }}
L1uSize{{ cpu.L1uSize }}
L1Way{{ cpu.L1Way }}
L2Count{{ cpu.L2Count }}
L2Size{{ cpu.L2Size }}
L2Way{{ cpu.L2Way }}
L3Count{{ cpu.L3Count }}
L3Size{{ cpu.L3Size }}
L3Way{{ cpu.L3Way }}
+
+{% endblock %} diff --git a/templates/form.html.twig b/templates/form.html.twig index b101166..afdd3d5 100644 --- a/templates/form.html.twig +++ b/templates/form.html.twig @@ -8,7 +8,7 @@ {% block body %}
-
+
{% block form %}{% endblock %}
diff --git a/templates/fpu/edit.html.twig b/templates/fpu/edit.html.twig index f3e7174..4705b50 100644 --- a/templates/fpu/edit.html.twig +++ b/templates/fpu/edit.html.twig @@ -3,7 +3,7 @@ {% block title %}Edit Fpu{% endblock %} {% block form %} -

Edit Fpu

+

Edit FPU

    diff --git a/templates/fpu/index.html.twig b/templates/fpu/index.html.twig index 54104c9..aae4bdd 100644 --- a/templates/fpu/index.html.twig +++ b/templates/fpu/index.html.twig @@ -1,9 +1,9 @@ {% extends 'base.html.twig' %} -{% block title %}Fpu index{% endblock %} +{% block title %}FPUs{% endblock %} {% block body %} -

    Fpu index

    +

    FPUs

      diff --git a/templates/fpu/new.html.twig b/templates/fpu/new.html.twig index 1713a8f..f5417e0 100644 --- a/templates/fpu/new.html.twig +++ b/templates/fpu/new.html.twig @@ -1,9 +1,9 @@ {% extends 'form.html.twig' %} -{% block title %}New Fpu{% endblock %} +{% block title %}Add FPU{% endblock %} {% block form %} -

      Add Fpu

      +

      Add FPU

        diff --git a/templates/fpu/show.html.twig b/templates/fpu/show.html.twig index 5ef8d71..ae557e4 100644 --- a/templates/fpu/show.html.twig +++ b/templates/fpu/show.html.twig @@ -1,9 +1,9 @@ {% extends 'form.html.twig' %} -{% block title %}Fpu{% endblock %} +{% block title %}FPU{% endblock %} {% block form %} -

        Fpu

        +

        FPU