From e549c2a33c3829e2faa2f3146f737071218cbcb9 Mon Sep 17 00:00:00 2001
From: Unknown <davhubner@gmail.com>
Date: Sat, 3 Jun 2017 01:37:11 +0200
Subject: [PATCH] Fix templates

---
 app/Resources/views/default/index.html.twig |  36 ++++---
 app/Resources/views/model/detail.html.twig  | 108 ++++++++++----------
 app/Resources/views/part/detail.html.twig   |  10 +-
 3 files changed, 80 insertions(+), 74 deletions(-)

diff --git a/app/Resources/views/default/index.html.twig b/app/Resources/views/default/index.html.twig
index 9135a85..51578d1 100644
--- a/app/Resources/views/default/index.html.twig
+++ b/app/Resources/views/default/index.html.twig
@@ -52,23 +52,25 @@
 
         <main class="ui full height segment vertical unpadded">
             <div class="ui main vertical stripe quote segment">
-                <div class="ui equal width stackable internally celled grid">
-                    <div class="center aligned row">
-                        <div class="column">
-                            <h2 class="ui icon header">
-                                <i class="cube icon"></i>
-                                {{ models }} {{ 'homepage.models.title' | trans }}
-                            </h2>
-                            <p>{{ 'homepage.models.text' | trans | raw }}</p>
-                            <a class="ui button big primary" href="{{ path('model_index') }}">{{ 'homepage.models.browse' | trans }}</a>
-                        </div>
-                        <div class="column">
-                            <h2 class="ui icon header">
-                                <i class="cubes icon"></i>
-                                {{ sets }} {{ 'homepage.sets.title' | trans }}
-                            </h2>
-                            <p>{{ 'homepage.sets.text' | trans | raw }}</p>
-                            <a class="ui button big primary" href="{{ path('set_index') }}">{{ 'homepage.sets.browse' | trans }}</a>
+                <div class="ui container">
+                    <div class="ui equal width stackable internally celled grid">
+                        <div class="center aligned row">
+                            <div class="column">
+                                <h2 class="ui icon header">
+                                    <i class="cube icon"></i>
+                                    {{ models }} {{ 'homepage.models.title' | trans }}
+                                </h2>
+                                <p>{{ 'homepage.models.text' | trans | raw }}</p>
+                                <a class="ui button big primary" href="{{ path('model_index') }}">{{ 'homepage.models.browse' | trans }}</a>
+                            </div>
+                            <div class="column">
+                                <h2 class="ui icon header">
+                                    <i class="cubes icon"></i>
+                                    {{ sets }} {{ 'homepage.sets.title' | trans }}
+                                </h2>
+                                <p>{{ 'homepage.sets.text' | trans | raw }}</p>
+                                <a class="ui button big primary" href="{{ path('set_index') }}">{{ 'homepage.sets.browse' | trans }}</a>
+                            </div>
                         </div>
                     </div>
                 </div>
diff --git a/app/Resources/views/model/detail.html.twig b/app/Resources/views/model/detail.html.twig
index a2325bb..49c4160 100644
--- a/app/Resources/views/model/detail.html.twig
+++ b/app/Resources/views/model/detail.html.twig
@@ -9,75 +9,75 @@
 {% block content %}
     <div class="ui vertical segment secondary">
         <div class="ui container stackable grid">
-            <div class="row">
-                <div class="column ten wide">
-                    <div id="model-viewer" class="model-container">
-                        {{ blocks.partImage(model.id,'part_large') }}
-                    </div>
+            <div class="column ten wide">
+                <div id="model-viewer" class="model-container">
+                    {{ blocks.partImage(model.id,'part_large') }}
                 </div>
-                <div class="column six wide">
-                    <div class="item-info ui">
-                        <table class="ui very basic table">
+            </div>
+            <div class="column six wide">
+                <div class="item-info ui">
+                    <table class="ui very basic table">
+                        <tr>
+                            <td>{{ 'model.id' | trans }}</td>
+                            <td><h2>{{ model.id }}</h2></td>
+                        </tr>
+                        <tr>
+                            <td>{{ 'model.name' | trans }}</td>
+                            <td>{{ model.name }}</td>
+                        </tr>
+                        <tr>
+                            <td>{{ 'model.category' | trans }}</td>
+                            <td><a href="{{ path('model_index',{'m[category]':model.category.id}) }}">{{ model.category ? model.category.name }}</a></td>
+                        </tr>
+                        <tr>
+                            <td>{{ 'model.author' | trans }}</td><td>{{ model.author.name }}</td>
+                        </tr>
+                        <tr>
+                            <td>{{ 'model.set.count' | trans }}</td><td>{{ sets|length }}</td>
+                        </tr>
+                        <tr>
+                            <td>{{ 'model.license' | trans }}</td>
+                            <td>
+                                {{ blocks.ccal2_license(model.name,model.author.name) }}
+                            </td>
+                        </tr>
+                        <tr>
+                            <td>{{ 'model.keywords' | trans }}</td>
+                            <td>
+                                <div class="ui grey labels">
+                                    {% for keyword in model.keywords %}
+                                        <span class="ui label">{{ keyword.name }}</span>
+                                    {% endfor %}
+                                </div>
+                            </td>
+                        </tr>
+                        {% if model.aliases|length %}
                             <tr>
-                                <td>{{ 'model.id' | trans }}</td>
-                                <td><h2>{{ model.id }}</h2></td>
-                            </tr>
-                            <tr>
-                                <td>{{ 'model.name' | trans }}</td>
-                                <td>{{ model.name }}</td>
-                            </tr>
-                            <tr>
-                                <td>{{ 'model.category' | trans }}</td>
-                                <td><a href="{{ path('model_index',{'m[category]':model.category.id}) }}">{{ model.category ? model.category.name }}</a></td>
-                            </tr>
-                            <tr>
-                                <td>{{ 'model.author' | trans }}</td><td>{{ model.author.name }}</td>
-                            </tr>
-                            <tr>
-                                <td>{{ 'model.set.count' | trans }}</td><td>{{ sets|length }}</td>
-                            </tr>
-                            <tr>
-                                <td>{{ 'model.license' | trans }}</td>
+                                <td>{{ 'model.aliases' | trans }}</td>
                                 <td>
-                                    {{ blocks.ccal2_license(model.name,model.author.name) }}
+                                    {% for alias in model.aliases | slice(0,15)%}
+                                        <span>{{ alias.id }}</span>{%  if not loop.last %},{% endif %}
+                                    {% endfor %}
+                                    {% if model.aliases|length > 15 %}&hellip;{% endif %}
                                 </td>
                             </tr>
-                            <tr>
-                                <td>{{ 'model.keywords' | trans }}</td>
-                                <td>
-                                    <div class="ui grey labels">
-                                        {% for keyword in model.keywords %}
-                                            <span class="ui label">{{ keyword.name }}</span>
-                                        {% endfor %}
-                                    </div>
-                                </td>
-                            </tr>
-                            {% if model.aliases|length %}
-                                <tr>
-                                    <td>{{ 'model.aliases' | trans }}</td>
-                                    <td>
-                                        {% for alias in model.aliases | slice(0,15)%}
-                                            <span>{{ alias.id }}</span>{%  if not loop.last %},{% endif %}
-                                        {% endfor %}
-                                        {% if model.aliases|length > 15 %}&hellip;{% endif %}
-                                    </td>
-                                </tr>
-                            {% endif %}
-                        </table>
-                        <a class="ui download fluid primary button" href="{{ path('model_zip', {id: model.id}) }}"><i class="download icon"></i> {{ 'model.download'|trans }}</a>
-                    </div>
+                        {% endif %}
+                    </table>
+                    <a class="ui download fluid primary button" href="{{ path('model_zip', {id: model.id}) }}"><i class="download icon"></i> {{ 'model.download'|trans }}</a>
                 </div>
             </div>
         </div>
     </div>
     <div class="ui vertical segment">
-        <div class="container ui">
-            <div class="ui tabular pointing secondary menu stackable">
+        <div class="ui tabular pointing secondary menu stackable">
+            <div class="container ui">
                 <a class="item active" data-tab="subparts">{{ 'model.subparts' | trans }} ({{ subparts|length }})</a>
                 <a class="item" data-tab="related">{{ 'model.related' | trans }} ({{ related|length }})</a>
                 <a class="item" data-tab="parents">{{ 'model.parents' | trans }} ({{ model.parents|length }})</a>
             </div>
+        </div>
 
+        <div class="container ui">
             <div class="ui tab active" data-tab="subparts">
                 <div class="ui grid doubling ten column row parts">
                     {% for subpart in subparts %}
diff --git a/app/Resources/views/part/detail.html.twig b/app/Resources/views/part/detail.html.twig
index ff590c0..673b4cf 100644
--- a/app/Resources/views/part/detail.html.twig
+++ b/app/Resources/views/part/detail.html.twig
@@ -38,7 +38,7 @@
                                     <td>{{ 'part.alternates' | trans }}</td>
                                     <td>
                                         {% for alternate in apiPart.alternates %}
-                                            <a href="{{ url('reb_part_detail', {'id': alternate})}}">{{ alternate }}</a>
+                                            <a href="{{ url('part_detail', {'id': alternate})}}">{{ alternate }}</a>
                                         {% endfor %}
                                     </td>
                                 </tr>
@@ -46,7 +46,7 @@
                                     <td>{{ 'part.molds' | trans }}</td>
                                     <td>
                                         {% for mold in apiPart.molds %}
-                                            <a href="{{ url('reb_part_detail', {'id': mold})}}">{{ mold }}</a>
+                                            <a href="{{ url('part_detail', {'id': mold})}}">{{ mold }}</a>
                                         {% endfor %}
                                     </td>
                                 </tr>
@@ -57,7 +57,11 @@
                             {% endif %}
                         </table>
 
-                        <a class="ui disabled fluid primary button"><i class="download icon"></i> {{ 'model.empty'|trans }}</a>
+                        {% if not part.model %}
+                            <a class="ui disabled fluid primary button"><i class="download icon"></i> {{ 'model.empty'|trans }}</a>
+                        {% else %}
+                            <a class="ui fluid primary button" href="{{ path('model_zip', {id: part.model.id}) }}"><i class="download icon"></i> {{ 'model.download'|trans }}</a>
+                        {% endif %}
                     </div>
                 </div>
             </div>