Skip to content
This repository was archived by the owner on Sep 10, 2021. It is now read-only.

Commit b39bdd9

Browse files
author
Charles Ma
committed
BUG: refs #301 fixed layout
1 parent e9231a2 commit b39bdd9

File tree

1 file changed

+33
-33
lines changed

1 file changed

+33
-33
lines changed

‎core/layouts/layout.phtml‎

Lines changed: 33 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<?php
1+
<?php
22
/*=========================================================================
33
MIDAS Server
44
Copyright (c) Kitware SAS. 20 rue de la Villette. All rights reserved.
@@ -9,26 +9,26 @@ This software is distributed WITHOUT ANY WARRANTY; without even
99
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
1010
PURPOSE. See the above copyright notices for more information.
1111
=========================================================================*/
12-
echo $this->doctype()
12+
echo $this->doctype()
1313
?>
1414
<html xmlns="http://www.w3.org/1999/xhtml">
1515
<head>
1616

1717
<!-- Meta -->
1818
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
1919
<title><?php echo $this->title ?></title>
20-
21-
<meta name="description" content="<?php echo htmlentities($this->metaDescription)?>" />
20+
21+
<meta name="description" content="<?php echo htmlentities($this->metaDescription)?>" />
2222
<meta name="keywords" content="<?php echo htmlentities($this->metaKeywords)?>" />
23-
<meta name="robots" content="index, follow, all" />
24-
<noscript>
25-
<meta http-equiv="refresh" content="1; URL=<?php echo $this->webroot?>/index/nojs">
26-
</noscript>
27-
23+
<meta name="robots" content="index, follow, all" />
24+
<noscript>
25+
<meta http-equiv="refresh" content="1; URL=<?php echo $this->webroot?>/index/nojs">
26+
</noscript>
27+
2828
<!--[if lte IE 6]>
29-
<meta http-equiv="refresh" content="1; URL=<?php echo $this->webroot?>/index/nobrowser">
29+
<meta http-equiv="refresh" content="1; URL=<?php echo $this->webroot?>/index/nobrowser">
3030
<![endif]-->
31-
31+
3232
<!-- Import CSS -->
3333
<link rel="shortcut icon" href="<?php echo $this->coreWebroot ?>/public/images/icons/favicon.ico" />
3434
<?php
@@ -53,7 +53,7 @@ echo $this->doctype()
5353
<![endif]-->
5454
<?php echo $this->headLink(); // import the css ?>
5555
<?php echo $this->headStyle(); // import the css ?>
56-
56+
5757
</head>
5858
<body>
5959
<div class="MainDialog" style="display:none;">
@@ -80,10 +80,10 @@ echo $this->doctype()
8080
<div class="TopbarLeft">
8181
<ul>
8282
<li class="first">
83-
<a href="http://www.kitware.com/midasindex.html" >MIDAS</a>
83+
<a href="http://midasplatform.org" target="_blank">MIDAS</a>
8484
</li>
8585
<li>
86-
<a href="http://www.kitware.com" >Kitware</a>
86+
<a href="http://www.kitware.com" target="_blank">Kitware</a>
8787
</li>
8888
</ul>
8989
</div>
@@ -104,8 +104,8 @@ echo $this->doctype()
104104
echo '
105105
<li onclick="location.replace(\''.$this->webroot.'/admin\');"><a>'.$this->t('Administration').'</a></li>';
106106
}
107-
108-
107+
108+
109109
$linksModules = Zend_Registry::get('notifier')->callback("CALLBACK_CORE_GET_USER_MENU", array());
110110
if(!empty($linksModules))
111111
{
@@ -126,7 +126,7 @@ echo $this->doctype()
126126
{
127127
echo '<b><a class="loginLink" href="#" >'.$this->t('Login').'</a></b>';
128128
}
129-
?>
129+
?>
130130
</li>
131131
<li>
132132
<?php
@@ -138,23 +138,23 @@ echo $this->doctype()
138138
{
139139
echo '<a class="registerLink" href="#" > '.$this->t('Register').'</a>';
140140
}
141-
?>
141+
?>
142142
</li>
143143
<li>
144144
<a href="#" > <?= $this->t('Help') ?></a>
145145
</li>
146146
<li>
147-
147+
148148
<a href="#" style="margin-right: 20px">
149-
150-
<?php
149+
150+
<?php
151151
echo $this->t('My Language');
152152
?>
153-
<img class="languageIcon" src="<?php echo $this->coreWebroot?>/public/images/icons/language.png" alt ="" />
153+
<img class="languageIcon" src="<?php echo $this->coreWebroot?>/public/images/icons/language.png" alt ="" />
154154
</a>
155155
<ul>
156156
<li>
157-
<?php
157+
<?php
158158
if($this->lang=='en')
159159
{
160160
echo '<a href="#"><b>English</b></a>';
@@ -166,7 +166,7 @@ echo $this->doctype()
166166
?>
167167
</li>
168168
<li>
169-
<?php
169+
<?php
170170
if($this->lang=='fr')
171171
{
172172
echo '<a href="#"><b>Francais</b></a>';
@@ -206,13 +206,13 @@ echo $this->doctype()
206206
</a>
207207
</li>
208208
</ul>
209-
<div class="viewNoticeWrapper">
209+
<div class="viewNoticeWrapper">
210210
<div class="viewNotice"></div>
211211
</div>
212212
</div>
213213
</div>
214214
</div>
215-
215+
216216
<div class="Wrapper">
217217
<?php
218218
if($this->needUpgrade)
@@ -242,7 +242,7 @@ echo $this->doctype()
242242
<li <?php if($this->activemenu=='uploaded') {echo 'class="active"';} ?> onclick="location.replace('<?php echo $this->webroot?>/browse/uploaded');" ><a href="<?php echo $this->webroot?>/browse/uploaded"><img alt="" src="<?php echo $this->coreWebroot?>/public/images/icons/addfile.png" /><span> <?php echo $this->t('My uploads');?></span></a></li>
243243
<?php
244244
}
245-
245+
246246
$linksModules = Zend_Registry::get('notifier')->callback("CALLBACK_CORE_GET_LEFT_LINKS", array());
247247
if(!empty($linksModules))
248248
{
@@ -276,7 +276,7 @@ echo $this->doctype()
276276
if(is_array($item))
277277
{
278278
echo "<li onclick=\"location.replace('{$this->webroot}/item/{$item['item_id']}');\" class='recentItem' qtip='". str_replace("'", '"', $item['name'])."'><a href='{$this->webroot}/item/{$item['item_id']}'>".$this->slicename($item['name'],20)."</a></li>";
279-
}
279+
}
280280
}
281281
echo '</ul>';
282282
}
@@ -289,13 +289,13 @@ echo $this->doctype()
289289
echo "<div class='viewHeader'>{$this->header} </div>";
290290
}
291291
?>
292-
292+
293293
<div class="viewWrapper">
294294
<!-- Content -->
295295
<?php echo $this->layout()->content ?>
296296
<!-- End Content -->
297-
298-
</div>
297+
298+
</div>
299299
<div class="clear"/>
300300
</div>
301301
</div>
@@ -307,7 +307,7 @@ echo $this->doctype()
307307
</div>
308308
</div>
309309
<hr style="display: none;"/>
310-
</div>
310+
</div>
311311
<?php
312312
if (Zend_Registry::get("configGlobal")->smartoptimizer == 1)
313313
{
@@ -328,7 +328,7 @@ echo $this->doctype()
328328
<?php echo $this->json?>
329329
</div>
330330
</body>
331-
331+
332332
<?php
333333
$footers = Zend_Registry::get('notifier')->callback("CALLBACK_CORE_GET_FOOTER_LAYOUT", array());
334334
if(!empty($footers))

0 commit comments

Comments
 (0)