diff --git a/e107_core/shortcodes/batch/admin_shortcodes.php b/e107_core/shortcodes/batch/admin_shortcodes.php
index 508390e14..68bba5a3f 100644
--- a/e107_core/shortcodes/batch/admin_shortcodes.php
+++ b/e107_core/shortcodes/batch/admin_shortcodes.php
@@ -723,7 +723,7 @@ class admin_shortcodes
{
if(e_DEBUG !== false)
{
- return "
".e107::getParser()->toGlyph('fa-bug', array('class'=>'text-warning'))."
";
+ return "".e107::getParser()->toGlyph('fa-bug', array('class'=>'text-warning'))."
";
}
}
@@ -754,7 +754,7 @@ class admin_shortcodes
$outboxUrl = e_PLUGIN.'pm/admin_config.php?mode=outbox&action=list&iframe=1';
$composeUrl = e_PLUGIN.'pm/admin_config.php?mode=outbox&action=create&iframe=1';
- $text = '
+ $text = '
-
'.$tp->toGlyph('fa-envelope').$countDisp.'
diff --git a/e107_handlers/admin_ui.php b/e107_handlers/admin_ui.php
index 017813bc7..439a947dd 100644
--- a/e107_handlers/admin_ui.php
+++ b/e107_handlers/admin_ui.php
@@ -4802,7 +4802,7 @@ class e_admin_ui extends e_admin_controller_ui
protected function handleListCopyBatch($selected)
{
// Batch Copy
-
+
$res = $this->getTreeModel()->copy($selected);
// callback
$this->afterCopy($res, $selected);
diff --git a/e107_themes/bootstrap3/admin_style.css b/e107_themes/bootstrap3/admin_style.css
index 43b87d09f..e3ab4472f 100644
--- a/e107_themes/bootstrap3/admin_style.css
+++ b/e107_themes/bootstrap3/admin_style.css
@@ -74,8 +74,11 @@ a.core-mainpanel-link-icon:hover { text-decoration: none; filter: none; }
.e-overlay .thumbnail { margin:0; }
.admin-ui-grid img.fallback { opacity: 0.3; }
+/*
+
#admin-ui-carousel .carousel-inner { min-height: 65vh; }
+*/
diff --git a/e107_web/js/core/admin.jquery.js b/e107_web/js/core/admin.jquery.js
index 3394700e7..39a9d4fda 100644
--- a/e107_web/js/core/admin.jquery.js
+++ b/e107_web/js/core/admin.jquery.js
@@ -733,6 +733,75 @@ $(document).ready(function()
+ $('.carousel').on('slid.bs.carousel', function () {
+ var currentIndex = $(this).find('.active').index();
+ var text = (currentIndex + 1);
+ $('#admin-ui-carousel-index').text(text);
+ });
+
+
+ $(window).load(function() {
+
+ $('.carousel').each(function(){
+
+ $(this).carouselHeights();
+
+ });
+
+ });
+
+ // Normalize Bootstrap Carousel Heights
+
+ $.fn.carouselHeights = function() {
+
+ var items = $(this).find('.item'), // grab all slides
+
+ heights = [], // create empty array to store height values
+
+ tallest, // create variable to make note of the tallest slide
+
+ call;
+
+ var normalizeHeights = function() {
+
+ items.each(function() { // add heights to array
+
+ heights.push($(this).outerHeight());
+
+ });
+
+ tallest = Math.max.apply(null, heights); // cache largest value
+
+ items.css('height', tallest);
+
+ };
+
+ normalizeHeights();
+
+ $(window).on('resize orientationchange', function() {
+
+ // reset vars
+
+ tallest = 0;
+
+ heights.length = 0;
+
+ items.css('height', ''); // reset height
+
+ if(call){
+
+ clearTimeout(call);
+
+ };
+
+ call = setTimeout(normalizeHeights, 100); // run it again
+
+ });
+
+ };
+
+
+
$("a.menuManagerSelect").click(function(e){
diff --git a/e107_web/js/core/all.jquery.js b/e107_web/js/core/all.jquery.js
index af7ada0d2..d5d6d087b 100644
--- a/e107_web/js/core/all.jquery.js
+++ b/e107_web/js/core/all.jquery.js
@@ -719,12 +719,7 @@ $(document).ready(function()
$(".e-expandit").show();
// $(".e-spinner").spinner(); //FIXME breaks tooltips
-
- $('.carousel').on('slid.bs.carousel', function () {
- var currentIndex = $(this).find('.active').index();
- var text = (currentIndex + 1);
- $('#admin-ui-carousel-index').text(text);
- });
+
//check all
$("#check-all").click(function(event){