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

fix темы шаблонов и обновление фреймворка

Browse source
This commit is contained in:
Mzhelskiy Maxim 2014-01-31 12:30:15 +07:00
parent 0dc098040e
commit 15cc2e1894
4 changed files with 30 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
application/config/config.php
View file

@ -38,7 +38,8 @@ $config['path']['offset_request_url'] = 0;
/**
* Настройки HTML вида
*/
$config['view']['skin'] = 'synio'; // шаблон(скин)
$config['view']['skin'] = 'synio'; // Название текущего шаблона
$config['view']['theme'] = 'default'; // тема оформления шаблона (шаблон должен поддерживать темы)
$config['view']['name'] = 'Your Site'; // название сайта
$config['view']['description'] = 'Description your site'; // seo description
$config['view']['keywords'] = 'site, google, internet'; // seo keywords
@ -301,6 +302,7 @@ $config['db']['table']['rbac_role'] = '___db.table.prefix___rbac_role';
$config['db']['table']['rbac_permission'] = '___db.table.prefix___rbac_permission';
$config['db']['table']['rbac_role_permission']= '___db.table.prefix___rbac_role_permission';
$config['db']['table']['rbac_user_role'] = '___db.table.prefix___rbac_user_role';
$config['db']['table']['storage'] = '___db.table.prefix___storage';
$config['db']['tables']['engine'] = 'InnoDB'; // InnoDB или MyISAM

15
application/frontend/skin/developer/settings/config/config.php
View file

@ -2,7 +2,6 @@
$config = array();
$config['view']['theme'] = 'default';
$config['module']['user']['profile_photo_width'] = 300;
/**
@ -23,7 +22,8 @@ $config['view']['grid']['fixed_width'] = 1000;
$config['head']['default']['js'] = Config::Get('head.default.js');
$config['head']['default']['js'][] = '___path.skin.assets.web___/js/init.js';
$config['head']['default']['css'] = array_merge(Config::Get('head.default.css'), array(
$aCss=array(
// Template styles
"___path.skin.assets.web___/css/base.css",
"___path.framework.frontend.web___/js/vendor/jquery-ui/css/smoothness/jquery-ui-1.10.2.custom.css",
@ -54,10 +54,13 @@ $config['head']['default']['css'] = array_merge(Config::Get('head.default.css'),
"___path.skin.assets.web___/css/poll.css",
"___path.skin.assets.web___/css/messages.css",
"___path.skin.assets.web___/css/sort.css",
"___path.skin.web___/themes/___view.theme___/style.css",
"___path.skin.assets.web___/css/print.css",
));
);
if (Config::Get('view.theme')) {
$aCss[]="___path.skin.web___/themes/___view.theme___/style.css";
}
$config['head']['default']['css'] = array_merge(Config::Get('head.default.css'),$aCss);
return $config;
?>
return $config;

2
framework

@ -1 +1 @@
Subproject commit 4f4149c9b19fedb98e0d51cac1b5be587dcb16b1
Subproject commit 65f0d402a06ed321d7db028c8ae409e41761c942

18
install/patch.sql
View file

@ -375,4 +375,20 @@ ALTER TABLE `prefix_rbac_user_role`
-- 28.01.2014
ALTER TABLE `prefix_user_complaint` ADD `state` TINYINT NOT NULL DEFAULT '1',
ADD INDEX ( `state` ) ;
ADD INDEX ( `state` ) ;
-- 31.01.2014
--
-- Структура таблицы `prefix_storage`
--
CREATE TABLE IF NOT EXISTS `prefix_storage` (
`id` int(11) NOT NULL AUTO_INCREMENT,
`key` varchar(50) NOT NULL,
`value` mediumtext NOT NULL,
`instance` varchar(50) NOT NULL,
PRIMARY KEY (`id`),
UNIQUE KEY `key_instance` (`key`,`instance`),
KEY `instance` (`instance`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;