Changeset 15352


Ignore:
Timestamp:
05/27/12 20:45:32 (7 years ago)
Author:
grum
Message:

feature:2634 - Compatibility with Piwigo 2.4
fix some RBuilder css

Location:
extensions/GrumPluginClasses/classes
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • extensions/GrumPluginClasses/classes/GPCCss.class.inc.php

    r15340 r15352  
    4141{ 
    4242  private $filename; 
     43  private $order; 
    4344 
    4445  static public function applyGpcCss() 
     
    4748  } 
    4849 
    49   static public function applyCSSFile($fileName="", $dependencies=array()) 
     50  static public function applyCSSFile($fileName="", $order=25) 
    5051  { 
    5152    global $template; 
     
    5556      //if no filename given, load the gpc.css file 
    5657      $fileName='./plugins/'.basename(dirname(dirname(__FILE__))).'/css/gpc'; 
    57       GPCCore::addHeaderCSS('gpc', $fileName.'.css'); 
    58       GPCCore::addHeaderCSS('gpc_theme', $fileName.'_'.$template->get_themeconf('name').'.css'); 
     58      GPCCore::addHeaderCSS('gpc', $fileName.'.css', 10); 
     59      GPCCore::addHeaderCSS('gpc_theme', $fileName.'_'.$template->get_themeconf('name').'.css', 15); 
    5960    } 
    6061    elseif(file_exists($fileName)) 
    6162    { 
    62       GPCCore::addHeaderCSS(basename(dirname($fileName)), 'plugins/'.basename(dirname($fileName)).'/'.basename($fileName).'', array_merge(array('gpc', 'gpc_theme'),$dependencies) ); 
     63      GPCCore::addHeaderCSS(basename(dirname($fileName)), 'plugins/'.basename(dirname($fileName)).'/'.basename($fileName).'', $order); 
    6364    } 
    6465  } 
    6566 
    66   public function __construct($filename) 
     67  public function __construct($filename, $order=25) 
    6768  { 
    6869    $this->filename=$filename; 
     70    $this->order=$order; 
    6971  } 
    7072 
     
    108110    global $template; 
    109111 
    110     GPCCss::applyCSSFile($this->filename); 
     112    GPCCss::applyCSSFile($this->filename, $this->order); 
    111113  } 
    112114 
  • extensions/GrumPluginClasses/classes/GPCRequestBuilder.class.inc.php

    r15340 r15352  
    536536 
    537537    $baseName=basename(dirname(dirname(__FILE__))).'/css/'; 
    538     $template->append('head_elements', '<link href="plugins/'.$baseName.'rbuilder.css" type="text/css" rel="stylesheet"/>'); 
    539     if(defined('IN_ADMIN')) $template->append('head_elements', '<link href="plugins/'.$baseName.'rbuilder_'.$template->get_themeconf('name').'.css" type="text/css" rel="stylesheet"/>'); 
     538    GPCCore::addHeaderCSS('gpc.rbuilder', 'plugins/'.$baseName.'rbuilder.css', 25); 
     539 
     540    //$template->append('head_elements', '<link href="plugins/'.$baseName.'rbuilder.css" type="text/css" rel="stylesheet"/>'); 
     541    if(defined('IN_ADMIN')) GPCCore::addHeaderCSS('gpc.rbuilder', 'plugins/'.$baseName.'rbuilder_'.$template->get_themeconf('name').'.css', 26); 
     542    //$template->append('head_elements', '<link href="plugins/'.$baseName.'rbuilder_'.$template->get_themeconf('name').'.css" type="text/css" rel="stylesheet"/>'); 
    540543 
    541544 
Note: See TracChangeset for help on using the changeset viewer.