ifhub/ifhub.club
1
0
Fork 0
mirror of https://github.com/Oreolek/ifhub.club.git synced 2024-06-16 23:00:51 +03:00
Code Issues Releases Wiki Activity

Доработка media + обновление fw

Browse source
This commit is contained in:
Mzhelskiy Maxim 2014-02-10 18:12:21 +07:00
parent fda7a51786
commit 7775df6818
8 changed files with 29 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
application/classes/actions/ActionAjax.class.php
View file

@ -555,6 +555,12 @@ class ActionAjax extends Action {
'align'=>getRequestStr('align'),
'size'=>getRequestStr('size')
);
/**
* Если изображений несколько, то генерируем идентификатор группы для лайтбокса
*/
if (count($aMediaItems)>1) {
$aParams['lbx_group']=rand(1,100);
}
$sTextResult='';
foreach($aMediaItems as $oMedia) {

6
application/classes/modules/media/Media.class.php
View file

@ -366,7 +366,11 @@ class ModuleMedia extends ModuleORM {
}
if ($bNeedHref) {
$sCode.=' />';
$sCode='<a href="'.$oMedia->getFileWebPath().'" '.$sDataParams.'>'.$sCode.'</a>';
$sLbxGroup='';
if (isset($aParams['lbx_group'])) {
$sLbxGroup=' data-rel="'.htmlspecialchars($aParams['lbx_group']).'"';
}
$sCode='<a class="js-lbx" '.$sLbxGroup.' href="'.$oMedia->getFileWebPath().'" '.$sDataParams.'>'.$sCode.'</a>';
} else {
$sCode.=$sDataParams.' />';
}

1
application/config/config.php
View file

@ -474,6 +474,7 @@ $config['head']['default']['js'] = array(
"___path.framework.frontend.web___/js/vendor/jquery.livequery.js",
"___path.framework.frontend.web___/js/vendor/fotorama/fotorama.js",
"___path.framework.frontend.web___/js/vendor/nprogress/nprogress.js",
"___path.framework.frontend.web___/js/vendor/colorbox/jquery.colorbox.js",
/* Core */
"___path.framework.frontend.web___/js/core/main.js",

4
application/config/jevix.php
View file

@ -25,6 +25,10 @@ return array(
'gallery',
array('items'=>'#text','nav'=>array('thumbs'),'caption'=>array('0','1'))
),
array(
'a',
array('data-rel'=>'#text', 'class'=>array('js-lbx'))
),
),
'cfgSetTagCallbackFull' => array(
array(

6
application/frontend/common/js/media.js
View file

@ -264,7 +264,11 @@ ls.media = (function ($) {
e.preventDefault();
}.bind(this));
this.loadImageList();
// После показа модального подгружаем контент
this.elements.modal.on('modalaftershow',function(){
this.loadImageList();
}.bind(this));
this.bindFileEvents();
};

7
application/frontend/skin/developer/assets/js/init.js
View file

@ -257,7 +257,12 @@ jQuery(document).ready(function($){
* Блок добавления пользователей
*/
ls.user_list_add.init();
/**
* Лайтбокс
*/
$('a.js-lbx').colorbox({ width:"100%", height:"100%" });
// Временный костыль для сабмита форм
// TODO: Перенести в плагин button

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

@ -35,6 +35,7 @@ $aCss=array(
"___path.framework.frontend.web___/js/vendor/notifier/jquery.notifier.css",
"___path.framework.frontend.web___/js/vendor/fotorama/fotorama.css",
"___path.framework.frontend.web___/js/vendor/nprogress/nprogress.css",
"___path.framework.frontend.web___/js/vendor/colorbox/colorbox.css",
"___path.skin.assets.web___/css/grid.css",
"___path.skin.assets.web___/css/forms.css",
"___path.skin.assets.web___/css/common.css",

2
framework

@ -1 +1 @@
Subproject commit 32fbce1287b2ea44617ccc4753b4e1bc1f82e742
Subproject commit 6e59102a4d7c7ec0f5f9e8e1d9444342263594ab