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

* ajusted style of modal dialog.

Browse Source
This commit is contained in:
Catouse
2014-04-24 18:02:16 +08:00
parent 7ca225a37c
commit 40cbbac903
3 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/my/view/editprofile.html.php
+1 -1
View File
@@ -88,7 +88,7 @@
</tr>
</table>
</fieldset>
<?php echo html::submitButton('', '', 'btn-primary') . html::backButton();?>
<div class='text-center'><?php echo html::submitButton('', '', 'btn-primary') . ' &nbsp; ' . html::backButton();?></div>
</form>
</div>
<?php include '../../common/view/footer.html.php';?>
www/js/my.full.js
+3 -1
View File
@@ -874,7 +874,7 @@ function setModal()
var i = $e.find("[class^='icon-']");
options.icon = i.length ? i.attr('class').substring(5) : 'file-text';
}
var modal = $('#ajaxModal').addClass('modal-loading');
var modal = $('#ajaxModal').addClass('modal-loading').data('first', true);
modal.html("<div class='icon-spinner icon-spin loader'></div><div class='modal-dialog modal-iframe' style='width: {width};'><div class='modal-content'><div class='modal-header'><button class='close' data-dismiss='modal'>×</button><h4 class='modal-title'><i class='icon-{icon}'></i> {title}</h4></div><div class='modal-body' style='height:{height}'><iframe id='{name}' name='{name}' src='{url}' frameborder='no' allowtransparency='true' scrolling='auto' hidefocus='' style='width: 100%; height: 100%; left: 0px;'></iframe></div></div></div>".format(options));
var modalBody = modal.find('.modal-body'), dialog = modal.find('.modal-dialog');
@@ -886,6 +886,7 @@ function setModal()
frame.onload = frame.onreadystatechange = function()
{
if (this.readyState && this.readyState != 'complete') return;
if(!modal.data('first')) modal.addClass('modal-loading');
modalBody.css('height', options.height - modal.find('.modal-header').outerHeight());
@@ -908,6 +909,7 @@ function setModal()
modalBody.css('height', $framebody.addClass('body-modal').outerHeight());
if(options.center) dialog.css('margin-top', Math.max(0, (modal.height() - dialog.height())/3));
modal.removeClass('modal-loading');
if(modal.data('first')) modal.data('first', false);
}, 100);
$framebody.resize(function()
www/theme/default/style.css
+7 -8
View File
@@ -191,16 +191,16 @@ i[class^="icon-"].disabled,i[class*=" icon-"].disabled,i[class^="icon-"].disable
.form-condensed .table-form {margin-bottom: 0;}
.form-condensed .table-form td, .form-condensed .table-form th {padding: 5px; font-size: 12px;}
.form-condensed .table-form > td + td, .form-condensed .table-form > th + th, .form-condensed .table-form > tbody > td + td, .form-condensed .table-form > tbody > th + th {padding-left: 5%;}
.form-condensed fieldset {background-color: #eee; padding: 2px 15px 2px 5px; margin-bottom: 10px; margin-top: 35px; border-radius: 2px; position: relative;}
.form-condensed fieldset {padding: 2px 15px 2px 5px; margin-bottom: 10px; margin-top: 35px; border-radius: 2px; position: relative;}
.form-condensed fieldset.fieldset-primary {background-color: transparent; padding: 0; margin-top: 0;}
.form-condensed fieldset .table-form {margin-bottom: 0;}
.form-condensed fieldset.collapsed, .form-condensed fieldset.fieldset-pure.collapsed {padding: 1px!important; background: #eee!important}
.form-condensed fieldset.collapsed .table-form, .form-condensed fieldset.collapsed .article-content, .form-condensed fieldset.collapsed .form-group, .form-condensed fieldset.collapsed #historyItem {display: none}
.form-condensed legend {font-size: 12px; font-weight: bold; border:0px solid red; padding: 5px; position: absolute; top: -25px; left: 0; cursor: pointer; line-height: 14px; vertical-align: top; color: #666}
.form-condensed legend {font-size: 12px; font-weight: bold; padding: 5px; position: absolute; top: -25px; left: 0; cursor: pointer; line-height: 14px; vertical-align: top; color: #666; background: #f1f1f1;}
.form-condensed .fieldset-pure legend{top: -20px}
.form-condensed legend:before {font-family: ZenIcon; content: '\e6b8'; font-size: 14px; color: #999; display: inline-block; margin-right: 4px; -webkit-font-smoothing: antialiased;}
/*.form-condensed legend:before {font-family: ZenIcon; content: '\e6b8'; font-size: 14px; color: #999; display: inline-block; margin-right: 4px; -webkit-font-smoothing: antialiased;}*/
.form-condensed legend:hover {color: #333;}
.form-condensed fieldset.collapsed legend:before {content: '\e6bb'}
/*.form-condensed fieldset.collapsed legend:before {content: '\e6bb'}*/
.form-condensed .chosen-container-single .chosen-single {padding: 4px 10px; height: 30px}
.form-condensed .chosen-container-single .chosen-single div {padding: 4px 10px}
.form-condensed .chosen-container-multi .chosen-choices {min-height: 30px}
@@ -520,11 +520,10 @@ body {font-size: 13px; color:#141414;padding-bottom: 40px;}
#_pageID, #goto {display: none}
/* modal with iframe */
.modal-dialog {transition: all .3s;}
.modal-title {font-size: 14px;}
/* modal with iframe */
.modal-iframe .modal-body {transition: all 0.3s; padding: 0}
.modal-iframe .modal-body {padding: 0}
.modal.with-titlebar .modal-header, .modal-dialog.hide-header .modal-header{position: relative; height: 0; padding: 0; border: none; z-index: 999; min-height: 0}
.modal.with-titlebar .modal-header .modal-body, .modal-dialog.hide-header .modal-header .modal-body {z-index: 990}
.modal.with-titlebar .modal-header .modal-title, .modal-dialog.hide-header .modal-header .modal-title {display: none}
@@ -541,9 +540,9 @@ body {font-size: 13px; color:#141414;padding-bottom: 40px;}
.modal-dialog.fullscreen {width: 100% !important; height: 100% !important; margin: 0; border: none !important;}
.modal-dialog.fullscreen .modal-body iframe {height: 100%}
.modal-loading .modal-dialog {margin-top: -100% !important}
.modal-loading .modal-dialog {margin-top: -100%!important;}
.loader {display: none}
.modal-loading .loader{display: block; text-align: center; font-size: 56px; color: #fff; margin-top: 10%}
.modal-loading .loader{position: absolute; display: block; text-align: center; font-size: 56px; color: #fff; top: 35%; width: 100%}
/* about dialog */
.modal .modal-about.modal-dialog {margin-top: 9%;}