diff --git a/module/common/model.php b/module/common/model.php
index 15cecee721..14cdb71052 100644
--- a/module/common/model.php
+++ b/module/common/model.php
@@ -595,16 +595,16 @@ class commonModel extends model
}
/**
- * Get recent executions.
+ * Print recent menu.
*
* @access public
* @return void
*/
- public static function getRecentExecutions()
+ public static function printRecentMemu()
{
global $lang;
echo "
";
- echo '' . $lang->recent . '';
+ echo '';
}
/**
diff --git a/module/index/css/index.css b/module/index/css/index.css
index 02d931cc3d..be6fd85344 100644
--- a/module/index/css/index.css
+++ b/module/index/css/index.css
@@ -1,6 +1,6 @@
body {padding-left: 96px}
-#menu {position: fixed; left: 0; top: 0; bottom: 0; background-color: #3C495C; color: #fff; width: 96px; z-index: 1015;}
+#menu {position: fixed; left: 0; top: 0; bottom: 0; background-color: #3C495C; width: 96px; z-index: 1015;}
#menuNav {position: absolute; top: 0; bottom: 80px; width: 100%;}
#menu .nav > li {float: none; padding: 4px 8px;}
#menu .nav > li > a {color: #fff; line-height: 20px; padding: 8px 6px; border-radius: 2px; white-space: nowrap;}
@@ -24,9 +24,11 @@ body.menu-hide {padding-left: 0;}
.menu-hide #menu .nav > li > a > .text {display: none}
.menu-hide #menu .nav > li.has-avatar > a {padding: 2px 0;}
-#moreExecution {display:none; max-height: 420px; position: fixed; bottom: 0; left: 96px; z-index: 999; background: white; padding: 20px 10px; height: 420px; margin-bottom: 40px; border: 1px solid #efefef}
-.menu-hide #moreExecution {left: 40px}
-#moreExecution > .list-group {height: 380px; min-width: 150px; max-width:200px;}
+#moreExecution {display:none; max-height: 380px; min-height: 140px; max-width:260px; min-width: 150px; position: fixed; bottom: 40px; z-index: 999; background: white; padding: 20px 10px; border: 1px solid #efefef}
+.more-execution-show {left: 96px;}
+.more-execution-hide {left: 40px;}
+#moreExecution .icon-search {opacity: 0.5;}
+#executionList {max-height: 280px; min-height: 100px; max-width:260px; min-width: 150px; margin-top: 5px;}
#pages {position: fixed; left: 96px; bottom: 0; right: 0; top: 0;}
.page-tab {position: absolute; left: 0; bottom: 0; right: 0; top: 0; background-color: #efefef;}
diff --git a/module/index/js/index.js b/module/index/js/index.js
index cd9915ffbf..c0717fdd13 100644
--- a/module/index/js/index.js
+++ b/module/index/js/index.js
@@ -449,9 +449,20 @@
});
/* Hide execution list on mouseleave or click */
- $('#executionList').on('mouseleave click', function()
+ $(document).click(function()
{
- $('#moreExecution').hide();
+ $("#moreExecution").hide();
+ });
+
+ $("#recentMenu").click(function(event)
+ {
+ event.stopPropagation();
+ getExecutions();
+ });
+
+ $("#moreExecution").click(function(event)
+ {
+ event.stopPropagation();
});
});
}());
@@ -462,6 +473,15 @@ function getExecutions()
var $moreExecution = $('#moreExecution').toggle();
if(!$moreExecution.is(':hidden'))
{
+ if($('body').hasClass('menu-hide'))
+ {
+ $('#moreExecution').addClass('more-execution-hide');
+ }
+ else
+ {
+ $('#moreExecution').removeClass('more-execution-hide');
+ }
+
$.ajax(
{
url: createLink('project', 'ajaxGetRecentExecutions'),
diff --git a/module/index/view/index.html.php b/module/index/view/index.html.php
index 47a264c27a..87746d2898 100644
--- a/module/index/view/index.html.php
+++ b/module/index/view/index.html.php
@@ -25,11 +25,18 @@ js::set('defaultOpen', $open);
-