From 3f6037ca314990780b127dfc827e3dbdaa6c7191 Mon Sep 17 00:00:00 2001
From: avene <gskanym@126.com>
Date: Sat, 23 Jun 2018 14:50:50 +0800
Subject: [PATCH] #53

---
 .../default/views/scripts/data/index.phtml    |  4 +-
 .../default/views/scripts/data/view.phtml     | 93 +++++++++----------
 2 files changed, 46 insertions(+), 51 deletions(-)

diff --git a/application/default/views/scripts/data/index.phtml b/application/default/views/scripts/data/index.phtml
index 6d9e3c84..ddcbad36 100755
--- a/application/default/views/scripts/data/index.phtml
+++ b/application/default/views/scripts/data/index.phtml
@@ -11,9 +11,7 @@ $this->headLink()->appendStylesheet('/static-sanjy-np/css/about.css');
     <div class="container">
         <div class="row">
             <div class="col-md-3 col-sm-4 bcid-cat">数据服务</div>
-            <div class="col-md-9 col-sm-8 location">
-                <?= $this->render('breadcrumbs.phtml'); ?>
-            </div>
+            <?= $this->render('breadcrumbs.phtml'); ?>
         </div>
     </div>
 </div>
diff --git a/application/default/views/scripts/data/view.phtml b/application/default/views/scripts/data/view.phtml
index 6d28f3e9..ad941992 100755
--- a/application/default/views/scripts/data/view.phtml
+++ b/application/default/views/scripts/data/view.phtml
@@ -9,15 +9,15 @@ $this->headLink()->appendStylesheet('/static-sanjy-np/css/about.css');
 $this->headLink()->appendStylesheet('/static-sanjy-np/css/dataDetail.css');
 $this->nav[] = array('link' => "/data/" . $this->metadata->uuid, 'title' => $this->metadata->title);
 ?>
-    <div class="breadcrumb-wrapper">
-        <div class="container">
-            <div class="row">
-                <div class="col-md-3 col-sm-4 bcid-cat">数据详情</div>
-                <?= $this->render('breadcrumbs.phtml'); ?>
-                </div>
-            </div>
+<div class="breadcrumb-wrapper">
+    <div class="container">
+        <div class="row">
+            <div class="col-md-3 col-sm-4 bcid-cat">数据详情</div>
+            <?= $this->render('breadcrumbs.phtml'); ?>
         </div>
     </div>
+</div>
+
 
 <?php $md = $this->metadata;
 if ($md): ?>
@@ -168,29 +168,28 @@ if ($md): ?>
                 <h6>联系信息</h6>
                 <div class="">
                     <?php
-                    $party_zh=array('resourceProvider'=>'资源提供者','custodian'=>'维护者','owner'=>'拥有者','user'=>'用户','distributor'=>'数据服务联系人','originator'=>'创建者','pointOfContact'=>'联系人','principalInvestigator'=>'数据调查与处理者','processor'=>'处理者','publisher'=>'元数据发布者','author'=>'元数据作者');
-                    $r='';
-                    $i=0;
-                    foreach($this->authors as $k=>$author) :
-                        if ($author->role!=$r)
-                        {
-                            $r=$author->role;
-                            $i=0;
-                            if ($k>0) echo '</p>';
-                            echo '<p>'.$party_zh[$author->role].'：';
+                    $party_zh = array('resourceProvider' => '资源提供者', 'custodian' => '维护者', 'owner' => '拥有者', 'user' => '用户', 'distributor' => '数据服务联系人', 'originator' => '创建者', 'pointOfContact' => '联系人', 'principalInvestigator' => '数据调查与处理者', 'processor' => '处理者', 'publisher' => '元数据发布者', 'author' => '元数据作者');
+                    $r = '';
+                    $i = 0;
+                    foreach ($this->authors as $k => $author) :
+                        if ($author->role != $r) {
+                            $r = $author->role;
+                            $i = 0;
+                            if ($k > 0) echo '</p>';
+                            echo '<p>' . $party_zh[$author->role] . '：';
                         }
-                        if ($i>0) echo '，';
-                        $i+=1;
-                        if (!empty($author->email) && $r!='principalInvestigator')
-                            echo '<a href="mailto:'.$author->email.'">';
-                        echo '<strong title="'.$author->organisation.'">';
+                        if ($i > 0) echo '，';
+                        $i += 1;
+                        if (!empty($author->email) && $r != 'principalInvestigator')
+                            echo '<a href="mailto:' . $author->email . '">';
+                        echo '<strong title="' . $author->organisation . '">';
                         if (!empty($author->individual))
                             echo $author->individual;
                         else
                             echo $author->organisation;
                         echo '</strong>';
                         if (!empty($author->email)) echo '</a>';
-                        if ($k+1==count($this->authors)) echo '</p>';
+                        if ($k + 1 == count($this->authors)) echo '</p>';
                     endforeach;
                     ?>
                 </div>
@@ -200,47 +199,45 @@ if ($md): ?>
     </div>
 
 
-
-
     <script type="text/javascript" charset="utf-8">
-        var config = { projection: "EPSG:4326"};
-        var map=new TMap("watermap",config);
-        var lat=<?= ($md->south+$md->north)/2; ?>;
-        var lng=<?= ($md->east+$md->west)/2; ?>;
-        map.centerAndZoom(new TLngLat(lng,lat),12);
+        var config = {projection: "EPSG:4326"};
+        var map = new TMap("watermap", config);
+        var lat =<?= ($md->south + $md->north) / 2; ?>;
+        var lng =<?= ($md->east + $md->west) / 2; ?>;
+        map.centerAndZoom(new TLngLat(lng, lat), 12);
         map.setMapType(TMAP_HYBRID_MAP);
-        <?php if ($md->north==$md->south && $md->east==$md->west) :?>
-        var marker=new TMarker(new TLngLat(lng,lat));
+        <?php if ($md->north == $md->south && $md->east == $md->west) :?>
+        var marker = new TMarker(new TLngLat(lng, lat));
         map.addOverLay(marker);
         <?php else :?>
-        var p1=new TLngLat(<?= $md->west ?>,<?= $md->south ?>);
-        var p2=new TLngLat(<?= $md->west ?>,<?= $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 p1 = new TLngLat(<?= $md->west ?>,<?= $md->south ?>);
+        var p2 = new TLngLat(<?= $md->west ?>,<?= $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:"red",	//折线颜色
-            fillColor:"#FFFFFF",	//填充颜色。当参数为空时，折线覆盖物将没有填充效果
-            strokeWeight:"3px",	//折线的宽度，以像素为单位
-            opacity:0.3,	//折线的透明度，取值范围0 - 1
-            strokeStyle:"dashed"	//折线的样式，solid或dashed
+            strokeColor: "red",	//折线颜色
+            fillColor: "#FFFFFF",	//填充颜色。当参数为空时，折线覆盖物将没有填充效果
+            strokeWeight: "3px",	//折线的宽度，以像素为单位
+            opacity: 0.3,	//折线的透明度，取值范围0 - 1
+            strokeStyle: "dashed"	//折线的样式，solid或dashed
         };
-        var rect = new TRect(bounds,config);
+        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表示隐藏。
+            type: "TMAP_NAVIGATION_CONTROL_SMALL",	//缩放平移的显示类型
+            anchor: "TMAP_ANCHOR_TOP_LEFT",			//缩放平移控件显示的位置
+            offset: [0, 0]						    //缩放平移控件的偏移值 showZoomInfo:true //是否显示级别提示信息，true表示显示，false表示隐藏。
         };
         //创建缩放平移控件对象
-        control=new TNavigationControl(config);
+        control = new TNavigationControl(config);
         //添加缩放平移控件
         map.addControl(control);
     </script>
 <?php else: ?>
     <p>Cannot find the metadata.</p>
     <p>没有找到对应的元数据。</p>
-<?php endif;?>
+<?php endif; ?>