Update style

app/Resources/assets/style/main.scss

@@ -1,8 +1,7 @@
 .default-theme {
 
   .ui.main {
-    padding-top: 10px;
+    padding-top: 50px;
-    margin-top: 40px;
     min-height: calc(100% - 67px);
   }
 
@@ -105,8 +104,29 @@
       font-weight: 700;
     }
 
+    .image {
+      width: 4em;
+      height: 4em;
+    }
     padding: 0.5em 1em !important;
   }
+
+  .spacing.top {
+    margin-top: 1em;
+  }
+
+  .show.all {
+    font-size: 1.5em;
+
+    &:after {
+      content: ' »';
+    }
+  }
+
+  .ajax-load > .loader, .empty{
+    margin-top: 100px !important;
+    margin-bottom: 100px !important;
+  }
 }
 
 @each $i in 5 10 15 20 25 30 40 50 60 {

app/Resources/relations/alias_model.yml

@@ -363,6 +363,16 @@ u9140p02c01: u9140p01c01
 
 92243p02c01: 92243p01c01
 
+u9142p02c03: u9142p01c08
+
+u9151p02c03: u9151p01c04
+
+u9106p02c02: u9106p01c03
+
+u595p02c04: u595p01c10
+
+u9140p02c02: u9140p01c04
+
 64022c01: 64022
 64022c02: 64022
 

app/Resources/translations/messages.en.yml

@@ -79,3 +79,7 @@ homepage:
     title: %count% sets
     text:
     browse: Browse sets
+
+view.all:
+  sets: View all matched sets
+  models: View all matched models

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 %}
     <div class="ui fixed inverted menu">

app/Resources/views/html.html.twig

@@ -14,7 +14,6 @@
     
 {% endblock %}
 {% block javascripts %}
-
     <script type="text/javascript" src="{{ asset('resources/js/three.js') }}"></script>
 
     <script type="text/javascript" src="{{ asset('resources/js/OrbitControls.js') }}"></script>

app/Resources/views/macros/blocks.html.twig

@@ -5,6 +5,7 @@
         {% else %}
             {% set placeholder = asset("resources/images/transparent_min.png") %}
         {% endif %}
+
         <img src="{{ placeholder }}" data-src="{{ asset(color~'/'~number~'.png') | imagine_filter(filter)}}">
     </div>
 {% endmacro %}
@@ -83,7 +84,9 @@
 {% endmacro %}
 
 {% macro empty(message) %}
-    <p class="ui center aligned icon header"><i class="circular frown icon"></i>{{ message }}</p>
+    <div class="ui center aligned icon header empty">
+        <p><i class="circular frown icon"></i>{{ message }}</p>
+    </div>
 {% endmacro %}
 
 {% macro ccal2_license(title,author) %}

app/Resources/views/model/detail.html.twig

@@ -75,7 +75,7 @@
         <div class="ui vertical segment">
 
             <div class="ui tab active" data-tab="subparts">
-                <div class="ui eight column grid">
+                <div class="ui eight column grid parts">
                     {% for subpart in subparts %}
                         {{ blocks.model(subpart['model'], subpart['quantity']) }}
                     {% endfor %}
@@ -83,7 +83,7 @@
             </div>
 
             <div class="ui tab" data-tab="related">
-                <div class="ui eight column grid">
+                <div class="ui eight column grid parts">
                     {% for subpart in related  %}
                         <div class="column">
                             {{ blocks.model(subpart) }}
@@ -93,7 +93,7 @@
             </div>
 
             <div class="ui tab" data-tab="parents">
-                <div class="ui eight column grid">
+                <div class="ui eight column grid parts">
                     {% for subpart in model.parents  %}
                         <div class="column">
                             {{ blocks.model(subpart.parent) }}

app/Resources/views/model/index.html.twig

@@ -11,15 +11,13 @@
         <div class="row">
             <div class="column four wide">
                 <h3>{{ 'model.filter.title' | trans }}</h3>
-                {#<form method="get" action="" class="ui form">#}
                 {{ form_start(form) }}
-
+                {{ form_row(form.query) }}
-                {{ form_rest(form) }}
+                {{ form_row(form.category) }}
                 <div class="field">
                     <input class="ui fluid submit button" type="submit" value="Filter"/>
                 </div>
                 {{ form_end(form) }}
-                {#</form>#}
             </div>
             <div class="column twelve wide">
                 <div class="ui header vertical noborder">
@@ -28,14 +26,14 @@
                         {{ knp_pagination_sortable(models, 'Number', 'm.id') }}
                         {{ knp_pagination_sortable(models, 'Name', 'm.name') }}
                     </div>
+
                     <div class="found-count ui text menu">
                         <div class="header item">Showing</div>
                         <span class="item">{{ models.getTotalItemCount }}</span>
                     </div>
                 </div>
-
                 <div class="ui segment vertical noborder">
-                    <div class="ui six column doubling grid">
+                    <div class="ui six column doubling grid parts">
                         {% for model in models %}
                             {{ blocks.model(model) }}
                         {% else %}

app/Resources/views/search/index.html.twig

@@ -7,26 +7,27 @@
 {% block header %}{{ 'page.search' | trans({'%query%':query}) }}{% endblock %}
 
 {% block content %}
-
-
     <div class="ui vertical segment noborder">
-        <h3 class="ui dividing header">Sets</h3>
+        <h2 class="ui dividing header">Sets</h2>
         <div class="ui eight column doubling grid sets">
             {% for set in sets %}
                 {{ blocks.set(set) }}
             {% endfor %}
         </div>
-        <a href="{{ path('set_index',{'s[query]':query}) }}">Show more</a>
+        <div class="spacing top">
+            <a class="show all" href="{{ path('set_index',{'s[query]':query}) }}">{{ 'view.all.sets' | trans }}</a>
+        </div>
     </div>
 
-
     <div class="ui vertical segment noborder">
-        <h3 class="ui dividing header">Models</h3>
+        <h2 class="ui dividing header">Models</h2>
         <div class="ui eight column doubling grid parts">
             {% for model in models %}
                 {{ blocks.model(model) }}
             {% endfor %}
         </div>
-        <a href="{{ path('model_index',{'m[query]':query}) }}">Show more</a>
+        <div class="spacing top">
+            <a class="show all" href="{{ path('model_index',{'m[query]':query}) }}">{{ 'view.all.models' | trans }}</a>
+        </div>
     </div>
 {% endblock %}

app/Resources/views/set/detail.html.twig

@@ -9,9 +9,9 @@
 {% block content %}
     <div class="ui stackable grid">
         <div class="column nine wide">
-            <div class="ui bordered fluid image">
+            <a class="ui bordered fluid image" href="{{ asset(set.id~'.jpg')|imagine_filter('set_large') }}" data-lightbox="setImages">
                 {{ blocks.setImage(set.id,'set_large') }}
-            </div>
+            </a>
         </div>
         <div class="column seven wide">
             <div class="item-info ui">

app/Resources/views/set/index.html.twig

@@ -34,8 +34,8 @@
                         {{ knp_pagination_sortable(sets, 'Year', ['s.year']) }}
                         {{ knp_pagination_sortable(sets, 'Name', ['s.name']) }}
                         {{ knp_pagination_sortable(sets, 'Parts', ['s.partCount']) }}
-
                     </div>
+
                     <div class="found-count ui text menu">
                         <div class="header item">Showing</div>
                         <span class="item">{{ sets.getTotalItemCount }}</span>
@@ -56,4 +56,5 @@
                 </div>
             </div>
         </div>
+    </div>
 {% endblock %}