Repair output popup, and add Reports to the splash page

Signed-off-by: Mike Rylander <mrylander@gmail.com>

diff --git a/Open-ILS/src/templates/staff/t_splash.tt2 b/Open-ILS/src/templates/staff/t_splash.tt2
index 2884ba6..1ca0ea2 100644 (file)
--- a/Open-ILS/src/templates/staff/t_splash.tt2
+++ b/Open-ILS/src/templates/staff/t_splash.tt2
@@ -65,6 +65,12 @@
               [% l('Workstation Administration') %]
             </a>
           </div>
+          <div>
+            <img src="/xul/server/skin/media/images/portal/reports.png"/>
+            <a target="_top" href="./reporter/legacy/main">
+              [% l('Reports') %]
+            </a>
+          </div>
         </div>
       </div>
     </div>

diff --git a/Open-ILS/web/reports/oils_rpt_folder_window.js b/Open-ILS/web/reports/oils_rpt_folder_window.js
index 0fb78db..f5e0cf8 100644 (file)
--- a/Open-ILS/web/reports/oils_rpt_folder_window.js
+++ b/Open-ILS/web/reports/oils_rpt_folder_window.js
@@ -390,7 +390,7 @@ oilsRptFolderWindow.prototype.showOutput = function(sched) {
                function(r) {
                        var url = oilsRptBuildOutputLink(r.template(), r.id(), sched.id());
                        _debug("launching report output view at URL: " + url);
-                       if(isXUL()) 
+                       if(isXUL() && !window.IAMBROWSER) 
                                xulG.new_tab(xulG.url_prefix('XUL_REMOTE_BROWSER?url=') + url,
                                        {tab_name: dojo.string.substitute( rpt_strings.FOLDER_WINDOW_REPORT_OUTPUT, [r.name()] ), browser:false},
                                        {no_xulG:false, show_nav_buttons:true, show_print_button:true});