bob
/
westdc-zf1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

merge heihedata branch r4132 to trunk

This commit is contained in:
wlx 2013-12-22 02:01:24 +00:00
parent 6b4e98b87a
commit ca8626b6f7
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
application/default/views/scripts/hiwater/view.phtml
View File

@ -46,9 +46,16 @@ if ($md->title_en) echo '<br />'.$this->escape($md->title_en);?>
<ol> <ol>
<?php foreach($this->mcitation as $ref) : <?php foreach($this->mcitation as $ref) :
if (empty($ref->link)) if (empty($ref->link))
echo '<li>'.$ref->reference.'</li>'; {
echo '<li>'.$ref->reference;
echo '<a href="/knowledge/paper/id/'.$ref->id.'"><i class="icon-info-sign text-success"></i>查看</a>';
if(!empty($ref->attid)) {
echo ' <a href="/service/attach/id/'.$ref->attid.'"><i class="icon-download text-success"></i>下载</a>';
}
echo "</li>";
}
else else
echo '<li>'.$ref->reference.' <a href="'.$ref->link.'"><i class="icon-download text-success"></i>下载</a></li>'; echo '<li>'.$ref->reference.'<a href="/knowledge/paper/id/'.$ref->id.'"><i class="icon-info-sign text-success"></i>查看</a> <a href="'.$ref->link.'"><i class="icon-download text-success"></i>下载</a></li>';
endforeach; endforeach;
?> ?>
</ol> </ol>

2
htdocs/index.php
View File

@ -4,7 +4,7 @@ ini_set('display_errors', 1);
date_default_timezone_set('Asia/Shanghai'); date_default_timezone_set('Asia/Shanghai');
// directory setup and class loading // directory setup and class loading
set_include_path('.' . PATH_SEPARATOR . '/var/www/westdc.westgis.ac.cn/include/' set_include_path('.' . PATH_SEPARATOR . '/Users/wangliangxu/Projects/metadata/include/'
. PATH_SEPARATOR . '../application/models' . PATH_SEPARATOR . '../application/models'
. PATH_SEPARATOR . '../application/module' . PATH_SEPARATOR . '../application/module'
. PATH_SEPARATOR . '../application/default/controllers' . PATH_SEPARATOR . '../application/default/controllers'