From 4b0978f58f4b973ee7f15800165c3701de3e883d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20H=C3=BCbner?= Date: Fri, 28 Apr 2017 16:13:32 +0200 Subject: [PATCH] Add download links --- app/Resources/assets/js/style.js | 8 + app/Resources/views/base.html.twig | 1 + app/Resources/views/model/detail.html.twig | 159 +++++++++--------- .../views/rebrickable/set/inventory.html.twig | 51 ------ .../views/rebrickable/set/models.html.twig | 48 ------ app/Resources/views/set/detail.html.twig | 17 ++ src/AppBundle/Controller/ModelController.php | 23 +-- 7 files changed, 111 insertions(+), 196 deletions(-) delete mode 100644 app/Resources/views/rebrickable/set/inventory.html.twig delete mode 100644 app/Resources/views/rebrickable/set/models.html.twig diff --git a/app/Resources/assets/js/style.js b/app/Resources/assets/js/style.js index 6a86128..c379249 100644 --- a/app/Resources/assets/js/style.js +++ b/app/Resources/assets/js/style.js @@ -25,4 +25,12 @@ $(document).bind('ready ajaxComplete', function(){ ; }) ; + + $('.item-info .download') + .popup({ + popup : $('.download.popup'), + on: 'click', + inline: true + }) + ; }); \ No newline at end of file diff --git a/app/Resources/views/base.html.twig b/app/Resources/views/base.html.twig index afe7f4f..8717292 100644 --- a/app/Resources/views/base.html.twig +++ b/app/Resources/views/base.html.twig @@ -1,6 +1,7 @@ {% extends 'html.html.twig' %} {% import 'macros/elements.html.twig' as elements %} +{% import 'macros/blocks.html.twig' as blocks %} {% block body %}
diff --git a/app/Resources/views/model/detail.html.twig b/app/Resources/views/model/detail.html.twig index 7f61bf5..67116c5 100644 --- a/app/Resources/views/model/detail.html.twig +++ b/app/Resources/views/model/detail.html.twig @@ -1,7 +1,5 @@ {% extends 'base.html.twig' %} -{% import 'macros/elements.html.twig' as elements %} - {% block title %}#{{ model.number }} - {{ model.name }}{% endblock %} {% block header %}#{{ model.number }} - {{ model.name }}{% endblock %} @@ -11,106 +9,107 @@
- + {{ blocks.modelImageLarge(model, -1) }}
-
- - - - - - - - - - - - - -
category{{ model.category ? model.category.name }}
model{{ model.path }}
author{{ model.author.name }}
sets{{ sets|length }}
+
+ {{ 'model.download'|trans }} -
-
keywords:
-
- {% for keyword in model.keywords %} - {{ keyword.name }} + + + + + + + + + + + + + + + + + + + {% if model.aliases|length %} + + + + + {% endif %} +
{{ 'model.category' | trans }}{{ model.category ? model.category.name }}
{{ 'model.author' | trans }}{{ model.author.name }}
{{ 'model.set.count' | trans }}{{ sets|length }}
{{ 'model.license' | trans }} + {{ blocks.ccal2_license(model.name,model.author.name) }} +
{{ 'model.keywords' | trans }} + {% for keyword in model.keywords %} + {{ keyword.name }} + {% endfor %} +
{{ 'model.aliases' | trans }} + {% for alias in model.aliases | slice(0,10)%} + {{ alias.number }}{% if not loop.last %},{% endif %} {% endfor %} - -
aliases:
-
- {% for alias in model.aliases %} - {{ alias.number }}{% if not loop.last %},{% endif %} - {% endfor %} -
-
Download:
-
{{ model.number }}
- +
-

- Related Models -

+
+
+ Subparts ({{ model.subparts|length }}) + Related ({{ related|length }}) + Parents ({{ model.parents|length }}) + Sets ({{ sets|length }}) +
+
- -
- Subparts of this model -
- -
- {% for subpart in model.subparts %} -
- {{ elements.part(subpart.subpart) }} -

{{ subpart.count }}

-

color: {{ subpart.color.name }}

+
+
+ {% for subpart in model.subparts %} +
+ {{ blocks.part(subpart.subpart) }} +

{{ subpart.count }}

+

color: {{ subpart.color.name }}

+
+ {% endfor %} +
- {% endfor %} -
-
- Model is subpart of -
- -
- {% for subpart in model.parents %} -
- {{ elements.part(subpart.parent) }} +
+
+ {% for subpart in related %} +
+ {{ blocks.part(subpart) }} +
+ {% endfor %} +
- {% endfor %} -
-
- Model pairs with -
- -
- {% for subpart in related %} -
- {{ elements.part(subpart) }} +
+
+ {% for subpart in model.parents %} +
+ {{ blocks.part(subpart.parent) }} +
+ {% endfor %} +
- {% endfor %} + +
+ {% for set in sets %} + {{ set.number }} + {% endfor %} +
+
- -

- Sets ({{ sets|length }}) -

- - {% for set in sets %} - {{ set.number }} - {% endfor %} - - - {% endblock %} {% block javascripts %} {{ parent() }} {% endblock %} \ No newline at end of file diff --git a/app/Resources/views/rebrickable/set/inventory.html.twig b/app/Resources/views/rebrickable/set/inventory.html.twig deleted file mode 100644 index c2a2750..0000000 --- a/app/Resources/views/rebrickable/set/inventory.html.twig +++ /dev/null @@ -1,51 +0,0 @@ -{% import 'macros/elements.html.twig' as elements %} - -This set consists of {{ models|length }} unique part models - -{% if regularParts|length > 0 %} -

- Regular parts -

- -
- {% for inventoryPart in regularParts %} - {% if inventoryPart.part is defined %} -
-
- {{ inventoryPart.quantity }} - -
- -
- -
{{ inventoryPart.part.number }}
- -
-
- {% endif %} - {% endfor %} -
-{% endif %} - -{% if spareParts|length > 0 %} -

- Spare parts -

-
- {% for inventoryPart in spareParts %} - {% if inventoryPart.part is defined %} -
-
- {{ inventoryPart.quantity }} - -
- -
-
{{ inventoryPart.part.number }}
- -
-
- {% endif %} - {% endfor %} -
-{% endif %} \ No newline at end of file diff --git a/app/Resources/views/rebrickable/set/models.html.twig b/app/Resources/views/rebrickable/set/models.html.twig deleted file mode 100644 index e8eb979..0000000 --- a/app/Resources/views/rebrickable/set/models.html.twig +++ /dev/null @@ -1,48 +0,0 @@ -{% extends 'base.html.twig' %} - -{% block content %} - {% set count = 0 %} - -
- {% for model in models %} -
-
- -
- -
-
{{ model['model'].number }}
- -
- {% for color in model['colors'] %} - {% set count = count + color['quantity'] %} -
{{ color['quantity'] }} {{ color['color'].name }}
- {% endfor %} -
- {% endfor %} -
- - -
- {% for model in spareModels %} -
-
- -
- -
-
{{ model['model'].number }}
- -
- {% for color in model['colors'] %} - {% set count = count + color['quantity'] %} -
{{ color['quantity'] }} {{ color['color'].name }}
- {% endfor %} -
- {% endfor %} -
- -

{{ set.partCount }}

-

{{ count }} models

- -{% endblock %} \ No newline at end of file diff --git a/app/Resources/views/set/detail.html.twig b/app/Resources/views/set/detail.html.twig index 12ba339..765e30c 100644 --- a/app/Resources/views/set/detail.html.twig +++ b/app/Resources/views/set/detail.html.twig @@ -64,6 +64,23 @@ + {{ 'set.download'|trans }} + + +
diff --git a/src/AppBundle/Controller/ModelController.php b/src/AppBundle/Controller/ModelController.php index 3d03397..3cb4cea 100644 --- a/src/AppBundle/Controller/ModelController.php +++ b/src/AppBundle/Controller/ModelController.php @@ -6,12 +6,10 @@ use AppBundle\Entity\LDraw\Model; use AppBundle\Entity\Rebrickable\Part; use AppBundle\Entity\Rebrickable\Set; use AppBundle\Form\Filter\Model\ModelFilterType; -use Doctrine\ORM\Query\AST\ConditionalTerm; use Sensio\Bundle\FrameworkExtraBundle\Configuration\Method; use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route; use Symfony\Bundle\FrameworkBundle\Controller\Controller; use Symfony\Component\HttpFoundation\Request; -use Symfony\Component\HttpFoundation\Response; /** * Part controller. @@ -66,10 +64,10 @@ class ModelController extends Controller /** @var Model $model */ if ($model = $this->get('repository.ldraw.model')->findOneByNumber($number)) { try { - $rbParts = $model != null ? $em->getRepository(Part::class)->findAllByModel($model) : null; - $sets = $model != null ? $em->getRepository(Set::class)->findAllByModel($model) : null; + $rbParts = $model != null ? $this->get('repository.rebrickable.part')->findAllByModel($model) : null; + $sets = $model != null ? $this->get('repository.rebrickable.set')->findAllByModel($model) : null; - $related = $em->getRepository(Model::class)->findAllRelatedModels($model->getNumber()); + $related = $this->get('repository.ldraw.model')->findAllRelatedModels($model->getNumber()); return $this->render('model/detail.html.twig', [ 'model' => $model, @@ -86,20 +84,11 @@ class ModelController extends Controller } /** - * @Route("/{number}/download", name="model_download") + * @Route("/{number}/zip", name="model_zip") * @Method("GET") */ - public function downloadAction(Model $model) + public function zipAction(Model $model) { - $zip = $this->get('service.zip')->create($model); - - dump($zip); - - $response = new Response(file_get_contents($zip)); - $response->headers->set('Content-Type', 'application/zip'); - $response->headers->set('Content-Disposition', 'attachment;filename="' . basename($zip) . '"'); - $response->headers->set('Content-length', filesize($zip)); - - return $response; + $zip = $this->get('service.zip')->createFromModel($model); } }