diff --git a/app/Resources/relations/alias_model.yml b/app/Resources/relations/alias_model.yml index 1e763f0..2a972f2 100644 --- a/app/Resources/relations/alias_model.yml +++ b/app/Resources/relations/alias_model.yml @@ -180,4 +180,7 @@ u588p02c02: u588p01c02 2958c01: 2723 -32181c03: 32181c01 \ No newline at end of file +32181c03: 32181c01 + +76019: 76244 +4107539: 76244 \ No newline at end of file diff --git a/app/Resources/views/base.html.twig b/app/Resources/views/base.html.twig index d8d0c9a..89487ea 100644 --- a/app/Resources/views/base.html.twig +++ b/app/Resources/views/base.html.twig @@ -1,16 +1,7 @@ +{% extends 'html.html.twig' %} + {% import 'macros/elements.html.twig' as elements %} - - - - - {% block title %}PrintABrick{% endblock %} - {% block stylesheets %} - - {% endblock %} - - - {% block body %}
{{ knp_menu_render('mainMenu') }} @@ -48,15 +39,4 @@
-{% endblock %} - -{% block javascripts %} - - - - - - -{% endblock %} - - +{% endblock %} \ No newline at end of file diff --git a/app/Resources/views/brickset/browse.html.twig b/app/Resources/views/brickset/browse.html.twig index 8bab86c..70cd9a4 100644 --- a/app/Resources/views/brickset/browse.html.twig +++ b/app/Resources/views/brickset/browse.html.twig @@ -14,12 +14,14 @@ {{ form_end(form) }} +

{{ sets|length }}

+
{% for set in sets %}
- +

{{ set.LegoSetID }} - {{ set.name }}
diff --git a/app/Resources/views/brickset/instructions.html.twig b/app/Resources/views/brickset/instructions.html.twig index 5b6e760..43c983d 100644 --- a/app/Resources/views/brickset/instructions.html.twig +++ b/app/Resources/views/brickset/instructions.html.twig @@ -10,7 +10,7 @@ {{ 'set.instructions.description' | trans }} {{ 'set.instructions.filesize' | trans }} - {{ 'set.instructions.download' | trans }} + {{ 'set.instructions.filename' | trans }} diff --git a/app/Resources/views/error/error.html.twig b/app/Resources/views/error/error.html.twig index b92b910..737f0ff 100644 --- a/app/Resources/views/error/error.html.twig +++ b/app/Resources/views/error/error.html.twig @@ -3,9 +3,9 @@ {% block title %}{{ 'page.error.title'|trans }}{% endblock %} {% block content %} -

+

{{ 'page.error.large'|trans }} -

+

{{ 'page.error.text'|trans }}

{% endblock %} \ No newline at end of file diff --git a/app/Resources/views/html.html.twig b/app/Resources/views/html.html.twig new file mode 100644 index 0000000..4e28c53 --- /dev/null +++ b/app/Resources/views/html.html.twig @@ -0,0 +1,25 @@ + + + + + {% block title %}PrintABrick{% endblock %} + {% block stylesheets %} + + {% endblock %} + + + +{% block body %} + +{% endblock %} + +{% block javascripts %} + + + + + + +{% endblock %} + + diff --git a/app/Resources/views/model/detail.html.twig b/app/Resources/views/model/detail.html.twig index 1ef114a..8d33ad5 100644 --- a/app/Resources/views/model/detail.html.twig +++ b/app/Resources/views/model/detail.html.twig @@ -38,7 +38,7 @@

{% for alias in rbParts %} - {{ alias.number }} + {{ alias.number }} {% endfor %}

diff --git a/app/Resources/views/rebrickable/part/detail.html.twig b/app/Resources/views/rebrickable/part/detail.html.twig index d3b6d6b..31a2e4a 100644 --- a/app/Resources/views/rebrickable/part/detail.html.twig +++ b/app/Resources/views/rebrickable/part/detail.html.twig @@ -29,7 +29,7 @@
- +
{{ set.number }}
diff --git a/app/Resources/views/rebrickable/set/parts.html.twig b/app/Resources/views/rebrickable/set/parts.html.twig index a8295f1..5e52b8c 100644 --- a/app/Resources/views/rebrickable/set/parts.html.twig +++ b/app/Resources/views/rebrickable/set/parts.html.twig @@ -1,7 +1,3 @@ -{% extends 'base.html.twig' %} - -{% block content %} -

Regular parts

@@ -14,7 +10,7 @@ {{ inventoryPart.quantity }}
- +
{{ inventoryPart.part.number }}
{{ inventoryPart.isSpare ? 'Spare' : 'Regular' }}
 @@ -35,7 +31,7 @@ {{ inventoryPart.quantity }}
- +
{{ inventoryPart.part.number }}
{{ inventoryPart.isSpare ? 'Spare' : 'Regular' }}
 @@ -43,6 +39,4 @@
{% endif %} {% endfor %} -
- -{% endblock %} \ No newline at end of file +
\ 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 388e99e..0c2e5d3 100644 --- a/app/Resources/views/set/detail.html.twig +++ b/app/Resources/views/set/detail.html.twig @@ -44,7 +44,7 @@ {% if brset %} {% elseif rbset %} - + {% endif %} {#{{ brset ? dump(brset) }}#} @@ -59,7 +59,25 @@
{% if rbset %} - {#{{ render(controller('AppBundle:Rebrickable/Set:parts', { 'number': rbset.number })) }}#} + {{ render(controller('AppBundle:Rebrickable/Set:parts', { 'number': rbset.number })) }} +
+
+ +

+ Sets +

+ + {% for set in inventorySets %} +
+ + +

{{ set.set.number }} - {{ set.set.name }}

+

{{ set.quantity}}

+ +
+ {% endfor %} +
+
{% endif %}
{% if brset %} diff --git a/app/Resources/views/set/index.html.twig b/app/Resources/views/set/index.html.twig index 7c3f768..96d3aa1 100644 --- a/app/Resources/views/set/index.html.twig +++ b/app/Resources/views/set/index.html.twig @@ -1,12 +1,28 @@ {% extends 'base.html.twig' %} {% block content %} + +
+ {{ form_start(form) }} + + {{ form_row(form.search) }} +
+ {{ form_label(form.theme.id) }} + {{ form_widget(form.theme.id) }} +
+
+ +
+ {{ form_rest(form) }} + {{ form_end(form) }} +
+
{% for set in sets %}
- +

{{ set.number }} - {{ set.name }}
diff --git a/src/AppBundle/Twig/AppExtension.php b/src/AppBundle/Twig/AppExtension.php index 4dd7974..1c0c0b0 100644 --- a/src/AppBundle/Twig/AppExtension.php +++ b/src/AppBundle/Twig/AppExtension.php @@ -37,14 +37,14 @@ class AppExtension extends \Twig_Extension ]; } - public function partImage(Part $part, Color $color = null) + public function partImage($number, $color = null) { - return '/parts/ldraw/'.($color ? $color->getId():'-1').'/'.$part->getNumber().'.png'; + return '/parts/ldraw/'.($color ? $color :'-1').'/'.$number.'.png'; } - public function setImage(Set $set) + public function setImage($number) { - return '/sets/'.strtolower($set->getNumber()).'.jpg'; + return '/sets/'.strtolower($number).'.jpg'; } public function remoteSize($url) {