From 8427e381c8abd6a8ce5a0aca74f3eb3f664b8c00 Mon Sep 17 00:00:00 2001
From: zero <skklove@gmail.com>
Date: Sun, 5 Aug 2007 08:19:06 +0000
Subject: [PATCH] =?UTF-8?q?=EC=B5=9C=EA=B7=BC=20=EA=B2=8C=EC=8B=9C?=
 =?UTF-8?q?=EB=AC=BC=20=EC=9C=84=EC=A0=AF=20=EC=98=A4=EB=A5=98=20=EC=88=98?=
 =?UTF-8?q?=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: http://xe-core.googlecode.com/svn/trunk@2195 201d5d3c-b55e-5fd7-737f-ddc643e51545
---
 modules/page/tpl/css/page.css                  |  2 +-
 modules/page/tpl/page_content_modify.html      |  2 ++
 widgets/newest_images/newest_images.class.php  | 18 ++++++++++++------
 widgets/newest_images/skins/default/list.html  |  2 ++
 .../newest_images/skins/xe_official/list.html  |  2 ++
 5 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/modules/page/tpl/css/page.css b/modules/page/tpl/css/page.css
index c33ce4db8..19dabd7ff 100644
--- a/modules/page/tpl/css/page.css
+++ b/modules/page/tpl/css/page.css
@@ -3,4 +3,4 @@ h3 { margin:0 10px 0 10px; }
 .widget_list { margin:10px; }
 .widget_list a { margin-bottom:10px; }
 .editor_box { margin:0 10px 10px 10px; }
-.button_box { margin:0 10px 10px 10px; text-align:right;}
+.button_box { float:right; overflow:hidden; }
diff --git a/modules/page/tpl/page_content_modify.html b/modules/page/tpl/page_content_modify.html
index 776291c80..c47481f21 100644
--- a/modules/page/tpl/page_content_modify.html
+++ b/modules/page/tpl/page_content_modify.html
@@ -27,6 +27,7 @@
         <span class="button"><input type="submit" value="{$lang->cmd_save}" accesskey="s" /></span>
         <span class="button"><input type="button" value="{$lang->cmd_close}" onclick="window.close(); return false;" /></span>
     </div>
+    <div class="clear"></div>
 
     <div class="editor_box">{$editor}</div>
 
@@ -35,5 +36,6 @@
         <span class="button"><input type="submit" value="{$lang->cmd_save}" accesskey="s" /></span>
         <span class="button"><input type="button" value="{$lang->cmd_close}" onclick="window.close(); return false;" /></span>
     </div>
+    <div class="clear"></div>
 
 </form>
diff --git a/widgets/newest_images/newest_images.class.php b/widgets/newest_images/newest_images.class.php
index 7fb11dd12..f54bf6136 100644
--- a/widgets/newest_images/newest_images.class.php
+++ b/widgets/newest_images/newest_images.class.php
@@ -71,15 +71,21 @@
                 }
             }
 
-            if(!count($document_srl_list)) return;
-
             $oDocumentModel = &getModel('document');
-            $documents_output = $oDocumentModel->getDocuments($document_srl_list);
-            if(!count($documents_output)) return;
+            if(count($document_srl_list)) {
+
+                $documents_output = $oDocumentModel->getDocuments($document_srl_list);
+                if(!count($documents_output)) return;
+
+                foreach($documents_output as $key => $val) {
+                    $document_list[] = $val;
+                }
 
-            foreach($documents_output as $key => $val) {
-                $document_list[] = $val;
             }
+
+            $document_count = count($document_list);
+            $total_count = $widget_info->rows_list_count * $widget_info->cols_list_count;
+            for($i=$document_count;$i<$total_count;$i++) $document_list[] = new DocumentItem();
             
             $widget_info->document_list = $document_list;
 
diff --git a/widgets/newest_images/skins/default/list.html b/widgets/newest_images/skins/default/list.html
index ee4745f11..48b1e5467 100644
--- a/widgets/newest_images/skins/default/list.html
+++ b/widgets/newest_images/skins/default/list.html
@@ -22,6 +22,7 @@
             <!--@for($j=0;$j<$widget_info->cols_list_count;$j++)-->
                 {@ $oDocument = $widget_info->document_list[$i*$widget_info->cols_list_count + $j]}
             <td <!--@if($widget_info->rows_list_count>1)-->class="bottomBorder"<!--@end-->>
+                <!--@if($oDocument->document_srl)-->
                 <div class="thumbnail"><a href="{getUrl('','document_srl',$oDocument->document_srl)}"><img src="{$oDocument->getThumbnail($widget_info->thumbnail_width)}" width="{$widget_info->thumbnail_width}" height="{$widget_info->thumbnail_width}" border="0" alt="" class="thumbnail" /></a></div>
 
                 <div>
@@ -53,6 +54,7 @@
                     <!--@end-->
                 </div>
                 <!--@end-->
+                <!--@end-->
 
             </td>
             <!--@end-->
diff --git a/widgets/newest_images/skins/xe_official/list.html b/widgets/newest_images/skins/xe_official/list.html
index d7c983429..98724c59d 100644
--- a/widgets/newest_images/skins/xe_official/list.html
+++ b/widgets/newest_images/skins/xe_official/list.html
@@ -18,6 +18,7 @@
             <!--@for($j=0;$j<$widget_info->cols_list_count;$j++)-->
                 {@ $oDocument = $widget_info->document_list[$i*$widget_info->cols_list_count + $j]}
             <td <!--@if($widget_info->rows_list_count>1)-->class="bottomBorder"<!--@end-->>
+                <!--@if($oDocument->document_srl)-->
                 <div class="thumbnail"><a href="{getUrl('','document_srl',$oDocument->document_srl)}"><img src="{$oDocument->getThumbnail($widget_info->thumbnail_width)}" width="{$widget_info->thumbnail_width}" height="{$widget_info->thumbnail_width}" border="0" alt="" class="thumbnail" /></a></div>
 
                 <div>
@@ -49,6 +50,7 @@
                     <!--@end-->
                 </div>
                 <!--@end-->
+                <!--@end-->
 
             </td>
             <!--@end-->