diff options
| author | vincent-peugnet <v.peugnet@free.fr> | 2020-03-23 16:31:56 +0100 |
|---|---|---|
| committer | vincent-peugnet <v.peugnet@free.fr> | 2020-03-23 16:31:56 +0100 |
| commit | 21569fcabfdcedbdd7f0185d9a7c5518f52f880c (patch) | |
| tree | 6ad27a5bcc9dd406b94982eb2debd22dd0cdc70d | |
| parent | 7d1b16dce7e435caefd39975ca68a08c4f79fc03 (diff) | |
| download | wcms-21569fcabfdcedbdd7f0185d9a7c5518f52f880c.tar.gz wcms-21569fcabfdcedbdd7f0185d9a7c5518f52f880c.zip | |
resolve conflicts
| -rw-r--r-- | app/class/Modelhome.php | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/app/class/Modelhome.php b/app/class/Modelhome.php index 18ae1a5..9aab4f2 100644 --- a/app/class/Modelhome.php +++ b/app/class/Modelhome.php @@ -141,23 +141,9 @@ class Modelhome extends Modelpage { $datas['elements'] = $this->mapdata($pagelist); -<<<<<<< HEAD - foreach ($page->linkto() as $linkto) { - $edge['group'] = 'edges'; - $edge['data']['id'] = $page->id() . '>' . $linkto; - $edge['data']['source'] = $page->id(); - $edge['data']['target'] = $linkto; - $edges[] = $edge; - } - } - $datas['elements'] = array_merge($nodes, $edges); - - $datas['layout']['name'] = 'cose-bilkent'; -======= $datas['layout'] = [ 'name' => $layout, ]; ->>>>>>> map integration in home $datas['style'] = [ [ 'selector' => 'node', |