ifhub/ifhub.club
1
0
Fork 0
mirror of https://github.com/Oreolek/ifhub.club.git synced 2024-05-20 17:58:24 +03:00
Code Issues Releases Wiki Activity

Закрытые блоги помечены ключиком. Много мелких фиксов.

Browse source
This commit is contained in:
Alexey Kachayev 2009-11-30 23:47:41 +00:00
parent 3c66ac3c54
commit 2e103ec5f7
8 changed files with 53 additions and 47 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

76
config/config.php
View file

@ -293,10 +293,10 @@ $config['router']['config']['action_not_found'] = 'error';
*/
$config['block']['rule_index_blog'] = array(
'path' => array(
$config['path']['root']['web'].'/blog$',
$config['path']['root']['web'].'/blog/*$',
$config['path']['root']['web'].'/blog/*/*\.html$',
$config['path']['root']['web'].'/blog/*\.html$',
'___path.root.web___/blog$',
'___path.root.web___/blog/*$',
'___path.root.web___/blog/*/*\.html$',
'___path.root.web___/blog/*\.html$',
),
'action' => array(
'index' => array('index'), 'new'
@ -352,52 +352,52 @@ $config['head']['rules']['page'] =array(
'path'=>$config['path']['root']['web'].'/page/',
'js' => array(
'exclude' => array(
$config['path']['static']['skin']."/js/vote.js",
$config['path']['static']['skin']."/js/favourites.js",
$config['path']['static']['skin']."/js/questions.js",
"___path.static.skin___/js/vote.js",
"___path.static.skin___/js/favourites.js",
"___path.static.skin___/js/questions.js",
)
),
);
$config['head']['default']['js'] = array(
$config['path']['root']['engine_lib']."/external/JsHttpRequest/JsHttpRequest.js",
$config['path']['root']['engine_lib']."/external/MooTools_1.2/mootools-1.2.js?v=1.2.2",
$config['path']['root']['engine_lib']."/external/MooTools_1.2/plugs/Roal/Roar.js",
$config['path']['root']['engine_lib']."/external/MooTools_1.2/plugs/Autocompleter/Observer.js",
$config['path']['root']['engine_lib']."/external/MooTools_1.2/plugs/Autocompleter/Autocompleter.js",
$config['path']['root']['engine_lib']."/external/MooTools_1.2/plugs/Autocompleter/Autocompleter.Request.js",
$config['path']['root']['engine_lib']."/external/MooTools_1.2/plugs/Piechart/moocanvas.js",
$config['path']['root']['engine_lib']."/external/MooTools_1.2/plugs/Piechart/piechart.js",
$config['path']['root']['engine_lib']."/external/MooTools_1.2/plugs/vlaCal-v2.1/jslib/vlaCal-v2.1.js",
$config['path']['root']['engine_lib']."/external/prettify/prettify.js",
$config['path']['static']['skin']."/js/vote.js",
$config['path']['static']['skin']."/js/favourites.js",
$config['path']['static']['skin']."/js/questions.js",
$config['path']['static']['skin']."/js/block_loader.js",
$config['path']['static']['skin']."/js/friend.js",
$config['path']['static']['skin']."/js/blog.js",
$config['path']['static']['skin']."/js/other.js",
$config['path']['static']['skin']."/js/login.js",
$config['path']['static']['skin']."/js/panel.js",
$config['path']['root']['engine_lib']."/external/MooTools_1.2/plugs/Piechart/moocanvas.js"=>array('browser'=>'IE'),
"___path.root.engine_lib___/external/JsHttpRequest/JsHttpRequest.js",
"___path.root.engine_lib___/external/MooTools_1.2/mootools-1.2.js?v=1.2.2",
"___path.root.engine_lib___/external/MooTools_1.2/plugs/Roal/Roar.js",
"___path.root.engine_lib___/external/MooTools_1.2/plugs/Autocompleter/Observer.js",
"___path.root.engine_lib___/external/MooTools_1.2/plugs/Autocompleter/Autocompleter.js",
"___path.root.engine_lib___/external/MooTools_1.2/plugs/Autocompleter/Autocompleter.Request.js",
"___path.root.engine_lib___/external/MooTools_1.2/plugs/Piechart/moocanvas.js",
"___path.root.engine_lib___/external/MooTools_1.2/plugs/Piechart/piechart.js",
"___path.root.engine_lib___/external/MooTools_1.2/plugs/vlaCal-v2.1/jslib/vlaCal-v2.1.js",
"___path.root.engine_lib___/external/prettify/prettify.js",
"___path.static.skin___/js/vote.js",
"___path.static.skin___/js/favourites.js",
"___path.static.skin___/js/questions.js",
"___path.static.skin___/js/block_loader.js",
"___path.static.skin___/js/friend.js",
"___path.static.skin___/js/blog.js",
"___path.static.skin___/js/other.js",
"___path.static.skin___/js/login.js",
"___path.static.skin___/js/panel.js",
"___path.root.engine_lib___/external/MooTools_1.2/plugs/Piechart/moocanvas.js"=>array('browser'=>'IE'),
);
$config['head']['default']['css'] = array(
$config['path']['static']['skin']."/css/style.css?v=1",
$config['path']['static']['skin']."/css/Roar.css",
$config['path']['static']['skin']."/css/piechart.css",
$config['path']['static']['skin']."/css/Autocompleter.css",
$config['path']['static']['skin']."/css/prettify.css",
$config['path']['static']['skin']."/css/thickbox.css",
$config['path']['static']['skin']."/css/vlaCal-v2.1.css",
$config['path']['static']['skin']."/css/ie6.css?v=1"=>array('browser'=>'IE 6'),
$config['path']['static']['skin']."/css/ie7.css?v=1"=>array('browser'=>'gte IE 7'),
$config['path']['static']['skin']."/css/simple_comments.css"=>array('browser'=>'gt IE 6'),
"___path.static.skin___/css/style.css?v=1",
"___path.static.skin___/css/Roar.css",
"___path.static.skin___/css/piechart.css",
"___path.static.skin___/css/Autocompleter.css",
"___path.static.skin___/css/prettify.css",
"___path.static.skin___/css/thickbox.css",
"___path.static.skin___/css/vlaCal-v2.1.css",
"___path.static.skin___/css/ie6.css?v=1"=>array('browser'=>'IE 6'),
"___path.static.skin___/css/ie7.css?v=1"=>array('browser'=>'gte IE 7'),
"___path.static.skin___/css/simple_comments.css"=>array('browser'=>'gt IE 6'),
);
/**
* Параметры компрессии css-файлов
*/
$config['compress']['css']['merge'] = false; // указывает на необходимость слияния файлов по указанным блокам.
$config['compress']['css']['merge'] = true; // указывает на необходимость слияния файлов по указанным блокам.
$config['compress']['css']['use'] = true; // указывает на необходимость компрессии файлов. Компрессия используется только в активированном режиме слияния файлов.
$config['compress']['css']['case_properties'] = 1;
$config['compress']['css']['merge_selectors'] = 0;

8
engine/lib/internal/ConfigSimple/Config.class.php
View file

@ -201,7 +201,13 @@ class Config {
static public function KeyReplace($cfg,$sInstance=self::DEFAULT_CONFIG_INSTANCE) {
if(is_array($cfg)) {
foreach($cfg as $k=>$v) {
$cfg[$k] = self::KeyReplace($v,$sInstance);
$k_replaced = self::KeyReplace($k, $sInstance);
if($k==$k_replaced) {
$cfg[$k] = self::KeyReplace($v,$sInstance);
} else {
$cfg[$k_replaced] = self::KeyReplace($v,$sInstance);
unset($cfg[$k]);
}
}
} else {
if(preg_match('~___([\S|\.|]+)___~Ui',$cfg))

2
engine/modules/text/Text.class.php
View file

@ -81,7 +81,7 @@ class LsText extends Module {
// Отключение авто-добавления <br>
$this->oJevix->cfgSetAutoBrMode(true);
// Автозамена
$this->oJevix->cfgSetAutoReplace(array('+/-', '(c)', '(r)', '(C)', '(R)'), array('±', '©', '®', '©', '®'));
$this->oJevix->cfgSetAutoReplace(array('+/-', '(c)', '(с)', '(r)', '(C)', '(С)', '(R)'), array('±', '©', '©', '®', '©', '©', '®'));
//$this->oJevix->cfgSetXHTMLMode(false);
$this->oJevix->cfgSetTagNoTypography('code');
$this->oJevix->cfgSetTagNoTypography('video');

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

@ -840,6 +840,7 @@ class LsViewer extends Module {
* Создаем новый файл и сливаем туда содержимое
*/
file_put_contents($sCacheName,$sContent);
@chmod($sCacheName, 0766);
}
/**
* Возвращаем имя файла, заменяя адрес сервера на веб-адрес

4
install/index.php
View file

@ -1320,8 +1320,8 @@ class Install {
*/
function SavePath() {
$sLocalConfigFile = $this->sConfigDir.'/'.self::LOCAL_CONFIG_FILE_NAME;
$this->SaveConfig('path.root.web',rtrim('http://'.$_SERVER['HTTP_HOST'],'/').'/', $sLocalConfigFile);
$this->SaveConfig('path.root.server', rtrim($_SERVER['DOCUMENT_ROOT'],'/').'/', $sLocalConfigFile);
$this->SaveConfig('path.root.web',rtrim('http://'.$_SERVER['HTTP_HOST'],'/'), $sLocalConfigFile);
$this->SaveConfig('path.root.server', rtrim($_SERVER['DOCUMENT_ROOT'],'/'), $sLocalConfigFile);
}
}

5
templates/skin/new/actions/ActionBlog/blog.tpl
View file

@ -14,7 +14,6 @@ function toggleBlogInfo(id,link) {
}
link.toggleClass('inactive');
slideObj.toggle();
}
function toggleBlogDeleteForm(id,link) {
@ -65,8 +64,8 @@ function toggleBlogDeleteForm(id,link) {
<option value="-1">{$aLang.blog_delete_clear}</option>
{if $aBlogs}
<option disabled="disabled">-------------</option>
{foreach from=$aBlogs item=oBlog}
<option value="{$oBlog->getId()}">{$oBlog->getTitle()}</option>
{foreach from=$aBlogs item=oBlogDelete}
<option value="{$oBlogDelete->getId()}">{$oBlogDelete->getTitle()}</option>
{/foreach}
{/if}
</select>

4
templates/skin/new/css/style.css
View file

@ -339,7 +339,7 @@ select { width: 99%; }
.block.blogs ul.list { border-top: 1px solid #eee; padding-top: 3px; margin-top: 10px; }
.block.blogs ul.list li { overflow: hidden; border-bottom: 1px solid #eee; padding-bottom: 5px; margin-bottom: 5px; }
.block.blogs ul.list li a { padding-right: 50px; color: #777; }
.block.blogs ul.list li a.close { padding-right: 50px; color: red; }
.block.blogs ul.list li a.close { padding-right: 20px; background: url(../images/key.png) no-repeat right; }
.block.blogs ul.list li .total { float: right; font-weight: bold; padding-right: 13px; }
.block.blogs ul.list li .up { background: url(../images/blog-rating-up.gif) no-repeat right 5px; }
.block.blogs ul.list li .down { background: url(../images/blog-rating-down.gif) no-repeat right 5px; }
@ -679,7 +679,7 @@ select { width: 99%; }
.people.top-blogs td.name { overflow: hidden; }
.people.top-blogs td.name img { float: left; padding-bottom: 5px; margin-right: 7px; width: 24px; height: 24px; }
.people.top-blogs td.name a.title { font-size: 18px; line-height: 14px; }
.people.top-blogs td.name a.title.close { font-size: 18px; line-height: 14px; color: red; }
.people.top-blogs td.name a.title.close { font-size: 18px; line-height: 14px; padding-right: 20px; background:url(../images/key.png) no-repeat right 5px; }
.people.top-blogs td.name a.author { line-height: 18px; background:url(../images/icons.gif) no-repeat scroll 0 -108px; padding-left: 12px; color: #999; font-weight: bold; }
.people.top-blogs .join { text-align: center; }
.people.top-blogs .join a { margin: 0 auto; outline: none; display: block; height: 10px; width: 10px; background: url(../images/icons.gif) no-repeat scroll 0 -250px; zoom: 1; }

BIN
templates/skin/new/images/key.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 437 B