Merge pull request #235 from driusan/MinorGUIFixes

Minor gui fixes
aces · Dec 10, 2013 · c3e7a2b · c3e7a2b
2 parents 0402506 + ca4e162
commit c3e7a2b
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 14 deletions.
diff --git a/htdocs/dicom_archive.php b/htdocs/dicom_archive.php
@@ -23,6 +23,8 @@
 // check for valid user login
 
 $user =& User::singleton();
+$site =& Site::singleton($user->getData('CenterID'));
+
 if(Utility::isErrorX($user)) {
     die("Error creating user object: ".$user->getMessage());
 }
@@ -34,12 +36,14 @@
 $tpl_data['user_full_name']=$user->getData('Real_name');
 $tpl_data['user_site_name']=$user->getData('Site');
 
+$tpl_data['user'] = $user->getData();
 $tpl_data['TarchiveID'] = $_REQUEST['TarchiveID'];
 // the the list of tabs, their links and perms
 $mainMenuTabs = $config->getSetting('main_menu_tabs');
 
 foreach(Utility::toArray($mainMenuTabs['tab']) AS $myTab){
     $tpl_data['tabs'][]=$myTab;
+
     foreach(Utility::toArray($myTab['subtab']) AS $mySubtab)
     {
         // skip if inactive

diff --git a/htdocs/main.css b/htdocs/main.css
@@ -514,7 +514,7 @@ list-style-type: none;
 
 #navlist a:link, #navlist a:visited
 {
-color: #000;
+color: white;
 text-decoration: none;
 }
 

diff --git a/smarty/templates/dicom_archive_main.tpl b/smarty/templates/dicom_archive_main.tpl
@@ -4,13 +4,16 @@
 <HEAD>
 <div id="page">
 <LINK REL=StyleSheet HREF="{$css}" TYPE="text/css">
+<link rel=StyleSheet HREF="css/jquery-ui-1.8.2.custom.css" TYPE="text/css">
+<link rel=StyleSheet HREF="css/jqueryslidemenu.css" TYPE="text/css">
 <!-- shortcut icon that displays on the browser window -->
 <link rel="shortcut icon" href="images/mni_icon.ico" type="image/ico" />
 <!-- page title -->
 <TITLE>DICOM - {$study_title}</TITLE>
 
 <link type="text/css" href="css/jqueryslidemenu.css" rel="Stylesheet" />
 <script type="text/javascript" src="js/jquery/jquery-1.4.2.min.js"></script>
+<script type="text/javascript" src="js/jquery/jquery-ui-1.8.2.custom.min.js"></script>
 <script type="text/javascript" src="js/jquery/jqueryslidemenu.js"></script>
 <!-- end page header -->
 </HEAD>
@@ -68,12 +71,13 @@ function JSFX_FloatDiv(id, sx, sy)
 	}
 	return el;
 }
-JSFX_FloatDiv("divTopLeft",       10, 200).flt();
+JSFX_FloatDiv("divTopLeft",10, 200).flt();
 
 </script>
 {/literal}
 
 <BODY>
+
 <table width="100%" class="header">
 <tr>
 <th align="left" id="jsheader">
@@ -84,21 +88,22 @@ JSFX_FloatDiv("divTopLeft",       10, 200).flt();
 {if $tab.visible == 1}
 <li><a href="#">{$tab.label}</a>
 <ul width="250">
-{foreach from=$tab.subtab item=mySubtab}
-{if $tab.label == $mySubtab.parent && $mySubtab.visible == 1}
+{foreach from=$subtab item=mySubtab}
+{if $tab.label == $mySubtab.parent}
+{if $mySubtab.label == "Data Query Tool"}
+<a href="{$mySubtab.link}" target="_blank">{$mySubtab.label}</a>
+{else}
 <a href="{$mySubtab.link}">{$mySubtab.label}</a>
 {/if}
-{/foreach}
-{if $tab.subtab.label != ''}
-<a href="{$tab.subtab.link}">{$tab.subtab.label}</a>
 {/if}
+{/foreach}
 </ul>
 </li>
 {/if}
 {/foreach}
-<li><a href= javascript:open_help_section()>Help</a></li>
-<div class="Account">
-<li><a href="#">{$user_full_name}</a>
+</ul>
+<ul style="float:right">
+<li><a href="#">{$user.Real_name}</a>
 <ul>
 <li><a href="main.php?test_name=user_accounts&subtest=my_preferences">My Preferences</a></li>
 <li><a href="main.php?logout=true">Log Out</a></li>
@@ -107,13 +112,23 @@ JSFX_FloatDiv("divTopLeft",       10, 200).flt();
 </ul>
 </div>
 <div class="site">
-Site: {$user_site_name} &nbsp;|
+&nbsp;&nbsp;  Site: {$user.Site} &nbsp;|
+
+</div>
+
+
+<div id="slidemenu" style="float:right" class="jqueryslidemenu">
+<ul>
+<li><a href="#" onclick="FeedbackButtonClicked()"><img width=17 src=images/pencil.gif></a></li>
+
+<li><a href="#" onClick="MyWindow=window.open('context_help_popup.php?test_name={$test_name}','MyWindow','toolbar=yes,location=yes,directories=yes,status=yes,menubar=yes,scrollbars=yes,resizable=yes,width=800,height=400'); return false;"><img width=17 src=images/help.gif></a></li>
+</ul>
+</div>
 </div>
 </div>
 </th>
 </tr>
 </table>
-
 <!-- start main table -->
 <table width="90%" cellpadding="5" cellspacing="2">
 <!-- navigation panel -->

diff --git a/smarty/templates/main.tpl b/smarty/templates/main.tpl
@@ -296,12 +296,10 @@ If this error persists, please report a bug using <a target="mantis" href="{$man
 <div id="footerLinks">
 <td width="100%">
 <ul id="navlist" style="margin-top: 5px; margin-bottom: 2px;" >
-<!--
 <li id="active">|</li>
 {foreach from=$links item=link}
 <li><a href="{$link.url}" target="{$link.windowName}">{$link.label}</a> | </li>
 {/foreach}
--->
 </ul>
 </td>
 </div>