diff --git a/common/js/common.js b/common/js/common.js index 29d75687d..6210a1571 100644 --- a/common/js/common.js +++ b/common/js/common.js @@ -621,22 +621,21 @@ function setFixedPopupSize() { offset = $pc.css({overflow:'scroll'}).offset(); w = $pc.width(10).height(10000).get(0).scrollWidth + offset.left*2; - h = $pc.height(10).width(10000).get(0).scrollHeight + offset.top*2; if(w < 800) w = 800 + offset.left*2; + // Window 의 너비나 높이는 스크린의 너비나 높이보다 클 수 없다. 스크린의 너비나 높이와 내용의 너비나 높이를 비교해서 최소값을 이용한다. + w = Math.min(w, window.screen.availWidth); + + h = $pc.width(w - offset.left*2).height(10).get(0).scrollHeight + offset.top*2; dw = $win.width(); dh = $win.height(); - // Window 의 너비나 높이는 스크린의 너비나 높이보다 클 수 없다. 스크린의 너비나 높이와 내용의 너비나 높이를 비교해서 최소값을 이용한다. - w = Math.min(w, window.screen.availWidth); h = Math.min(h, window.screen.availHeight - 100); window.resizeBy(w - dw, h - dh); - $pc.width(w - offset.left*2).css({overflow:'',height:''}); - if(h === window.screen.availHeight - 100) { - $pc.width(w - offset.left*2-scbw).css({overflow:'',height:''}); - } + $pc.width('100%').css({overflow:'',height:'','box-sizing':'border-box'}); + } /** diff --git a/modules/document/tpl/checked_list.html b/modules/document/tpl/checked_list.html index dd32526f1..6b683a445 100644 --- a/modules/document/tpl/checked_list.html +++ b/modules/document/tpl/checked_list.html @@ -1,5 +1,6 @@ +{@Context::addMetaTag('viewport', 'width=device-width', FALSE);}
diff --git a/modules/document/tpl/saved_list_popup.html b/modules/document/tpl/saved_list_popup.html index 0ea345a05..38823f693 100644 --- a/modules/document/tpl/saved_list_popup.html +++ b/modules/document/tpl/saved_list_popup.html @@ -1,35 +1,40 @@ -

{$lang->cmd_view_saved_document}

- - - - - - - - - - - - - - - - - - - -
Total : {number_format($total_count)}, Page {number_format($page)}/{number_format($total_page)}
{$lang->date}{$lang->title}{$lang->cmd_select}
{$val->getRegdate("Y-m-d H:i:s")} {$val->getTitle()} - - {$lang->cmd_select}
- - \ No newline at end of file diff --git a/modules/editor/components/emoticon/tpl/popup.js b/modules/editor/components/emoticon/tpl/popup.js index a44f31450..b13328cdd 100644 --- a/modules/editor/components/emoticon/tpl/popup.js +++ b/modules/editor/components/emoticon/tpl/popup.js @@ -1,5 +1,3 @@ -jQuery(function($){ - var is_popup = window._isPoped; /** @@ -17,25 +15,12 @@ function getEmoticons(emoName) { * @brief Load callback */ function completeGetEmoticons(ret_obj) { - var emoticons = ret_obj['emoticons'].split("\n"); - var html = []; - for(var i=0;i'; - } - jQuery('#emoticons').html(html.join('')).find('img.emoticon') - .click(insertEmoticon) - .load(function(){ - /* resize popup window for new emoticons loaded, 2015-07-14 by misol */ - if(jQuery('section.section').outerHeight(true) != jQuery( window ).height()) - { - // more space for y-scroll - var ww = (jQuery('section.section').outerHeight(true) > jQuery( window ).height())? jQuery('section.section').outerWidth(true) + 60 : jQuery('section.section').outerWidth(true) + 30; - // not more than screen height - var wh = (screen.height-100 < jQuery('section.section').outerHeight(true)+100)? screen.height-100 : jQuery('section.section').outerHeight(true)+100; - - window.resizeTo(ww, wh); - } - }); + var emoticons = ret_obj.emoticons.item; + var html = []; + for(var i=0;i'; + } + $('#emoticons').html(html.join('')); } /** @@ -47,7 +32,7 @@ function insertEmoticon() { if(!win) return; - html = ''; + html = ''; win.editorFocus(win.editorPrevSrl); win.editorRelKeys[win.editorPrevSrl].pasteHTML(html); @@ -57,8 +42,9 @@ function insertEmoticon() { return false; } -// load default emoticon set -getEmoticons('msn'); -$('#selectEmoticonList').change(function(){ getEmoticons(this.value) }); +$(function(){ + // load default emoticon set + getEmoticons('msn'); + $('#selectEmoticonList').change(function(){ getEmoticons(this.value) }); }); diff --git a/modules/editor/components/image_gallery/tpl/popup.html b/modules/editor/components/image_gallery/tpl/popup.html index 3e0b93d5a..68fd4126d 100644 --- a/modules/editor/components/image_gallery/tpl/popup.html +++ b/modules/editor/components/image_gallery/tpl/popup.html @@ -2,8 +2,10 @@ {@Context::addMetaTag('viewport', 'width=device-width', FALSE);} -
+

{$component_info->title}

+
+
@@ -64,6 +66,6 @@
-
+ diff --git a/modules/editor/components/image_link/tpl/popup.html b/modules/editor/components/image_link/tpl/popup.html index 33fa612d1..d11ed24ef 100644 --- a/modules/editor/components/image_link/tpl/popup.html +++ b/modules/editor/components/image_link/tpl/popup.html @@ -2,8 +2,10 @@ {@Context::addMetaTag('viewport', 'width=device-width', FALSE);} -
+

{$component_info->title}

+
+
@@ -81,4 +83,4 @@
-
+ diff --git a/modules/editor/components/poll_maker/tpl/popup.html b/modules/editor/components/poll_maker/tpl/popup.html index b3ccc9b2d..1778b0eba 100644 --- a/modules/editor/components/poll_maker/tpl/popup.html +++ b/modules/editor/components/poll_maker/tpl/popup.html @@ -9,9 +9,10 @@ - -
+

{$component_info->title}

+
+
@@ -21,32 +22,30 @@
- + //if the browser does not support type date input, start datepicker. If it does, brower's UI will show their datepicker. + $(".inputDate").datepicker(option); + } + else + { + } + }); +
@@ -115,4 +114,4 @@ $(function(){
-
+ diff --git a/modules/editor/tpl/view_component.html b/modules/editor/tpl/view_component.html index 6d0dae34b..91f60518a 100644 --- a/modules/editor/tpl/view_component.html +++ b/modules/editor/tpl/view_component.html @@ -1,7 +1,9 @@ {@Context::addMetaTag('viewport', 'width=device-width', FALSE);} -
+

{$component->title}

+
+

{$lang->component_author}

    @@ -33,4 +35,4 @@

    {$lang->component_description}

    {nl2br(trim($component->description))}

-
+ \ No newline at end of file diff --git a/modules/widget/widget.admin.view.php b/modules/widget/widget.admin.view.php index fb2a5be16..712e56610 100644 --- a/modules/widget/widget.admin.view.php +++ b/modules/widget/widget.admin.view.php @@ -79,7 +79,7 @@ class widgetAdminView extends widget $security->encodeHTML('member_config..'); $this->setLayoutPath('./common/tpl'); - $this->setLayoutFile("default_layout"); + $this->setLayoutFile("popup_layout"); $this->setTemplateFile('add_content_widget'); } } diff --git a/modules/widget/widget.view.php b/modules/widget/widget.view.php index 226c8a939..5d4272ced 100644 --- a/modules/widget/widget.view.php +++ b/modules/widget/widget.view.php @@ -121,7 +121,7 @@ class widgetView extends widget if(!Context::get('selected_widget')) Context::set('selected_widget',$widget_list[0]->widget); $this->dispWidgetGenerateCode(); - $this->setLayoutFile('default_layout'); + $this->setLayoutFile('popup_layout'); $this->setTemplateFile('widget_generate_code_in_page'); } @@ -143,7 +143,7 @@ class widgetView extends widget } $this->dispWidgetGenerateCode(); - $this->setLayoutFile('default_layout'); + $this->setLayoutFile('popup_layout'); $this->setTemplateFile('widget_style_generate_code_in_page'); } }