From 2a13dfd3f182043b52f5aacf9e87af1e8ae8fa6c Mon Sep 17 00:00:00 2001 From: sim2github Date: Mon, 25 Aug 2014 00:32:42 +0300 Subject: [PATCH] Fix hang #20 This reverts commit 2829e4f7510ef4ff9d74b9800038626582d84e92. Define miss --- cms/config/definitions.conf.php | 1 + cms/templates/default.tpl | 1 - static/css/style.css | 4 ++-- static/js/main.js | 11 +---------- 4 files changed, 4 insertions(+), 13 deletions(-) diff --git a/cms/config/definitions.conf.php b/cms/config/definitions.conf.php index c9a96bd..3336a19 100644 --- a/cms/config/definitions.conf.php +++ b/cms/config/definitions.conf.php @@ -7,6 +7,7 @@ define('JQUERY_UI_HANDLER', STATIC_URL.'js/jquery_ui_handler.js'); define('BOOTSTRAP', '//netdna.bootstrapcdn.com/bootstrap/3.1.1/js/bootstrap.min.js'); define('BOOTSTRAP_CSS', '//netdna.bootstrapcdn.com/bootstrap/3.1.1/css/bootstrap.min.css'); +define('BOOTSTRAP_HOVER_PLUGIN', 'http://cdnjs.cloudflare.com/ajax/libs/bootstrap-hover-dropdown/2.0.10/bootstrap-hover-dropdown.js'); define('WYSIWYG_EDITOR', '//tinymce.cachefly.net/4.0/tinymce.min.js'); define('WYSIWYG_EDITOR_INIT', BASE_URL . 'static/js/wysiwyg_init.js'); diff --git a/cms/templates/default.tpl b/cms/templates/default.tpl index eceec12..d6c971e 100644 --- a/cms/templates/default.tpl +++ b/cms/templates/default.tpl @@ -105,7 +105,6 @@ - diff --git a/static/css/style.css b/static/css/style.css index bb6188c..da1c51f 100644 --- a/static/css/style.css +++ b/static/css/style.css @@ -80,13 +80,13 @@ h4.author { font-size:14px; margin-bottom:5px; font-style:italic; } .dropdown-menu .glyphicon { padding-right:5px; } /* Pills dropdown*/ -/*ul.nav.nav-pills li.dropdown:hover ul.dropdown-menu{ +ul.nav.nav-pills li.dropdown:hover ul.dropdown-menu{ display: block; } ul.nav.nav-pills .dropdown-menu { margin-top: 1px; -}*/ +} a.rss { padding-left:23px; background:url(../img/rss.png) no-repeat left; } a.pdf { padding-left:23px; background-image:url(../img/pdf.png); background-repeat:no-repeat; background-position: top left; } diff --git a/static/js/main.js b/static/js/main.js index 3d556ca..ea29e6a 100644 --- a/static/js/main.js +++ b/static/js/main.js @@ -7,14 +7,7 @@ $('ul.nav.nav-pills > li').each( var _sameSection = $('li[data-section*="'+$(this).data('section')+'"]'); if(_sameSection.length > 1 && !_sameSection.hasClass('dropdown')){ _sameSection.first().addClass('dropdown') - .find('a:first').addClass('dropdown-toggle') - .attr({ - 'data-hover':'dropdown', - 'data-toggle':'dropdown', - 'data-hover':'dropdown', - 'data-delay':'500', - 'data-close-others':'false', - }) + .find('a:first') .append(''); _sameSection.first().append(_sameSection.not(':first')); @@ -24,7 +17,5 @@ $('ul.nav.nav-pills > li').each( } ); - $('[data-hover="dropdown"]').dropdownHover(); - });