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

merge sanjiangyuan-sub branch r4734 - r4762 into sjy-water

This commit is contained in:
wlx 2014-06-15 07:32:15 +00:00
parent 67b8d54ae1 a43b45863d
commit 15cf169eb5
11 changed files with 124 additions and 197 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
application/default/controllers/IndexController.php
View File

@ -9,7 +9,7 @@ class IndexController extends Zend_Controller_Action
$this->view->theme = new Theme(); $this->view->theme = new Theme();
$this->submd = $this->view->config->sub->metadata; $this->submd = $this->view->config->sub->metadata;
$this->subnews = $this->view->config->sub->news; $this->subnews = $this->view->config->sub->news;
$this->_helper->layout->setLayout('index'); # $this->_helper->layout->setLayout('index');
//$this->view->main_nav_pageID = "index"; //$this->view->main_nav_pageID = "index";
} }

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

@ -21,7 +21,7 @@ $this->theme->AppendPlus($this,'colorbox');
<div class="clearfix" style="border-bottom:1px dashed #DFDFDF; overflow:hidden"> <div class="clearfix" style="border-bottom:1px dashed #DFDFDF; overflow:hidden">
<div class="pull-left"> <div class="pull-left">
<a href="/service/thumb/id/<?php echo $md['id'];?>" class="colorbox"> <a href="/service/bigthumb/id/<?php echo $md['id'];?>" class="colorbox">
<img class="img-rounded img-polaroid" src="/service/thumb/id/<?php echo $md['id'];?>" style="margin:20px 20px" width="140" height="80" /> <img class="img-rounded img-polaroid" src="/service/thumb/id/<?php echo $md['id'];?>" style="margin:20px 20px" width="140" height="80" />
</a> </a>
</div> </div>

61
application/default/views/scripts/data/view.phtml
View File

@ -7,7 +7,7 @@
$this->breadcrumb('<a href="/data">'.$this->config->title->data.'</a>'); $this->breadcrumb('<a href="/data">'.$this->config->title->data.'</a>');
$this->breadcrumb('查看元数据'); $this->breadcrumb('查看元数据');
$this->breadcrumb()->setSeparator(' > '); $this->breadcrumb()->setSeparator(' > ');
//$this->theme->AppendPlus($this,'google_map_v3'); $this->theme->AppendPlus($this,'tianditu');
$this->theme->AppendPlus($this,'colorbox'); $this->theme->AppendPlus($this,'colorbox');
if(!empty($this->dataService)) { if(!empty($this->dataService)) {
$this->theme->AppendModel($this,"dataservice"); $this->theme->AppendModel($this,"dataservice");
@ -18,6 +18,7 @@ h3.gs_rt{font-size:110%;}
#file-list li:hover {background-color: #f5f5f5;} #file-list li:hover {background-color: #f5f5f5;}
#file-list li li:hover {background-color: #dedede;} #file-list li li:hover {background-color: #dedede;}
#file-list li li li:hover {background-color: #eeeeee;} #file-list li li li:hover {background-color: #eeeeee;}
#watermap img {max-width:none;}
</style> </style>
<?php $md=$this->metadata;if ($md):?> <?php $md=$this->metadata;if ($md):?>
<h3><?php echo $this->escape($md->title); <h3><?php echo $this->escape($md->title);
@ -498,15 +499,7 @@ endforeach;
</div> </div>
<script src="/js/metadata-view.js"></script> <script src="/js/metadata-view.js"></script>
<script type="text/javascript" charset="utf-8"> <script type="text/javascript" charset="utf-8">
function loadScript() {
var script = document.createElement("script");
script.type = "text/javascript";
script.src = "http://maps.google.com/maps/api/js?sensor=false&callback=initialize";
document.body.appendChild(script);
}
window.onload = loadScript;
$(function() { $(function() {
//google.maps.event.addDomListener(window, 'load', initialize);
$(".colorbox").colorbox({photo:"true"}); $(".colorbox").colorbox({photo:"true"});
$('.googlesearch').click(function(){googleSearch('<?php echo $ev;?>');}); $('.googlesearch').click(function(){googleSearch('<?php echo $ev;?>');});
$('.bingsearch').click(function(){bingSearch('<?php echo $ev;?>');}); $('.bingsearch').click(function(){bingSearch('<?php echo $ev;?>');});
@ -555,20 +548,42 @@ function ajaxpage(page){
ajaxpage_get(page,'<?= $md->uuid; ?>'); ajaxpage_get(page,'<?= $md->uuid; ?>');
} }
var map = null; var config = { projection: "EPSG:4326"}
var mapElementID = "watermap"; var map=new TMap("watermap",config);
var bounds = null; var lat=<?= ($md->south+$md->north)/2; ?>;
var rectangle = null; var lng=<?= ($md->east+$md->west)/2; ?>;
var zoomlevel = 1; map.centerAndZoom(new TLngLat(lng,lat),12);
var bound = { map.setMapType(TMAP_HYBRID_MAP);
lat:<?= ($md->south+$md->north)/2; ?>, <?php if ($md->north==$md->south && $md->east==$md->west) :?>
lng:<?= ($md->east+$md->west)/2; ?>, var marker=new TMarker(new TLngLat(lng,lat));
zoom:<?php if ($md->north==$md->south) { ?> 10 <?php }else {?> 6 <?php }?>, map.addOverLay(marker);
east:<?= $md->east; ?>, <?php else :?>
west:<?= $md->west; ?>, var p1=new TLngLat(<?= $md->west ?>,<?= $md->south ?>);
south:<?= $md->south; ?>, var p2=new TLngLat(<?= $md->west ?>,<?= $md->north ?>);
north:<?= $md->north; ?> var p3=new TLngLat(<?= $md->east ?>,<?= $md->north ?>);
} var p4=new TLngLat(<?= $md->east ?>,<?= $md->south ?>);
map.setViewport(new Array(p1,p2,p3,p4));
var bounds = new TBounds(<?= $md->west; ?>,<?= $md->south; ?>,<?= $md->east; ?>,<?= $md->north; ?>);
var config = {
strokeColor:"blue", //折线颜色
fillColor:"#FFFFFF", //填充颜色。当参数为空时，折线覆盖物将没有填充效果
strokeWeight:"3px", //折线的宽度，以像素为单位
opacity:0.3, //折线的透明度，取值范围0 - 1
strokeStyle:"dashed" //折线的样式，solid或dashed
};
var rect = new TRect(bounds,config);
map.addOverLay(rect);
//map.zoomOut();
<?php endif; ?>
var config = {
type:"TMAP_NAVIGATION_CONTROL_SMALL", //缩放平移的显示类型
anchor:"TMAP_ANCHOR_TOP_LEFT", //缩放平移控件显示的位置
offset:[0,0], //缩放平移控件的偏移值 showZoomInfo:true //是否显示级别提示信息，true表示显示，false表示隐藏。
};
//创建缩放平移控件对象
control=new TNavigationControl(config);
//添加缩放平移控件
map.addControl(control);
function addfavorite(url,title){ function addfavorite(url,title){
var fav_url = url; var fav_url = url;

74
application/default/views/scripts/header-index.phtml
View File

@ -1,74 +0,0 @@
<!-- header -->
<link href="/sjyportal/css/style.css" rel="stylesheet" type="text/css" />
<header>
<div class="container">
<div class="row-fluid">
<div class="span12">
<div class="span4">
<img src="/sjyportal/img/logo.png" />
</div>
<div class="span8 inline">
<p class="pull-right" style="color:#000000; font-size:9px;">
<?php
$auth = Zend_Auth::getInstance();
if($auth->hasIdentity())
{
$user = $auth->getIdentity();
echo '<a href="/account"><i class="icon-user"></i> '.$user->username.'</a> ';
if ($user->usertype == $this->config->auth->identifier)
{
echo '<a href="/admin"><i class="icon-cog"></i> 后台 </a>';
}
echo '<a href="/data/order"><i class="icon-shopping-cart"></i> 数据篮 </a>';
echo '<a href="/account/logout">退出</a>';
} else {
echo '<a href="/account/login">登 录</a>&nbsp;&nbsp;|&nbsp;&nbsp;<a href="/account/register">注 册</a>';
} ?>
</p>
<?php $current_url =$_SERVER["REQUEST_URI"]?>
<p >
<ul class="nav nav-pills pull-right">
<li style="padding-right:20px"<?php if($current_url=='/') echo " class='active'";?> ><a href="/">首 页</a></li>
<li style="padding-right:20px"><a href="/archives/">新 闻</a></li>
<li style="padding-right:20px"><a href="/data">数 据</a></li>
<li style="padding-right:20px"><a href="/about">关于我们</a></li>
<li style="padding-right:20px" class="input-append ">
<form action="/search" method="get"><input class="input-medium" placeholder="关键字" type="text" name="q"><button class="btn" type="submit">搜索</button></form>
</li>
</ul>
</p>
</div>
</div>
</div>
</div>
</header>
<!-- Carousel
================================================== -->
<div class="container-fluid1 ">
<div id="myCarousel" class="carousel slide">
<div class="carousel-inner">
<div class="item active"> <img src="/sjyportal/img/slide-01.jpg" alt="" class="">
<div class="container">
<div class="carousel-caption">
<h2>青海省首度启动国家重点级水土保持监测工作</h2>
</div>
</div>
</div>
<div class="item"> <img src="/sjyportal/img/slide-02.jpg" alt="" class="">
<div class="container">
<div class="carousel-caption">
<h2>青海省积极落实基层水土保持监测经费</h2>
</div>
</div>
</div>
</div>
<a class="left carousel-control" href="#myCarousel" data-slide="prev">‹</a> <a class="right carousel-control" href="#myCarousel" data-slide="next">›</a> </div>
</div>
<!-- /.carousel -->
<div class="container">

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

@ -6,11 +6,11 @@
<div class="container"> <div class="container">
<div class="row-fluid"> <div class="row-fluid">
<div class="span12"> <div class="span12">
<div class="span4"> <div class="span3">
<img src="/sjyportal/img/logo.png" /> <img src="/sjyportal/img/logo.png" />
</div> </div>
<div class="span8 inline"> <div class="span9">
<p class="pull-right" style="color:#000000; font-size:9px;"> <p class="pull-right" style="font-size:9px; position:relative; top:-8px;">
<?php <?php
$auth = Zend_Auth::getInstance(); $auth = Zend_Auth::getInstance();
if($auth->hasIdentity()) if($auth->hasIdentity())
@ -27,19 +27,23 @@
echo '<a href="/account/login">登 录</a>&nbsp;&nbsp;|&nbsp;&nbsp;<a href="/account/register">注 册</a>'; echo '<a href="/account/login">登 录</a>&nbsp;&nbsp;|&nbsp;&nbsp;<a href="/account/register">注 册</a>';
} ?> } ?>
</p> </p>
<?php $current_url =$_SERVER["REQUEST_URI"]?>
<p > <p class="pull-right" >
<ul class="nav nav-pills pull-right" id="mainmenu"> <form action="/search" method="get">
<li style="padding-right:20px"<?php if($current_url=='/') echo " class='active'";?> ><a href="/">首 页</a></li> <ul class="navigat nav nav-pills pull-right" id="mainmenu">
<li style="padding-right:20px"><a href="/archives/">新 闻</a></li> <li><a href="/">首 页</a></li>
<li style="padding-right:20px"><a href="/data">数 据</a></li> <li style="padding-left:15px"><a href="/archives/">新 闻</a></li>
<li style="padding-right:20px"><a href="/about">关于我们</a></li> <li style="padding-left:15px"><a href="/data">数 据</a></li>
<li style="padding-right:20px" class="input-append "> <li style="padding-left:15px"><a href="/about">关于我们</a></li>
<form action="/search" method="get"><input class="input-medium" placeholder="关键字" type="text" name="q"><button class="btn" type="submit">搜索</button></form> <li style="padding-left:15px" class="input-append ">
<input class="input-medium" placeholder="关键字" type="text" name="q">
<button class="btn" type="submit">搜索</button>
</li> </li>
</ul> </ul>
</form>
</p> </p>
</div> </div>
</div> </div>
</div> </div>
@ -47,4 +51,4 @@
</header> </header>
<div class="container"> <div class="container">
<?= $this->render('breadcrumbs.phtml'); ?> <?= $this->render('breadcrumbs.phtml'); ?>

28
application/default/views/scripts/index/index.phtml
View File

@ -4,9 +4,33 @@
$this->headTitle()->setSeparator(' - '); $this->headTitle()->setSeparator(' - ');
?> ?>
<!-- Wrap the rest of the page in another container to center all the content. --> </div><!-- 结束container容器，实现banner全屏展示-->
<link href="/sjyportal/css/style.css" rel="stylesheet" type="text/css" /> <!-- Carousel
================================================== -->
<div class="container-fluid1 ">
<div id="myCarousel" class="carousel slide">
<div class="carousel-inner">
<div class="item active"> <img src="/sjyportal/img/slide-00.jpg" alt="" class="">
<div class="container">
<div class="carousel-caption">
<h2>青海54.6%国土被纳入三江源国家生态保护试验区</h2>
</div>
</div>
</div>
<div class="item"> <img src="/sjyportal/img/slide-01.jpg" alt="" class="">
<div class="container">
<div class="carousel-caption">
<h2>青海54.6%国土被纳入三江源国家生态保护试验区</h2>
</div>
</div>
</div>
</div>
<a class="left carousel-control" href="#myCarousel" data-slide="prev">‹</a> <a class="right carousel-control" href="#myCarousel" data-slide="next">›</a> </div>
</div>
<!-- /.carousel -->
<div class="container">
<!-- Three columns of text below the carousel --> <!-- Three columns of text below the carousel -->
<div class="row-fluid"> <div class="row-fluid">

58
application/layouts/index.phtml
View File

@ -1,58 +0,0 @@
<!DOCTYPE html>
<html>
<head>
<?= $this->headTitle() ?>
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
<link href="/js/lib/bootstrap/css/bootstrap.min.css" rel="stylesheet" media="screen">
<link href="/js/lib/bootstrap/css/bootstrap-responsive.min.css" rel="stylesheet" media="screen">
<link rel="stylesheet" href="/js/lib/bootstrap/css/font-awesome.min.css">
<link href="/sjyportal/css/style.css" rel="stylesheet" media="screen">
<!--[if IE 7]>
<link rel="stylesheet" href="/js/lib/bootstrap/css/font-awesome-ie7.min.css">
<![endif]-->
<!-- HTML5 shim, for IE6-8 support of HTML5 elements -->
<!--[if lt IE 9]>
<script src="/sjyprotal/js/html5shiv.js"></script>
<![endif]-->
<!-- Fav and touch icons -->
<script src="/js/lib/jquery.lasted.js"></script>
<script src="/js/lib/bootstrap/js/bootstrap.min.js"></script>
<script src="/js/navi.js"></script>
<?= $this->headScript() ?>
<?= $this->headLink() ?>
<?= $this->headStyle() ?>
<link rel="shortcut icon" href="/favicon_64.png" />
<link rel="alternate" type="application/rss+xml" title="WestDC RSS Feed" href="/data/feed" />
<link rel="pingback" href="http://westdc.westgis.ac.cn/data/pingback" />
</head>
<body>
<?= $this->render('header-index.phtml') ?>
<!--<div class="breadcrumb"><?= $this->breadcrumb() ?> </div>-->
<?= $this->layout()->content ?>
<?= $this->render('footer.phtml') ?>
</body>
<!-- Piwik -->
<script type="text/javascript">
var _paq = _paq || [];
_paq.push(['trackPageView']);
_paq.push(['enableLinkTracking']);
(function() {
var u=(("https:" == document.location.protocol) ? "https" : "http") + "://piwik.westgis.ac.cn/";
_paq.push(['setTrackerUrl', u+'piwik.php']);
_paq.push(['setSiteId', 12]);
var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0]; g.type='text/javascript';
g.defer=true; g.async=true; g.src=u+'piwik.js'; s.parentNode.insertBefore(g,s);
})();
</script>
<noscript><p><img src="http://piwik.westgis.ac.cn/piwik.php?idsite=12" style="border:0;" alt="" /></p></noscript>
<!-- End Piwik Code -->
<script>setPage();</script>
</html>

7
application/models/Theme.php
View File

@ -158,7 +158,12 @@ class Theme
'/js/lib/google-map/keydragzoom.js' '/js/lib/google-map/keydragzoom.js'
) )
), ),
//Google Map API v3
'tianditu'=>array(
$this->ScriptKey => array(
'http://api.tianditu.com/js/maps.js'
)
),
);//插件列表 );//插件列表
}// _init_plus() }// _init_plus()

2
htdocs/js/lib/bootstrap/css/bootstrap.min.css vendored
View File

File diff suppressed because one or more lines are too long

39
htdocs/sjyportal/css/style.css
View File

@ -8,6 +8,27 @@ body {
padding-bottom: 40px; padding-bottom: 40px;
color: #5a5a5a; color: #5a5a5a;
} }
header{
margin: 5px 0px;
}
#logo, #search {
}
.navigat {
float: right;
position: relative;
left: 70px;
top: 15px;
}
}
.container .span12 .row .span8 .nav {
padding-top: 0px;
}
/* Sidenav for Docs /* Sidenav for Docs
-------------------------------------------------- */ -------------------------------------------------- */
@ -77,17 +98,7 @@ body {
} }
/* */ /* */
/* */ /* */
#logo, #search {
}
.container .row-fluid .span12 .span9 .nav {
float: right;
padding-top: 10px;
}
.container .span12 .row .span8 .nav {
padding-top: 0px;
}
.box { .box {
border: 1px solid #EFEFEF; border: 1px solid #EFEFEF;
padding-top: 10px; padding-top: 10px;
@ -139,7 +150,7 @@ body {
/* Carousel base class */ /* Carousel base class */
.carousel { .carousel {
margin-bottom: 30px; margin-bottom: 15px;
} }
.carousel .container { .carousel .container {
@ -156,14 +167,14 @@ body {
z-index: 10; z-index: 10;
} }
.carousel .item { .carousel .item {
height: 320px; height: 260px;
} }
.carousel img { .carousel img {
position: absolute; position: absolute;
top: 0; top: 0;
left: 0; left: 0;
min-width: 100%; min-width: 100%;
height: 320px; height: 260px;
} }
.carousel-caption { .carousel-caption {
background-color: transparent; background-color: transparent;
@ -171,7 +182,7 @@ body {
max-width: 1128px; max-width: 1128px;
padding: 0 20px; padding: 0 20px;
margin-top:260px; margin-top:210px;
} }
.carousel-caption h2, .carousel-caption .lead { .carousel-caption h2, .carousel-caption .lead {
margin: 0; margin: 0;