diff --git a/js/saimod_webcraft_gallery.js b/js/saimod_webcraft_gallery.js index 2a49225..5dfd867 100644 --- a/js/saimod_webcraft_gallery.js +++ b/js/saimod_webcraft_gallery.js @@ -10,6 +10,12 @@ function load_tab(name){ } function register_controlls(){ + $('.flexslider').flexslider({ + animation: "slide", + directionNav: true, + slideshow: true, + animationLoop: false + }); $('.gallery_entry').click(function(){ $('#tab_gallery').load('./sai.php?sai_mod=saimod_webcraft_gallery&action=showgalleryitem&gallery='+$(this).attr('gallery')+'&id='+$(this).attr('galleryid'), function(){ $('#input_show_file_cat').change(function(){ diff --git a/saimod_webcraft_gallery.php b/saimod_webcraft_gallery.php index e261615..e11260c 100644 --- a/saimod_webcraft_gallery.php +++ b/saimod_webcraft_gallery.php @@ -7,8 +7,8 @@ class saimod_webcraft_gallery extends \SYSTEM\SAI\SaiModule { while($img = $gallery->next()){ $img['active'] = $first ? 'active' : ''; $first = false; - $gallery_items .= \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new PSAI(), 'saimod_webcraft_gallery/tpl/saimod_webraft_gallery_gallery_item.tpl'), $img);} - return \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new PSAI(), 'saimod_webcraft_gallery/tpl/saimod_webraft_gallery_gallery.tpl'), + $gallery_items .= \SYSTEM\PAGE\replace::replaceFile((new PSAI('saimod_webcraft_gallery/tpl/saimod_webraft_gallery_gallery_item.tpl'))->SERVERPATH(), $img);} + return \SYSTEM\PAGE\replace::replaceFile((new PSAI('saimod_webcraft_gallery/tpl/saimod_webraft_gallery_gallery.tpl'))->SERVERPATH(), array('gallery' => $id, 'items' => $gallery_items)); } @@ -21,6 +21,15 @@ class saimod_webcraft_gallery extends \SYSTEM\SAI\SaiModule { return $result; } + public static function getGalleryFlexslider($id){ + $gallery = \SQL\SAIMOD_WEBCRAFT_GALLERY_GALLERY_ID::QQ(array($id)); + $result = ''; + return $result; + } + public static function sai_mod_saimod_webcraft_gallery_action_addgalleryitem($gallery, $position, $heading, $description, $file_cat, $file_id){ if(!\SQL\SAIMOD_WEBCRAFT_GALLERY_GALLERY_ITEM_ADD::QI(array($gallery, $position, $heading, $description, $file_cat, $file_id))){ throw new SYSTEM\LOG\ERROR("Problem with adding Galleryitem!");} @@ -36,7 +45,7 @@ class saimod_webcraft_gallery extends \SYSTEM\SAI\SaiModule { public static function sai_mod_saimod_webcraft_gallery_action_addgallery(){ $vars = array('file_cat_options' => self::select_options_cat(), 'file_id_options' => self::sai_mod_saimod_webcraft_gallery_action_select_options_id(array_keys(\SYSTEM\FILES\files::get())[0])); - return \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new PSAI(), 'saimod_webcraft_gallery/tpl/saimod_webcraft_gallery_add.tpl'),$vars); + return \SYSTEM\PAGE\replace::replaceFile((new PSAI('saimod_webcraft_gallery/tpl/saimod_webcraft_gallery_add.tpl'))->SERVERPATH(),$vars); } private static function select_options_cat($cat = null){ @@ -44,7 +53,7 @@ class saimod_webcraft_gallery extends \SYSTEM\SAI\SaiModule { $cats = \SYSTEM\FILES\files::get(); foreach($cats as $name=>$path){ $selected = $name == $cat ? 'selected' : ''; - $result .= \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new PSAI(), 'saimod_webcraft_gallery/tpl/saimod_webcraft_gallery_file_option.tpl'), array('name' => $name, 'selected' => $selected)); + $result .= \SYSTEM\PAGE\replace::replaceFile((new PSAI('saimod_webcraft_gallery/tpl/saimod_webcraft_gallery_file_option.tpl'))->SERVERPATH(), array('name' => $name, 'selected' => $selected)); } return $result; } @@ -54,7 +63,7 @@ class saimod_webcraft_gallery extends \SYSTEM\SAI\SaiModule { $files = \SYSTEM\FILES\files::get($cat); foreach($files as $file){ $selected = $file == $id ? 'selected' : ''; - $result .= \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new PSAI(), 'saimod_webcraft_gallery/tpl/saimod_webcraft_gallery_file_option.tpl'), array('name' => $file, 'selected' => $selected)); + $result .= \SYSTEM\PAGE\replace::replaceFile((new PSAI('saimod_webcraft_gallery/tpl/saimod_webcraft_gallery_file_option.tpl'))->SERVERPATH(), array('name' => $file, 'selected' => $selected)); } return $result; } @@ -62,7 +71,7 @@ class saimod_webcraft_gallery extends \SYSTEM\SAI\SaiModule { public static function sai_mod_saimod_webcraft_gallery_action_showgalleryitem($gallery,$id){ $vars = \SQL\SAIMOD_WEBCRAFT_GALLERY_GALLERY_ITEM_ID::Q1(array($gallery,$id)); $vars = array_merge($vars, array('file_cat_options' => self::select_options_cat($vars['file_cat']), 'file_id_options' => self::sai_mod_saimod_webcraft_gallery_action_select_options_id($vars['file_cat'],$vars['file_id']))); - return \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new PSAI(), 'saimod_webcraft_gallery/tpl/saimod_webcraft_gallery_show.tpl'),$vars); + return \SYSTEM\PAGE\replace::replaceFile((new PSAI('saimod_webcraft_gallery/tpl/saimod_webcraft_gallery_show.tpl'))->SERVERPATH(),$vars); } public static function sai_mod_saimod_webcraft_gallery(){ @@ -73,25 +82,26 @@ class saimod_webcraft_gallery extends \SYSTEM\SAI\SaiModule { $gallery['active'] = $first ? 'active' : ''; if($first){$vars['firsttab'] = self::sai_mod_saimod_webcraft_gallery_action_tab($gallery['gallery']);} $first = false; - $vars['tabopts'] .= \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new PSAI(), 'saimod_webcraft_gallery/tpl/saimod_webcraft_gallery_tabopt.tpl'), $gallery);} + $vars['tabopts'] .= \SYSTEM\PAGE\replace::replaceFile((new PSAI('saimod_webcraft_gallery/tpl/saimod_webcraft_gallery_tabopt.tpl'))->SERVERPATH(), $gallery);} - return \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new PSAI(), 'saimod_webcraft_gallery/tpl/saimod_webcraft_gallery_tabs.tpl'),$vars); + return \SYSTEM\PAGE\replace::replaceFile((new PSAI('saimod_webcraft_gallery/tpl/saimod_webcraft_gallery_tabs.tpl'))->SERVERPATH(),$vars); } public static function sai_mod_saimod_webcraft_gallery_action_tab($name){ $gallery = \SQL\SAIMOD_WEBCRAFT_GALLERY_GALLERY_ID::QQ(array($name)); $content = ''; while($entry = $gallery->next()){ - $content .= \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new PSAI(), 'saimod_webcraft_gallery/tpl/saimod_webcraft_gallery_tabentry.tpl'), $entry);} - return \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new PSAI(), 'saimod_webcraft_gallery/tpl/saimod_webcraft_gallery_tab.tpl'), - array('content' => $content, 'gallery' => self::getGalleryBootstrap($name))); + $content .= \SYSTEM\PAGE\replace::replaceFile((new PSAI('saimod_webcraft_gallery/tpl/saimod_webcraft_gallery_tabentry.tpl'))->SERVERPATH(), $entry);} + return \SYSTEM\PAGE\replace::replaceFile((new PSAI('saimod_webcraft_gallery/tpl/saimod_webcraft_gallery_tab.tpl'))->SERVERPATH(), + array('content' => $content, 'gallery' => self::getGalleryFlexslider($name))); } public static function html_li_menu(){return '
  • Gallery
  • ';} public static function right_public(){return false;} public static function right_right(){return \SYSTEM\SECURITY\Security::check(\SYSTEM\SECURITY\RIGHTS::SYS_SAI);} public static function js(){ - return array( \SYSTEM\WEBPATH(new PSAI(),'saimod_webcraft_gallery/js/saimod_webcraft_gallery.js'));} + return array( \LIB\lib_flexslider::js(), + new PSAI('saimod_webcraft_gallery/js/saimod_webcraft_gallery.js'));} public static function css(){ - return array();} + return array( \LIB\lib_flexslider::css());} } \ No newline at end of file diff --git a/sql/DATA_SAIMOD_WEBCRAFT_GALLERY.php b/sql/DATA_SAIMOD_WEBCRAFT_GALLERY.php index 4348b39..ccf7589 100644 --- a/sql/DATA_SAIMOD_WEBCRAFT_GALLERY.php +++ b/sql/DATA_SAIMOD_WEBCRAFT_GALLERY.php @@ -3,8 +3,8 @@ namespace SQL; class DATA_SAIMOD_WEBCRAFT_GALLERY extends \SYSTEM\DB\QI { public static function get_class(){return \get_class();} public static function files_mysql(){ - return array( \SYSTEM\SERVERPATH(new \PSAI(),'/saimod_webcraft_gallery/sql/mysql/schema_webcraft_gallery.sql'), - \SYSTEM\SERVERPATH(new \PSAI(),'/saimod_webcraft_gallery/sql/mysql/saimod_webcraft_gallery.sql'), - \SYSTEM\SERVERPATH(new \PSAI(),'/saimod_webcraft_gallery/sql/mysql/saimod_webcraft_gallery_page.sql')); + return array( (new \PSAI('/saimod_webcraft_gallery/sql/mysql/schema_webcraft_gallery.sql'))->SERVERPATH(), + (new \PSAI('/saimod_webcraft_gallery/sql/mysql/saimod_webcraft_gallery.sql'))->SERVERPATH(), + (new \PSAI('/saimod_webcraft_gallery/sql/mysql/saimod_webcraft_gallery_page.sql'))->SERVERPATH()); } } \ No newline at end of file diff --git a/tpl/saimod_webcraft_gallery_tab.tpl b/tpl/saimod_webcraft_gallery_tab.tpl index 05e3985..ece3367 100644 --- a/tpl/saimod_webcraft_gallery_tab.tpl +++ b/tpl/saimod_webcraft_gallery_tab.tpl @@ -1,4 +1,6 @@ -${gallery} +
    + ${gallery} +
    ID