Changeset 24142


Ignore:
Timestamp:
Aug 7, 2013, 6:09:21 PM (7 years ago)
Author:
mistic100
Message:

fix lightbow conflict

Location:
extensions/oAuth
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • extensions/oAuth/include/public_events.inc.php

    r23815 r24142  
    11<?php
    22defined('OAUTH_PATH') or die('Hacking attempt!');
     3
     4function oauth_anti_lightbox($tpl_thumbnails_var)
     5{
     6  global $template, $page;
     7 
     8  if ($page['section'] == 'collections' && !empty($template->css_by_priority[0]))
     9  {
     10    foreach ($template->css_by_priority[0] as $file)
     11    {
     12      if (strpos($file[0], 'colorbox.css') !== false)
     13      {
     14        $template->assign('OAUTH_NO_LIGHTBOX', true);
     15        break;
     16      }
     17    }
     18  }
     19 
     20  return $tpl_thumbnails_var;
     21}
    322
    423/**
  • extensions/oAuth/main.inc.php

    r23815 r24142  
    6060 
    6161  add_event_handler('blockmanager_apply', 'oauth_blockmanager');
     62 
     63  add_event_handler('loc_end_index_thumbnails', 'oauth_anti_lightbox', 41);
    6264 
    6365  include_once(OAUTH_PATH . 'include/public_events.inc.php');
  • extensions/oAuth/template/identification_common.tpl

    r23808 r24142  
    1616{/literal}{/html_style}
    1717
     18{if not isset($OAUTH_NO_LIGHTBOX)}
    1819{combine_script id='jquery.colorbox' load='footer' require='jquery' path='themes/default/js/plugins/jquery.colorbox.min.js'}
    1920{combine_css path="themes/default/js/plugins/colorbox/style2/colorbox.css"}
     21{/if}
    2022
    2123{footer_script}{literal}
Note: See TracChangeset for help on using the changeset viewer.