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

merge sanjiangyuan-sub r4788 - r4802 into sjy-water

This commit is contained in:
wlx 2014-06-17 09:09:15 +00:00
parent d65db86315 3e9b768363
commit 8c93f2aa8e
6 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
application/default/controllers/VisualController.php
View File

@ -10,6 +10,10 @@ class VisualController extends Zend_Controller_Action
{ {
$this->view->config = Zend_Registry::get('config'); $this->view->config = Zend_Registry::get('config');
$this->db=Zend_Registry::get('db'); $this->db=Zend_Registry::get('db');
$this->view->nav = array(
array('link'=>'/','title'=>'<i class="icon-home"></i>'),
array('link'=>'/data','title'=>$this->view->config->title->data),
);
$auth = Zend_Auth::getInstance(); $auth = Zend_Auth::getInstance();
if($auth->hasIdentity()) if($auth->hasIdentity())

2
application/default/views/scripts/archives/list.phtml
View File

@ -56,7 +56,7 @@ $this->breadcrumb()->setSeparator(' > ');
$description = $v['description']; $description = $v['description'];
} }
?> ?>
<li><a href="<?php echo $v['url']; ?>"><?php echo $v['title']; ?></a> <small>[<?php echo date("Y-m-d",strtotime( $v['ts_published'] )); ?>]</small></li> <li><a href="<?php echo $v['url']; ?>"><?php echo $v['title']; ?></a> <small class="pull-right">[<?php echo date("Y-m-d",strtotime( $v['ts_published'] )); ?>]</small></li>
<?php <?php
} }
} }

2
application/default/views/scripts/data/visual.phtml
View File

@ -15,7 +15,7 @@ $this->theme->AppendPlus($this,'colorbox');
<div class="mditem"> <div class="mditem">
<div class="thumb"> <div class="thumb">
<a href="/service/bigthumb/uuid/<?= $md['uuid'] ?>" class="colorbox"> <a href="/service/bigthumb/uuid/<?= $md['uuid'] ?>" class="colorbox">
<img src="/service/thumb/id/<?php echo $md['id'];?>" /> <img src="/service/thumb/uuid/<?php echo $md['uuid'];?>" />
</a> </a>
</div> </div>
<h2><a href="/data/<?php echo $md['uuid']; ?>"><?php echo $this->escape($md['title']);?></a></h2> <h2><a href="/data/<?php echo $md['uuid']; ?>"><?php echo $this->escape($md['title']);?></a></h2>

2
application/default/views/scripts/header.phtml
View File

@ -7,7 +7,7 @@
<div class="row-fluid"> <div class="row-fluid">
<div class="span12"> <div class="span12">
<div class="span3"> <div class="span3">
<img src="/sjyportal/img/logo.png" /> <a href="/"><img src="/sjyportal/img/logo.png" /></a>
</div> </div>
<div class="span9"> <div class="span9">
<p class="pull-right" style="font-size:9px; position:relative; top:-8px;"> <p class="pull-right" style="font-size:9px; position:relative; top:-8px;">

1
application/default/views/scripts/visual/view.phtml
View File

@ -8,6 +8,7 @@ $this->breadcrumb('<a href="/">首页</a>');
$this->breadcrumb('<a href="/data">数据与服务</a>'); $this->breadcrumb('<a href="/data">数据与服务</a>');
$this->breadcrumb('数据可视化'); $this->breadcrumb('数据可视化');
$this->breadcrumb()->setSeparator(' > '); $this->breadcrumb()->setSeparator(' > ');
$this->nav[] = array('link'=>"/data/visual",'title'=>'可视化数据列表');
?> ?>
<div class="row"> <div class="row">
<div class="span12"> <div class="span12">

2
htdocs/js/navi.js
View File

@ -2,7 +2,7 @@ function extractPageName(hrefString)
{ {
var arr = hrefString.split('/'); var arr = hrefString.split('/');
var result=(arr.length<3) ? hrefString : arr[3].toLowerCase(); var result=(arr.length<3) ? hrefString : arr[3].toLowerCase();
if (result=='water' || result=='heihe' || result=='glacier' || result=='yrnmr' || result=='hiwater') result='data'; if (result=='visual' || result=='heihe') result='data';
if (result=='admin' && arr.length>=4) result+="/"+arr[4]; if (result=='admin' && arr.length>=4) result+="/"+arr[4];
return result; return result;
} }