Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

Merge branch 'master' of github.com:easysoft/zentaopms

Browse Source
This commit is contained in:
chenfeiCF
2016-11-17 14:43:59 +08:00
parent befa5a2a80 fd7742ce14
commit 6dfdf69b6f
3 changed files with 28 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/common/model.php
+3 -3
View File
@@ -303,10 +303,10 @@ class commonModel extends model
echo "<a href='javascript:;' data-toggle='dropdown'>" . $lang->help . " <span class='caret'></span></a>";
echo "<ul class='dropdown-menu pull-right'>";
echo '<li>' . html::a('javascript:;', $lang->manual, '', "class='open-help-tab'") . '</li>';
if(!commonModel::isTutorialMode() and $app->user->account != 'guest') echo '<li>' . html::a(helper::createLink('tutorial', 'start'), $lang->tutorial, '', "class='iframe' data-width='800' data-headerless='true'") . "</li>";
echo '<li>' . html::a(helper::createLink('misc', 'changeLog'), $lang->changeLog, '', "class='iframe' data-width='800' data-headerless='true'") . '</li>';
if(!commonModel::isTutorialMode() and $app->user->account != 'guest') echo '<li>' . html::a(helper::createLink('tutorial', 'start'), $lang->tutorial, '', "class='iframe' data-width='800' data-headerless='true' data-backdrop='true' data-keyboard='true'") . "</li>";
echo '<li>' . html::a(helper::createLink('misc', 'changeLog'), $lang->changeLog, '', "class='iframe' data-width='800' data-headerless='true' data-backdrop='true' data-keyboard='true'") . '</li>';
echo "</ul></div>";
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'");
}
/**
www/js/my.full.js
+15 -12
View File
@@ -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)
www/theme/default/style.css
+10 -1
View File
@@ -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}