ifhub/ifhub.club
1
0
Fork 0
mirror of https://github.com/Oreolek/ifhub.club.git synced 2024-06-26 11:40:48 +03:00
Code Issues Releases Wiki Activity

Строки подключения js и css разделены в массив

Browse source
This commit is contained in:
Alexey Kachayev 2009-10-07 11:30:06 +00:00
parent cd9279609f
commit a9368efe7b
2 changed files with 13 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
engine/modules/viewer/Viewer.class.php
View file

@ -134,7 +134,7 @@ class LsViewer extends Module {
*
* @var string
*/
protected $sHtmlHeadFiles='';
protected $aHtmlHeadFiles='';
/**
* Переменные для отдачи при ajax запросе
@ -232,7 +232,7 @@ class LsViewer extends Module {
$this->Assign("sHtmlTitle",htmlspecialchars($this->sHtmlTitle));
$this->Assign("sHtmlKeywords",htmlspecialchars($this->sHtmlKeywords));
$this->Assign("sHtmlDescription",htmlspecialchars($this->sHtmlDescription));
$this->Assign("sHtmlHeadFiles",$this->sHtmlHeadFiles);
$this->Assign("aHtmlHeadFiles",$this->aHtmlHeadFiles);
$this->Assign("aHtmlRssAlternate",$this->aHtmlRssAlternate);
}
@ -731,8 +731,8 @@ class LsViewer extends Module {
/**
* Получаем HTML код
*/
$sHtmlHeadFiles = $this->BuildHtmlHeadFiles($aHeadFiles);
$this->SetHtmlHeadFiles($sHtmlHeadFiles);
$aHtmlHeadFiles = $this->BuildHtmlHeadFiles($aHeadFiles);
$this->SetHtmlHeadFiles($aHtmlHeadFiles);
return true;
}
@ -881,16 +881,16 @@ class LsViewer extends Module {
* @return string
*/
protected function BuildHtmlHeadFiles($aFileList) {
$sHeader='';
$aHeader=array('js'=>'','css'=>'');
foreach ((array)$aFileList['css'] as $sCss) {
$sHeader.=$this->WrapHtmlHack("<link rel='stylesheet' type='text/css' href='{$sCss}' />", $sCss, 'css').PHP_EOL;
$aHeader['css'].=$this->WrapHtmlHack("<link rel='stylesheet' type='text/css' href='{$sCss}' />", $sCss, 'css').PHP_EOL;
}
foreach((array)$aFileList['js'] as $sJs) {
$sHeader.=$this->WrapHtmlHack("<script type='text/javascript' src='{$sJs}'></script>",$sJs,'js').PHP_EOL;
$aHeader['js'].=$this->WrapHtmlHack("<script type='text/javascript' src='{$sJs}'></script>",$sJs,'js').PHP_EOL;
}
return $sHeader;
return $aHeader;
}
/**
@ -907,8 +907,8 @@ class LsViewer extends Module {
return "<!--[if {$this->aFilesParams[$sType][$sFile]['browser']}]>$sHtml<![endif]-->";
}
public function SetHtmlHeadFiles($sText) {
$this->sHtmlHeadFiles=$sText;
public function SetHtmlHeadFiles($aText) {
$this->aHtmlHeadFiles=$aText;
}
/**

4
templates/skin/new/header.tpl
View file

@ -7,6 +7,8 @@
<meta http-equiv="content-type" content="text/html; charset=utf-8" />
<meta name="DESCRIPTION" content="{$sHtmlDescription}" />
<meta name="KEYWORDS" content="{$sHtmlKeywords}" />
{$aHtmlHeadFiles.css}
<link href="{$aConfig.path.static.skin}/images/favicon.ico" rel="shortcut icon" />
<link rel="search" type="application/opensearchdescription+xml" href="{router page='search'}opensearch/" title="{$aConfig.view.name}" />
@ -30,7 +32,7 @@ aRouter['{$sPage}']='{$sPath}';
{/foreach}
</script>
{$sHtmlHeadFiles}
{$aHtmlHeadFiles.js}
{literal}
<script language="JavaScript" type="text/javascript">