admin: always stretch table

diff --git a/ipf/admin/static/admin/css/changelists.css b/ipf/admin/static/admin/css/changelists.css
index 08aed23f33e2e6cdae4c40b103e0cbb149db7a10..eb0106c4f0723be0585475d3667282ad9595c698 100644 (file)
--- a/ipf/admin/static/admin/css/changelists.css
+++ b/ipf/admin/static/admin/css/changelists.css
@@ -1,14 +1,13 @@
 /* CHANGELISTS */
 #changelist { position:relative; width:100%; }
 #changelist table { width:100%; }
-.change-list .filtered table { border-right:1px solid #ddd;  }
-.change-list .filtered { min-height:400px; }
-.change-list .filtered { background:white url(../img/changelist-bg.gif) top right repeat-y !important; }
-.change-list .filtered table, .change-list .filtered .paginator, .filtered #toolbar, .filtered div.xfull { margin-right:200px !important; width:auto !important; }
-.change-list .filtered table tbody th { padding-right:1em; }
+
+.change-list .filtered #items-grid-container { margin-right: 200px; padding-right: 5px; }
+.change-list .filtered table,
+.change-list .filtered .paginator { border-right:1px solid #ddd; }
+
 #changelist .toplinks { border-bottom:1px solid #ccc !important; }
 #changelist .paginator { color:#666; border-top:1px solid #eee; border-bottom:1px solid #eee; background:white url(../img/nav-bg.gif) 0 180% repeat-x; overflow:hidden; }
-.change-list .filtered .paginator { border-right:1px solid #ddd; }
 
 /*  CHANGELIST TABLES  */
 #changelist table thead th { white-space:nowrap; }
@@ -22,7 +21,7 @@
 #changelist #changelist-search img { vertical-align:middle; }
 
 /*  FILTER COLUMN  */
-#changelist-filter { position:absolute; top:0; right:0; z-index:1000; width:200px; border-left:1px solid #ddd; background:#efefef; margin:0; }
+#changelist-filter { float: right; width:200px; border:1px solid #ddd; background:#efefef; margin:0 -1px 0 0; }
 #changelist-filter h2 { font-size:11px; padding:2px 5px; border-bottom:1px solid #ddd; }
 #changelist-filter h3 { font-size:12px; margin-bottom:0; }
 #changelist-filter ul { padding-left:0;margin-left:10px; }

diff --git a/ipf/admin/static/admin/img/changelist-bg.gif b/ipf/admin/static/admin/img/changelist-bg.gif
deleted file mode 100644 (file)
index 7f46994..0000000
Binary files a/ipf/admin/static/admin/img/changelist-bg.gif and /dev/null differ

diff --git a/ipf/admin/templates/admin/items.html b/ipf/admin/templates/admin/items.html
index 97368bebe3028f47926e159e891e58b56e7f11f8..f1508f924bf53c05c905527561b8829345386969 100644 (file)
--- a/ipf/admin/templates/admin/items.html
+++ b/ipf/admin/templates/admin/items.html
@@ -1,8 +1,8 @@
 {extends "admin/base.html"}
 
 {block css}
-  {superblock}
-  <link rel="stylesheet" href="{$ADMIN_MEDIA_URL}css/changelists.css" />
+{superblock}
+<link rel="stylesheet" href="{$ADMIN_MEDIA_URL}css/changelists.css" />
 {/block}
 
 {block bodyclass}change-list{/block}
@@ -11,67 +11,75 @@
 
 {block content}
 <div id="content" class="flex">
-    <h1>{$page_title}</h1>
-    <div id="content-main">
-        <ul class="object-tools">{block objecttools}{if array_search('add',$perms)!==false}<li><a href="add/" class="addlink">{$title_add}</a></li>{/if}<li><a href="javascript:print();">Print</a></li>{/block}</ul>
-        <div id="changelist" class="module {if $filters} filtered{/if}">
-
-            {if $is_search}
-            <div id="toolbar">
-                <form id="changelist-search" method="get" action="">
-                <div>
-                <label for="searchbar">
-                <img alt="Search" src="{$ADMIN_MEDIA_URL}img/icon_searchbox.png" />
-                </label>
-                <input id="searchbar" type="text" value="{$search_value}" name="q" size="40"/>
-                <input type="submit" value="Go"/>
-                {if $search_value}
-                    <span class="small quiet">{$pager->getPager()->getNumResults()} results (<a href="{url 'IPF_Admin_Views_ListItems', array($lapp, $lmodel)}">reset</a>)</span>
-                {/if}
-                </div>
-                </form>
-            </div>
+  <h1>{$page_title}</h1>
+  <div id="content-main">
+    <ul class="object-tools">
+      {block objecttools}
+      {if array_search('add',$perms)!==false}<li><a href="add/" class="addlink">{$title_add}</a></li>{/if}
+      <li><a href="javascript:print();">Print</a></li>
+      {/block}
+    </ul>
+    <div id="changelist" class="module {if $filters} filtered{/if}">
+      {if $is_search}
+      <div id="toolbar">
+        <form id="changelist-search" method="get" action="">
+          <div>
+            <label for="searchbar">
+              <img alt="Search" src="{$ADMIN_MEDIA_URL}img/icon_searchbox.png" />
+            </label>
+            <input id="searchbar" type="text" value="{$search_value}" name="q" size="40"/>
+            <input type="submit" value="Go"/>
+            {if $search_value}
+            <span class="small quiet">{$pager->getPager()->getNumResults()} results (<a href="{url 'IPF_Admin_Views_ListItems', array($lapp, $lmodel)}">reset</a>)</span>
             {/if}
+          </div>
+        </form>
+      </div>
+      {/if}
 
-            {if $filters}
-            <div id="changelist-filter">
-            <h2>Filter</h2>
-            {foreach $filters as $f}
-            <h3>{$f->title}</h3>
-            <ul>
-            {foreach $f->choices as $ch}
-                {block filterchoice}<li{if $ch['selected']} class="selected"{/if}><a href="?{$ch['param']}">{$ch['name']}</a></li>{/block}
-            {/foreach}
-            </ul>
+      {if $filters}
+      <div id="changelist-filter">
+        <h2>Filter</h2>
+        {foreach $filters as $f}
+        <h3>{$f->title}</h3>
+        <ul>
+          {foreach $f->choices as $ch}
+          {block filterchoice}<li{if $ch['selected']} class="selected"{/if}><a href="?{$ch['param']}">{$ch['name']}</a></li>{/block}
+          {/foreach}
+        </ul>
+        {/foreach}
+      </div>
+      {/if}
+
+      <div id="items-grid-container">
+        {block table}
+        <table id="items-grid">
+          <thead>
+            <tr class="nodrop">
+              {foreach $header as $h}
+              <th>{$h.title}</th>
+              {/foreach}
+            </tr>
+          </thead>
+          <tbody>
+            {foreach $objects as $o}
+            <tr class="trsort" id="{$o.pk()}">
+              {foreach $o.ModelAdmin().ListRow($o) as $v}
+              <td>{$v|safe}</td>
+              {/foreach}
+            </tr>
             {/foreach}
-            </div>
-            {/if}
-            {block table}
-            <table id="items-grid">
-                <thead>
-                    <tr class="nodrop">
-                    {foreach $header as $h}
-                        <th>{$h.title}</th>
-                    {/foreach}
-                    </tr>
-                </thead>
-                <tbody>
-                    {foreach $objects as $o}
-                    <tr class="trsort" id="{$o.pk()}">
-                        {foreach $o.ModelAdmin().ListRow($o) as $v}
-                        <td>{$v|safe}</td>
-                        {/foreach}
-                    </tr>
-                    {/foreach}
-                </tbody>
-            </table>
-            {/block}
-            <p class="paginator">
-                {$pager->display()|safe}{$pager->getPager()->getNumResults()} record(s) of {$classname}
-            </p>
-        </div>
+          </tbody>
+        </table>
+        {/block}
+        <p class="paginator">
+          {$pager->display()|safe}{$pager->getPager()->getNumResults()} record(s) of {$classname}
+        </p>
+      </div>
+
     </div>
-    <br class="clear" />
+  </div>
+  <br class="clear" />
 </div>
 {/block}