fix: Reduce space on homepage

Relates #893
geokrety · Nov 14, 2023 · dffa777 · dffa777
1 parent 697e71d
commit dffa777
Showing 1 changed file with 63 additions and 54 deletions.
diff --git a/website/app-templates/smarty/pages/home.tpl b/website/app-templates/smarty/pages/home.tpl
@@ -9,82 +9,91 @@
 
 <div class="row" id="welcome_intro">
   <div class="col-md-9">
-    {include file='banners/site_intro.tpl'}
-    {include file='banners/intro_stats.tpl'}
+    <div class="row">
+      {include file='banners/site_intro.tpl'}
+    </div>
+    <div class="row">
+      {include file='banners/intro_stats.tpl'}
+    </div>
+
+    {if $news}
+    <div class="row">
+      <h2>📰 {t}News{/t}</h2>
+      {foreach from=$news item=item}
+      {include file='elements/news.tpl' news=$item}
+      {/foreach}
+    </div>
+    {/if}
+
+    {if $moves}
+    <div class="row">
+      <h2>🥾 {t}Latest moves{/t}</h2>
+      <div class="table-responsive" id="recentMovesPanel">
+        <table class="table table-striped">
+          <thead>
+            <tr>
+              <th></th>
+              <th>{t}ID{/t}</th>
+              <th>{t}Spotted in{/t}</th>
+              <th>{t}Comment{/t}</th>
+              <th class="text-center">{t}Last move{/t}</th>
+              <th class="text-right"><img src="{GK_CDN_IMAGES_URL}/log-icons/dist.gif" title="{t}Distance{/t}" /></th>
+            </tr>
+          </thead>
+          <tbody>
+            {include file='elements/move_as_list.tpl' move=$moves}
+          </tbody>
+        </table>
+      </div>
+    </div>
+    {/if}
   </div>
   <div class="col-md-3">
     {include file='banners/donate.tpl'}
+    {include file='blocks/found_geokret.tpl'}
   </div>
 </div>
 
+{if $pictures}
 <div class="row">
-  <div class="col-md-3 col-md-push-9">
-    {include file='blocks/found_geokret.tpl'}
+  <div class="col-md-12">
+    <h2>📷 {t}Recent pictures{/t}</h2>
+    <div class="panel panel-default picturesList" id="recentPicturesPanel">
+        <div class="panel-body">
+            <div class="gallery">
+                {foreach from=$pictures item=picture}
+                        {$picture|picture:true:true:false:true:true nofilter}
+                {/foreach}
+            </div>
+        </div>
+    </div>
   </div>
-  <div class="col-md-9 col-md-pull-3">
-    {if $news}
-    <h2>📰 {t}News{/t}</h2>
-    {foreach from=$news item=item}
-    {include file='elements/news.tpl' news=$item}
-    {/foreach}
-    {/if}
+</div>
+{/if}
 
-    {if $moves}
-    <h2>🥾 {t}Latest moves{/t}</h2>
-    <div class="table-responsive" id="recentMovesPanel">
+{if $geokrety}
+<div class="row">
+  <div class="col-md-12">
+    <h2>🐥 {t}Recently created GeoKrety{/t}</h2>
+    <div class="table-responsive">
       <table class="table table-striped">
         <thead>
           <tr>
             <th></th>
             <th>{t}ID{/t}</th>
-            <th>{t}Spotted in{/t}</th>
-            <th>{t}Comment{/t}</th>
-            <th class="text-center">{t}Last move{/t}</th>
-            <th class="text-right"><img src="{GK_CDN_IMAGES_URL}/log-icons/dist.gif" title="{t}Distance{/t}" /></th>
+            <th class="text-center">{t}Owner{/t}</th>
+            <th class="text-center">{t}Born{/t}</th>
           </tr>
         </thead>
         <tbody>
-          {include file='elements/move_as_list.tpl' move=$moves}
+    {foreach from=$geokrety item=item}
+    {include file='elements/geokrety_as_list_recently_born.tpl' geokret=$item}
+    {/foreach}
         </tbody>
       </table>
     </div>
-    {/if}
   </div>
 </div>
-
-
-{if $pictures}
-<h2>📷 {t}Recent pictures{/t}</h2>
-<div class="panel panel-default picturesList" id="recentPicturesPanel">
-    <div class="panel-body">
-        <div class="gallery">
-            {foreach from=$pictures item=picture}
-                    {$picture|picture:true:true:false:true:true nofilter}
-            {/foreach}
-        </div>
-    </div>
-</div>
-{/if}
-
-{if $geokrety}
-<h2>🐥 {t}Recently created GeoKrety{/t}</h2>
-<div class="table-responsive">
-  <table class="table table-striped">
-    <thead>
-      <tr>
-        <th></th>
-        <th>{t}ID{/t}</th>
-        <th class="text-center">{t}Owner{/t}</th>
-        <th class="text-center">{t}Born{/t}</th>
-      </tr>
-    </thead>
-    <tbody>
-{foreach from=$geokrety item=item}
-{include file='elements/geokrety_as_list_recently_born.tpl' geokret=$item}
-{/foreach}
-    </tbody>
-  </table>
-</div>
 {/if}
 
 {/block}