From 83071d38893b5ff3a73af56258bf132f9142a237 Mon Sep 17 00:00:00 2001
From: wangyidong <yidong@cnezsoft.com>
Date: Fri, 28 Aug 2015 14:17:40 +0800
Subject: [PATCH]  * finish task #2304.

---
 module/doc/css/view.css              |  2 ++
 module/doc/js/view.js                |  5 +++++
 module/doc/view/view.html.php        | 31 ++++++++++++++++------------
 module/file/view/printfiles.html.php |  4 ++--
 4 files changed, 27 insertions(+), 15 deletions(-)
 create mode 100644 module/doc/css/view.css
 create mode 100644 module/doc/js/view.js

diff --git a/module/doc/css/view.css b/module/doc/css/view.css
new file mode 100644
index 0000000000..495e13970e
--- /dev/null
+++ b/module/doc/css/view.css
@@ -0,0 +1,2 @@
+.file-content fieldset .files-list{font-size:25px;}
+.file-content fieldset .files-list i.icon-file-text{font-size:25px;}
diff --git a/module/doc/js/view.js b/module/doc/js/view.js
new file mode 100644
index 0000000000..65e84da0ce
--- /dev/null
+++ b/module/doc/js/view.js
@@ -0,0 +1,5 @@
+$(function()
+    {
+      var outerH =$('.outer').css('min-height').replace('px', '');
+      $('#url-content').height(outerH - 180);
+    })
diff --git a/module/doc/view/view.html.php b/module/doc/view/view.html.php
index 46e906a29f..6e38002117 100644
--- a/module/doc/view/view.html.php
+++ b/module/doc/view/view.html.php
@@ -48,18 +48,13 @@
 <div class='row-table'>
   <div class='col-main'>
     <div class='main'>
-      <fieldset>
-        <legend><?php echo $lang->doc->digest;?></legend>
-        <div><?php echo $doc->digest;?></div>
-      </fieldset>
-      <fieldset>
-        <legend><?php echo $lang->doc->keywords;?></legend>
-        <div><?php echo $doc->keywords;?></div>
-      </fieldset>
       <?php if($doc->type == 'url'):?>
       <fieldset>
         <legend><?php echo $lang->doc->url;?></legend>
-        <div><?php echo html::a(urldecode($doc->url), '', '_blank');?></div>
+        <div>
+          <?php echo html::a(urldecode($doc->url), '', '_blank');?>
+          <iframe src='<?php echo urldecode($doc->url);?>' width='100%'frameborder='0' id='url-content'></iframe>
+        </div>
       </fieldset>
       <?php endif;?>
       <?php if($doc->type == 'text'):?>
@@ -68,15 +63,24 @@
         <div class='content'><?php echo $doc->content;?></div>
       </fieldset>
       <?php endif;?>
-      <?php if($doc->type == 'file'):?>
-      <?php echo $this->fetch('file', 'printFiles', array('files' => $doc->files, 'fieldset' => 'true'));?>
-      <?php endif;?>
-      <?php include '../../common/view/action.html.php';?>
+      <div class='file-content'>
+        <?php if($doc->type == 'file'):?>
+        <?php echo $this->fetch('file', 'printFiles', array('files' => $doc->files, 'fieldset' => 'true'));?>
+        <?php endif;?>
+      </div>
       <div class='actions'><?php if(!$doc->deleted) echo $actionLinks;?></div>
     </div>
   </div>
   <div class='col-side'>
     <div class='main main-side'>
+      <fieldset>
+        <legend><?php echo $lang->doc->digest;?></legend>
+        <div><?php echo $doc->digest;?></div>
+      </fieldset>
+      <fieldset>
+        <legend><?php echo $lang->doc->keywords;?></legend>
+        <div><?php echo $doc->keywords;?></div>
+      </fieldset>
       <fieldset>
         <legend><?php echo $lang->doc->basicInfo;?></legend>
         <table class='table table-data table-condensed table-borderless table-fixed'>
@@ -110,6 +114,7 @@
           </tr>
         </table>
       </fieldset>
+      <?php include '../../common/view/action.html.php';?>
     </div>
   </div>
 </div>
diff --git a/module/file/view/printfiles.html.php b/module/file/view/printfiles.html.php
index d18333d84e..30059f8238 100644
--- a/module/file/view/printfiles.html.php
+++ b/module/file/view/printfiles.html.php
@@ -34,8 +34,8 @@ function downloadFile(fileID)
   {
       if(common::hasPriv('file', 'download'))
       {
-          echo "<li class='list-group-item'><i class='icon-file-text text-muted icon'></i> &nbsp;";
-          echo html::a($this->createLink('file', 'download', "fileID=$file->id") . $sessionString, $file->title .'.' . $file->extension, '_blank', "onclick='return downloadFile($file->id)'");
+          $fileTitle = "<li class='list-group-item'><i class='icon-file-text text-muted icon'></i> &nbsp;" . $file->title .'.' . $file->extension;
+          echo html::a($this->createLink('file', 'download', "fileID=$file->id") . $sessionString, $fileTitle, '_blank', "onclick='return downloadFile($file->id)'");
           echo "<span class='right-icon'>";
           common::printLink('file', 'edit', "fileID=$file->id", "<i class='icon-pencil'></i>", '', "class='edit btn-icon' title='{$lang->file->edit}'");
           if(common::hasPriv('file', 'delete')) echo html::a('###', "<i class='icon-remove'></i>", '', "class='btn-icon' onclick='deleteFile($file->id)' title='$lang->delete'");