From b99b401ea0141f296716e63bf00c1015bff15a81 Mon Sep 17 00:00:00 2001 From: Dave MacFarlane Date: Fri, 6 Dec 2013 11:30:13 -0500 Subject: [PATCH 1/3] Fixed fact that links were for some reason commented out in template --- smarty/templates/main.tpl | 2 -- 1 file changed, 2 deletions(-) diff --git a/smarty/templates/main.tpl b/smarty/templates/main.tpl index 53271902a92..388bafc1ec4 100644 --- a/smarty/templates/main.tpl +++ b/smarty/templates/main.tpl @@ -296,12 +296,10 @@ If this error persists, please report a bug using From db0c5e2d892be1177dced927fb3586b774de8483 Mon Sep 17 00:00:00 2001 From: Dave MacFarlane Date: Fri, 6 Dec 2013 11:32:10 -0500 Subject: [PATCH 2/3] Fixed link colour in footer --- htdocs/main.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/main.css b/htdocs/main.css index a455dc46dbc..1a946944f67 100644 --- 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; } From ca4e162bd66b12fcca43ed10ccbf02c048c31650 Mon Sep 17 00:00:00 2001 From: Dave MacFarlane Date: Fri, 6 Dec 2013 12:29:38 -0500 Subject: [PATCH 3/3] Fixed dicom archive menu in new gui --- htdocs/dicom_archive.php | 4 +++ smarty/templates/dicom_archive_main.tpl | 37 +++++++++++++++++-------- 2 files changed, 30 insertions(+), 11 deletions(-) diff --git a/htdocs/dicom_archive.php b/htdocs/dicom_archive.php index af1629076eb..b5bc4035c45 100644 --- 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/smarty/templates/dicom_archive_main.tpl b/smarty/templates/dicom_archive_main.tpl index 011577d9c08..eac419b0e66 100644 --- a/smarty/templates/dicom_archive_main.tpl +++ b/smarty/templates/dicom_archive_main.tpl @@ -4,6 +4,8 @@
+ + @@ -11,6 +13,7 @@ + @@ -68,12 +71,13 @@ function JSFX_FloatDiv(id, sx, sy) } return el; } -JSFX_FloatDiv("divTopLeft", 10, 200).flt(); +JSFX_FloatDiv("divTopLeft",10, 200).flt(); {/literal} +
@@ -84,21 +88,22 @@ JSFX_FloatDiv("divTopLeft", 10, 200).flt(); {if $tab.visible == 1}
  • {$tab.label}
      -{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"} +{$mySubtab.label} +{else} {$mySubtab.label} {/if} -{/foreach} -{if $tab.subtab.label != ''} -{$tab.subtab.label} {/if} +{/foreach}
    • {/if} {/foreach} -
  • Help
    • -
    -Site: {$user_site_name}  | +   Site: {$user.Site}  | + +
    + + +
    +
      +
      • + +
      • +
    +
    -