From bc2323b915d1ecfbb89b049c4624e5413ac303d4 Mon Sep 17 00:00:00 2001 From: Anders Date: Wed, 29 Jul 2020 12:25:36 +0200 Subject: [PATCH] Removed @extends("app.layout.header") from a few blade.php files in app --- Diagram.mdj | 726 ++++++++++++++++++ .../views/app/contacts/index.blade.php | 1 - .../views/app/events/index.blade.php | 1 - .../views/app/menuplans/index.blade.php | 1 - .../views/app/vagttelefons/index.blade.php | 1 - 5 files changed, 726 insertions(+), 4 deletions(-) diff --git a/Diagram.mdj b/Diagram.mdj index 5e97374..f8eab55 100644 --- a/Diagram.mdj +++ b/Diagram.mdj @@ -2518,6 +2518,487 @@ "headNameLabel": { "$ref": "AAAAAAFyktFfi0G3a2o=" } + }, + { + "_type": "RectangleView", + "_id": "AAAAAAFzmS7LcWMLwXs=", + "_parent": { + "$ref": "AAAAAAFyJv8bdYmeyX0=" + }, + "font": "Arial;13;0", + "left": 1128, + "top": 288, + "width": 937, + "height": 225 + }, + { + "_type": "UMLTextView", + "_id": "AAAAAAFzmS8SCGMPFm8=", + "_parent": { + "$ref": "AAAAAAFyJv8bdYmeyX0=" + }, + "font": "Arial;13;0", + "left": 1160, + "top": 304, + "width": 60, + "height": 25, + "text": "Events" + }, + { + "_type": "ERDEntityView", + "_id": "AAAAAAFzmS+aamMoovQ=", + "_parent": { + "$ref": "AAAAAAFyJv8bdYmeyX0=" + }, + "model": { + "$ref": "AAAAAAFzmS+aamMmKco=" + }, + "subViews": [ + { + "_type": "LabelView", + "_id": "AAAAAAFzmS+aamMp18A=", + "_parent": { + "$ref": "AAAAAAFzmS+aamMoovQ=" + }, + "font": "Arial;13;1", + "left": 1144, + "top": 373, + "width": 195.45166015625, + "height": 13, + "text": "events" + }, + { + "_type": "ERDColumnCompartmentView", + "_id": "AAAAAAFzmS+aamMqMjs=", + "_parent": { + "$ref": "AAAAAAFzmS+aamMoovQ=" + }, + "model": { + "$ref": "AAAAAAFzmS+aamMmKco=" + }, + "subViews": [ + { + "_type": "ERDColumnView", + "_id": "AAAAAAFzmS+hNmM1gqI=", + "_parent": { + "$ref": "AAAAAAFzmS+aamMqMjs=" + }, + "model": { + "$ref": "AAAAAAFzmS+hAGMyFxQ=" + }, + "font": "Arial;13;0", + "left": 1149, + "top": 396, + "width": 185.45166015625, + "height": 13 + }, + { + "_type": "ERDColumnView", + "_id": "AAAAAAFzmTAruGM/Lp8=", + "_parent": { + "$ref": "AAAAAAFzmS+aamMqMjs=" + }, + "model": { + "$ref": "AAAAAAFzmTArgGM8P34=" + }, + "font": "Arial;13;0", + "left": 1149, + "top": 411, + "width": 185.45166015625, + "height": 13 + }, + { + "_type": "ERDColumnView", + "_id": "AAAAAAFzmTKxaGNOze0=", + "_parent": { + "$ref": "AAAAAAFzmS+aamMqMjs=" + }, + "model": { + "$ref": "AAAAAAFzmTKxMGNLYfU=" + }, + "font": "Arial;13;0", + "left": 1149, + "top": 426, + "width": 185.45166015625, + "height": 13 + }, + { + "_type": "ERDColumnView", + "_id": "AAAAAAFzmTMsZ2NV6ug=", + "_parent": { + "$ref": "AAAAAAFzmS+aamMqMjs=" + }, + "model": { + "$ref": "AAAAAAFzmTMsN2NSMr0=" + }, + "font": "Arial;13;0", + "left": 1149, + "top": 441, + "width": 185.45166015625, + "height": 13 + } + ], + "font": "Arial;13;0", + "left": 1144, + "top": 391, + "width": 195.45166015625, + "height": 68 + } + ], + "font": "Arial;13;0", + "left": 1144, + "top": 368, + "width": 195.45166015625, + "height": 91, + "nameLabel": { + "$ref": "AAAAAAFzmS+aamMp18A=" + }, + "columnCompartment": { + "$ref": "AAAAAAFzmS+aamMqMjs=" + } + }, + { + "_type": "ERDEntityView", + "_id": "AAAAAAFzmTUSMWOxglk=", + "_parent": { + "$ref": "AAAAAAFyJv8bdYmeyX0=" + }, + "model": { + "$ref": "AAAAAAFzmTUSMGOvbdY=" + }, + "subViews": [ + { + "_type": "LabelView", + "_id": "AAAAAAFzmTUSMWOysPE=", + "_parent": { + "$ref": "AAAAAAFzmTUSMWOxglk=" + }, + "font": "Arial;13;1", + "left": 1488, + "top": 341, + "width": 176, + "height": 13, + "text": "user_events" + }, + { + "_type": "ERDColumnCompartmentView", + "_id": "AAAAAAFzmTUSMWOzIXA=", + "_parent": { + "$ref": "AAAAAAFzmTUSMWOxglk=" + }, + "model": { + "$ref": "AAAAAAFzmTUSMGOvbdY=" + }, + "subViews": [ + { + "_type": "ERDColumnView", + "_id": "AAAAAAFzmTUsRWO/CkM=", + "_parent": { + "$ref": "AAAAAAFzmTUSMWOzIXA=" + }, + "model": { + "$ref": "AAAAAAFzmTUsD2O8Tv0=" + }, + "font": "Arial;13;0", + "left": 1493, + "top": 364, + "width": 166, + "height": 13 + }, + { + "_type": "ERDColumnView", + "_id": "AAAAAAFzmTVGV2PGQ0M=", + "_parent": { + "$ref": "AAAAAAFzmTUSMWOzIXA=" + }, + "model": { + "$ref": "AAAAAAFzmTVGIWPD9D4=" + }, + "font": "Arial;13;0", + "left": 1493, + "top": 379, + "width": 166, + "height": 13 + }, + { + "_type": "ERDColumnView", + "_id": "AAAAAAFzmTVY/GPNcbw=", + "_parent": { + "$ref": "AAAAAAFzmTUSMWOzIXA=" + }, + "model": { + "$ref": "AAAAAAFzmTVYxmPKgHI=" + }, + "font": "Arial;13;0", + "left": 1493, + "top": 394, + "width": 166, + "height": 13 + } + ], + "font": "Arial;13;0", + "left": 1488, + "top": 359, + "width": 176, + "height": 53 + } + ], + "font": "Arial;13;0", + "left": 1488, + "top": 336, + "width": 176, + "height": 96, + "nameLabel": { + "$ref": "AAAAAAFzmTUSMWOysPE=" + }, + "columnCompartment": { + "$ref": "AAAAAAFzmTUSMWOzIXA=" + } + }, + { + "_type": "ERDRelationshipView", + "_id": "AAAAAAFzmTidSGPovGU=", + "_parent": { + "$ref": "AAAAAAFyJv8bdYmeyX0=" + }, + "model": { + "$ref": "AAAAAAFzmTidSGPkITg=" + }, + "subViews": [ + { + "_type": "EdgeLabelView", + "_id": "AAAAAAFzmTidSGPpLVU=", + "_parent": { + "$ref": "AAAAAAFzmTidSGPovGU=" + }, + "visible": false, + "font": "Arial;13;0", + "left": 1413, + "top": 379, + "height": 13, + "alpha": 1.5707963267948966, + "distance": 15, + "hostEdge": { + "$ref": "AAAAAAFzmTidSGPovGU=" + }, + "edgePosition": 1 + }, + { + "_type": "EdgeLabelView", + "_id": "AAAAAAFzmTidSGPqI+A=", + "_parent": { + "$ref": "AAAAAAFzmTidSGPovGU=" + }, + "font": "Arial;13;0", + "left": 1363, + "top": 379, + "height": 13, + "alpha": 0.5235987755982988, + "distance": 30, + "hostEdge": { + "$ref": "AAAAAAFzmTidSGPovGU=" + }, + "edgePosition": 2 + }, + { + "_type": "EdgeLabelView", + "_id": "AAAAAAFzmTidSWPrhLo=", + "_parent": { + "$ref": "AAAAAAFzmTidSGPovGU=" + }, + "font": "Arial;13;0", + "left": 1462, + "top": 379, + "height": 13, + "alpha": -0.5235987755982988, + "distance": 30, + "hostEdge": { + "$ref": "AAAAAAFzmTidSGPovGU=" + } + } + ], + "font": "Arial;13;0", + "head": { + "$ref": "AAAAAAFzmTUSMWOxglk=" + }, + "tail": { + "$ref": "AAAAAAFzmS+aamMoovQ=" + }, + "lineStyle": 2, + "points": "1338:400;1488:400", + "nameLabel": { + "$ref": "AAAAAAFzmTidSGPpLVU=" + }, + "tailNameLabel": { + "$ref": "AAAAAAFzmTidSGPqI+A=" + }, + "headNameLabel": { + "$ref": "AAAAAAFzmTidSWPrhLo=" + } + }, + { + "_type": "ERDEntityView", + "_id": "AAAAAAFzmTrFAGQbbu8=", + "_parent": { + "$ref": "AAAAAAFyJv8bdYmeyX0=" + }, + "model": { + "$ref": "AAAAAAFzmTrE/mQZtbU=" + }, + "subViews": [ + { + "_type": "LabelView", + "_id": "AAAAAAFzmTrFAGQc1P0=", + "_parent": { + "$ref": "AAAAAAFzmTrFAGQbbu8=" + }, + "font": "Arial;13;1", + "left": 1784, + "top": 341, + "width": 208, + "height": 13, + "text": "users (find in user system)" + }, + { + "_type": "ERDColumnCompartmentView", + "_id": "AAAAAAFzmTrFAGQdssg=", + "_parent": { + "$ref": "AAAAAAFzmTrFAGQbbu8=" + }, + "model": { + "$ref": "AAAAAAFzmTrE/mQZtbU=" + }, + "subViews": [ + { + "_type": "ERDColumnView", + "_id": "AAAAAAFzmTrWuWQpM6E=", + "_parent": { + "$ref": "AAAAAAFzmTrFAGQdssg=" + }, + "model": { + "$ref": "AAAAAAFzmTrWh2QmNU4=" + }, + "font": "Arial;13;0", + "left": 1789, + "top": 364, + "width": 198, + "height": 13 + }, + { + "_type": "ERDColumnView", + "_id": "AAAAAAFzmTr2rGQyAHE=", + "_parent": { + "$ref": "AAAAAAFzmTrFAGQdssg=" + }, + "model": { + "$ref": "AAAAAAFzmTr2eGQvxRY=" + }, + "font": "Arial;13;0", + "left": 1789, + "top": 379, + "width": 198, + "height": 13 + } + ], + "font": "Arial;13;0", + "left": 1784, + "top": 359, + "width": 208, + "height": 38 + } + ], + "font": "Arial;13;0", + "left": 1784, + "top": 336, + "width": 208, + "height": 73, + "nameLabel": { + "$ref": "AAAAAAFzmTrFAGQc1P0=" + }, + "columnCompartment": { + "$ref": "AAAAAAFzmTrFAGQdssg=" + } + }, + { + "_type": "ERDRelationshipView", + "_id": "AAAAAAFzmTtiuWR2PIU=", + "_parent": { + "$ref": "AAAAAAFyJv8bdYmeyX0=" + }, + "model": { + "$ref": "AAAAAAFzmTtiuWRye2I=" + }, + "subViews": [ + { + "_type": "EdgeLabelView", + "_id": "AAAAAAFzmTtiuWR3x4k=", + "_parent": { + "$ref": "AAAAAAFzmTtiuWR2PIU=" + }, + "visible": false, + "font": "Arial;13;0", + "left": 1723, + "top": 347, + "height": 13, + "alpha": 1.5707963267948966, + "distance": 15, + "hostEdge": { + "$ref": "AAAAAAFzmTtiuWR2PIU=" + }, + "edgePosition": 1 + }, + { + "_type": "EdgeLabelView", + "_id": "AAAAAAFzmTtiuWR4U60=", + "_parent": { + "$ref": "AAAAAAFzmTtiuWR2PIU=" + }, + "font": "Arial;13;0", + "left": 1688, + "top": 347, + "height": 13, + "alpha": 0.5235987755982988, + "distance": 30, + "hostEdge": { + "$ref": "AAAAAAFzmTtiuWR2PIU=" + }, + "edgePosition": 2 + }, + { + "_type": "EdgeLabelView", + "_id": "AAAAAAFzmTtiuWR5oHg=", + "_parent": { + "$ref": "AAAAAAFzmTtiuWR2PIU=" + }, + "font": "Arial;13;0", + "left": 1758, + "top": 347, + "height": 13, + "alpha": -0.5235987755982988, + "distance": 30, + "hostEdge": { + "$ref": "AAAAAAFzmTtiuWR2PIU=" + } + } + ], + "font": "Arial;13;0", + "head": { + "$ref": "AAAAAAFzmTrFAGQbbu8=" + }, + "tail": { + "$ref": "AAAAAAFzmTUSMWOxglk=" + }, + "lineStyle": 2, + "points": "1663:368;1784:368", + "nameLabel": { + "$ref": "AAAAAAFzmTtiuWR3x4k=" + }, + "tailNameLabel": { + "$ref": "AAAAAAFzmTtiuWR4U60=" + }, + "headNameLabel": { + "$ref": "AAAAAAFzmTtiuWR5oHg=" + } } ] }, @@ -3498,6 +3979,251 @@ "foreignKey": true } ] + }, + { + "_type": "ERDEntity", + "_id": "AAAAAAFzmS9Y8GMUhJA=", + "_parent": { + "$ref": "AAAAAAFyJv8bdImdWmM=" + }, + "name": "Entity1" + }, + { + "_type": "ERDEntity", + "_id": "AAAAAAFzmS+aamMmKco=", + "_parent": { + "$ref": "AAAAAAFyJv8bdImdWmM=" + }, + "name": "events", + "ownedElements": [ + { + "_type": "ERDRelationship", + "_id": "AAAAAAFzmTidSGPkITg=", + "_parent": { + "$ref": "AAAAAAFzmS+aamMmKco=" + }, + "end1": { + "_type": "ERDRelationshipEnd", + "_id": "AAAAAAFzmTidSGPlGys=", + "_parent": { + "$ref": "AAAAAAFzmTidSGPkITg=" + }, + "reference": { + "$ref": "AAAAAAFzmS+aamMmKco=" + } + }, + "end2": { + "_type": "ERDRelationshipEnd", + "_id": "AAAAAAFzmTidSGPmix0=", + "_parent": { + "$ref": "AAAAAAFzmTidSGPkITg=" + }, + "reference": { + "$ref": "AAAAAAFzmTUSMGOvbdY=" + }, + "cardinality": "0..*" + } + } + ], + "columns": [ + { + "_type": "ERDColumn", + "_id": "AAAAAAFzmS+hAGMyFxQ=", + "_parent": { + "$ref": "AAAAAAFzmS+aamMmKco=" + }, + "name": "id", + "type": "INTEGER", + "length": 0, + "primaryKey": true + }, + { + "_type": "ERDColumn", + "_id": "AAAAAAFzmTArgGM8P34=", + "_parent": { + "$ref": "AAAAAAFzmS+aamMmKco=" + }, + "name": "name", + "type": "varchar", + "length": "256" + }, + { + "_type": "ERDColumn", + "_id": "AAAAAAFzmTKxMGNLYfU=", + "_parent": { + "$ref": "AAAAAAFzmS+aamMmKco=" + }, + "name": "description", + "type": "varchar", + "length": "512" + }, + { + "_type": "ERDColumn", + "_id": "AAAAAAFzmTMsN2NSMr0=", + "_parent": { + "$ref": "AAAAAAFzmS+aamMmKco=" + }, + "name": "date", + "type": "datetime", + "length": 0 + } + ] + }, + { + "_type": "ERDEntity", + "_id": "AAAAAAFzmTUSMGOvbdY=", + "_parent": { + "$ref": "AAAAAAFyJv8bdImdWmM=" + }, + "name": "user_events", + "ownedElements": [ + { + "_type": "ERDRelationship", + "_id": "AAAAAAFzmTsziWRExxQ=", + "_parent": { + "$ref": "AAAAAAFzmTUSMGOvbdY=" + }, + "end1": { + "_type": "ERDRelationshipEnd", + "_id": "AAAAAAFzmTsziWRFRrA=", + "_parent": { + "$ref": "AAAAAAFzmTsziWRExxQ=" + }, + "reference": { + "$ref": "AAAAAAFzmTUSMGOvbdY=" + } + }, + "end2": { + "_type": "ERDRelationshipEnd", + "_id": "AAAAAAFzmTsziWRGUkg=", + "_parent": { + "$ref": "AAAAAAFzmTsziWRExxQ=" + }, + "reference": { + "$ref": "AAAAAAFzmTszCGQ4N4k=" + }, + "cardinality": "0..*" + } + }, + { + "_type": "ERDRelationship", + "_id": "AAAAAAFzmTtiuWRye2I=", + "_parent": { + "$ref": "AAAAAAFzmTUSMGOvbdY=" + }, + "end1": { + "_type": "ERDRelationshipEnd", + "_id": "AAAAAAFzmTtiuWRzhic=", + "_parent": { + "$ref": "AAAAAAFzmTtiuWRye2I=" + }, + "reference": { + "$ref": "AAAAAAFzmTUSMGOvbdY=" + } + }, + "end2": { + "_type": "ERDRelationshipEnd", + "_id": "AAAAAAFzmTtiuWR0NaQ=", + "_parent": { + "$ref": "AAAAAAFzmTtiuWRye2I=" + }, + "reference": { + "$ref": "AAAAAAFzmTrE/mQZtbU=" + }, + "cardinality": "0..*" + } + } + ], + "columns": [ + { + "_type": "ERDColumn", + "_id": "AAAAAAFzmTUsD2O8Tv0=", + "_parent": { + "$ref": "AAAAAAFzmTUSMGOvbdY=" + }, + "name": "id", + "type": "INTEGER", + "length": 0, + "primaryKey": true + }, + { + "_type": "ERDColumn", + "_id": "AAAAAAFzmTVGIWPD9D4=", + "_parent": { + "$ref": "AAAAAAFzmTUSMGOvbdY=" + }, + "name": "user_id", + "type": "INTEGER", + "length": 0, + "foreignKey": true + }, + { + "_type": "ERDColumn", + "_id": "AAAAAAFzmTVYxmPKgHI=", + "_parent": { + "$ref": "AAAAAAFzmTUSMGOvbdY=" + }, + "name": "event_id", + "type": "INTEGER", + "length": 0, + "foreignKey": true + } + ] + }, + { + "_type": "ERDEntity", + "_id": "AAAAAAFzmTicyGPYVxQ=", + "_parent": { + "$ref": "AAAAAAFyJv8bdImdWmM=" + }, + "name": "Entity2" + }, + { + "_type": "ERDEntity", + "_id": "AAAAAAFzmTrE/mQZtbU=", + "_parent": { + "$ref": "AAAAAAFyJv8bdImdWmM=" + }, + "name": "users (find in user system)", + "columns": [ + { + "_type": "ERDColumn", + "_id": "AAAAAAFzmTrWh2QmNU4=", + "_parent": { + "$ref": "AAAAAAFzmTrE/mQZtbU=" + }, + "name": "id", + "type": "INTEGER", + "length": 0, + "primaryKey": true + }, + { + "_type": "ERDColumn", + "_id": "AAAAAAFzmTr2eGQvxRY=", + "_parent": { + "$ref": "AAAAAAFzmTrE/mQZtbU=" + }, + "name": "...", + "type": "...", + "length": 0 + } + ] + }, + { + "_type": "ERDEntity", + "_id": "AAAAAAFzmTszCGQ4N4k=", + "_parent": { + "$ref": "AAAAAAFyJv8bdImdWmM=" + }, + "name": "Entity3" + }, + { + "_type": "ERDEntity", + "_id": "AAAAAAFzmTtiNmRmWq4=", + "_parent": { + "$ref": "AAAAAAFyJv8bdImdWmM=" + }, + "name": "Entity4" } ] } diff --git a/skolehjem/resources/views/app/contacts/index.blade.php b/skolehjem/resources/views/app/contacts/index.blade.php index e61a011..a66affd 100644 --- a/skolehjem/resources/views/app/contacts/index.blade.php +++ b/skolehjem/resources/views/app/contacts/index.blade.php @@ -1,5 +1,4 @@ @extends("app.layout.base") -@extends("app.layout.header") @section("title") Kontakt @endsection diff --git a/skolehjem/resources/views/app/events/index.blade.php b/skolehjem/resources/views/app/events/index.blade.php index 427a7ab..43e03ac 100644 --- a/skolehjem/resources/views/app/events/index.blade.php +++ b/skolehjem/resources/views/app/events/index.blade.php @@ -1,5 +1,4 @@ @extends("app.layout.base") -@extends("app.layout.header") @section("title") Aktiviteter @endsection diff --git a/skolehjem/resources/views/app/menuplans/index.blade.php b/skolehjem/resources/views/app/menuplans/index.blade.php index 3f4514a..639ee20 100644 --- a/skolehjem/resources/views/app/menuplans/index.blade.php +++ b/skolehjem/resources/views/app/menuplans/index.blade.php @@ -1,5 +1,4 @@ @extends("app.layout.base") -@extends("app.layout.header") @section("title") Menuplan @endsection diff --git a/skolehjem/resources/views/app/vagttelefons/index.blade.php b/skolehjem/resources/views/app/vagttelefons/index.blade.php index bbd4eb3..493b44c 100644 --- a/skolehjem/resources/views/app/vagttelefons/index.blade.php +++ b/skolehjem/resources/views/app/vagttelefons/index.blade.php @@ -1,5 +1,4 @@ @extends("app.layout.base") -@extends("app.layout.header") @section("title") Vagttelefon @endsection