diff --git a/module/common/model.php b/module/common/model.php index 632ca7de18..7e115d43cf 100644 --- a/module/common/model.php +++ b/module/common/model.php @@ -303,10 +303,10 @@ class commonModel extends model echo "" . $lang->help . " "; echo "
"; - echo html::a(helper::createLink('misc', 'about'), $lang->aboutZenTao, '', "class='about iframe' data-width='900' data-headerless='true' data-class='modal-about'"); + echo html::a(helper::createLink('misc', 'about'), $lang->aboutZenTao, '', "class='about iframe' data-width='900' data-headerless='true' data-backdrop='true' data-keyboard='true' data-class='modal-about'"); } /** diff --git a/www/js/my.full.js b/www/js/my.full.js index 9d4b9806e7..9cdcb668be 100644 --- a/www/js/my.full.js +++ b/www/js/my.full.js @@ -989,18 +989,18 @@ function setModal() var type = (setting ? setting.type : false) || ($e.hasClass('iframe') ? 'iframe' : ($e.data('type') || 'ajax')); if(type == 'iframe') { - var options = + var options = $.extend( { url: url, - width: $e.data('width') || 800, - height: $e.data('height') || 'auto', - icon: $e.data('icon') || '?', - title: $e.data('title') || $e.attr('title') || $e.text(), - name: $e.data('name') || 'modalIframe', + width: 800, + height: 'auto', + icon: '?', + title: $e.attr('title') || $e.text(), + name: 'modalIframe', cssClass: $e.data('class'), - headerless: $e.data('headerless') || false, - center: $e.data('center') || true - }; + headerless: false, + center: true + }, $e.data()); if(options.icon == '?') { @@ -1036,7 +1036,7 @@ function setModal() ajustModalPosition(); } - ajaxModal.modal('show'); + ajaxModal.modal($.extend({backdrop: 'static', keyboard: false, show: true}, options)); }); } @@ -1061,7 +1061,10 @@ function setModal() cssClass: '', headerless: false, waittime: 0, - center: true + center: true, + backdrop: 'static', + keyboard: false, + show: true } if(typeof(settings) == 'string') @@ -1118,7 +1121,7 @@ function setModal() } showModal(options, modal, modalBody, dialog); } - modal.modal('show'); + modal.modal(options); } function showModal(options, modal, modalBody, dialog) diff --git a/www/theme/default/style.css b/www/theme/default/style.css index dba4d77d38..d7155fea45 100644 --- a/www/theme/default/style.css +++ b/www/theme/default/style.css @@ -722,7 +722,16 @@ body {font-size: 13px; color:#141414;padding-bottom: 40px;} #passwordStrength{display:none;} .fixedTfootAction {position: fixed; bottom: 40px; box-shadow: 0 -3px 4px rgba(0,0,0,0.05)} -.table > .fixedTfootAction > tr > td {background: #F8FAFE; border-top-color: #bbb; border-bottom: none} +.table > .fixedTfootAction > tr > td {background: #114f8e; border: none; color: #fff} +.fixedTfootAction .btn {border: 1px solid #fff; border-color: rgba(255,255,255,.5); background-color: #2e6dad!important; text-shadow: none; color: #e5e5e5!important;} +.fixedTfootAction .btn:hover {background-color: #114f8e!important;} +.fixedTfootAction .pager, +.fixedTfootAction .pager > a, +.fixedTfootAction .pager > .dropdown > a, +.fixedTfootAction .table-actions > .text {color: #e5e5e5} +.fixedTfootAction .pager strong, +.fixedTfootAction .table-actions > .text strong {color: #fff;} +.fixedTfootAction .pager .dropdown > a:hover, .fixedTfootAction .pager > a:hover {background-color: #2e6dad} .fixedTheadOfList {position: fixed; top: 0px; z-index:1000;} .datatable.head-fixed > .datatable-head .table > thead > tr > th, .fixedTheadOfList > thead > tr > th {background-color: #114f8e; border-bottom-color: #bbb; color: #aaa}