diff --git a/common/js/plugins/ui.colorpicker/xe_colorpicker.js b/common/js/plugins/ui.colorpicker/xe_colorpicker.js index 70e8426da..1466f6632 100644 --- a/common/js/plugins/ui.colorpicker/xe_colorpicker.js +++ b/common/js/plugins/ui.colorpicker/xe_colorpicker.js @@ -4,9 +4,12 @@ **/ jQuery(function($){ - $.fn.xe_colorpicker = function(settings){ + $.fn.xe_colorpicker = function(settings){ return this.jPicker(settings); - } + } - $('input.color-indicator').xe_colorpicker(); -}); + // 컬러 피커가 내장된 브라우저에서는 내장된 컬러피커 이용 by misol 2016.02.05 + if ( $("input.color-indicator").prop('type') != 'color' ) { + $('input.color-indicator').xe_colorpicker(); + } +}); \ No newline at end of file diff --git a/common/tpl/popup_layout.html b/common/tpl/popup_layout.html index 7896f4986..ac0d1ed18 100644 --- a/common/tpl/popup_layout.html +++ b/common/tpl/popup_layout.html @@ -1,7 +1,5 @@ - - - - + +
{$content}
diff --git a/modules/document/document.admin.view.php b/modules/document/document.admin.view.php index 5351aed4c..4efa55613 100644 --- a/modules/document/document.admin.view.php +++ b/modules/document/document.admin.view.php @@ -75,10 +75,30 @@ class documentAdminView extends document $oModuleModel = getModel('module'); $module_list = array(); $mod_srls = array(); + $anonymous_member_srls = array(); foreach($output->data as $oDocument) { $mod_srls[] = $oDocument->get('module_srl'); + if($oDocument->get('member_srl') < 0) + { + $anonymous_member_srls[] = abs($oDocument->get('member_srl')); + } } + if($anonymous_member_srls) + { + $member_args = new stdClass(); + $member_args->member_srl = $anonymous_member_srls; + $member_output = executeQueryArray('member.getMembers', $member_args); + if($member_output) + { + $member_nick_neme = array(); + foreach($member_output->data as $member) + { + $member_nick_neme[$member->member_srl] = $member->nick_name; + } + } + } + Context::set('member_nick_name', $member_nick_neme); $mod_srls = array_unique($mod_srls); // Module List $mod_srls_count = count($mod_srls); diff --git a/modules/document/document.controller.php b/modules/document/document.controller.php index 301617bd9..9800206b7 100644 --- a/modules/document/document.controller.php +++ b/modules/document/document.controller.php @@ -2693,7 +2693,7 @@ class documentController extends document } $oSecurity = new Security($documentList); $oSecurity->encodeHTML('..variables.'); - $this->add('document_list', $documentList); + $this->add('document_list', array_values($documentList)); } /** diff --git a/modules/document/tpl/document_list.html b/modules/document/tpl/document_list.html index 5d3ff161c..4ee16718b 100644 --- a/modules/document/tpl/document_list.html +++ b/modules/document/tpl/document_list.html @@ -51,7 +51,10 @@ xe.lang.msg_empty_search_keyword = '{$lang->msg_empty_search_keyword}'; {$module_list[$oDocument->get('module_srl')]->browser_title} - {htmlspecialchars($oDocument->getTitleText())}{$lang->no_title_document} - {$oDocument->getNickName()} + + {$oDocument->getNickName()} + ({$lang->anonymous}) {$member_nick_name[abs($oDocument->get('member_srl'))]} + {$oDocument->get('readed_count')} {$oDocument->get('voted_count')}/{$oDocument->get('blamed_count')} {$oDocument->getRegdate("Y-m-d H:i")} diff --git a/modules/editor/components/emoticon/tpl/popup.css b/modules/editor/components/emoticon/tpl/popup.css index 369bcb563..9ea7a8d43 100644 --- a/modules/editor/components/emoticon/tpl/popup.css +++ b/modules/editor/components/emoticon/tpl/popup.css @@ -1,5 +1,8 @@ -@charset "utf-8"; -@import url(../../../../../modules/admin/tpl/css/admin.css); -@import url(../../../../../common/css/bootstrap.min.css); +@charset "UTF-8"; img.emoticon{ margin:10px 10px 0 0; cursor:pointer} #emoticons{padding:0 10px 20px 10px} + +/* for mobile view */ +div.xe_mobile { + display:none!important; +} \ No newline at end of file diff --git a/modules/editor/components/emoticon/tpl/popup.html b/modules/editor/components/emoticon/tpl/popup.html index e408bf16b..82d009b39 100644 --- a/modules/editor/components/emoticon/tpl/popup.html +++ b/modules/editor/components/emoticon/tpl/popup.html @@ -1,7 +1,8 @@ +{@Context::addMetaTag('viewport', 'width=device-width', FALSE);}
-

{$component_info->title} ver. {$component_info->version}

+

{$component_info->title}

- px + px
@@ -33,19 +34,19 @@
- px + px
- +
- +
diff --git a/modules/editor/components/image_link/tpl/popup.css b/modules/editor/components/image_link/tpl/popup.css index 1d3a0b43c..bffc0fee7 100644 --- a/modules/editor/components/image_link/tpl/popup.css +++ b/modules/editor/components/image_link/tpl/popup.css @@ -1,7 +1,4 @@ -@charset "utf-8"; -@import url(../../../../../modules/admin/tpl/css/admin.css); -@import url(../../../../../common/css/bootstrap.min.css); - +@charset "UTF-8"; .image_align { margin:0px 0px 5px 0px; float:left; @@ -9,3 +6,8 @@ } li {list-style:none; float:left; margin-right:.5em;} + +/* for mobile view */ +div.xe_mobile { + display:none!important; +} \ No newline at end of file diff --git a/modules/editor/components/image_link/tpl/popup.html b/modules/editor/components/image_link/tpl/popup.html index d95a2336c..33fa612d1 100644 --- a/modules/editor/components/image_link/tpl/popup.html +++ b/modules/editor/components/image_link/tpl/popup.html @@ -1,8 +1,9 @@ +{@Context::addMetaTag('viewport', 'width=device-width', FALSE);}
-

{$component_info->title} ver. {$component_info->version}

+

{$component_info->title}

@@ -13,15 +14,15 @@
- px - px + px + px
- +
@@ -64,13 +65,13 @@
- px + px
- px + px
diff --git a/modules/editor/components/poll_maker/tpl/popup.html b/modules/editor/components/poll_maker/tpl/popup.html index 16864d2be..662befbf1 100644 --- a/modules/editor/components/poll_maker/tpl/popup.html +++ b/modules/editor/components/poll_maker/tpl/popup.html @@ -5,13 +5,13 @@ -{@Context::addMetaTag('viewport', 'width=device-width, user-scalable=no', FALSE);} +{@Context::addMetaTag('viewport', 'width=device-width', FALSE);}
-

{$component_info->title} ver. {$component_info->version}

+

{$component_info->title}

diff --git a/modules/editor/tpl/css/view_component.css b/modules/editor/tpl/css/view_component.css new file mode 100644 index 000000000..9d5bff84c --- /dev/null +++ b/modules/editor/tpl/css/view_component.css @@ -0,0 +1,7 @@ +@charset "UTF-8"; +section.section>div>* { + padding: 0px 15px; +} +section.section>div>h2 { + padding: 0px; +} \ No newline at end of file diff --git a/modules/editor/tpl/view_component.html b/modules/editor/tpl/view_component.html index 06e887955..9918345f4 100644 --- a/modules/editor/tpl/view_component.html +++ b/modules/editor/tpl/view_component.html @@ -1,41 +1,36 @@ - - - - +{@Context::addMetaTag('viewport', 'width=device-width', FALSE);} +
-

{$component->title} ver. {$component->version}

- - - - - - - - - - - - - - - - - - - - - - - -
{$lang->component_author}
 - - {$author->name} ({$author->homepage}, {$author->email_address})
- -
{$lang->homepage}
{$component->homepage}
{$lang->regdate}
{zdate(str_replace('-',"",$component->date), 'Y-m-d')}
{$lang->component_license}
 +

{$component->title}

+
+

{$lang->component_author}

+ +
+
+

{$lang->homepage}

+

{$component->homepage}

+
+
+

{$lang->component_version}

+

{$component->version}

+
+
+

{$lang->regdate}

+

+
+
+

{$lang->component_license}

+

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

{$component->license_link}

- -
{$lang->component_description}
{nl2br(trim($component->description))}
- + {$component->license_link} +

+
+
+

{$lang->component_description}

+

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

+