diff --git a/.gitignore b/.gitignore index 3b98d313a..c0a3a9bf5 100755 --- a/.gitignore +++ b/.gitignore @@ -8,4 +8,5 @@ /system/controllers/api/ /system/languages/ru/controllers/api/ /system/languages/en/controllers/api/ -/templates/default/controllers/api/ \ No newline at end of file +/templates/default/controllers/api/ +/cache/rsscache/ \ No newline at end of file diff --git a/credits.txt b/credits.txt index bb9ced12c..66aa299b5 100755 --- a/credits.txt +++ b/credits.txt @@ -97,3 +97,7 @@ Third-party plugins, libraries and resources included in InstantCMS: jQuery UI Touch Punch by David Furfero http://touchpunch.furf.com/ + + jQuery CSS Customizable Scrollbar + by Yuriy Khabarov + https://github.com/gromo/jquery.scrollbar/ diff --git a/install/steps/php.php b/install/steps/php.php index f4b245838..3604d0044 100755 --- a/install/steps/php.php +++ b/install/steps/php.php @@ -16,9 +16,9 @@ function step($is_submit){ function check_requirements(){ - $min_php_version = '5.3.0'; - $vars = array('magic_quotes_gpc' => 0, 'register_globals' => 0); - $extensions = array('date', 'gd', 'json', 'mbstring', 'mysqli', 'session', 'filter'); + $min_php_version = '5.4.0'; + $vars = array('magic_quotes_gpc' => 0, 'register_globals' => 0); + $extensions = array('date', 'gd', 'json', 'mbstring', 'mysqli', 'session', 'filter'); $extensions_extra = array('ftp', 'memcache', 'zip', 'curl'); sort($extensions); @@ -30,7 +30,7 @@ function check_requirements(){ $info['php'] = array( 'version' => PHP_VERSION, - 'valid' => (version_compare(PHP_VERSION, $min_php_version) >= 0) + 'valid' => (version_compare(PHP_VERSION, $min_php_version) >= 0) ); $info['valid'] = $info['valid'] && $info['php']['valid']; @@ -56,4 +56,4 @@ function check_requirements(){ return $info; -} \ No newline at end of file +} diff --git a/system/controllers/admin/actions/index.php b/system/controllers/admin/actions/index.php index 3faa43ea2..59290160c 100755 --- a/system/controllers/admin/actions/index.php +++ b/system/controllers/admin/actions/index.php @@ -56,6 +56,11 @@ public function run(){ LANG_CP_DASHBOARD_SI_ZENDG => in_array('Zend Guard Loader', $extensions) ); + $dashboard_blocks[] = array( + 'title' => LANG_CP_DASHBOARD_NEWS, + 'html' => $this->cms_template->getRenderedChild('index_news', array()) + ); + $dashboard_blocks[] = array( 'title' => LANG_CP_DASHBOARD_SYSINFO, 'html' => $this->cms_template->getRenderedChild('index_sysinfo', array( diff --git a/system/controllers/admin/actions/load_icms_news.php b/system/controllers/admin/actions/load_icms_news.php new file mode 100755 index 000000000..8c7000d0b --- /dev/null +++ b/system/controllers/admin/actions/load_icms_news.php @@ -0,0 +1,57 @@ + 'http://www.instantcms.ru/rss/content/2/feed.rss', + 'icms_addons' => 'http://addons.instantcms.ru/rss/feed/addons', + 'icms_docs' => 'http://docs.instantcms.ru/feed.php' + ); + + private $news_count = 10; + + public function run($target){ + + if (!$this->request->isAjax()) { cmsCore::error404(); } + + if (!$target || !in_array($target, array_keys($this->news_link))) { cmsCore::error404(); } + + cmsCore::loadLib('lastrss.class'); + + $rss = new lastRSS; + + $rss->cache_dir = cmsConfig::get('cache_path'); + $rss->cache_time = 3600; + $rss->stripHTML = true; + $rss->cp = 'UTF-8'; + $rss->items_limit = $this->news_count; + + $items = array(); + + $res = $rss->get($this->news_link[$target]); + + if(!empty($res['items'])){ + foreach ($res['items'] as $item) { + + $item['target_title'] = empty($res['title']) ? + (empty($res['image_title']) ? '' : $res['image_title']) : + $res['title']; + + $item['target_description'] = empty($res['description']) ? + (empty($res['image_description']) ? '' : $res['image_description']) : + $res['description']; + + $items[] = $item; + + } + } + + if(!$items){ $this->halt(LANG_NO_ITEMS); } + + $this->cms_template->renderPlain('index_news_data', array( + 'items' => $items + )); + + } + +} diff --git a/system/controllers/content/frontend.php b/system/controllers/content/frontend.php index 28a8fa04a..31bf4260e 100755 --- a/system/controllers/content/frontend.php +++ b/system/controllers/content/frontend.php @@ -196,7 +196,8 @@ public function renderItemsList($ctype, $page_url, $hide_filter=false, $category // Получаем количество и список записей $total = $this->model->getContentItemsCount($ctype['name']); - $items = $this->model->getContentItems($ctype['name'], function ($item, $model) use ($ctype, $hide_except_title){ + $items = $this->model->getContentItems($ctype['name'], function ($item, $model, $ctype_name, $user) + use ($ctype, $hide_except_title, $fields){ $item['ctype'] = $ctype; $item['ctype_name'] = $ctype['name']; @@ -210,6 +211,32 @@ public function renderItemsList($ctype, $page_url, $hide_filter=false, $category $item['private_item_hint'] = LANG_PRIVACY_PRIVATE_HINT; } + // строим поля списка + foreach($fields as $field){ + + if ($field['is_system'] || !$field['is_in_list'] || !isset($item[$field['name']])) { continue; } + if ($field['groups_read'] && !$user->isInGroups($field['groups_read'])) { continue; } + if (!$item[$field['name']] && $item[$field['name']] !== '0') { continue; } + + if (!isset($field['options']['label_in_list'])) { + $label_pos = 'none'; + } else { + $label_pos = $field['options']['label_in_list']; + } + + $field_html = $field['handler']->setItem($item)->parseTeaser($item[$field['name']]); + if (!$field_html) { continue; } + + $item['fields'][$field['name']] = array( + 'label_pos' => $label_pos, + 'type' => $field['type'], + 'name' => $field['name'], + 'title' => $field['title'], + 'html' => $field_html + ); + + } + return $item; }); diff --git a/system/controllers/content/model.php b/system/controllers/content/model.php index a9e42741b..1d243dfea 100755 --- a/system/controllers/content/model.php +++ b/system/controllers/content/model.php @@ -2298,7 +2298,7 @@ public function getContentItems($ctype_name, $callback = null){ ); if (is_callable($callback)){ - $item = $callback($item, $model, $ctype_name); + $item = $callback($item, $model, $ctype_name, $user); } return $item; diff --git a/system/controllers/groups/frontend.php b/system/controllers/groups/frontend.php index f1db124be..13ee860a6 100755 --- a/system/controllers/groups/frontend.php +++ b/system/controllers/groups/frontend.php @@ -405,12 +405,15 @@ public function renderGroupsList($page_url, $dataset_name = false){ $label_pos = $field['options']['label_in_list']; } - $groups[$key]['fields'][] = array( + $field_html = $field['handler']->setItem($group)->parseTeaser($group[$field['name']]); + if (!$field_html) { continue; } + + $groups[$key]['fields'][$field['name']] = array( 'label_pos' => $label_pos, 'type' => $field['type'], 'name' => $field['name'], 'title' => $field['title'], - 'html' => $field['handler']->setItem($group)->parseTeaser($group[$field['name']]) + 'html' => $field_html ); } diff --git a/system/languages/en/controllers/admin/admin.php b/system/languages/en/controllers/admin/admin.php index b6d023d6f..4bec14212 100755 --- a/system/languages/en/controllers/admin/admin.php +++ b/system/languages/en/controllers/admin/admin.php @@ -7,6 +7,9 @@ define('LANG_CP_DASHBOARD_STATS', 'Site Stats'); define('LANG_CP_DASHBOARD_SYSINFO', 'System Info'); define('LANG_CP_DASHBOARD_RESOURCES', 'Useful Resources'); + define('LANG_CP_DASHBOARD_NEWS', 'InstantCMS news'); + define('LANG_CP_DASHBOARD_NEWS_O', 'Official'); + define('LANG_CP_DASHBOARD_NEWS_A', 'Addons'); define('LANG_CP_DASHBOARD_SI_ICMS', 'InstantCMS version'); define('LANG_CP_DASHBOARD_SI_PHP', 'PHP version'); diff --git a/system/languages/ru/controllers/admin/admin.php b/system/languages/ru/controllers/admin/admin.php index 364b0eb10..d6154cf36 100755 --- a/system/languages/ru/controllers/admin/admin.php +++ b/system/languages/ru/controllers/admin/admin.php @@ -7,6 +7,9 @@ define('LANG_CP_DASHBOARD_STATS', 'Статистика'); define('LANG_CP_DASHBOARD_SYSINFO', 'Информация о системе'); define('LANG_CP_DASHBOARD_RESOURCES', 'Полезные ресурсы'); + define('LANG_CP_DASHBOARD_NEWS', 'Новости InstantCMS'); + define('LANG_CP_DASHBOARD_NEWS_O', 'Официальные'); + define('LANG_CP_DASHBOARD_NEWS_A', 'Дополнения'); define('LANG_CP_DASHBOARD_SI_ICMS', 'Версия InstantCMS'); define('LANG_CP_DASHBOARD_SI_PHP', 'Версия PHP'); diff --git a/system/libs/lastrss.class.php b/system/libs/lastrss.class.php new file mode 100644 index 000000000..14b4af15a --- /dev/null +++ b/system/libs/lastrss.class.php @@ -0,0 +1,288 @@ +getCached($rss_url); + + if(!$result){ + + $result = $this->parse($rss_url); + + if ($result) { + + $this->cacheResult($rss_url, $result); + + $result['cached'] = 0; + + } + + } + + return $result; + + } + + private function getCached($rss_url) { + + if (!$this->cache_dir) { return false; } + + $cache_dir = $this->cache_dir . '/rsscache/'; + + if(!is_dir($cache_dir)){ mkdir($cache_dir, 0777); } + + $cache_file = $cache_dir.md5($rss_url); + + if(!is_readable($cache_file)){ + return false; + } + + $timedif = (time() - filemtime($cache_file)); + + if ($timedif < $this->cache_time) { + + $result = include $cache_file; + + if ($result) { + + $result['cached'] = 1; + + return $result; + + } else { + unlink($cache_file); + } + + } else { + unlink($cache_file); + } + + return false; + + } + + private function cacheResult($rss_url, $result) { + + if (!$this->cache_dir) { return false; } + + $cache_dir = $this->cache_dir . '/rsscache/'; + + if(!is_dir($cache_dir)){ mkdir($cache_dir, 0777); } + + $cache_file = $cache_dir.md5($rss_url); + + file_put_contents($cache_file, 'CDATA == 'content') { // Get CDATA content (without CDATA tag) + $out[1] = strtr($out[1], array(''', ']]>'=>'')); + } elseif ($this->CDATA == 'strip') { // Strip CDATA + $out[1] = strtr($out[1], array(''', ']]>'=>'')); + } + + // If code page is set convert character encoding to required + if ($this->cp != '') { + $out[1] = iconv($this->rsscp, $this->cp.'//TRANSLIT', $out[1]); + } + // Return result + return trim($out[1]); + } else { + // if there is NO result, return empty string + return ''; + } + } + + // ------------------------------------------------------------------- + // Replace HTML entities &something; by real characters + // ------------------------------------------------------------------- + private function unhtmlentities ($string) { + // Get HTML entities table + $trans_tbl = get_html_translation_table (HTML_ENTITIES, ENT_QUOTES); + // Flip keys<==>values + $trans_tbl = array_flip ($trans_tbl); + // Add support for ' entity (missing in HTML_ENTITIES) + $trans_tbl += array(''' => "'"); + // Replace entities by values + return strtr ($string, $trans_tbl); + } + + // ------------------------------------------------------------------- + // Parse() is private method used by get() to load and parse RSS file. + // Don't use parse() in your scripts - use get($rss_file) instead. + // ------------------------------------------------------------------- + public function parse ($rss_url) { + + $rss_content = $this->getRssFromUrl($rss_url); + if(!$rss_content){ return false; } + + // Parse document encoding + $result['encoding'] = $this->my_preg_match("'encoding=[\'\"](.*?)[\'\"]'si", $rss_content); + // if document codepage is specified, use it + if ($result['encoding'] != '') + { $this->rsscp = $result['encoding']; } // This is used in my_preg_match() + // otherwise use the default codepage + else + { $this->rsscp = $this->default_cp; } // This is used in my_preg_match() + + // Parse CHANNEL info + preg_match("'(.*)'si", $rss_content, $out_channel); + foreach($this->channeltags as $channeltag) { + $temp = $this->my_preg_match("'<$channeltag.*?>(.*?)'si", @$out_channel[1]); + if ($temp != '') { $result[$channeltag] = $temp; } // Set only if not empty + } + // If date_format is specified and lastBuildDate is valid + if ($this->date_format != '' && ($timestamp = strtotime($result['lastBuildDate'])) !==-1) { + // convert lastBuildDate to specified date format + $result['lastBuildDate'] = date($this->date_format, $timestamp); + } + + // Parse TEXTINPUT info + preg_match("']*[^/])>(.*?)'si", $rss_content, $out_textinfo); + // This a little strange regexp means: + // Look for tag with or without any attributes, but skip truncated version (it's not beggining tag) + if (isset($out_textinfo[2])) { + foreach($this->textinputtags as $textinputtag) { + $temp = $this->my_preg_match("'<$textinputtag.*?>(.*?)'si", $out_textinfo[2]); + if ($temp != '') { $result['textinput_'.$textinputtag] = $temp; } // Set only if not empty + } + } + // Parse IMAGE info + preg_match("'(.*?)'si", $rss_content, $out_imageinfo); + if (isset($out_imageinfo[1])) { + foreach($this->imagetags as $imagetag) { + $temp = $this->my_preg_match("'<$imagetag.*?>(.*?)'si", $out_imageinfo[1]); + if ($temp != '') { $result['image_'.$imagetag] = $temp; } // Set only if not empty + } + } + // Parse ITEMS + preg_match_all("'(.*?)'si", $rss_content, $items); + $rss_items = $items[2]; + $i = 0; + $result['items'] = array(); // create array even if there are no items + foreach($rss_items as $rss_item) { + // If number of items is lower then limit: Parse one item + if ($i < $this->items_limit || $this->items_limit == 0) { + foreach($this->itemtags as $itemtag) { + $temp = $this->my_preg_match("'<$itemtag.*?>(.*?)'si", $rss_item); + if ($temp != '') { $result['items'][$i][$itemtag] = $temp; } // Set only if not empty + } + $temp = $this->my_preg_match('#stripHTML && !empty($result['items'][$i]['description'])){ + $result['items'][$i]['description'] = strip_tags(str_replace('><', '> <', $this->unhtmlentities(strip_tags(str_replace('><', '> <', $result['items'][$i]['description']))))); + } + // Strip HTML tags and other bullshit from TITLE + if ($this->stripHTML && $result['items'][$i]['title']){ + $result['items'][$i]['title'] = strip_tags($this->unhtmlentities(strip_tags($result['items'][$i]['title']))); + } + // If date_format is specified and pubDate is valid + if ($this->date_format != '' && ($timestamp = strtotime($result['items'][$i]['pubDate'])) !==-1) { + // convert pubDate to specified date format + $result['items'][$i]['pubDate'] = date($this->date_format, $timestamp); + } + // Item counter + $i++; + } + } + + $result['items_count'] = $i; + + return $result; + + } + + private function getRssFromUrl($url){ + + $data = @file_get_contents($url); + + if ($data===false){ + + if (function_exists('curl_init')){ + + $curl = curl_init(); + + if(strpos($url, 'https') === 0){ + curl_setopt($curl, CURLOPT_SSL_VERIFYHOST, 0); + curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, false); + } + curl_setopt($curl, CURLOPT_URL, $url); + curl_setopt($curl, CURLOPT_RETURNTRANSFER, true); + curl_setopt($curl, CURLOPT_HEADER, false); + curl_setopt($curl, CURLOPT_TIMEOUT, 3); + $data = curl_exec($curl); + curl_close($curl); + + } + + } + + return $data; + + } + +} diff --git a/templates/default/assets/ui/grid-data.tpl.php b/templates/default/assets/ui/grid-data.tpl.php index 7061bae2a..32c35892f 100755 --- a/templates/default/assets/ui/grid-data.tpl.php +++ b/templates/default/assets/ui/grid-data.tpl.php @@ -70,6 +70,11 @@
+
diff --git a/templates/default/content/albums_list.tpl.php b/templates/default/content/albums_list.tpl.php index ba10d85d2..2cf7a5ac3 100755 --- a/templates/default/content/albums_list.tpl.php +++ b/templates/default/content/albums_list.tpl.php @@ -40,7 +40,6 @@ style="background-image: url();"> -
@@ -61,52 +60,38 @@
- +
- isInGroups($fields['content']['groups_read'])) { ?> - - - setItem($item)->parseTeaser($item['content']); ?> - - +
- +
- + - - isInGroups($field['groups_read'])) { continue; } ?> - - -
- -
+ +
+ +
- setItem($item)->parseTeaser($item[$field['name']]); ?> +
diff --git a/templates/default/content/default_list.tpl.php b/templates/default/content/default_list.tpl.php index acedf742d..dc6533085 100755 --- a/templates/default/content/default_list.tpl.php +++ b/templates/default/content/default_list.tpl.php @@ -23,7 +23,7 @@
- +
@@ -32,34 +32,24 @@ - +
- + - - isInGroups($field['groups_read'])) { continue; } ?> - - -
- -
+ +
+ +
-

@@ -81,7 +71,7 @@
- setItem($item)->parseTeaser($item[$field['name']]); ?> +

diff --git a/templates/default/content/default_list_featured.tpl.php b/templates/default/content/default_list_featured.tpl.php index 5f0cf6137..7f53797dd 100755 --- a/templates/default/content/default_list_featured.tpl.php +++ b/templates/default/content/default_list_featured.tpl.php @@ -29,7 +29,7 @@
- +
@@ -38,32 +38,21 @@ - +
- + - - isInGroups($field['groups_read'])) { continue; } ?> - - -
- -
- + +
+
@@ -88,7 +77,7 @@
- setItem($item)->parseTeaser($item[$field['name']]); ?> +
diff --git a/templates/default/content/default_list_table.tpl.php b/templates/default/content/default_list_table.tpl.php index 48a71fb21..0fe6ef018 100755 --- a/templates/default/content/default_list_table.tpl.php +++ b/templates/default/content/default_list_table.tpl.php @@ -45,7 +45,6 @@ - class="is_vip"> diff --git a/templates/default/content/default_list_tiles.tpl.php b/templates/default/content/default_list_tiles.tpl.php index b56c5fd52..889b77394 100755 --- a/templates/default/content/default_list_tiles.tpl.php +++ b/templates/default/content/default_list_tiles.tpl.php @@ -25,7 +25,7 @@
- +
@@ -38,31 +38,22 @@ - +
- + - - isInGroups($field['groups_read'])) { continue; } ?> - - -
- -
+ +
+ +
@@ -87,7 +78,7 @@
- setItem($item)->parseTeaser($item[$field['name']]); ?> +
diff --git a/templates/default/controllers/admin/index_news.tpl.php b/templates/default/controllers/admin/index_news.tpl.php new file mode 100755 index 000000000..cfb5d12ef --- /dev/null +++ b/templates/default/controllers/admin/index_news.tpl.php @@ -0,0 +1,33 @@ +addJS('templates/default/js/jquery.scrollbar.js'); ?> +
    +
    • +
    • +
    • +
+
+
+ +
+
+
+ \ No newline at end of file diff --git a/templates/default/controllers/admin/index_news_data.tpl.php b/templates/default/controllers/admin/index_news_data.tpl.php new file mode 100755 index 000000000..9a28319bd --- /dev/null +++ b/templates/default/controllers/admin/index_news_data.tpl.php @@ -0,0 +1,26 @@ +
    + +
  • + + +
    + +
    + +
    + + +
    + + +
    + +
    + +
    + +
    + +
    • + +
\ No newline at end of file diff --git a/templates/default/controllers/admin/index_resources.tpl.php b/templates/default/controllers/admin/index_resources.tpl.php index 1f533cfac..35d5c05b4 100755 --- a/templates/default/controllers/admin/index_resources.tpl.php +++ b/templates/default/controllers/admin/index_resources.tpl.php @@ -8,7 +8,6 @@
-*/ ?>
  • instantcms.ru
    • @@ -17,6 +16,7 @@
  • instantcms.ru/forum
+*/ ?>
    • diff --git a/templates/default/controllers/admin/styles.css b/templates/default/controllers/admin/styles.css index a13981c0a..17be8fb1f 100755 --- a/templates/default/controllers/admin/styles.css +++ b/templates/default/controllers/admin/styles.css @@ -2040,6 +2040,8 @@ table.layout-no-fit td.main .loading { background:url("../../images/loader16.gif padding:10px 10px; background:#F9F9F9; margin:0; + height: 20px; + line-height: 20px; } #dashboard .actions-toolbar { padding: 5px 0; @@ -2064,6 +2066,8 @@ table.layout-no-fit td.main .loading { background:url("../../images/loader16.gif } #dashboard .col .col-body{ padding:15px; + height: calc(100% - 40px); + box-sizing: border-box; } #dashboard .links { margin: 0 0 20px; @@ -2081,7 +2085,11 @@ table.layout-no-fit td.main .loading { background:url("../../images/loader16.gif padding-bottom: 0; } #dashboard .adb_list li > div { - margin:5px 0; + margin:5px 0; clear: both; +} +#dashboard .adb_list li > div > .image { + float: left; + margin: 5px 10px 0 0; } #dashboard .adb_list li .date { text-align: right; @@ -2169,6 +2177,36 @@ table.layout-no-fit td.main .loading { background:url("../../images/loader16.gif background:#09c; font-weight: bold; } +ul.news_targets_tabs { + margin: 0 0 15px 0; + padding: 0; + list-style: none; + line-height: 20px; + height: 20px; +} +ul.news_targets_tabs > li { + display: inline-block; + color: #97A5A6; + cursor: pointer; + margin: 0 10px 0 0; +} +ul.news_targets_tabs > li:last-child { + margin-right: 0; +} +ul.news_targets_tabs > li.active_news { + color: inherit; +} +#news-loading { + display: none; +} +#icms_news_wrap { + height: calc(100% - 35px); + box-sizing: border-box; +} +#icms_news_wrap .icms_news_wrap { + height: 100%; + box-sizing: border-box; +} .grid_field_edit > .button { line-height: 23px; height: 24px; @@ -2308,6 +2346,41 @@ table.layout-no-fit td.main .loading { background:url("../../images/loader16.gif form .field .input_checkbox_list#countries_view label, form .field .input_checkbox_list#countries_hide label { display: block; } +.spinner { + margin: 100px auto 0; + width: 70px; + text-align: center; +} +.spinner > div { + width: 18px; + height: 18px; + background-color: #B3C2C9; + border-radius: 100%; + display: inline-block; + -webkit-animation: sk-bouncedelay 1.4s infinite ease-in-out both; + animation: sk-bouncedelay 1.4s infinite ease-in-out both; +} +.spinner .bounce1 { + -webkit-animation-delay: -0.32s; + animation-delay: -0.32s; +} +.spinner .bounce2 { + -webkit-animation-delay: -0.16s; + animation-delay: -0.16s; +} +@-webkit-keyframes sk-bouncedelay { + 0%, 80%, 100% { -webkit-transform: scale(0) } + 40% { -webkit-transform: scale(1.0) } +} +@keyframes sk-bouncedelay { + 0%, 80%, 100% { + -webkit-transform: scale(0); + transform: scale(0); + } 40% { + -webkit-transform: scale(1.0); + transform: scale(1.0); + } +} @media screen and (max-width: 980px) { #dashboard .col1 { width: calc(50% - 20px); @@ -2385,3 +2458,126 @@ form .field .input_checkbox_list#countries_view label, form .field .input_checkb margin-left: 5px; } } +.scroll-wrapper { + overflow: hidden !important; + padding: 0 !important; + position: relative; +} +.scroll-wrapper > .scroll-content { + border: none !important; + box-sizing: content-box !important; + height: auto; + left: 0; + margin: 0; + max-height: none; + max-width: none !important; + overflow: scroll !important; + padding: 0; + position: relative !important; + top: 0; + width: auto !important; +} +.scroll-wrapper > .scroll-content::-webkit-scrollbar { + height: 0; + width: 0; +} +.scroll-element { + display: none; +} +.scroll-element, .scroll-element div { + box-sizing: content-box; +} +.scroll-element.scroll-x.scroll-scrollx_visible, +.scroll-element.scroll-y.scroll-scrolly_visible { + display: block; +} +.scroll-element .scroll-bar, +.scroll-element .scroll-arrow { + cursor: default; +} +.scroll-textarea { + border: 1px solid #cccccc; + border-top-color: #999999; +} +.scroll-textarea > .scroll-content { + overflow: hidden !important; +} +.scroll-textarea > .scroll-content > textarea { + border: none !important; + box-sizing: border-box; + height: 100% !important; + margin: 0; + max-height: none !important; + max-width: none !important; + overflow: scroll !important; + outline: none; + padding: 2px; + position: relative !important; + top: 0; + width: 100% !important; +} +.scroll-textarea > .scroll-content > textarea::-webkit-scrollbar { + height: 0; + width: 0; +} +.scrollbar-macosx > .scroll-element, +.scrollbar-macosx > .scroll-element div { + background: none; + border: none; + margin: 0; + padding: 0; + position: absolute; + z-index: 10; +} +.scrollbar-macosx > .scroll-element div { + display: block; + height: 100%; + left: 0; + top: 0; + width: 100%; +} +.scrollbar-macosx > .scroll-element .scroll-element_track { display: none; } +.scrollbar-macosx > .scroll-element .scroll-bar { + background-color: #6C6E71; + display: block; + -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=0)"; + filter: alpha(opacity=0); + opacity: 0; + -webkit-border-radius: 4px; + -moz-border-radius: 4px; + border-radius: 4px; + -webkit-transition: opacity 0.2s linear; + -moz-transition: opacity 0.2s linear; + -o-transition: opacity 0.2s linear; + -ms-transition: opacity 0.2s linear; + transition: opacity 0.2s linear; +} +.scrollbar-macosx:hover > .scroll-element .scroll-bar, +.scrollbar-macosx > .scroll-element.scroll-draggable .scroll-bar { + -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=70)"; + filter: alpha(opacity=80); + opacity: 0.8; +} +.scrollbar-macosx > .scroll-element.scroll-x { + bottom: 0px; + height: 0px; + left: 0; + min-width: 100%; + overflow: visible; + width: 100%; +} +.scrollbar-macosx > .scroll-element.scroll-y { + height: 100%; + min-height: 100%; + right: 0px; + top: 0; + width: 0px; +} +.scrollbar-macosx > .scroll-element.scroll-x .scroll-bar { height: 7px; min-width: 10px; top: -9px; } +.scrollbar-macosx > .scroll-element.scroll-y .scroll-bar { left: -7px; min-height: 10px; width: 7px; } +.scrollbar-macosx > .scroll-element.scroll-x .scroll-element_outer { left: 2px; } +.scrollbar-macosx > .scroll-element.scroll-x .scroll-element_size { left: -4px; } +.scrollbar-macosx > .scroll-element.scroll-y .scroll-element_outer { top: 2px; } +.scrollbar-macosx > .scroll-element.scroll-y .scroll-element_size { top: -4px; } +.scrollbar-macosx > .scroll-element.scroll-x.scroll-scrolly_visible .scroll-element_size { left: -11px; } +.scrollbar-macosx > .scroll-element.scroll-y.scroll-scrollx_visible .scroll-element_size { top: -11px; } \ No newline at end of file diff --git a/templates/default/css/theme-widgets.css b/templates/default/css/theme-widgets.css index c9ab60a13..9c9f7d0a3 100755 --- a/templates/default/css/theme-widgets.css +++ b/templates/default/css/theme-widgets.css @@ -115,7 +115,7 @@ aside .widget > .title { padding-right:15px; } -.widget_tabbed > .tabs .links a{ +.widget_tabbed > .tabs .links a { display:inline; padding: 3px 8px; background: #27ae60; @@ -123,9 +123,13 @@ aside .widget > .title { font-size: 12px; font-weight: normal; text-decoration: none; + margin: 0 5px 0 0; +} +.widget_tabbed > .tabs .links a:last-child { + margin-right: 0; } -.widget_tabbed > .tabs .links a:hover{ +.widget_tabbed > .tabs .links a:hover { background:#2ecc71; } diff --git a/templates/default/js/jquery.scrollbar.js b/templates/default/js/jquery.scrollbar.js new file mode 100644 index 000000000..5a86f9ad4 --- /dev/null +++ b/templates/default/js/jquery.scrollbar.js @@ -0,0 +1,16 @@ +/** + * jQuery CSS Customizable Scrollbar + * + * Copyright 2015, Yuriy Khabarov + * Dual licensed under the MIT or GPL Version 2 licenses. + * + * If you found bug, please contact me via email <13real008@gmail.com> + * + * Compressed by http://jscompress.com/ + * + * @author Yuriy Khabarov aka Gromo + * @version 0.2.11 + * @url https://github.com/gromo/jquery.scrollbar/ + * + */ +!function(a,b){"function"==typeof define&&define.amd?define(["jquery"],b):b("undefined"!=typeof exports?require("jquery"):a.jQuery)}(this,function(a){"use strict";function h(b){if(c.webkit&&!b)return{height:0,width:0};if(!c.data.outer){var d={border:"none","box-sizing":"content-box",height:"200px",margin:"0",padding:"0",width:"200px"};c.data.inner=a("
    ").css(a.extend({},d)),c.data.outer=a("
    ").css(a.extend({left:"-1000px",overflow:"scroll",position:"absolute",top:"-1000px"},d)).append(c.data.inner).appendTo("body")}return c.data.outer.scrollLeft(1e3).scrollTop(1e3),{height:Math.ceil(c.data.outer.offset().top-c.data.inner.offset().top||0),width:Math.ceil(c.data.outer.offset().left-c.data.inner.offset().left||0)}}function i(){var a=h(!0);return!(a.height||a.width)}function j(a){var b=a.originalEvent;return(!b.axis||b.axis!==b.HORIZONTAL_AXIS)&&!b.wheelDeltaX}var b=!1,c={data:{index:0,name:"scrollbar"},firefox:/firefox/i.test(navigator.userAgent),macosx:/mac/i.test(navigator.platform),msedge:/edge\/\d+/i.test(navigator.userAgent),msie:/(msie|trident)/i.test(navigator.userAgent),mobile:/android|webos|iphone|ipad|ipod|blackberry/i.test(navigator.userAgent),overlay:null,scroll:null,scrolls:[],webkit:/webkit/i.test(navigator.userAgent)&&!/edge\/\d+/i.test(navigator.userAgent)};c.scrolls.add=function(a){this.remove(a).push(a)},c.scrolls.remove=function(b){for(;a.inArray(b,this)>=0;)this.splice(a.inArray(b,this),1);return this};var d={autoScrollSize:!0,autoUpdate:!0,debug:!1,disableBodyScroll:!1,duration:200,ignoreMobile:!1,ignoreOverlay:!1,isRtl:!1,scrollStep:30,showArrows:!1,stepScrolling:!0,scrollx:null,scrolly:null,onDestroy:null,onFallback:null,onInit:null,onScroll:null,onUpdate:null},e=function(b){c.scroll||(c.overlay=i(),c.scroll=h(),g(),a(window).resize(function(){var a=!1;if(c.scroll&&(c.scroll.height||c.scroll.width)){var b=h();b.height===c.scroll.height&&b.width===c.scroll.width||(c.scroll=b,a=!0)}g(a)})),this.container=b,this.namespace=".scrollbar_"+c.data.index++,this.options=a.extend({},d,window.jQueryScrollbarOptions||{}),this.scrollTo=null,this.scrollx={},this.scrolly={},b.data(c.data.name,this),c.scrolls.add(this)};e.prototype={destroy:function(){if(this.wrapper){this.container.removeData(c.data.name),c.scrolls.remove(this);var b=this.container.scrollLeft(),d=this.container.scrollTop();this.container.insertBefore(this.wrapper).css({height:"",margin:"","max-height":""}).removeClass("scroll-content scroll-scrollx_visible scroll-scrolly_visible").off(this.namespace).scrollLeft(b).scrollTop(d),this.scrollx.scroll.removeClass("scroll-scrollx_visible").find("div").addBack().off(this.namespace),this.scrolly.scroll.removeClass("scroll-scrolly_visible").find("div").addBack().off(this.namespace),this.wrapper.remove(),a(document).add("body").off(this.namespace),a.isFunction(this.options.onDestroy)&&this.options.onDestroy.apply(this,[this.container])}},init:function(b){var d=this,e=this.container,f=this.containerWrapper||e,g=this.namespace,h=a.extend(this.options,b||{}),i={x:this.scrollx,y:this.scrolly},k=this.wrapper,l={},m={scrollLeft:e.scrollLeft(),scrollTop:e.scrollTop()};if(c.mobile&&h.ignoreMobile||c.overlay&&h.ignoreOverlay||c.macosx&&!c.webkit)return a.isFunction(h.onFallback)&&h.onFallback.apply(this,[e]),!1;if(k)l={height:"auto","margin-bottom":c.scroll.height*-1+"px","max-height":""},l[h.isRtl?"margin-left":"margin-right"]=c.scroll.width*-1+"px",f.css(l);else{if(this.wrapper=k=a("
    ").addClass("scroll-wrapper").addClass(e.attr("class")).css("position","absolute"===e.css("position")?"absolute":"relative").insertBefore(e).append(e),h.isRtl&&k.addClass("scroll--rtl"),e.is("textarea")&&(this.containerWrapper=f=a("
    ").insertBefore(e).append(e),k.addClass("scroll-textarea")),l={height:"auto","margin-bottom":c.scroll.height*-1+"px","max-height":""},l[h.isRtl?"margin-left":"margin-right"]=c.scroll.width*-1+"px",f.addClass("scroll-content").css(l),e.on("scroll"+g,function(b){var f=e.scrollLeft(),g=e.scrollTop();if(h.isRtl)switch(!0){case c.firefox:f=Math.abs(f);case c.msedge||c.msie:f=e[0].scrollWidth-e[0].clientWidth-f}a.isFunction(h.onScroll)&&h.onScroll.call(d,{maxScroll:i.y.maxScrollOffset,scroll:g,size:i.y.size,visible:i.y.visible},{maxScroll:i.x.maxScrollOffset,scroll:f,size:i.x.size,visible:i.x.visible}),i.x.isVisible&&i.x.scroll.bar.css("left",f*i.x.kx+"px"),i.y.isVisible&&i.y.scroll.bar.css("top",g*i.y.kx+"px")}),k.on("scroll"+g,function(){k.scrollTop(0).scrollLeft(0)}),h.disableBodyScroll){var n=function(a){j(a)?i.y.isVisible&&i.y.mousewheel(a):i.x.isVisible&&i.x.mousewheel(a)};k.on("MozMousePixelScroll"+g,n),k.on("mousewheel"+g,n),c.mobile&&k.on("touchstart"+g,function(b){var c=b.originalEvent.touches&&b.originalEvent.touches[0]||b,d={pageX:c.pageX,pageY:c.pageY},f={left:e.scrollLeft(),top:e.scrollTop()};a(document).on("touchmove"+g,function(a){var b=a.originalEvent.targetTouches&&a.originalEvent.targetTouches[0]||a;e.scrollLeft(f.left+d.pageX-b.pageX),e.scrollTop(f.top+d.pageY-b.pageY),a.preventDefault()}),a(document).on("touchend"+g,function(){a(document).off(g)})})}a.isFunction(h.onInit)&&h.onInit.apply(this,[e])}a.each(i,function(b,f){var k=null,l=1,m="x"===b?"scrollLeft":"scrollTop",n=h.scrollStep,o=function(){var a=e[m]();e[m](a+n),1==l&&a+n>=p&&(a=e[m]()),l==-1&&a+n<=p&&(a=e[m]()),e[m]()==a&&k&&k()},p=0;f.scroll||(f.scroll=d._getScroll(h["scroll"+b]).addClass("scroll-"+b),h.showArrows&&f.scroll.addClass("scroll-element_arrows_visible"),f.mousewheel=function(a){if(!f.isVisible||"x"===b&&j(a))return!0;if("y"===b&&!j(a))return i.x.mousewheel(a),!0;var c=a.originalEvent.wheelDelta*-1||a.originalEvent.detail,g=f.size-f.visible-f.offset;return c||("x"===b&&a.originalEvent.deltaX?c=40*a.originalEvent.deltaX:"y"===b&&a.originalEvent.deltaY&&(c=40*a.originalEvent.deltaY)),(c>0&&p0)&&(p+=c,p<0&&(p=0),p>g&&(p=g),d.scrollTo=d.scrollTo||{},d.scrollTo[m]=p,setTimeout(function(){d.scrollTo&&(e.stop().animate(d.scrollTo,240,"linear",function(){p=e[m]()}),d.scrollTo=null)},1)),a.preventDefault(),!1},f.scroll.on("MozMousePixelScroll"+g,f.mousewheel).on("mousewheel"+g,f.mousewheel).on("mouseenter"+g,function(){p=e[m]()}),f.scroll.find(".scroll-arrow, .scroll-element_track").on("mousedown"+g,function(g){if(1!=g.which)return!0;l=1;var i={eventOffset:g["x"===b?"pageX":"pageY"],maxScrollValue:f.size-f.visible-f.offset,scrollbarOffset:f.scroll.bar.offset()["x"===b?"left":"top"],scrollbarSize:f.scroll.bar["x"===b?"outerWidth":"outerHeight"]()},j=0,q=0;if(a(this).hasClass("scroll-arrow")){if(l=a(this).hasClass("scroll-arrow_more")?1:-1,n=h.scrollStep*l,p=l>0?i.maxScrollValue:0,h.isRtl)switch(!0){case c.firefox:p=l>0?0:i.maxScrollValue*-1;break;case c.msie||c.msedge:}}else l=i.eventOffset>i.scrollbarOffset+i.scrollbarSize?1:i.eventOffset','
    ','
    ','
    ','
    ','
    ','
    ','
    ','
    ',"
    ","
    ",'
    ','
    ','
    ',"
    ",'
    ','
    ',"
    ","
    ","
    "].join(""),simple:['
    ','
    ','
    ','
    ','
    ',"
    ","
    "].join("")};return c[b]&&(b=c[b]),b||(b=c.simple),b="string"==typeof b?a(b).appendTo(this.wrapper):a(b),a.extend(b,{bar:b.find(".scroll-bar"),size:b.find(".scroll-element_size"),track:b.find(".scroll-element_track")}),b},_handleMouseDown:function(b,c){var d=this.namespace;return a(document).on("blur"+d,function(){a(document).add("body").off(d),b&&b()}),a(document).on("dragstart"+d,function(a){return a.preventDefault(),!1}),a(document).on("mouseup"+d,function(){a(document).add("body").off(d),b&&b()}),a("body").on("selectstart"+d,function(a){return a.preventDefault(),!1}),c&&c.preventDefault(),!1},_updateScroll:function(b,d){var e=this.container,f=this.containerWrapper||e,g="scroll-scroll"+b+"_visible",h="x"===b?this.scrolly:this.scrollx,i=parseInt(this.container.css("x"===b?"left":"top"),10)||0,j=this.wrapper,k=d.size,l=d.visible+i;d.isVisible=k-l>1,d.isVisible?(d.scroll.addClass(g),h.scroll.addClass(g),f.addClass(g)):(d.scroll.removeClass(g),h.scroll.removeClass(g),f.removeClass(g)),"y"===b&&(e.is("textarea")||k10?(window.console&&console.log("Scroll updates exceed 10"),g=function(){}):(clearTimeout(a),a=setTimeout(g,300))}}();window.angular&&!function(a){a.module("jQueryScrollbar",[]).provider("jQueryScrollbar",function(){var b=d;return{setOptions:function(c){a.extend(b,c)},$get:function(){return{options:a.copy(b)}}}}).directive("jqueryScrollbar",["jQueryScrollbar","$parse",function(a,b){return{restrict:"AC",link:function(c,d,e){var f=b(e.jqueryScrollbar),g=f(c);d.scrollbar(g||a.options).on("$destroy",function(){d.scrollbar("destroy")})}}}])}(window.angular)}); \ No newline at end of file