mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-02 20:57:26 +02:00
Code Issues Releases Wiki Activity

Partial fix for modal window size

Browse Source
This commit is contained in:
Cameron
2013-03-13 03:25:38 -07:00
parent b864c192e1
commit ea6ef5d648
4 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
e107_admin/header.php
View File

@@ -496,7 +496,7 @@ if ($e107_popup != 1)
} }
else else
{ {
e107::css("inline","body { padding:10px } "); // default padding for iFrame-only. e107::css("inline","body { padding:0px } "); // default padding for iFrame-only.
} }
e107::getDb()->db_Mark_Time('(End: Parse Admin Header)'); e107::getDb()->db_Mark_Time('(End: Parse Admin Header)');

2
e107_plugins/tinymce/plugins/e107bbcode/editor_plugin.js
View File

@@ -13,7 +13,7 @@
ed.windowManager.open({ ed.windowManager.open({
file : url + '/dialog.php', file : url + '/dialog.php',
width : 900 , // + parseInt(ed.getLang('e107bbcode.delta_width', 0)), width : 900 , // + parseInt(ed.getLang('e107bbcode.delta_width', 0)),
height : 400, // + parseInt(ed.getLang('e107bbcode.delta_height', 0)), height : 450, // + parseInt(ed.getLang('e107bbcode.delta_height', 0)),
inline : 1 inline : 1
}, { }, {
plugin_url : url, // Plugin absolute URL plugin_url : url, // Plugin absolute URL

4
e107_plugins/tinymce/plugins/jqueryinlinepopups/editor_plugin.js vendored
View File

@@ -26,7 +26,7 @@
getInfo : function() { getInfo : function() {
return { return {
longname : 'jQuery UI Inline Popups', longname : 'jQuery UI Inline Popups',
author : 'Richard Willis', author : 'Richard Willis. Modified by e107 Inc.',
authorurl : 'http://badsyntax.co', authorurl : 'http://badsyntax.co',
infourl : 'http://is.gd/j1FuI', infourl : 'http://is.gd/j1FuI',
version : '0.1b' version : '0.1b'
@@ -131,8 +131,10 @@
var wdt = f.width + 'px'; var wdt = f.width + 'px';
$('#uiModal .modal-caption').text(f.title); $('#uiModal .modal-caption').text(f.title);
// $('#uiModal').css('height',f.height + "px"); // $('#uiModal').css('height',f.height + "px");
var windowHeight = $(window).height() - 50;
$('#uiModal').width(wdt); $('#uiModal').width(wdt);
$('#uiModal').css('min-width','800px'); $('#uiModal').css('min-width','800px');
$('#uiModal').css('max-height', $(window).height());
$('#uiModal .modal-body').html("<iframe src='" + src + "' width='100%' height='" + (f.height + 60) + "px' frameborder='0'></iframe>"); $('#uiModal .modal-body').html("<iframe src='" + src + "' width='100%' height='" + (f.height + 60) + "px' frameborder='0'></iframe>");
$('#uiModal .modal-footer').text(''); $('#uiModal .modal-footer').text('');

3
e107_themes/bootstrap/admin_style.css
View File

@@ -86,8 +86,9 @@ a.brand:hover img {
.modal { min-width:800px; left:38%; z-index:10001} .modal { min-width:800px; left:38%; z-index:10001}
.modal-header { border-radius: 6px 6px 6px 6px; border-bottom:1px solid #DDDDDD; padding-left:20px; background-image: -moz-linear-gradient(center top , rgb(253, 253, 253) 0%, rgb(234, 234, 234) 100%); } .modal-header { border-radius: 6px 6px 6px 6px; border-bottom:1px solid #DDDDDD; padding-left:20px; background-image: -moz-linear-gradient(center top , rgb(253, 253, 253) 0%, rgb(234, 234, 234) 100%); }
.modal-body { max-height:800px } .modal-body { max-height:500px; padding:10px }
#media-select-container { min-height:378px } #media-select-container { min-height:378px }
.modal.fade.in { top: 5%; }
@media (min-width: 1500px) { @media (min-width: 1500px) {