From 61a3755fdeb940fb229bc4752792521b09546c8d Mon Sep 17 00:00:00 2001 From: ngleader Date: Mon, 5 Jan 2009 11:48:29 +0000 Subject: [PATCH 001/144] firebird class bugfix git-svn-id: http://xe-core.googlecode.com/svn/sandbox@5243 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- classes/db/DBFirebird.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/classes/db/DBFirebird.class.php b/classes/db/DBFirebird.class.php index e5181f810..e6859b2eb 100644 --- a/classes/db/DBFirebird.class.php +++ b/classes/db/DBFirebird.class.php @@ -623,7 +623,7 @@ $type = $this->getColumnType($column_type,$name); $pipe = $v['pipe']; - $value = $this->getConditionValue($name, $value, $operation, $type, $column_type); + $value = $this->getConditionValue('"'.$name.'"', $value, $operation, $type, $column_type); if(!$value) $value = $v['value']; $str = $this->getConditionPart($name, $value, $operation); if($sub_condition) $sub_condition .= ' '.$pipe.' '; From ef1f9410560ae569efe50237ff520dcaf2c190e0 Mon Sep 17 00:00:00 2001 From: ngleader Date: Tue, 6 Jan 2009 01:43:55 +0000 Subject: [PATCH 002/144] =?UTF-8?q?#17586262=20=EA=B2=8C=EC=8B=9C=ED=8C=90?= =?UTF-8?q?=20=EC=B9=B4=ED=85=8C=EA=B3=A0=EB=A6=AC=20=ED=8E=BC=EC=B9=A8?= =?UTF-8?q?=EA=B8=B0=EB=8A=A5=20=EB=B3=B5=EA=B5=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: http://xe-core.googlecode.com/svn/sandbox@5244 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- modules/board/tpl/category_info.html | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/modules/board/tpl/category_info.html b/modules/board/tpl/category_info.html index e679da5e1..faee29b33 100644 --- a/modules/board/tpl/category_info.html +++ b/modules/board/tpl/category_info.html @@ -22,7 +22,13 @@

{$lang->about_category_color}

- + +
{$lang->expand}
+ + expand=="Y")-->checked="checked" class="checkbox" /> +

{$lang->about_expand}

+ +
{$lang->category_group_srls}
From fb06e0dbb9e9d31e90aad652912e95c7d4b97a63 Mon Sep 17 00:00:00 2001 From: misol Date: Tue, 6 Jan 2009 01:50:18 +0000 Subject: [PATCH 003/144] =?UTF-8?q?=EA=B8=80=EC=9E=90=EC=B2=B4=20=ED=95=9C?= =?UTF-8?q?=EA=B8=80=EB=A1=9C=20=ED=91=9C=EC=8B=9C,=20=EB=A7=88=ED=81=AC?= =?UTF-8?q?=EB=8A=94=20=EC=98=81=EB=AC=B8(=EC=A4=91=EA=B5=AD=EC=96=B4=20?= =?UTF-8?q?=ED=8F=B0=ED=8A=B8=EB=8A=94=20=EC=9E=98=20=EB=AA=B0=EB=9D=BC=20?= =?UTF-8?q?=EA=B7=B8=EB=8C=80=EB=A1=9C=20=EC=9C=A0=EC=A7=80)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: http://xe-core.googlecode.com/svn/sandbox@5245 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- modules/editor/lang/en.lang.php | 18 ++++++++-------- modules/editor/lang/es.lang.php | 18 ++++++++-------- modules/editor/lang/fr.lang.php | 18 ++++++++-------- modules/editor/lang/jp.lang.php | 24 +++++++++++----------- modules/editor/lang/ko.lang.php | 26 ++++++++++++------------ modules/editor/lang/ru.lang.php | 18 ++++++++-------- modules/editor/lang/zh-CN.lang.php | 26 ++++++++++++------------ modules/editor/lang/zh-TW.lang.php | 24 +++++++++++----------- modules/editor/skins/default/editor.html | 2 +- 9 files changed, 87 insertions(+), 87 deletions(-) diff --git a/modules/editor/lang/en.lang.php b/modules/editor/lang/en.lang.php index df777412c..c01001bd0 100644 --- a/modules/editor/lang/en.lang.php +++ b/modules/editor/lang/en.lang.php @@ -52,15 +52,15 @@ $lang->edit->fontsize = 'Size'; $lang->edit->use_paragraph = 'Paragraph Function'; $lang->edit->fontlist = array( - 'Arial', - 'Arial Black', - 'Tahoma', - 'Verdana', - 'Sans-serif', - 'Serif', - 'Monospace', - 'Cursive', - 'Fantasy', + 'Arial'=>'Arial', + 'Arial Black'=>'Arial Black', + 'Tahoma'=>'Tahoma', + 'Verdana'=>'Verdana', + 'Sans-serif'=>'Sans-serif', + 'Serif'=>'Serif', + 'Monospace'=>'Monospace', + 'Cursive'=>'Cursive', + 'Fantasy'=>'Fantasy', ); $lang->edit->header = 'Style'; diff --git a/modules/editor/lang/es.lang.php b/modules/editor/lang/es.lang.php index f3d575ec2..8b44c6570 100644 --- a/modules/editor/lang/es.lang.php +++ b/modules/editor/lang/es.lang.php @@ -52,15 +52,15 @@ $lang->edit->fontsize = 'Tamaño'; $lang->edit->use_paragraph = 'Párrafo'; $lang->edit->fontlist = array( - 'Arial', - 'Arial Black', - 'Tahoma', - 'Verdana', - 'Sans-serif', - 'Serif', - 'Monospace', - 'Cursive', - 'Fantasy', + 'Arial'=>'Arial', + 'Arial Black'=>'Arial Black', + 'Tahoma'=>'Tahoma', + 'Verdana'=>'Verdana', + 'Sans-serif'=>'Sans-serif', + 'Serif'=>'Serif', + 'Monospace'=>'Monospace', + 'Cursive'=>'Cursive', + 'Fantasy'=>'Fantasy', ); $lang->edit->header = 'Estilo'; diff --git a/modules/editor/lang/fr.lang.php b/modules/editor/lang/fr.lang.php index d0a009d26..645d2734d 100644 --- a/modules/editor/lang/fr.lang.php +++ b/modules/editor/lang/fr.lang.php @@ -52,15 +52,15 @@ $lang->edit->fontsize = 'Mesure'; $lang->edit->use_paragraph = 'Fonctions sur Paragraphe'; $lang->edit->fontlist = array( - 'Arial', - 'Arial Black', - 'Tahoma', - 'Verdana', - 'Sans-serif', - 'Serif', - 'Monospace', - 'Cursive', - 'Fantasy', + 'Arial'=>'Arial', + 'Arial Black'=>'Arial Black', + 'Tahoma'=>'Tahoma', + 'Verdana'=>'Verdana', + 'Sans-serif'=>'Sans-serif', + 'Serif'=>'Serif', + 'Monospace'=>'Monospace', + 'Cursive'=>'Cursive', + 'Fantasy'=>'Fantasy', ); $lang->edit->header = 'Style'; diff --git a/modules/editor/lang/jp.lang.php b/modules/editor/lang/jp.lang.php index 637903bd1..91397ec18 100644 --- a/modules/editor/lang/jp.lang.php +++ b/modules/editor/lang/jp.lang.php @@ -52,18 +52,18 @@ $lang->edit->fontsize = 'フォントサイズ'; $lang->edit->use_paragraph = '段落機能'; $lang->edit->fontlist = array( - 'ＭＳ Ｐゴシック', - 'ＭＳ Ｐ明朝', - 'MS UI Gothic', - 'Arial', - 'Arial Black', - 'Tahoma', - 'Verdana', - 'Sans-serif', - 'Serif', - 'Monospace', - 'Cursive', - 'Fantasy', + 'MS PGothic'=>'ＭＳ Ｐゴシック', + 'MS PMincho'=>'ＭＳ Ｐ明朝', + 'MS UI Gothic'=>'MS UI Gothic', + 'Arial'=>'Arial', + 'Arial Black'=>'Arial Black', + 'Tahoma'=>'Tahoma', + 'Verdana'=>'Verdana', + 'Sans-serif'=>'Sans-serif', + 'Serif'=>'Serif', + 'Monospace'=>'Monospace', + 'Cursive'=>'Cursive', + 'Fantasy'=>'Fantasy', ); $lang->edit->header = '見出し'; diff --git a/modules/editor/lang/ko.lang.php b/modules/editor/lang/ko.lang.php index 4022e5119..a511449ae 100644 --- a/modules/editor/lang/ko.lang.php +++ b/modules/editor/lang/ko.lang.php @@ -26,7 +26,7 @@ $lang->msg_component_is_first_order = '선택하신 컴포넌트는 첫번째에 위치하고 있습니다'; $lang->msg_component_is_last_order = '선택하신 컴포넌트는 마지막에 위치하고 있습니다'; $lang->msg_load_saved_doc = "자동저장된 글이 있습니다. 복구하시겠습니까?\n글을 다 쓰신 후 저장하시면 자동저장본은 사라집니다"; - $lang->msg_auto_saved = "자동 저장되었습니다"; + $lang->msg_auto_saved = "자동 저장되었습니다."; $lang->cmd_disable = "비활성"; $lang->cmd_enable = "활성"; @@ -52,18 +52,18 @@ $lang->edit->fontsize = '크기'; $lang->edit->use_paragraph = '문단기능'; $lang->edit->fontlist = array( - 'Dotum', - 'Gulim', - 'Batang', - 'Arial', - 'Arial Black', - 'Tahoma', - 'Verdana', - 'Sans-serif', - 'Serif', - 'Monospace', - 'Cursive', - 'Fantasy', + 'Dotum' => '돋움', + 'Gulim' => '굴림', + 'Batang' => '바탕', + 'Arial' => 'Arial', + 'Arial Black' => 'Arial Black', + 'Tahoma' => 'Tahoma', + 'Verdana' => 'Verdana', + 'Sans-serif' => 'Sans-serif', + 'Serif' => 'Serif', + 'Monospace' => 'Monospace', + 'Cursive' => 'Cursive', + 'Fantasy' => 'Fantasy', ); $lang->edit->header = '형식'; diff --git a/modules/editor/lang/ru.lang.php b/modules/editor/lang/ru.lang.php index cf734574f..889fa3900 100644 --- a/modules/editor/lang/ru.lang.php +++ b/modules/editor/lang/ru.lang.php @@ -52,15 +52,15 @@ $lang->edit->fontsize = 'Размер'; $lang->edit->use_paragraph = 'Функции параграфа'; $lang->edit->fontlist = array( - 'Arial', - 'Arial Black', - 'Tahoma', - 'Verdana', - 'Sans-serif', - 'Serif', - 'Monospace', - 'Cursive', - 'Fantasy', + 'Arial'=>'Arial', + 'Arial Black'=>'Arial Black', + 'Tahoma'=>'Tahoma', + 'Verdana'=>'Verdana', + 'Sans-serif'=>'Sans-serif', + 'Serif'=>'Serif', + 'Monospace'=>'Monospace', + 'Cursive'=>'Cursive', + 'Fantasy'=>'Fantasy', ); $lang->edit->header = 'Стиль'; diff --git a/modules/editor/lang/zh-CN.lang.php b/modules/editor/lang/zh-CN.lang.php index 54c427b5e..5e01be511 100644 --- a/modules/editor/lang/zh-CN.lang.php +++ b/modules/editor/lang/zh-CN.lang.php @@ -52,19 +52,19 @@ $lang->edit->fontsize = '大小'; $lang->edit->use_paragraph = '段落功能'; $lang->edit->fontlist = array( - '仿宋_GB2312', - '黑体', - '楷体_GB2312', - '宋体', - 'Arial', - 'Arial Black', - 'Tahoma', - 'Verdana', - 'Sans-serif', - 'Serif', - 'Monospace', - 'Cursive', - 'Fantasy', + '仿宋_GB2312'=>'仿宋_GB2312', + '黑体'=>'黑体', + '楷体_GB2312'=>'楷体_GB2312', + '宋体'=>'宋体', + 'Arial'=>'Arial', + 'Arial Black'=>'Arial Black', + 'Tahoma'=>'Tahoma', + 'Verdana'=>'Verdana', + 'Sans-serif'=>'Sans-serif', + 'Serif'=>'Serif', + 'Monospace'=>'Monospace', + 'Cursive'=>'Cursive', + 'Fantasy'=>'Fantasy', ); $lang->edit->header = '样式'; diff --git a/modules/editor/lang/zh-TW.lang.php b/modules/editor/lang/zh-TW.lang.php index d54676e75..49527ed9b 100644 --- a/modules/editor/lang/zh-TW.lang.php +++ b/modules/editor/lang/zh-TW.lang.php @@ -52,18 +52,18 @@ $lang->edit->fontsize = '大小'; $lang->edit->use_paragraph = '段落功能'; $lang->edit->fontlist = array( - '新細明體', - '標楷體', - '細明體', - 'Arial', - 'Arial Black', - 'Tahoma', - 'Verdana', - 'Sans-serif', - 'Serif', - 'Monospace', - 'Cursive', - 'Fantasy', + '新細明體'=>'新細明體', + '標楷體'=>'標楷體', + '細明體'=>'細明體', + 'Arial'=>'Arial', + 'Arial Black'=>'Arial Black', + 'Tahoma'=>'Tahoma', + 'Verdana'=>'Verdana', + 'Sans-serif'=>'Sans-serif', + 'Serif'=>'Serif', + 'Monospace'=>'Monospace', + 'Cursive'=>'Cursive', + 'Fantasy'=>'Fantasy', ); $lang->edit->header = '樣式'; diff --git a/modules/editor/skins/default/editor.html b/modules/editor/skins/default/editor.html index edc1741d9..00b462b84 100644 --- a/modules/editor/skins/default/editor.html +++ b/modules/editor/skins/default/editor.html @@ -91,7 +91,7 @@ From 3dfc69746734b353b33d94be01735f77b174eea4 Mon Sep 17 00:00:00 2001 From: misol Date: Tue, 6 Jan 2009 02:00:02 +0000 Subject: [PATCH 004/144] =?UTF-8?q?=EC=9E=90=EB=8F=99=20=EC=A0=80=EC=9E=A5?= =?UTF-8?q?=20=EB=A9=98=ED=8A=B8=20=EC=A4=84=20=EB=B0=94=EA=BF=88=ED=91=9C?= =?UTF-8?q?=EC=8B=9C=EA=B0=80=20=EC=99=B8=EA=B5=AD=EC=96=B4=20=EB=B2=88?= =?UTF-8?q?=EC=97=AD=EC=97=90=EC=84=9C=20=EB=AC=B8=EC=9E=90=EC=97=B4=20\n?= =?UTF-8?q?=20=EC=9C=BC=EB=A1=9C=20=ED=91=9C=EC=8B=9C=EB=90=98=EB=8D=98=20?= =?UTF-8?q?=EA=B2=83=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: http://xe-core.googlecode.com/svn/sandbox@5246 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- modules/editor/lang/es.lang.php | 2 +- modules/editor/lang/fr.lang.php | 2 +- modules/editor/lang/jp.lang.php | 2 +- modules/editor/lang/ru.lang.php | 2 +- modules/editor/lang/zh-CN.lang.php | 2 +- modules/editor/lang/zh-TW.lang.php | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/modules/editor/lang/es.lang.php b/modules/editor/lang/es.lang.php index 8b44c6570..4dfcee147 100644 --- a/modules/editor/lang/es.lang.php +++ b/modules/editor/lang/es.lang.php @@ -25,7 +25,7 @@ $lang->msg_component_is_inserted = 'El componente seleccionado ya esta insertado'; $lang->msg_component_is_first_order = 'El componente seleccionado se localiza en la primera posición'; $lang->msg_component_is_last_order = 'El componente seleccionado se localiza en la última posición'; - $lang->msg_load_saved_doc = 'Existe un documento guardado automáticamente ¿desea recuperarlo ?\nDespués de guardar el documento escrito, el documento autoguardado sera eliminado.'; + $lang->msg_load_saved_doc = "Existe un documento guardado automáticamente ¿desea recuperarlo ?\nDespués de guardar el documento escrito, el documento autoguardado sera eliminado."; $lang->msg_auto_saved = 'Documento guardado automáticamente'; $lang->cmd_disable = 'Desactivado'; diff --git a/modules/editor/lang/fr.lang.php b/modules/editor/lang/fr.lang.php index 645d2734d..ab5291e19 100644 --- a/modules/editor/lang/fr.lang.php +++ b/modules/editor/lang/fr.lang.php @@ -25,7 +25,7 @@ $lang->msg_component_is_inserted = 'Composant choisi est déjà entré'; $lang->msg_component_is_first_order = 'Composant choisi est localisé à la première position'; $lang->msg_component_is_last_order = 'Composant choisi est localisé à la position dernière'; - $lang->msg_load_saved_doc = 'Il y a un article conservé automatiquement. Voulez-vous le réstaurer?\nL\'esquisse conservé automatiquement va être débarrasser après conserver l\'article courant.'; + $lang->msg_load_saved_doc = "Il y a un article conservé automatiquement. Voulez-vous le réstaurer?\nL'esquisse conservé automatiquement va être débarrasser après conserver l'article courant."; $lang->msg_auto_saved = 'Conservé automatiquement'; $lang->cmd_disable = 'Invalider'; diff --git a/modules/editor/lang/jp.lang.php b/modules/editor/lang/jp.lang.php index 91397ec18..47ff9094a 100644 --- a/modules/editor/lang/jp.lang.php +++ b/modules/editor/lang/jp.lang.php @@ -25,7 +25,7 @@ $lang->msg_component_is_inserted = '選択されたコンポーネントは既に入力されています。'; $lang->msg_component_is_first_order = '選択されたコンポーネントは最初に位置しています。'; $lang->msg_component_is_last_order = '選択されたコンポーネントは最後に位置しています。'; - $lang->msg_load_saved_doc = '自動保存された書き込みがあります。復旧しますか？\n書き終わってから登録すると前の自動保存データは削除されます。'; + $lang->msg_load_saved_doc = "自動保存された書き込みがあります。復旧しますか？\n書き終わってから登録すると前の自動保存データは削除されます。"; $lang->msg_auto_saved = '自動保存されました。'; $lang->cmd_disable = '未使用'; diff --git a/modules/editor/lang/ru.lang.php b/modules/editor/lang/ru.lang.php index 889fa3900..5de300ab5 100644 --- a/modules/editor/lang/ru.lang.php +++ b/modules/editor/lang/ru.lang.php @@ -25,7 +25,7 @@ $lang->msg_component_is_inserted = 'Выбранный компонент уже присутствует'; $lang->msg_component_is_first_order = 'Выбранный компонент находится на первой позиции'; $lang->msg_component_is_last_order = 'Выбранный компонент находится на последней позиции'; - $lang->msg_load_saved_doc = 'Существует автоматически сохраненная статья. Хотите ли Вы ее восстановить?\nАвтоматически сохраненный черновик будет отменен после сохранения текущей статьи'; + $lang->msg_load_saved_doc = "Существует автоматически сохраненная статья. Хотите ли Вы ее восстановить?\nАвтоматически сохраненный черновик будет отменен после сохранения текущей статьи"; $lang->msg_auto_saved = 'Автоматически сохранено'; $lang->cmd_disable = 'Неавтивно'; diff --git a/modules/editor/lang/zh-CN.lang.php b/modules/editor/lang/zh-CN.lang.php index 5e01be511..10d52d42b 100644 --- a/modules/editor/lang/zh-CN.lang.php +++ b/modules/editor/lang/zh-CN.lang.php @@ -25,7 +25,7 @@ $lang->msg_component_is_inserted = '您选择的组件已插入！'; $lang->msg_component_is_first_order = '您选择的组件已到最上端位置！'; $lang->msg_component_is_last_order = '您选择的组件已到最下端位置！'; - $lang->msg_load_saved_doc = '有自动保存的内容， 确定要恢复吗？\n保存内容后，自动保存的文本将会被删除。'; + $lang->msg_load_saved_doc = "有自动保存的内容， 确定要恢复吗？\n保存内容后，自动保存的文本将会被删除。"; $lang->msg_auto_saved = '已自动保存！'; $lang->cmd_disable = '非激活'; diff --git a/modules/editor/lang/zh-TW.lang.php b/modules/editor/lang/zh-TW.lang.php index 49527ed9b..4cb563a65 100644 --- a/modules/editor/lang/zh-TW.lang.php +++ b/modules/editor/lang/zh-TW.lang.php @@ -25,7 +25,7 @@ $lang->msg_component_is_inserted = '您選擇的組件已插入！'; $lang->msg_component_is_first_order = '您選擇的組件已達最頂端位置！'; $lang->msg_component_is_last_order = '您選擇的組件已達最底端位置！'; - $lang->msg_load_saved_doc = '有自動儲存的內容，確定要恢復嗎?\n儲存內容後，自動儲存的內容將會被刪除。'; + $lang->msg_load_saved_doc = "有自動儲存的內容，確定要恢復嗎?\n儲存內容後，自動儲存的內容將會被刪除。"; $lang->msg_auto_saved = '已自動儲存！'; $lang->cmd_disable = '暫停'; From 8c66609bec1a708be919f1f98c378378253f85ef Mon Sep 17 00:00:00 2001 From: bnu Date: Tue, 6 Jan 2009 06:37:37 +0000 Subject: [PATCH 005/144] =?UTF-8?q?=EC=B9=B4=EC=9A=B4=ED=84=B0=20=ED=8E=98?= =?UTF-8?q?=EC=9D=B4=EC=A7=80=EB=B7=B0=20=EC=97=85=EB=8D=B0=EC=9D=B4?= =?UTF-8?q?=ED=8A=B8=EC=8B=9C=20=EC=BF=BC=EB=A6=AC=20=ED=9A=9F=EC=88=98=20?= =?UTF-8?q?=EC=A4=84=EC=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: http://xe-core.googlecode.com/svn/sandbox@5247 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- modules/counter/counter.controller.php | 3 +-- modules/counter/queries/updateCounterPageview.xml | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/modules/counter/counter.controller.php b/modules/counter/counter.controller.php index 9f30c1963..86f3654d4 100644 --- a/modules/counter/counter.controller.php +++ b/modules/counter/counter.controller.php @@ -68,9 +68,8 @@ * @brief pageview 등록 **/ function insertPageView() { - $args->regdate = date("Ymd"); + $args->regdate = '0, '.date('Ymd'); executeQuery('counter.updateCounterPageview', $args); - executeQuery('counter.updateTotalCounterPageview'); } /** diff --git a/modules/counter/queries/updateCounterPageview.xml b/modules/counter/queries/updateCounterPageview.xml index d4ec933b4..a950964c0 100644 --- a/modules/counter/queries/updateCounterPageview.xml +++ b/modules/counter/queries/updateCounterPageview.xml @@ -6,6 +6,6 @@ - + From 714d11ca618c19b19192c3299586540532a80dcd Mon Sep 17 00:00:00 2001 From: misol Date: Tue, 6 Jan 2009 08:26:29 +0000 Subject: [PATCH 006/144] =?UTF-8?q?=EA=B8=B0=EB=B3=B8=20=EC=97=90=EB=94=94?= =?UTF-8?q?=ED=84=B0=EC=9D=98=20=EB=B2=84=ED=8A=BC=EB=93=A4=20=ED=95=9C?= =?UTF-8?q?=EA=B8=80=EC=9D=B4=EB=82=98=20=EB=B2=88=EC=97=AD=20=EA=B0=80?= =?UTF-8?q?=EB=8A=A5=ED=95=98=EA=B2=8C(=ED=95=9C=EA=B8=80=EC=9D=80=20?= =?UTF-8?q?=EC=99=84=EC=A0=84=20=ED=95=9C=EA=B8=80=ED=99=94)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: http://xe-core.googlecode.com/svn/sandbox@5248 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- modules/editor/lang/en.lang.php | 33 ++++++++- modules/editor/lang/es.lang.php | 29 +++++++- modules/editor/lang/fr.lang.php | 29 +++++++- modules/editor/lang/jp.lang.php | 29 +++++++- modules/editor/lang/ko.lang.php | 91 +++++++++++++++--------- modules/editor/lang/ru.lang.php | 29 +++++++- modules/editor/lang/zh-CN.lang.php | 29 +++++++- modules/editor/lang/zh-TW.lang.php | 29 +++++++- modules/editor/skins/default/editor.html | 72 +++++++++---------- 9 files changed, 292 insertions(+), 78 deletions(-) diff --git a/modules/editor/lang/en.lang.php b/modules/editor/lang/en.lang.php index c01001bd0..194eb1203 100644 --- a/modules/editor/lang/en.lang.php +++ b/modules/editor/lang/en.lang.php @@ -75,6 +75,26 @@ $lang->edit->submit = 'Submit'; + $lang->edit->fontcolor = 'Text Color'; + $lang->edit->fontbgcolor = 'Background Color'; + $lang->edit->bold = 'Bold'; + $lang->edit->italic = 'Italic'; + $lang->edit->underline = 'Underline'; + $lang->edit->strike = 'Strike'; + $lang->edit->sup = 'Sup'; + $lang->edit->sub = 'Sub'; + $lang->edit->redo = 'Re Do'; + $lang->edit->undo = 'Un Do'; + $lang->edit->align_left = 'Align Left'; + $lang->edit->align_center = 'Align Center'; + $lang->edit->align_right = 'Align Right'; + $lang->edit->align_justify = 'Align Justify'; + $lang->edit->add_indent = 'Indent'; + $lang->edit->remove_indent = 'Outdent'; + $lang->edit->list_number = 'Orderd List'; + $lang->edit->list_bullet = 'Unordered List'; + $lang->edit->remove_format = 'Style Remover'; + $lang->edit->help_remove_format = 'Tags in selected area will be removed'; $lang->edit->help_strike_through = 'Strike will be on the words'; $lang->edit->help_align_full = 'Align left and right'; @@ -85,8 +105,8 @@ $lang->edit->help_italic = 'Make italic font'; $lang->edit->help_underline = 'Underline font'; $lang->edit->help_strike = 'Strike font'; - $lang->edit->help_sup = 'Sup'; - $lang->edit->help_sub = 'Sub'; + $lang->edit->help_sup = 'Superscript'; + $lang->edit->help_sub = 'Subscript'; $lang->edit->help_redo = 'Redo'; $lang->edit->help_undo = 'Undo'; $lang->edit->help_align_left = 'Align left'; @@ -96,7 +116,14 @@ $lang->edit->help_remove_indent = 'Remove indent'; $lang->edit->help_list_number = 'Apply number list'; $lang->edit->help_list_bullet = 'Apply bullet list'; - $lang->edit->help_use_paragrapth = 'Press Ctrl+Enter to use paragraph. (Press Alt+S to submit)'; + $lang->edit->help_use_paragraph = 'Press Ctrl+Enter to use paragraph. (Press Alt+S to submit)'; + + $lang->edit->url = 'URL'; + $lang->edit->blockquote = 'Blockquote'; + $lang->edit->table = 'Table'; + $lang->edit->image = 'Image'; + $lang->edit->multimedia = 'Movie'; + $lang->edit->emoticon = 'Emoticon'; $lang->edit->upload = 'Attachment'; $lang->edit->upload_file = 'Attach'; diff --git a/modules/editor/lang/es.lang.php b/modules/editor/lang/es.lang.php index 4dfcee147..2d310ad4f 100644 --- a/modules/editor/lang/es.lang.php +++ b/modules/editor/lang/es.lang.php @@ -75,6 +75,26 @@ $lang->edit->submit = 'Confirmar'; + $lang->edit->fontcolor = 'Text Color'; + $lang->edit->fontbgcolor = 'Background Color'; + $lang->edit->bold = 'Bold'; + $lang->edit->italic = 'Italic'; + $lang->edit->underline = 'Underline'; + $lang->edit->strike = 'Strike'; + $lang->edit->sup = 'Sup'; + $lang->edit->sub = 'Sub'; + $lang->edit->redo = 'Re Do'; + $lang->edit->undo = 'Un Do'; + $lang->edit->align_left = 'Align Left'; + $lang->edit->align_center = 'Align Center'; + $lang->edit->align_right = 'Align Right'; + $lang->edit->align_justify = 'Align Justify'; + $lang->edit->add_indent = 'Indent'; + $lang->edit->remove_indent = 'Outdent'; + $lang->edit->list_number = 'Orderd List'; + $lang->edit->list_bullet = 'Unordered List'; + $lang->edit->remove_format = 'Style Remover'; + $lang->edit->help_fontcolor = 'Selecciona el color de las letras'; $lang->edit->help_fontbgcolor = 'Selecciona el color del fondo de la letras'; $lang->edit->help_bold = 'Letra gruesa'; @@ -92,7 +112,14 @@ $lang->edit->help_remove_indent = 'Quitar tabulación'; $lang->edit->help_list_number = 'Aplicar la lista con números'; $lang->edit->help_list_bullet = 'Aplicar la lista con símbolos'; - $lang->edit->help_use_paragrapth = 'Presiona Ctrl+Enter para usar el párrafo (Presiona Alt+S para guardar)'; + $lang->edit->help_use_paragraph = 'Presiona Ctrl+Enter para usar el párrafo (Presiona Alt+S para guardar)'; + + $lang->edit->url = 'URL'; + $lang->edit->blockquote = 'Blockquote'; + $lang->edit->table = 'Table'; + $lang->edit->image = 'Image'; + $lang->edit->multimedia = 'Movie'; + $lang->edit->emoticon = 'Emoticon'; $lang->edit->upload = 'Adjuntar'; $lang->edit->upload_file = 'Archivo adjunto'; diff --git a/modules/editor/lang/fr.lang.php b/modules/editor/lang/fr.lang.php index ab5291e19..94218b65e 100644 --- a/modules/editor/lang/fr.lang.php +++ b/modules/editor/lang/fr.lang.php @@ -75,6 +75,26 @@ $lang->edit->submit = 'Soumettre'; + $lang->edit->fontcolor = 'Text Color'; + $lang->edit->fontbgcolor = 'Background Color'; + $lang->edit->bold = 'Bold'; + $lang->edit->italic = 'Italic'; + $lang->edit->underline = 'Underline'; + $lang->edit->strike = 'Strike'; + $lang->edit->sup = 'Sup'; + $lang->edit->sub = 'Sub'; + $lang->edit->redo = 'Re Do'; + $lang->edit->undo = 'Un Do'; + $lang->edit->align_left = 'Align Left'; + $lang->edit->align_center = 'Align Center'; + $lang->edit->align_right = 'Align Right'; + $lang->edit->align_justify = 'Align Justify'; + $lang->edit->add_indent = 'Indent'; + $lang->edit->remove_indent = 'Outdent'; + $lang->edit->list_number = 'Orderd List'; + $lang->edit->list_bullet = 'Unordered List'; + $lang->edit->remove_format = 'Style Remover'; + $lang->edit->help_remove_format = 'Supprimer les balises dans l\'endroit sélectionné'; $lang->edit->help_strike_through = 'Représenter la ligne d\'annulation sur les lettres.'; $lang->edit->help_align_full = 'Aligner pleinement selon largeur'; @@ -96,7 +116,14 @@ $lang->edit->help_remove_indent = 'Enlever un Rentré'; $lang->edit->help_list_number = 'Appliquer la liste numroté'; $lang->edit->help_list_bullet = 'Appliquer la liste à puces'; - $lang->edit->help_use_paragrapth = 'Appuyez Ctrl+Enter pour séparer les paragraphe. (Appuyez Alt+S pour conserver)'; + $lang->edit->help_use_paragraph = 'Appuyez Ctrl+Enter pour séparer les paragraphe. (Appuyez Alt+S pour conserver)'; + + $lang->edit->url = 'URL'; + $lang->edit->blockquote = 'Blockquote'; + $lang->edit->table = 'Table'; + $lang->edit->image = 'Image'; + $lang->edit->multimedia = 'Movie'; + $lang->edit->emoticon = 'Emoticon'; $lang->edit->upload = 'Attacher'; $lang->edit->upload_file = 'Attacher un(des) Fichier(s)'; diff --git a/modules/editor/lang/jp.lang.php b/modules/editor/lang/jp.lang.php index 47ff9094a..04764add5 100644 --- a/modules/editor/lang/jp.lang.php +++ b/modules/editor/lang/jp.lang.php @@ -78,6 +78,26 @@ $lang->edit->submit = '送信'; + $lang->edit->fontcolor = 'Text Color'; + $lang->edit->fontbgcolor = 'Background Color'; + $lang->edit->bold = 'Bold'; + $lang->edit->italic = 'Italic'; + $lang->edit->underline = 'Underline'; + $lang->edit->strike = 'Strike'; + $lang->edit->sup = 'Sup'; + $lang->edit->sub = 'Sub'; + $lang->edit->redo = 'Re Do'; + $lang->edit->undo = 'Un Do'; + $lang->edit->align_left = 'Align Left'; + $lang->edit->align_center = 'Align Center'; + $lang->edit->align_right = 'Align Right'; + $lang->edit->align_justify = 'Align Justify'; + $lang->edit->add_indent = 'Indent'; + $lang->edit->remove_indent = 'Outdent'; + $lang->edit->list_number = 'Orderd List'; + $lang->edit->list_bullet = 'Unordered List'; + $lang->edit->remove_format = 'Style Remover'; + $lang->edit->help_remove_format = '選択領域の中のタグを消します。'; $lang->edit->help_strike_through = 'テキストに取り消し線を表示します。'; $lang->edit->help_align_full = '左右の余白に合わせて文字列を配置します。'; @@ -99,7 +119,14 @@ $lang->edit->help_remove_indent = 'インデントを減らします。'; $lang->edit->help_list_number = '段落番号'; $lang->edit->help_list_bullet = '箇条書き'; - $lang->edit->help_use_paragrapth = '段落機能を使用する場合は、「Ctrl+Enter」を押します（書き終わった後、「Alt+S」を押すと保存されます）。'; + $lang->edit->help_use_paragraph = '段落機能を使用する場合は、「Ctrl+Enter」を押します（書き終わった後、「Alt+S」を押すと保存されます）。'; + + $lang->edit->url = 'URL'; + $lang->edit->blockquote = 'Blockquote'; + $lang->edit->table = 'Table'; + $lang->edit->image = 'Image'; + $lang->edit->multimedia = 'Movie'; + $lang->edit->emoticon = 'Emoticon'; $lang->edit->upload = '添付'; $lang->edit->upload_file = 'ファイル添付'; diff --git a/modules/editor/lang/ko.lang.php b/modules/editor/lang/ko.lang.php index a511449ae..48465b6f0 100644 --- a/modules/editor/lang/ko.lang.php +++ b/modules/editor/lang/ko.lang.php @@ -19,13 +19,13 @@ $lang->about_component = '컴포넌트 소개'; $lang->about_component_grant = '기본 컴포넌트외의 확장 컴포넌트 기능을 사용할 수 있는 권한을 지정할 수 있습니다.
(모두 해제시 아무나 사용 가능합니다)'; - $lang->about_component_mid = '에디터 컴포넌트가 사용될 대상을 지정할 수 있습니다.
(모두 해제시 모든 대상에서 사용 가능합니다)'; + $lang->about_component_mid = '에디터 컴포넌트가 사용될 대상을 지정할 수 있습니다.
(모두 해제 시 모든 대상에서 사용 가능합니다)'; - $lang->msg_component_is_not_founded = '%s 에디터 컴포넌트를 찾을 수 없습니다'; - $lang->msg_component_is_inserted = '선택하신 컴포넌트는 이미 입력되어 있습니다'; - $lang->msg_component_is_first_order = '선택하신 컴포넌트는 첫번째에 위치하고 있습니다'; - $lang->msg_component_is_last_order = '선택하신 컴포넌트는 마지막에 위치하고 있습니다'; - $lang->msg_load_saved_doc = "자동저장된 글이 있습니다. 복구하시겠습니까?\n글을 다 쓰신 후 저장하시면 자동저장본은 사라집니다"; + $lang->msg_component_is_not_founded = '%s 에디터 컴포넌트를 찾을 수 없습니다.'; + $lang->msg_component_is_inserted = '선택하신 컴포넌트는 이미 입력되어 있습니다.'; + $lang->msg_component_is_first_order = '선택하신 컴포넌트는 첫번째에 위치하고 있습니다.'; + $lang->msg_component_is_last_order = '선택하신 컴포넌트는 마지막에 위치하고 있습니다.'; + $lang->msg_load_saved_doc = "자동 저장된 글이 있습니다. 복구하시겠습니까?\n글을 다 쓰신 후 저장하시면 자동 저장본은 사라집니다."; $lang->msg_auto_saved = "자동 저장되었습니다."; $lang->cmd_disable = "비활성"; @@ -41,12 +41,12 @@ $lang->editor_height = '에디터 높이'; $lang->about_editor_skin = '에디터 스킨을 선택하실 수 있습니다'; - $lang->about_upload_file_grant = '파일을 첨부할 수 있는 권한을 지정하실 수 있습니다 (모두 해제시 아무나 첨부 가능합니다)'; - $lang->about_default_component_grant = '에디터에서 사용되는 기본 컴포넌트를 사용할 수 있는 권한을 지정할 수 있습니다. (모두 해제시 아무나 사용 가능합니다)'; - $lang->about_editor_height = '에디터의 기본 높이를 지정하실 수 있습니다'; - $lang->about_editor_height_resizable = '에디터의 높이를 직접 변경할 수 있도록 허용합니다'; + $lang->about_upload_file_grant = '파일을 첨부할 수 있는 권한을 지정하실 수 있습니다. (모두 해제 시 아무나 첨부 가능합니다)'; + $lang->about_default_component_grant = '에디터에서 사용되는 기본 컴포넌트를 사용할 수 있는 권한을 지정할 수 있습니다. (모두 해제 시 아무나 사용 가능합니다)'; + $lang->about_editor_height = '에디터의 기본 높이를 지정하실 수 있습니다.'; + $lang->about_editor_height_resizable = '에디터의 높이를 직접 변경할 수 있도록 허용합니다.'; $lang->about_enable_html_grant = 'HTML편집 권한을 부여할 수 있습니다.'; - $lang->about_enable_autosave = '글작성시 자동 저장 기능을 활성화 시킬 수 있습니다'; + $lang->about_enable_autosave = '글 작성시 자동 저장 기능을 활성화 시킬 수 있습니다.'; $lang->edit->fontname = '글꼴'; $lang->edit->fontsize = '크기'; @@ -78,28 +78,55 @@ $lang->edit->submit = '확인'; - $lang->edit->help_remove_format = '선택된 영역 내의 태그를 지웁니다'; - $lang->edit->help_strike_through = '글자에 취소선을 표시합니다'; - $lang->edit->help_align_full = '좌우 폭에 맞게 정렬을 합니다'; + $lang->edit->fontcolor = '글자 색'; + $lang->edit->fontbgcolor = '글자 배경색'; + $lang->edit->bold = '진하게'; + $lang->edit->italic = '기울임'; + $lang->edit->underline = '밑줄'; + $lang->edit->strike = '취소선'; + $lang->edit->sup = '윗첨자'; + $lang->edit->sub = '아랫첨자'; + $lang->edit->redo = '다시 실행'; + $lang->edit->undo = '되돌리기'; + $lang->edit->align_left = '왼쪽 정렬'; + $lang->edit->align_center = '가운데 정렬'; + $lang->edit->align_right = '오른쪽 정렬'; + $lang->edit->align_justify = '양쪽 정렬'; + $lang->edit->add_indent = '들여쓰기'; + $lang->edit->remove_indent = '내어쓰기'; + $lang->edit->list_number = '번호 매기기'; + $lang->edit->list_bullet = '목록'; + $lang->edit->remove_format = '글꼴 지우기'; - $lang->edit->help_fontcolor = '글자의 색상을 지정합니다'; - $lang->edit->help_fontbgcolor = '글자의 배경색상을 지정합니다'; - $lang->edit->help_bold = '글자를 진하게 합니다'; - $lang->edit->help_italic = '글자를 기울이게 합니다'; - $lang->edit->help_underline = '밑줄을 긋습니다'; - $lang->edit->help_strike = '취소선을 긋습니다'; + $lang->edit->help_remove_format = '선택된 영역 내의 태그를 지웁니다.'; + $lang->edit->help_strike_through = '글자에 취소선을 표시합니다.'; + $lang->edit->help_align_full = '좌우 폭에 맞게 정렬을 합니다.'; + + $lang->edit->help_fontcolor = '글자의 색상을 지정합니다.'; + $lang->edit->help_fontbgcolor = '글자의 배경색상을 지정합니다.'; + $lang->edit->help_bold = '글자를 진하게 합니다.'; + $lang->edit->help_italic = '글자를 기울이게 합니다.'; + $lang->edit->help_underline = '밑줄을 긋습니다.'; + $lang->edit->help_strike = '취소선을 긋습니다.'; $lang->edit->help_sup = '윗첨자를 입력합니다.'; $lang->edit->help_sub = '아랫첨자를 입력합니다.'; - $lang->edit->help_redo = '다음 동작으로 돌아갑니다'; - $lang->edit->help_undo = '이전 동작으로 돌아갑니다'; - $lang->edit->help_align_left = '왼쪽 정렬을 합니다'; - $lang->edit->help_align_center = '가운데 정렬을 합니다'; - $lang->edit->help_align_right = '오른쪽 정렬을 합니다'; - $lang->edit->help_add_indent = '들여쓰기를 합니다'; - $lang->edit->help_remove_indent = '들여쓰기를 제거합니다'; - $lang->edit->help_list_number = '숫자로된 목록을 적용합니다'; - $lang->edit->help_list_bullet = '기호로된 목록을 적용합니다'; - $lang->edit->help_use_paragrapth = '문단 나누기를 하시려면 ctrl-엔터를 누르시면 됩니다. (글 작성완료후 alt-S를 누르면 저장이 됩니다)'; + $lang->edit->help_redo = '다음 동작으로 돌아갑니다.'; + $lang->edit->help_undo = '이전 동작으로 돌아갑니다.'; + $lang->edit->help_align_left = '왼쪽 정렬을 합니다.'; + $lang->edit->help_align_center = '가운데 정렬을 합니다.'; + $lang->edit->help_align_right = '오른쪽 정렬을 합니다.'; + $lang->edit->help_add_indent = '단락의 들여쓰기 수준을 높입니다.'; + $lang->edit->help_remove_indent = '단락의 들여쓰기 수준을 낮춥니다.'; + $lang->edit->help_list_number = '숫자로된 목록을 적용합니다.'; + $lang->edit->help_list_bullet = '기호로된 목록을 적용합니다.'; + $lang->edit->help_use_paragraph = '문단 나누기를 하시려면 Ctrl+Enter를 누르시면 됩니다. (글 작성완료 후 Alt+S를 누르면 저장이 됩니다.)'; + + $lang->edit->url = '링크'; + $lang->edit->blockquote = '인용문'; + $lang->edit->table = '표'; + $lang->edit->image = '그림'; + $lang->edit->multimedia = '동영상'; + $lang->edit->emoticon = '이모티콘'; $lang->edit->upload = '첨부'; $lang->edit->upload_file = '파일 첨부'; @@ -111,7 +138,7 @@ $lang->edit->icon_align_middle = '가운데 정렬'; $lang->edit->icon_align_right = '글의 우측으로'; - $lang->about_dblclick_in_editor = '배경, 글자, 이미지, 인용문등에서 더블클릭을 하시면 상세한 컴포넌트 설정이 가능합니다'; + $lang->about_dblclick_in_editor = '배경, 글자, 이미지, 인용문등에서 더블클릭을 하시면 상세한 컴포넌트 설정이 가능합니다.'; $lang->edit->rich_editor = '스타일 편집기'; @@ -120,6 +147,4 @@ $lang->edit->help = '도움말'; $lang->edit->help_command = '단축키 안내'; - - ?> diff --git a/modules/editor/lang/ru.lang.php b/modules/editor/lang/ru.lang.php index 5de300ab5..7a7671421 100644 --- a/modules/editor/lang/ru.lang.php +++ b/modules/editor/lang/ru.lang.php @@ -75,6 +75,26 @@ $lang->edit->submit = 'Принять'; + $lang->edit->fontcolor = 'Text Color'; + $lang->edit->fontbgcolor = 'Background Color'; + $lang->edit->bold = 'Bold'; + $lang->edit->italic = 'Italic'; + $lang->edit->underline = 'Underline'; + $lang->edit->strike = 'Strike'; + $lang->edit->sup = 'Sup'; + $lang->edit->sub = 'Sub'; + $lang->edit->redo = 'Re Do'; + $lang->edit->undo = 'Un Do'; + $lang->edit->align_left = 'Align Left'; + $lang->edit->align_center = 'Align Center'; + $lang->edit->align_right = 'Align Right'; + $lang->edit->align_justify = 'Align Justify'; + $lang->edit->add_indent = 'Indent'; + $lang->edit->remove_indent = 'Outdent'; + $lang->edit->list_number = 'Orderd List'; + $lang->edit->list_bullet = 'Unordered List'; + $lang->edit->remove_format = 'Style Remover'; + $lang->edit->help_fontcolor = 'Выберать цвет шрифта'; $lang->edit->help_fontbgcolor = 'Выберать цвет фона шрифта'; $lang->edit->help_bold = 'Сделать шрифт жирным'; @@ -92,7 +112,14 @@ $lang->edit->help_remove_indent = 'Удалить отступ'; $lang->edit->help_list_number = 'Применить числовой список'; $lang->edit->help_list_bullet = 'Применить маркированный список'; - $lang->edit->help_use_paragrapth = 'Нажмите Ctrl+Enter, чтобы отметить параграф. (Нажмите Alt+S , чтобы сохранить)'; + $lang->edit->help_use_paragraph = 'Нажмите Ctrl+Enter, чтобы отметить параграф. (Нажмите Alt+S , чтобы сохранить)'; + + $lang->edit->url = 'URL'; + $lang->edit->blockquote = 'Blockquote'; + $lang->edit->table = 'Table'; + $lang->edit->image = 'Image'; + $lang->edit->multimedia = 'Movie'; + $lang->edit->emoticon = 'Emoticon'; $lang->edit->upload = 'Вложение'; $lang->edit->upload_file = 'Вложить'; diff --git a/modules/editor/lang/zh-CN.lang.php b/modules/editor/lang/zh-CN.lang.php index 10d52d42b..9f3c4888c 100644 --- a/modules/editor/lang/zh-CN.lang.php +++ b/modules/editor/lang/zh-CN.lang.php @@ -79,6 +79,26 @@ $lang->edit->submit = '确认'; + $lang->edit->fontcolor = 'Text Color'; + $lang->edit->fontbgcolor = 'Background Color'; + $lang->edit->bold = 'Bold'; + $lang->edit->italic = 'Italic'; + $lang->edit->underline = 'Underline'; + $lang->edit->strike = 'Strike'; + $lang->edit->sup = 'Sup'; + $lang->edit->sub = 'Sub'; + $lang->edit->redo = 'Re Do'; + $lang->edit->undo = 'Un Do'; + $lang->edit->align_left = 'Align Left'; + $lang->edit->align_center = 'Align Center'; + $lang->edit->align_right = 'Align Right'; + $lang->edit->align_justify = 'Align Justify'; + $lang->edit->add_indent = 'Indent'; + $lang->edit->remove_indent = 'Outdent'; + $lang->edit->list_number = 'Orderd List'; + $lang->edit->list_bullet = 'Unordered List'; + $lang->edit->remove_format = 'Style Remover'; + $lang->edit->help_fontcolor = '文本颜色'; $lang->edit->help_fontbgcolor = '背景颜色'; $lang->edit->help_bold = '粗体'; @@ -96,7 +116,14 @@ $lang->edit->help_remove_indent = '清除缩进'; $lang->edit->help_list_number = '有序列表'; $lang->edit->help_list_bullet = '无序列表'; - $lang->edit->help_use_paragrapth = '分段请按 ctrl＋回车． (发表主题快捷键：alt＋S)'; + $lang->edit->help_use_paragraph = '分段请按 ctrl＋回车． (发表主题快捷键：alt＋S)'; + + $lang->edit->url = 'URL'; + $lang->edit->blockquote = 'Blockquote'; + $lang->edit->table = 'Table'; + $lang->edit->image = 'Image'; + $lang->edit->multimedia = 'Movie'; + $lang->edit->emoticon = 'Emoticon'; $lang->edit->upload = '上传'; $lang->edit->upload_file = '上传附件'; diff --git a/modules/editor/lang/zh-TW.lang.php b/modules/editor/lang/zh-TW.lang.php index 4cb563a65..2ac4f735e 100644 --- a/modules/editor/lang/zh-TW.lang.php +++ b/modules/editor/lang/zh-TW.lang.php @@ -78,6 +78,26 @@ $lang->edit->submit = '確認'; + $lang->edit->fontcolor = 'Text Color'; + $lang->edit->fontbgcolor = 'Background Color'; + $lang->edit->bold = 'Bold'; + $lang->edit->italic = 'Italic'; + $lang->edit->underline = 'Underline'; + $lang->edit->strike = 'Strike'; + $lang->edit->sup = 'Sup'; + $lang->edit->sub = 'Sub'; + $lang->edit->redo = 'Re Do'; + $lang->edit->undo = 'Un Do'; + $lang->edit->align_left = 'Align Left'; + $lang->edit->align_center = 'Align Center'; + $lang->edit->align_right = 'Align Right'; + $lang->edit->align_justify = 'Align Justify'; + $lang->edit->add_indent = 'Indent'; + $lang->edit->remove_indent = 'Outdent'; + $lang->edit->list_number = 'Orderd List'; + $lang->edit->list_bullet = 'Unordered List'; + $lang->edit->remove_format = 'Style Remover'; + $lang->edit->help_remove_format = '移除格式'; $lang->edit->help_strike_through = '文字刪除線'; $lang->edit->help_align_full = '左右對齊'; @@ -99,7 +119,14 @@ $lang->edit->help_remove_indent = '凸排'; $lang->edit->help_list_number = '編號'; $lang->edit->help_list_bullet = '清單符號'; - $lang->edit->help_use_paragrapth = '換行請按 ctrl+backspace (快速發表主題：alt+S)'; + $lang->edit->help_use_paragraph = '換行請按 ctrl+backspace (快速發表主題：alt+S)'; + + $lang->edit->url = 'URL'; + $lang->edit->blockquote = 'Blockquote'; + $lang->edit->table = 'Table'; + $lang->edit->image = 'Image'; + $lang->edit->multimedia = 'Movie'; + $lang->edit->emoticon = 'Emoticon'; $lang->edit->upload = '上傳'; $lang->edit->upload_file = '上傳附檔'; diff --git a/modules/editor/skins/default/editor.html b/modules/editor/skins/default/editor.html index 00b462b84..a18fd83aa 100644 --- a/modules/editor/skins/default/editor.html +++ b/modules/editor/skins/default/editor.html @@ -54,16 +54,16 @@ -
+
-
+
    -
    • -
    • +
    • +
    @@ -98,36 +98,36 @@
    -
    • -
    • -
    • -
    • -
    • -
    • -
    • -
    • -
    • +
    • +
    • +
    • +
    • +
    • +
    • +
    • +
    • +
    -
    • -
    • -
    • -
    • -
    • -
    • -
    • -
    • +
    • +
    • +
    • +
    • +
    • +
    • +
    • +
    -
    • -
    • -
    • -
    • -
    • - -
    • +
    • +
    • +
    • +
    • +
    • + +
@@ -155,17 +155,17 @@
  • {$lang->about_dblclick_in_editor}
    • -
  • {$lang->edit->help_use_paragrapth}
    • +
  • {$lang->edit->help_use_paragraph}
  • {$lang->edit->help_command}
      -
    • Un Do : Ctrl+Z
      • -
    • Re Do : Ctrl+Y
      • -
    • Bold : Ctrl+B
      • -
    • Underline : Ctrl+U
      • -
    • Italic : Ctrl+I
      • -
    • Style Remover : Ctrl+D
      • -
    • URL : Ctrl+L
      • +
    • {$lang->edit->undo} : Ctrl+Z
      • +
    • {$lang->edit->redo} : Ctrl+Y
      • +
    • {$lang->edit->bold} : Ctrl+B
      • +
    • {$lang->edit->underline} : Ctrl+U
      • +
    • {$lang->edit->italic} : Ctrl+I
      • +
    • {$lang->edit->remove_format} : Ctrl+D
      • +
    • {$lang->edit->url} : Ctrl+L
    • From a6f4777541a071cb130c223114e2dc3158c63ab6 Mon Sep 17 00:00:00 2001 From: ngleader Date: Tue, 6 Jan 2009 08:37:33 +0000 Subject: [PATCH 007/144] board open api adding act 'dispBoardContentFileList' git-svn-id: http://xe-core.googlecode.com/svn/sandbox@5249 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- modules/board/board.api.php | 34 ++++++++++++++++++++++++++++++++-- modules/board/board.view.php | 8 ++++++++ modules/board/conf/module.xml | 2 +- 3 files changed, 41 insertions(+), 3 deletions(-) diff --git a/modules/board/board.api.php b/modules/board/board.api.php index f717cfa27..ff594f2eb 100644 --- a/modules/board/board.api.php +++ b/modules/board/board.api.php @@ -43,6 +43,15 @@ $oModule->add('oDocument',$this->arrangeContent(Context::get('oDocument'))); } + + /** + * @brief 컨텐츠의 파일 목록 + **/ + function dispBoardContentFileList(&$oModule) { + $oModule->add('file_list',$this->arrangeFile(Context::get('file_list'))); + } + + /** * @brief 태그 목록 **/ @@ -50,8 +59,10 @@ $oModule->add('tag_list',Context::get('tag_list')); } - - function dispBoardConentCommentList(&$oModule) { + /** + * @brief 컨텐츠의 코멘트 목록 + **/ + function dispBoardContentCommentList(&$oModule) { $oModule->add('comment_list',$this->arrangeComment(Context::get('comment_list'))); } @@ -83,5 +94,24 @@ } return $output; } + + + function arrangeFile($file_list) { + $output = array(); + if(count($file_list)) { + foreach($file_list as $key => $val){ + $item = null; + $item->sid = $val->sid; + $item->download_count = $val->download_count; + $item->source_filename = $val->source_filename; + $item->uploaded_filename = $val->uploaded_filename; + $item->file_size = $val->file_size; + $item->regdate = $val->regdate; + $item->download_url = $val->download_url; + $output[] = $item; + } + } + return $output; + } } ?> diff --git a/modules/board/board.view.php b/modules/board/board.view.php index ec7f1f964..55077ff52 100644 --- a/modules/board/board.view.php +++ b/modules/board/board.view.php @@ -177,6 +177,14 @@ Context::set('oDocument', $oDocument); } + + function dispBoardContentFileList(){ + $oDocumentModel = &getModel('document'); + $document_srl = Context::get('document_srl'); + $oDocument = $oDocumentModel->getDocument($document_srl); + Context::set('file_list',$oDocument->getUploadedFiles()); + } + function dispBoardContentCommentList(){ $oDocumentModel = &getModel('document'); $document_srl = Context::get('document_srl'); diff --git a/modules/board/conf/module.xml b/modules/board/conf/module.xml index 65b1b6517..f51274914 100644 --- a/modules/board/conf/module.xml +++ b/modules/board/conf/module.xml @@ -86,7 +86,7 @@ - + From 309ee5221529c4e78641ea7cba440435b0e26026 Mon Sep 17 00:00:00 2001 From: ngleader Date: Tue, 6 Jan 2009 09:29:01 +0000 Subject: [PATCH 008/144] =?UTF-8?q?#17609516=20=ED=99=88=ED=8E=98=EC=9D=B4?= =?UTF-8?q?=EC=A7=80=EB=AA=A8=EB=93=88=20=ED=9A=8C=EC=9B=90=EA=B7=B8?= =?UTF-8?q?=EB=A3=B9=EA=B4=80=EB=A6=AC=20bug=20fix?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: http://xe-core.googlecode.com/svn/sandbox@5250 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- .../homepage/skins/xe_official/js/homepage.js | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/modules/homepage/skins/xe_official/js/homepage.js b/modules/homepage/skins/xe_official/js/homepage.js index 92afd1868..c21fd9be6 100644 --- a/modules/homepage/skins/xe_official/js/homepage.js +++ b/modules/homepage/skins/xe_official/js/homepage.js @@ -274,4 +274,21 @@ function completeInsertBoard(ret_obj) { if(module_srl) url = url.setQuery('module_srl',module_srl); if(page) url.setQuery('page',page); location.href = url; +} +function completeInsertGroup(ret_obj) { + location.href = current_url.setQuery('group_srl',''); +} + +function completeDeleteGroup(ret_obj) { + location.href = current_url.setQuery('group_srl',''); + +} + +function completeInsertGrant(ret_obj) { + var error = ret_obj['error']; + var message = ret_obj['message']; + var page = ret_obj['page']; + var module_srl = ret_obj['module_srl']; + + alert(message); } \ No newline at end of file From 6f18d7632e22ce7485bb0debcc8cae16d1bd440c Mon Sep 17 00:00:00 2001 From: ngleader Date: Tue, 6 Jan 2009 09:31:04 +0000 Subject: [PATCH 009/144] =?UTF-8?q?=ED=99=88=ED=8E=98=EC=9D=B4=EC=A7=80?= =?UTF-8?q?=EB=AA=A8=EB=93=88=20ui=20bug=20fix?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: http://xe-core.googlecode.com/svn/sandbox@5251 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- modules/homepage/skins/xe_official/js/homepage.js | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/modules/homepage/skins/xe_official/js/homepage.js b/modules/homepage/skins/xe_official/js/homepage.js index c21fd9be6..9fdc6f028 100644 --- a/modules/homepage/skins/xe_official/js/homepage.js +++ b/modules/homepage/skins/xe_official/js/homepage.js @@ -291,4 +291,9 @@ function completeInsertGrant(ret_obj) { var module_srl = ret_obj['module_srl']; alert(message); +} + +function completeInsertPage(ret_obj) { + alert(ret_obj['message']); + location.reload(); } \ No newline at end of file From 08d01b7afd149521086ce18606efe691640155a2 Mon Sep 17 00:00:00 2001 From: misol Date: Tue, 6 Jan 2009 14:22:14 +0000 Subject: [PATCH 010/144] =?UTF-8?q?=EA=B8=B0=EB=B3=B8=20=EB=A0=88=EC=9D=B4?= =?UTF-8?q?=EC=95=84=EC=9B=83=20xml=ED=8C=8C=EC=9D=BC=EC=97=90=20=ED=99=88?= =?UTF-8?q?=ED=8E=98=EC=9D=B4=EC=A7=80=20=EB=A7=81=ED=81=AC=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80,=20=ED=95=9C=EA=B8=80=20=EB=A7=9E=EC=B6=A4=EB=B2=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: http://xe-core.googlecode.com/svn/sandbox@5252 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- layouts/xe_blog/conf/info.xml | 439 +++++++++++++++--------------- layouts/xe_official/conf/info.xml | 401 +++++++++++++-------------- modules/editor/lang/ko.lang.php | 8 +- 3 files changed, 425 insertions(+), 423 deletions(-) diff --git a/layouts/xe_blog/conf/info.xml b/layouts/xe_blog/conf/info.xml index e3d7f62de..2638a3037 100644 --- a/layouts/xe_blog/conf/info.xml +++ b/layouts/xe_blog/conf/info.xml @@ -1,219 +1,220 @@ - - - XE 블로그 기본 스킨 - XEブログのデフォルトスキン - XE博客默认皮肤 - Default Skin of XE blog - Standard-Skin von XE Blog - Cuidado de la Piel por defecto de XE blog - По умолчанию Кожа XE блоге - XE部落格預設面板 - - XE 블로그 기본 스킨입니다. - 디자인 : 서기정 (http://blog.naver.com/addcozy) - HTML/CSS : 소지훈 - - - XEブログの基本スキンです。 - デザイン：ソギジョン (http://blog.naver.com/addcozy) - HTML/CSS : Ju-Hoon So - - - XE博客默认皮肤。 - 设计 : Ki-Jeong Seo (http://blog.naver.com/addcozy) - HTML/CSS : Ju-Hoon So - - - This is default skin of XE blog. - Design : Ki-Jeong Seo (http://blog.naver.com/addcozy) - HTML/CSS : Ju-Hoon So - - - Dies ist der Standard-Skin XE-Blog. - Design: Ki-Seo Jeong (http://blog.naver.com/addcozy) - HTML / CSS: Ju-Hoon Also - - - Esto es por defecto de la piel XE blog. - Diseño: Ki-Jeong Seo (http://blog.naver.com/addcozy) - HTML/CSS : Ju-Hoon So - - - Это умолчанию кожи XE блоге. - Дизайн: Ki-Jeong Seo (http://blog.naver.com/addcozy) - HTML/CSS : Ju-Hoon So - - - XE部落格預設面板。 - 設計 : Ki-Jeong Seo (http://blog.naver.com/addcozy) - HTML/CSS : Ju-Hoon So - - 0.1 - 2008-02-26 - - - zero - zero - zero - zero - zero - zero - zero - zero - - - - - 컬러셋 - カラーセット - 颜色 - Colorset - Colorset - Set de Colores - Colorset - 顏色設定 - 원하시는 컬러셋을 선택해주세요. - 希望するカラーセットを選択してください。 - 请选择颜色。 - Please select a colorset you want. - Bitte wählen Sie ein colorset Sie wollen. - Выберите colorset хотите. - Seleccione set de colores que desea. - 請選擇顏色。 - - 파란색 (기본) - 青 (default) - 蓝色 (default) - Blue (default) - Blue (Standard) - Azul (default) - Blue (default) - 藍色(預設) - - - 회색 - 灰色背景 - 灰色背景 - Gray - Gray - Gray - Gray - 灰色 - - - 오렌지 - Orange - Orange - Orange - Orange - Orange - Orange - 橘色 - - - 보라색 - Violet - Violet - Violet - Violett - Violet - Violet - 紫色 - - - 초록색 - 緑 - 绿色 - Green - Grün - Verde - Green - 綠色 - - - - 기본 모듈 - デフォルトモジュール - 默认模块 - Basic module - Basismodul - Módulo Básico - Основной модуль - 預設模組 - 기본 모듈을 지정해주시면 레이아웃에서 표시되는 위젯들이 정상적으로 동작을 하게 됩니다 - デフォルトモジュールを指定するとレイアウトで表示されるウィジェットが正常に作動するようになります。 - 为了让博客系统中的控件正常运作，在这里必须得指定默认版面模块名。 - The widgets that are being displayed in the layout will work properly if you select the basic module - Die Widgets, die angezeigt werden im Layout wird ordnungsgemäß funktionieren, wenn Sie das Basismodul - Los reproductores que se muestran en el diseño funcionará correctamente si selecciona el módulo básico - В виджеты, которые отображаются в формате будет работать правильно, если вы выбираете основной модуль - 要讓部落格系統中的控件正常運作，必須要指定預設討論板模組名稱。 - - - 배경 이미지 - 背景イメージ - 背景图片 - Background Image - Imagen de fondo - Фоновое изображение - 背景圖片 - 배경 이미지를 사용하시려면 등록해주세요. - 背景イメージを使う場合は、登録してください。 - 要想使用背景图片请在这里上传。 - Please input if you want to use background image. - Bitte geben Sie, wenn Sie verwenden wollen Hintergrundbild. - Entre, por favor, si desea utilizar la imagen de fondo. - Введите, если вы хотите использовать фоновое изображение. - 請在這裡上傳想要使用的背景圖片。 - - - 프로필 이미지 - プロフィールイメージ - 博客头像 - Profile Image - Profil Bilder - Perfil de Imagen - Профиль Изображение - 部落格頭像 - 프로필 이미지를 입력해 주세요 (가로 사이즈는 160px이 가장 보기 좋습니다) - プロフィールイメージを入力してください（横幅は「160px」が一番適しています）。 - 请上传博客个性头像(推荐宽度为160px)。 - Please input profile image (It is recommended to set width as 160px) - itte geben Sie Ihre Image-Profil (Es wird empfohlen, Breite 160px) - Por favor, el perfil de entrada de imagen (Se recomienda configurar el ancho de 160px) - Введите профиля изображения (Рекомендуется устанавливать ширину, 160px) - 請上傳部落格頭像(最適寬度 160px)。 - - - 프로필 - プロフィール - 简介 - Profile - Profil - Perfil - Профиль - 簡介 - 간단한 프로필을 입력해주세요 - 簡単なプロフィールを入力してください。 - 请输入简单介绍。 - Please input your simple profile - Bitte geben Sie Ihre Simple Profile - Por favor, introduzca su perfil simple - Введите простое профиль - 請輸入簡單說明。 - - - - - - 상단 메뉴 - 上段メニュー - 菜单 - Top Menu - Top-Menü - Menú superior - Главное меню - 主選單 - - - + + + XE 블로그 기본 스킨 + XEブログのデフォルトスキン + XE博客默认皮肤 + Default Skin of XE blog + Standard-Skin von XE Blog + Cuidado de la Piel por defecto de XE blog + По умолчанию Кожа XE блоге + XE部落格預設面板 + + XE 블로그 기본 스킨입니다. + 디자인 : 서기정 (http://blog.naver.com/addcozy) + HTML/CSS : 소지훈 + + + XEブログの基本スキンです。 + デザイン：ソギジョン (http://blog.naver.com/addcozy) + HTML/CSS : Ju-Hoon So + + + XE博客默认皮肤。 + 设计 : Ki-Jeong Seo (http://blog.naver.com/addcozy) + HTML/CSS : Ju-Hoon So + + + This is default skin of XE blog. + Design : Ki-Jeong Seo (http://blog.naver.com/addcozy) + HTML/CSS : Ju-Hoon So + + + Dies ist der Standard-Skin XE-Blog. + Design: Ki-Seo Jeong (http://blog.naver.com/addcozy) + HTML / CSS: Ju-Hoon Also + + + Esto es por defecto de la piel XE blog. + Diseño: Ki-Jeong Seo (http://blog.naver.com/addcozy) + HTML/CSS : Ju-Hoon So + + + Это умолчанию кожи XE блоге. + Дизайн: Ki-Jeong Seo (http://blog.naver.com/addcozy) + HTML/CSS : Ju-Hoon So + + + XE部落格預設面板。 + 設計 : Ki-Jeong Seo (http://blog.naver.com/addcozy) + HTML/CSS : Ju-Hoon So + + 0.1 + 2008-02-26 + http://blog.nzeo.com + + + zero + zero + zero + zero + zero + zero + zero + zero + + + + + 컬러셋 + カラーセット + 颜色 + Colorset + Colorset + Set de Colores + Colorset + 顏色設定 + 원하시는 컬러셋을 선택해주세요. + 希望するカラーセットを選択してください。 + 请选择颜色。 + Please select a colorset you want. + Bitte wählen Sie ein colorset Sie wollen. + Выберите colorset хотите. + Seleccione set de colores que desea. + 請選擇顏色。 + + 파란색 (기본) + 青 (default) + 蓝色 (default) + Blue (default) + Blue (Standard) + Azul (default) + Blue (default) + 藍色(預設) + + + 회색 + 灰色背景 + 灰色背景 + Gray + Gray + Gray + Gray + 灰色 + + + 오렌지 + Orange + Orange + Orange + Orange + Orange + Orange + 橘色 + + + 보라색 + Violet + Violet + Violet + Violett + Violet + Violet + 紫色 + + + 초록색 + 緑 + 绿色 + Green + Grün + Verde + Green + 綠色 + + + + 기본 모듈 + デフォルトモジュール + 默认模块 + Basic module + Basismodul + Módulo Básico + Основной модуль + 預設模組 + 기본 모듈을 지정해주시면 레이아웃에서 표시되는 위젯들이 정상적으로 동작을 하게 됩니다 + デフォルトモジュールを指定するとレイアウトで表示されるウィジェットが正常に作動するようになります。 + 为了让博客系统中的控件正常运作，在这里必须得指定默认版面模块名。 + The widgets that are being displayed in the layout will work properly if you select the basic module + Die Widgets, die angezeigt werden im Layout wird ordnungsgemäß funktionieren, wenn Sie das Basismodul + Los reproductores que se muestran en el diseño funcionará correctamente si selecciona el módulo básico + В виджеты, которые отображаются в формате будет работать правильно, если вы выбираете основной модуль + 要讓部落格系統中的控件正常運作，必須要指定預設討論板模組名稱。 + + + 배경 이미지 + 背景イメージ + 背景图片 + Background Image + Imagen de fondo + Фоновое изображение + 背景圖片 + 배경 이미지를 사용하시려면 등록해주세요. + 背景イメージを使う場合は、登録してください。 + 要想使用背景图片请在这里上传。 + Please input if you want to use background image. + Bitte geben Sie, wenn Sie verwenden wollen Hintergrundbild. + Entre, por favor, si desea utilizar la imagen de fondo. + Введите, если вы хотите использовать фоновое изображение. + 請在這裡上傳想要使用的背景圖片。 + + + 프로필 이미지 + プロフィールイメージ + 博客头像 + Profile Image + Profil Bilder + Perfil de Imagen + Профиль Изображение + 部落格頭像 + 프로필 이미지를 입력해 주세요 (가로 사이즈는 160px이 가장 보기 좋습니다) + プロフィールイメージを入力してください（横幅は「160px」が一番適しています）。 + 请上传博客个性头像(推荐宽度为160px)。 + Please input profile image (It is recommended to set width as 160px) + itte geben Sie Ihre Image-Profil (Es wird empfohlen, Breite 160px) + Por favor, el perfil de entrada de imagen (Se recomienda configurar el ancho de 160px) + Введите профиля изображения (Рекомендуется устанавливать ширину, 160px) + 請上傳部落格頭像(最適寬度 160px)。 + + + 프로필 + プロフィール + 简介 + Profile + Profil + Perfil + Профиль + 簡介 + 간단한 프로필을 입력해주세요 + 簡単なプロフィールを入力してください。 + 请输入简单介绍。 + Please input your simple profile + Bitte geben Sie Ihre Simple Profile + Por favor, introduzca su perfil simple + Введите простое профиль + 請輸入簡單說明。 + + + + + + 상단 메뉴 + 上段メニュー + 菜单 + Top Menu + Top-Menü + Menú superior + Главное меню + 主選單 + + + diff --git a/layouts/xe_official/conf/info.xml b/layouts/xe_official/conf/info.xml index 414c2e271..2e674a9fc 100644 --- a/layouts/xe_official/conf/info.xml +++ b/layouts/xe_official/conf/info.xml @@ -1,200 +1,201 @@ - - - XE 공식 사이트 레이아웃 - XEオフィシャルレイアウト - XE Official website layout - XE Offizielle Website-Layout - XE Официальный сайт макет - Diseño oficial de la página web de XE - XE 官方网站布局 - XE 官方網站版面 - - XE 공식 사이트 레이아웃입니다. - 디자인 : 이소라 - 퍼블리싱 : 정찬명 - 레이아웃 제작 : zero - - - XEのオフィシャルサイトのレイアウトです。 - デザイン：イ ソラ - パブリシング：ジョン チャンミョン - レイアウト作成：Zero - - - This layout is the XE Official website layout. - Designer : So-Ra Lee - HTML/CSS : Chan-Myung Jeong - Layout producer : zero - - - Dieses Layout ist das XE Offizielle Website-Layout. - Designer: So-Ra Lee - HTML / CSS: Chan-Myung Jeong - Layout Hersteller: Zero - - - Этот формат является XE Официальный сайт компоновку. - Дизайнер: So-Ra Lee - HTML / CSS: Chan-Myung Jeong - Макет производителя: ноль - - - Este diseño is el diseño oficial de la página web de Zerobard XE. - Deseñador : So-Ra Lee - HTML/CSS : Chan-Myung Jeong - Productor del diseño : zero - - - XE官方网站布局。 - 设计 : So-Ra Lee - HTML/CSS : Chan-Myung Jeong - 布局 : zero - - - XE官方網站版面。 - 設計 : So-Ra Lee - HTML/CSS : Chan-Myung Jeong - 版面設計 : zero - - 0.1 - 2007-08-01 - - - zero - zero - zero - zero - zero - zero - zero - zero - - - - - 컬러셋 - カラーセット - 颜色 - 顏色設定 - Colorset - Colorset - Colorset - Set de colores - 원하시는 컬러셋을 선택해주세요. - 希望するカラーセットを選択してください。 - 请选择颜色。 - 請選擇顏色。 - Please select a colorset you want. - Bitte wählen Sie ein colorset Sie wollen. - Выберите colorset хотите. - Seleccione set de colores que desea. - - 기본 - デフォルト - Basic - Basic - Базовые - Básico - 默认 - 預設 - - - 검은색 - 黒 - Black - Schwarz - Черного - Negro - 黑色 - 黑色 - - - 하얀색 - 白 - white - weiß - белый - Blanco - 白色 - 白色 - - - - 로고이미지 - ロゴイメージ - LOGO图片 - LOGO圖片 - Logo image - Logobildes - Изображения логотипа - Imagen del logotipo - 레이아웃의 상단에 표시될 로고이미지를 입력하세요. (세로길이가 23px인 투명이미지가 가장 어울립니다) - レイアウトの上段に表示されるロゴイメージを入力してください。 (縦幅が23pxである透明イメージが最も合います。) - 请输入显示在布局顶部的LOGO图片。(高度为23px的透明图片为适。) - 請輸入在版面上端要顯示的LOGO圖片。(適當高度為23px的透明圖片。) - Please input a logo image which will be displayed on the top of layout. (Transparent image with height of 23px is recommended.) - Bitte geben Sie ein Logo das Bild wird auf dem oberen Layout. (Transparent Bild mit einer Höhe von 23px wird empfohlen). - Введите логотип изображение, которое будет отображаться в верхней части формы. (Прозрачный изображение с высотой 23px рекомендуется.) - Ingresar una imagen para logotipo. ( Se recomienda una imagen de fondo transparente con una altura de 23px. - - - 홈 페이지 URL - ホームページURL - 主页地址 - 主頁網址 - Homepage URL - Homepage URL - Домашняя страница URL - URL de la página web - 로고를 클릭시에 이동할 홈 페이지 URL을 입력해 주세요. - ロゴをクリックした時に移動するホームページのURLを入力してください。 - 点击网站LOGO时要移动的页面URL。 - 請輸入當用戶按了網站LOGO後，要前往的頁面網址。 - Please input the URL to redirect when user clicks the logo - Bitte geben Sie die URL umzuleiten, wenn Benutzer klickt das Logo - Пожалуйста, введите URL для перенаправления, когда пользователь нажимает логотип - Ingresar el URL de la página web para redireccionar al pulsar el logotipo - - - 배경 이미지 - 背景イメージ - 背景图片 - 背景圖片 - Background Image - Hintergrundbild - Фоновое изображение - Imagen de fondo - 배경 이미지를 사용하시려면 등록해주세요. - 背景イメージを使う場合は、登録してください。 - 要想使用背景图片请在这里上传。 - 請在這裡上傳想要使用的背景圖片。 - Please input if you want to use background image. - Bitte geben Sie, wenn Sie verwenden wollen Hintergrundbild. - Введите, если вы хотите использовать фоновое изображение. - Ingresar imagen de fondo si desea usar. - - - - - - 상단 메뉴 - 上段メニュー - 主菜单 - 主選單 - Top menu - Top Menü - Верхнее меню - Menú Principal - - - 하단 메뉴 - 下段メニュー - 底部菜单 - 底部選單 - Bottom menu - Bottom-Menü - Внизу меню - Menú Inferior - - - + + + XE 공식 사이트 레이아웃 + XEオフィシャルレイアウト + XE Official website layout + XE Offizielle Website-Layout + XE Официальный сайт макет + Diseño oficial de la página web de XE + XE 官方网站布局 + XE 官方網站版面 + + XE 공식 사이트 레이아웃입니다. + 디자인 : 이소라 + 퍼블리싱 : 정찬명 + 레이아웃 제작 : zero + + + XEのオフィシャルサイトのレイアウトです。 + デザイン：イ ソラ + パブリシング：ジョン チャンミョン + レイアウト作成：Zero + + + This layout is the XE Official website layout. + Designer : So-Ra Lee + HTML/CSS : Chan-Myung Jeong + Layout producer : zero + + + Dieses Layout ist das XE Offizielle Website-Layout. + Designer: So-Ra Lee + HTML / CSS: Chan-Myung Jeong + Layout Hersteller: Zero + + + Этот формат является XE Официальный сайт компоновку. + Дизайнер: So-Ra Lee + HTML / CSS: Chan-Myung Jeong + Макет производителя: ноль + + + Este diseño is el diseño oficial de la página web de Zerobard XE. + Deseñador : So-Ra Lee + HTML/CSS : Chan-Myung Jeong + Productor del diseño : zero + + + XE官方网站布局。 + 设计 : So-Ra Lee + HTML/CSS : Chan-Myung Jeong + 布局 : zero + + + XE官方網站版面。 + 設計 : So-Ra Lee + HTML/CSS : Chan-Myung Jeong + 版面設計 : zero + + 0.1 + 2007-08-01 + http://blog.nzeo.com + + + zero + zero + zero + zero + zero + zero + zero + zero + + + + + 컬러셋 + カラーセット + 颜色 + 顏色設定 + Colorset + Colorset + Colorset + Set de colores + 원하시는 컬러셋을 선택해주세요. + 希望するカラーセットを選択してください。 + 请选择颜色。 + 請選擇顏色。 + Please select a colorset you want. + Bitte wählen Sie ein colorset Sie wollen. + Выберите colorset хотите. + Seleccione set de colores que desea. + + 기본 + デフォルト + Basic + Basic + Базовые + Básico + 默认 + 預設 + + + 검은색 + 黒 + Black + Schwarz + Черного + Negro + 黑色 + 黑色 + + + 하얀색 + 白 + white + weiß + белый + Blanco + 白色 + 白色 + + + + 로고이미지 + ロゴイメージ + LOGO图片 + LOGO圖片 + Logo image + Logobildes + Изображения логотипа + Imagen del logotipo + 레이아웃의 상단에 표시될 로고이미지를 입력하세요. (세로길이가 23px인 투명이미지가 가장 어울립니다) + レイアウトの上段に表示されるロゴイメージを入力してください。 (縦幅が23pxである透明イメージが最も合います。) + 请输入显示在布局顶部的LOGO图片。(高度为23px的透明图片为适。) + 請輸入在版面上端要顯示的LOGO圖片。(適當高度為23px的透明圖片。) + Please input a logo image which will be displayed on the top of layout. (Transparent image with height of 23px is recommended.) + Bitte geben Sie ein Logo das Bild wird auf dem oberen Layout. (Transparent Bild mit einer Höhe von 23px wird empfohlen). + Введите логотип изображение, которое будет отображаться в верхней части формы. (Прозрачный изображение с высотой 23px рекомендуется.) + Ingresar una imagen para logotipo. ( Se recomienda una imagen de fondo transparente con una altura de 23px. + + + 홈 페이지 URL + ホームページURL + 主页地址 + 主頁網址 + Homepage URL + Homepage URL + Домашняя страница URL + URL de la página web + 로고를 클릭시에 이동할 홈 페이지 URL을 입력해 주세요. + ロゴをクリックした時に移動するホームページのURLを入力してください。 + 点击网站LOGO时要移动的页面URL。 + 請輸入當用戶按了網站LOGO後，要前往的頁面網址。 + Please input the URL to redirect when user clicks the logo + Bitte geben Sie die URL umzuleiten, wenn Benutzer klickt das Logo + Пожалуйста, введите URL для перенаправления, когда пользователь нажимает логотип + Ingresar el URL de la página web para redireccionar al pulsar el logotipo + + + 배경 이미지 + 背景イメージ + 背景图片 + 背景圖片 + Background Image + Hintergrundbild + Фоновое изображение + Imagen de fondo + 배경 이미지를 사용하시려면 등록해주세요. + 背景イメージを使う場合は、登録してください。 + 要想使用背景图片请在这里上传。 + 請在這裡上傳想要使用的背景圖片。 + Please input if you want to use background image. + Bitte geben Sie, wenn Sie verwenden wollen Hintergrundbild. + Введите, если вы хотите использовать фоновое изображение. + Ingresar imagen de fondo si desea usar. + + + + + + 상단 메뉴 + 上段メニュー + 主菜单 + 主選單 + Top menu + Top Menü + Верхнее меню + Menú Principal + + + 하단 메뉴 + 下段メニュー + 底部菜单 + 底部選單 + Bottom menu + Bottom-Menü + Внизу меню + Menú Inferior + + + diff --git a/modules/editor/lang/ko.lang.php b/modules/editor/lang/ko.lang.php index 48465b6f0..5b16eee0e 100644 --- a/modules/editor/lang/ko.lang.php +++ b/modules/editor/lang/ko.lang.php @@ -84,8 +84,8 @@ $lang->edit->italic = '기울임'; $lang->edit->underline = '밑줄'; $lang->edit->strike = '취소선'; - $lang->edit->sup = '윗첨자'; - $lang->edit->sub = '아랫첨자'; + $lang->edit->sup = '위 첨자'; + $lang->edit->sub = '아래 첨자'; $lang->edit->redo = '다시 실행'; $lang->edit->undo = '되돌리기'; $lang->edit->align_left = '왼쪽 정렬'; @@ -108,8 +108,8 @@ $lang->edit->help_italic = '글자를 기울이게 합니다.'; $lang->edit->help_underline = '밑줄을 긋습니다.'; $lang->edit->help_strike = '취소선을 긋습니다.'; - $lang->edit->help_sup = '윗첨자를 입력합니다.'; - $lang->edit->help_sub = '아랫첨자를 입력합니다.'; + $lang->edit->help_sup = '위 첨자를 입력합니다.'; + $lang->edit->help_sub = '아래 첨자를 입력합니다.'; $lang->edit->help_redo = '다음 동작으로 돌아갑니다.'; $lang->edit->help_undo = '이전 동작으로 돌아갑니다.'; $lang->edit->help_align_left = '왼쪽 정렬을 합니다.'; From 7301818f723a5c8478ee2d3625ef92890183e7a5 Mon Sep 17 00:00:00 2001 From: heemin Date: Tue, 6 Jan 2009 23:06:40 +0000 Subject: [PATCH 011/144] =?UTF-8?q?=ED=82=A4=EC=9B=8C=EB=93=9C=20=EB=A7=81?= =?UTF-8?q?=ED=81=AC=20=EC=95=A0=EB=93=9C=EC=98=A8=20=EC=9D=BC=EB=B3=B8?= =?UTF-8?q?=EC=96=B4=20=EB=B2=88=EC=97=AD=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: http://xe-core.googlecode.com/svn/sandbox@5253 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- addons/keyword_link/conf/info.xml | 25 ++++++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) diff --git a/addons/keyword_link/conf/info.xml b/addons/keyword_link/conf/info.xml index 285e83d16..fbc3a9ce6 100644 --- a/addons/keyword_link/conf/info.xml +++ b/addons/keyword_link/conf/info.xml @@ -2,6 +2,7 @@ 키워드 링크 애드온 關鍵字連結 + キーワードリンクアドオン 게시글과 댓글의 내용중 등록된 키워드에 링크를 걸어주는 애드온입니다. 키워드는 콤마(,)로 구분하여 여러개 등록할 수 있습니다. @@ -12,6 +13,11 @@ 可用逗號(,)區隔多個關鍵字。 以第一關鍵字為主。 + + 本文とコメントの内容中、登録されたキーワードにリンクを貼りつける機能を行います。 + キーワードは半角コンマ(,)区切りで複数登録が出来ます。 + 先に登録されるキーワードが優先度が高いです。 + 0.1 2008-12-20 @@ -28,68 +34,85 @@ cssquery cssquery + cssquery 치환할 부분의 jQuery cssquery입니다. xe_board 게시판 스킨이면 공백으로 두면 됩니다. 치환할 부분의 jQuery cssquery입니다. xe_board 게시판 스킨이면 공백으로 두면 됩니다. + 置き換える部分のjQuery cssqueryです。 + xe_board掲示板スキンの場合、空白にして下さい。 링크 방법 連結方式 + リンクの貼りつけ方 키워드가 여러개 있을때 "첫번째 키워드"에만 링크를 걸 것인지 "모든 키워드"에 걸 것인지 선택합니다. 키워드가 여러개 있을때 "첫번째 키워드"에만 링크를 걸 것인지 "모든 키워드"에 걸 것인지 선택합니다. - + 複数のキーワードの場合、"最初のキーワード"のみ、もしくは "全てのキーワード"にリンクを貼りつけるかを選択します。 + 첫번째 키워드 第一關鍵字 + 最初のキーワード 모든 키워드 所有關鍵字 + 全てのキーワード 키워드 關鍵字 + キーワード 링크 連結 + リンク 키워드 關鍵字 + キーワード 링크 連結 + リンク 키워드 關鍵字 + キーワード 링크 連結 + リンク 키워드 關鍵字 + キーワード 링크 連結 + リンク 키워드 關鍵字 + キーワード 링크 連結 + リンク From 369ea86fe7de19b4297d2951b835a88678b0e6cb Mon Sep 17 00:00:00 2001 From: ngleader Date: Wed, 7 Jan 2009 01:11:44 +0000 Subject: [PATCH 012/144] board category delete bug fix git-svn-id: http://xe-core.googlecode.com/svn/sandbox@5254 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- modules/document/document.model.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/document/document.model.php b/modules/document/document.model.php index bc1248588..dade66bc0 100644 --- a/modules/document/document.model.php +++ b/modules/document/document.model.php @@ -485,7 +485,8 @@ * @brief 특정 카테고리에 child가 있는지 체크 **/ function getCategoryChlidCount($category_srl) { - $output = executeQuery('document.getChildCategoryCount'); + $args->category_srl = $category_srl; + $output = executeQuery('document.getChildCategoryCount',$args); if($output->data->count > 0) return true; return false; } From e3fcd08b26bf1af2e282ee6ec0cfca6e6c54af6a Mon Sep 17 00:00:00 2001 From: ngleader Date: Wed, 7 Jan 2009 01:25:04 +0000 Subject: [PATCH 013/144] =?UTF-8?q?#17607358=20=ED=99=88=ED=8E=98=EC=9D=B4?= =?UTF-8?q?=EC=A7=80=EC=9D=98=20=EB=A0=88=EC=9D=B4=EC=95=84=EC=9B=83=20?= =?UTF-8?q?=EB=B3=80=EA=B2=BD=20=EB=B0=8F=20=EA=B7=B8=EB=A3=B9=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80=20=EB=AC=B8=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: http://xe-core.googlecode.com/svn/sandbox@5255 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- modules/homepage/skins/xe_official/js/homepage.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/homepage/skins/xe_official/js/homepage.js b/modules/homepage/skins/xe_official/js/homepage.js index 9fdc6f028..f25949a47 100644 --- a/modules/homepage/skins/xe_official/js/homepage.js +++ b/modules/homepage/skins/xe_official/js/homepage.js @@ -296,4 +296,8 @@ function completeInsertGrant(ret_obj) { function completeInsertPage(ret_obj) { alert(ret_obj['message']); location.reload(); +} + +function completeChangeLayout(ret_obj) { + location.reload(); } \ No newline at end of file From d64652c8511743d3e03ce47e5d6ad8ed0d813b26 Mon Sep 17 00:00:00 2001 From: misol Date: Wed, 7 Jan 2009 02:01:03 +0000 Subject: [PATCH 014/144] =?UTF-8?q?#16969585=20=20#17283354=20=EC=A3=BC?= =?UTF-8?q?=EC=84=9D=EC=97=90=20=EB=A7=9E=EA=B2=8C=20=ED=8F=AC=EC=9D=B8?= =?UTF-8?q?=ED=8A=B8=20%=ED=91=9C=EC=8B=9C=20=EA=B3=84=EC=82=B0=20?= =?UTF-8?q?=EB=82=B4=EC=9A=A9=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: http://xe-core.googlecode.com/svn/sandbox@5256 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- addons/point_level_icon/point_level_icon.lib.php | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/addons/point_level_icon/point_level_icon.lib.php b/addons/point_level_icon/point_level_icon.lib.php index 55b4b5458..1bc1c741b 100644 --- a/addons/point_level_icon/point_level_icon.lib.php +++ b/addons/point_level_icon/point_level_icon.lib.php @@ -28,13 +28,17 @@ // 레벨 아이콘의 위치를 구함 $level_icon = sprintf('./modules/point/icons/%s/%d.gif', $config->level_icon, $level); - // 최고 레벨이 아니면 다음 레벨로 가기 위한 per을 구함 + // 최고 레벨이 아니면 다음 레벨로 가기 위한 per을 구함 :: 주석과 실제 내용이 맞지 않아 실제 내용을 수정 if($level < $config->max_level) { $next_point = $config->level_step[$level+1]; - if($next_point > 0) $per = (int)($point / $next_point*100); + $present_point = $config->level_step[$level]; + if($next_point > 0) { + $per = (int)(($point - $present_point) / ($next_point - $present_point)*100); + $per = $per.'%'; + } } - $title = sprintf('%s:%s%s %s, %s:%s/%s', Context::getLang('point'), $point, $config->point_name, $per?'('.$per.'%)':'', Context::getLang('level'), $level, $config->max_level); + $title = sprintf('%s:%s%s%s, %s:%s/%s', Context::getLang('point'), $point, $config->point_name, $per?' ('.$per.')':'', Context::getLang('level'), $level, $config->max_level); $alt = sprintf('[%s:%s]', Context::getLang('level'), $level); $GLOBALS['_pointLevelIcon'][$member_srl] = sprintf('%s', $level_icon, $alt, $title); From 60821c90b798c250f72a6180494addd0cb4aa431 Mon Sep 17 00:00:00 2001 From: zero Date: Wed, 7 Jan 2009 02:06:47 +0000 Subject: [PATCH 015/144] =?UTF-8?q?issueTracker=20=EC=88=98=EC=A0=95=20?= =?UTF-8?q?=EC=95=88=EB=90=98=EB=8A=94=20=EB=AC=B8=EC=A0=9C=20=ED=95=B4?= =?UTF-8?q?=EA=B2=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: http://xe-core.googlecode.com/svn/sandbox@5257 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- modules/issuetracker/issuetracker.view.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/issuetracker/issuetracker.view.php b/modules/issuetracker/issuetracker.view.php index 03ae8d529..9d1427213 100644 --- a/modules/issuetracker/issuetracker.view.php +++ b/modules/issuetracker/issuetracker.view.php @@ -74,7 +74,7 @@ } Context::set('display_option', $display_option); - if(Context::get('document_srl')) { + if(Context::get('document_srl') && Context::get('act')!='dispIssuetrackerNewIssue') { $this->act = 'dispIssuetrackerViewIssue'; Context::set('act','dispIssuetrackerViewIssue'); } From 505fc9f6259a4205d28539f393adbfbb06debe8f Mon Sep 17 00:00:00 2001 From: ngleader Date: Wed, 7 Jan 2009 02:25:55 +0000 Subject: [PATCH 016/144] =?UTF-8?q?#17607358=20=ED=99=88=ED=8E=98=EC=9D=B4?= =?UTF-8?q?=EC=A7=80=EC=9D=98=20=EB=A0=88=EC=9D=B4=EC=95=84=EC=9B=83=20?= =?UTF-8?q?=EB=B3=80=EA=B2=BD=20=EB=B0=8F=20=EA=B7=B8=EB=A3=B9=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80=20=EB=AC=B8=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: http://xe-core.googlecode.com/svn/sandbox@5258 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- modules/homepage/skins/xe_official/js/homepage.js | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/modules/homepage/skins/xe_official/js/homepage.js b/modules/homepage/skins/xe_official/js/homepage.js index f25949a47..86aa6a127 100644 --- a/modules/homepage/skins/xe_official/js/homepage.js +++ b/modules/homepage/skins/xe_official/js/homepage.js @@ -300,4 +300,10 @@ function completeInsertPage(ret_obj) { function completeChangeLayout(ret_obj) { location.reload(); +} + +function doDeleteGroup(group_srl) { + var fo_obj = xGetElementById('fo_group'); + fo_obj.group_srl.value = group_srl; + procFilter(fo_obj, delete_group); } \ No newline at end of file From b46dc7c52bdaaba4961ee845cf661a2ee8990d64 Mon Sep 17 00:00:00 2001 From: misol Date: Wed, 7 Jan 2009 02:51:31 +0000 Subject: [PATCH 017/144] =?UTF-8?q?=EC=9C=84=EC=A0=AF,=20=EC=95=A0?= =?UTF-8?q?=EB=93=9C=EC=98=A8,=20=EB=A0=88=EC=9D=B4=EC=95=84=EC=9B=83=20xm?= =?UTF-8?q?l=EC=97=90=20=EB=82=B4=EC=9A=A9=20=EC=97=86=EC=9D=84=EB=95=8C,?= =?UTF-8?q?=20=EA=B0=80=EB=8A=A5=ED=95=98=EB=A9=B4=20=EC=9E=90=EC=97=B0?= =?UTF-8?q?=EC=8A=A4=EB=9F=BD=EA=B2=8C=20=EB=B3=B4=EC=9D=B4=EB=8F=84?= =?UTF-8?q?=EB=A1=9D=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: http://xe-core.googlecode.com/svn/sandbox@5259 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- modules/addon/tpl/addon_info.html | 15 +++++++++------ modules/layout/tpl/downloaded_layout_list.html | 2 +- modules/layout/tpl/layout_detail_info.html | 13 ++++++++----- modules/layout/tpl/top_refresh.html | 4 ++-- modules/widget/tpl/downloaded_widget_list.html | 4 ++-- modules/widget/tpl/widget_detail_info.html | 8 ++++---- 6 files changed, 26 insertions(+), 20 deletions(-) diff --git a/modules/addon/tpl/addon_info.html b/modules/addon/tpl/addon_info.html index fd25975a1..24b731c32 100644 --- a/modules/addon/tpl/addon_info.html +++ b/modules/addon/tpl/addon_info.html @@ -3,28 +3,30 @@
    - + - + + - + + - + + - +
    {$lang->title}
    		 {$addon_info->title} ver. {$addon_info->version}
    {$lang->author}
    		 - {$author->name} ({$author->homepage}, {$author->email_address})
    + {$author->name} ({$author->homepage}, {$author->email_address})
    {$lang->homepage}
    		 {$addon_info->homepage}
    {$lang->regdate}
    		 {zdate($addon_info->date, 'Y-m-d')}
    {$lang->addon_license}
    		 @@ -33,11 +35,12 @@

    {$addon_info->license_link}

    {$lang->description}
    		 {nl2br(trim($addon_info->description))}
    diff --git a/modules/layout/tpl/downloaded_layout_list.html b/modules/layout/tpl/downloaded_layout_list.html index 2206040c2..766861285 100644 --- a/modules/layout/tpl/downloaded_layout_list.html +++ b/modules/layout/tpl/downloaded_layout_list.html @@ -28,7 +28,7 @@ {$val->version} - {$author->name} + {$author->name} {$val->menu_count} diff --git a/modules/layout/tpl/layout_detail_info.html b/modules/layout/tpl/layout_detail_info.html index ad7f3b662..aeaeb8e2e 100644 --- a/modules/layout/tpl/layout_detail_info.html +++ b/modules/layout/tpl/layout_detail_info.html @@ -12,18 +12,20 @@
    {$lang->author}
    - {$author->name} ({$author->homepage}, {$author->email_address})
    + {$author->name} ({$author->homepage}, {$author->email_address})
    +
    {$lang->homepage}
    - {$layout_info->homepage}  - + {$layout_info->homepage} +
    {$lang->regdate}
    {zdate($layout_info->date, 'Y-m-d')} +
    {$lang->layout_license}
    @@ -33,11 +35,12 @@   - + +
    {$lang->description}
    {nl2br(trim($layout_info->description))} - +
    diff --git a/modules/layout/tpl/top_refresh.html b/modules/layout/tpl/top_refresh.html index 1c4d1632d..76f474d8f 100644 --- a/modules/layout/tpl/top_refresh.html +++ b/modules/layout/tpl/top_refresh.html @@ -1,4 +1,4 @@ - +//]]> diff --git a/modules/widget/tpl/downloaded_widget_list.html b/modules/widget/tpl/downloaded_widget_list.html index bd83cbc9c..f5299f00c 100644 --- a/modules/widget/tpl/downloaded_widget_list.html +++ b/modules/widget/tpl/downloaded_widget_list.html @@ -27,7 +27,7 @@ {$val->version} - {$author->name} + {$author->name} {zdate($val->date, 'Y-m-d')} @@ -36,7 +36,7 @@ - {nl2br(trim($val->description))} + {nl2br(trim($val->description))}  diff --git a/modules/widget/tpl/widget_detail_info.html b/modules/widget/tpl/widget_detail_info.html index 6d7c56fc7..7279d3538 100644 --- a/modules/widget/tpl/widget_detail_info.html +++ b/modules/widget/tpl/widget_detail_info.html @@ -12,7 +12,7 @@
    {$lang->author}
    - {$author->name} ({$author->homepage}, {$author->email_address})
    + {$author->name} ({$author->homepage}, {$author->email_address})
    @@ -35,12 +35,12 @@

    {$widget_info->license_link}

    - - + +
    {$lang->description}
    {nl2br(trim($widget_info->description))} - +
    From ac1de56228c23dda4c18cd85ae0841c9f6131bf3 Mon Sep 17 00:00:00 2001 From: misol Date: Wed, 7 Jan 2009 03:00:45 +0000 Subject: [PATCH 018/144] =?UTF-8?q?=EC=9E=90=EC=97=B0=EC=8A=A4=EB=A0=88=20?= =?UTF-8?q?=EB=B3=B4=EC=9D=B4=EA=B8=B02?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: http://xe-core.googlecode.com/svn/sandbox@5260 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- modules/board/tpl/skin_info.html | 12 +++++++----- modules/board/tpl/top_refresh.html | 3 ++- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/modules/board/tpl/skin_info.html b/modules/board/tpl/skin_info.html index ad54348d1..36fede0b1 100644 --- a/modules/board/tpl/skin_info.html +++ b/modules/board/tpl/skin_info.html @@ -17,18 +17,20 @@
    {$lang->skin_author}
    - {$author->name} ({$author->homepage}, {$author->email_address})
    + {$author->name} ({$author->homepage}, {$author->email_address})
    +
    {$lang->homepage}
    {$skin_info->homepage} - +
    {$lang->date}
    {zdate($skin_info->date, 'Y-m-d')}  +
    {$lang->skin_license}
    @@ -36,13 +38,13 @@

    {$skin_info->license_link}

    -   - + +
    {$lang->description}
    {nl2br(trim($skin_info->description))} - + diff --git a/modules/board/tpl/top_refresh.html b/modules/board/tpl/top_refresh.html index 2f4983d1d..a739609df 100644 --- a/modules/board/tpl/top_refresh.html +++ b/modules/board/tpl/top_refresh.html @@ -1,3 +1,4 @@ - From d072e828bc101ed29891d9f494b4b18143d8c643 Mon Sep 17 00:00:00 2001 From: misol Date: Wed, 7 Jan 2009 04:04:32 +0000 Subject: [PATCH 019/144] =?UTF-8?q?=ED=91=9C=ED=98=84=20=EB=8C=80=EC=B2=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: http://xe-core.googlecode.com/svn/sandbox@5261 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- modules/editor/lang/ko.lang.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/editor/lang/ko.lang.php b/modules/editor/lang/ko.lang.php index 5b16eee0e..a60c9579a 100644 --- a/modules/editor/lang/ko.lang.php +++ b/modules/editor/lang/ko.lang.php @@ -96,7 +96,7 @@ $lang->edit->remove_indent = '내어쓰기'; $lang->edit->list_number = '번호 매기기'; $lang->edit->list_bullet = '목록'; - $lang->edit->remove_format = '글꼴 지우기'; + $lang->edit->remove_format = '글맵시 지우기'; $lang->edit->help_remove_format = '선택된 영역 내의 태그를 지웁니다.'; $lang->edit->help_strike_through = '글자에 취소선을 표시합니다.'; From 78f284c8ea505e9237a2bf637981e45c1446c2ee Mon Sep 17 00:00:00 2001 From: zero Date: Wed, 7 Jan 2009 04:45:30 +0000 Subject: [PATCH 020/144] =?UTF-8?q?issueTracker=20=EB=AA=A8=EB=93=88=20?= =?UTF-8?q?=EA=B8=80=20=EC=82=AD=EC=A0=9C=20=EC=95=88=EB=90=98=EB=8A=94=20?= =?UTF-8?q?=EB=AC=B8=EC=A0=9C=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: http://xe-core.googlecode.com/svn/sandbox@5262 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- modules/issuetracker/issuetracker.view.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/issuetracker/issuetracker.view.php b/modules/issuetracker/issuetracker.view.php index 9d1427213..c47725a7f 100644 --- a/modules/issuetracker/issuetracker.view.php +++ b/modules/issuetracker/issuetracker.view.php @@ -74,7 +74,7 @@ } Context::set('display_option', $display_option); - if(Context::get('document_srl') && Context::get('act')!='dispIssuetrackerNewIssue') { + if(Context::get('document_srl') && !in_array(Context::get('act'),array('dispIssuetrackerNewIssue','dispIssuetrackerDeleteIssue'))) { $this->act = 'dispIssuetrackerViewIssue'; Context::set('act','dispIssuetrackerViewIssue'); } From 2efa0c6d02ac0ede02c970c0c8f96e3ba00bcd12 Mon Sep 17 00:00:00 2001 From: ngleader Date: Wed, 7 Jan 2009 05:10:51 +0000 Subject: [PATCH 021/144] bugfix git-svn-id: http://xe-core.googlecode.com/svn/sandbox@5263 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- modules/homepage/skins/xe_official/js/homepage.js | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/modules/homepage/skins/xe_official/js/homepage.js b/modules/homepage/skins/xe_official/js/homepage.js index 86aa6a127..d3ba98e90 100644 --- a/modules/homepage/skins/xe_official/js/homepage.js +++ b/modules/homepage/skins/xe_official/js/homepage.js @@ -306,4 +306,16 @@ function doDeleteGroup(group_srl) { var fo_obj = xGetElementById('fo_group'); fo_obj.group_srl.value = group_srl; procFilter(fo_obj, delete_group); +} + +function changeMenuType(obj) { + if(obj.selectedIndex == 2) { + xGetElementById('itemAttr2').style.display = 'none'; + xGetElementById('itemAttr3').style.display = 'block'; + return; + } + + xGetElementById('itemAttr2').style.display = 'block'; + xGetElementById('itemAttr3').style.display = 'none'; + } \ No newline at end of file From fff201cd10d24b14d8bd8573272d125a5382a6bc Mon Sep 17 00:00:00 2001 From: ngleader Date: Wed, 7 Jan 2009 05:19:01 +0000 Subject: [PATCH 022/144] bugfix git-svn-id: http://xe-core.googlecode.com/svn/sandbox@5264 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- modules/homepage/skins/xe_official/js/homepage.js | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/homepage/skins/xe_official/js/homepage.js b/modules/homepage/skins/xe_official/js/homepage.js index d3ba98e90..6887ab843 100644 --- a/modules/homepage/skins/xe_official/js/homepage.js +++ b/modules/homepage/skins/xe_official/js/homepage.js @@ -201,6 +201,7 @@ function menuFormReset() { jQuery('#menu_normal_btn_img','#menu_hover_btn_img','#menu_active_btn_img').attr("src",""); jQuery('#itemAttr4').css("display","none"); fo_obj.reset(); + location.href = '#'; } function completeInsertMenuItem(data) { From b7ab7223d0e3a7cffdb8e7ac2c0660b4fc71f87e Mon Sep 17 00:00:00 2001 From: misol Date: Wed, 7 Jan 2009 05:23:06 +0000 Subject: [PATCH 023/144] =?UTF-8?q?=EC=9E=90=EC=97=B0=EC=8A=A4=EB=A0=88=20?= =?UTF-8?q?=EB=B3=B4=EC=9D=B4=EA=B8=B0=203?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: http://xe-core.googlecode.com/svn/sandbox@5265 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- modules/addon/tpl/addon_info.html | 3 +-- modules/admin/tpl/index.html | 2 +- modules/editor/tpl/view_component.html | 16 +++++++++------- modules/module/tpl/module_info.html | 5 +++-- modules/module/tpl/module_list.html | 2 +- modules/module/tpl/skin_info.html | 4 +++- 6 files changed, 18 insertions(+), 14 deletions(-) diff --git a/modules/addon/tpl/addon_info.html b/modules/addon/tpl/addon_info.html index 24b731c32..97441a3cd 100644 --- a/modules/addon/tpl/addon_info.html +++ b/modules/addon/tpl/addon_info.html @@ -8,7 +8,6 @@ - - + diff --git a/modules/admin/tpl/index.html b/modules/admin/tpl/index.html index be488a4d2..35b4d1349 100644 --- a/modules/admin/tpl/index.html +++ b/modules/admin/tpl/index.html @@ -61,7 +61,7 @@ + - - + + + - + + - +
    {$lang->title}
    		 {$addon_info->title} ver. {$addon_info->version}
    {$lang->author}
    		 @@ -16,7 +15,7 @@ {$author->name} ({$author->homepage}, {$author->email_address})
    {$lang->homepage}
    		{$val->version} - {$author->name} + {$author->name} diff --git a/modules/editor/tpl/view_component.html b/modules/editor/tpl/view_component.html index 2fa04cc03..c8bd80c0c 100644 --- a/modules/editor/tpl/view_component.html +++ b/modules/editor/tpl/view_component.html @@ -11,31 +11,33 @@
    {$lang->component_author}
    		 - {$author->name} ({$author->homepage}, {$author->email_address})
    + {$author->name} ({$author->homepage}, {$author->email_address})
    {$lang->homepage}
    		{$component->homepage} 
    {$component->homepage}
    {$lang->regdate}
    		 {zdate(str_replace('-',"",$component->date), 'Y-m-d')}
    {$lang->component_license}
    		 {nl2br(trim($component->license))} - +

    {$component->license_link}

    -  
    {$lang->component_description}
    		 {nl2br(trim($component->description))}
    diff --git a/modules/module/tpl/module_info.html b/modules/module/tpl/module_info.html index 11f672569..34181d1ad 100644 --- a/modules/module/tpl/module_info.html +++ b/modules/module/tpl/module_info.html @@ -13,7 +13,7 @@
    {$lang->author}
    - {$author->name} ({$author->homepage}, {$author->email_address})
    + {$author->name} ({$author->homepage}, {$author->email_address})
    @@ -37,11 +37,12 @@ - +
    {$lang->description}
    {nl2br(trim($module_info->description))} + diff --git a/modules/module/tpl/module_list.html b/modules/module/tpl/module_list.html index badc09176..c76b9cef0 100644 --- a/modules/module/tpl/module_list.html +++ b/modules/module/tpl/module_list.html @@ -24,7 +24,7 @@ {$val->version} - {$author->name} + {$author->name} diff --git a/modules/module/tpl/skin_info.html b/modules/module/tpl/skin_info.html index 41f90128d..9a99722f6 100644 --- a/modules/module/tpl/skin_info.html +++ b/modules/module/tpl/skin_info.html @@ -15,7 +15,7 @@ - {$author->name} ({$author->homepage}, {$author->email_address})
    + {$author->name} ({$author->homepage}, {$author->email_address})
    @@ -40,10 +40,12 @@ + {$lang->description} {nl2br(trim($skin_info->description))} + From fcd59bc3302943a770d58a1c405b5b1e66eae8ff Mon Sep 17 00:00:00 2001 From: misol Date: Wed, 7 Jan 2009 05:35:50 +0000 Subject: [PATCH 024/144] git-svn-id: http://xe-core.googlecode.com/svn/sandbox@5266 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- modules/addon/tpl/addon_list.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/addon/tpl/addon_list.html b/modules/addon/tpl/addon_list.html index 225a8650c..0caa8f3fd 100644 --- a/modules/addon/tpl/addon_list.html +++ b/modules/addon/tpl/addon_list.html @@ -50,7 +50,7 @@ - {nl2br($val->description)} + {nl2br($val->description)}  From f69135d0deba03b39410a9754f3ef9b323f16b63 Mon Sep 17 00:00:00 2001 From: misol Date: Wed, 7 Jan 2009 06:01:58 +0000 Subject: [PATCH 025/144] #17612752 git-svn-id: http://xe-core.googlecode.com/svn/sandbox@5267 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- modules/document/document.admin.view.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/document/document.admin.view.php b/modules/document/document.admin.view.php index 71c66e3dd..dd78c4790 100644 --- a/modules/document/document.admin.view.php +++ b/modules/document/document.admin.view.php @@ -165,7 +165,7 @@ // 모듈 카테고리 목록과 모듈 목록의 조합 - if(count($module_list)>1) Context::set('module_list', $module_categories); + if(count($module_list)>=1) Context::set('module_list', $module_categories); // 팝업 레이아웃 선택 $this->setLayoutPath('./common/tpl'); From dc5c356f2bc5c8eb9a6dd1237e0f55f8977980f0 Mon Sep 17 00:00:00 2001 From: misol Date: Wed, 7 Jan 2009 06:56:25 +0000 Subject: [PATCH 026/144] =?UTF-8?q?=EB=90=98=EB=8F=8C=EB=A6=AC=EA=B8=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: http://xe-core.googlecode.com/svn/sandbox@5268 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- modules/document/document.admin.view.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/document/document.admin.view.php b/modules/document/document.admin.view.php index dd78c4790..71c66e3dd 100644 --- a/modules/document/document.admin.view.php +++ b/modules/document/document.admin.view.php @@ -165,7 +165,7 @@ // 모듈 카테고리 목록과 모듈 목록의 조합 - if(count($module_list)>=1) Context::set('module_list', $module_categories); + if(count($module_list)>1) Context::set('module_list', $module_categories); // 팝업 레이아웃 선택 $this->setLayoutPath('./common/tpl'); From 6ecc16deef21a3b247769060bdfbada24dd84191 Mon Sep 17 00:00:00 2001 From: misol Date: Wed, 7 Jan 2009 07:32:48 +0000 Subject: [PATCH 027/144] =?UTF-8?q?mid=20=ED=99=95=EC=9E=A5=EC=9E=90=20?= =?UTF-8?q?=EC=A7=80=EC=9B=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: http://xe-core.googlecode.com/svn/sandbox@5269 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- modules/file/file.controller.php | 4 ++-- modules/importer/importer.admin.controller.php | 2 +- modules/importer/ttimport.class.php | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/file/file.controller.php b/modules/file/file.controller.php index f0fffde72..30ddab975 100644 --- a/modules/file/file.controller.php +++ b/modules/file/file.controller.php @@ -263,7 +263,7 @@ } // 이미지인지 기타 파일인지 체크하여 upload path 지정 - if(preg_match("/\.(jpg|jpeg|gif|png|wmv|wma|mpg|mpeg|avi|swf|flv|mp3|asaf|wav|asx|midi|asf)$/i", $file_info['name'])) { + if(preg_match("/\.(jpg|jpeg|gif|png|wmv|wma|mpg|mpeg|avi|swf|flv|mp3|asaf|wav|asx|mid|midi|asf)$/i", $file_info['name'])) { $path = sprintf("./files/attach/images/%s/%s", $module_srl,getNumberingPath($upload_target_srl,3)); $filename = $path.$file_info['name']; $direct_download = 'Y'; @@ -423,7 +423,7 @@ $old_file = $file_info->uploaded_filename; // 이미지인지 기타 파일인지 체크하여 이동할 위치 정함 - if(preg_match("/\.(jpg|jpeg|gif|png|wmv|wma|mpg|mpeg|avi|swf|flv|mp3|asaf|wav|asx|midi|asf)$/i", $file_info->source_filename)) { + if(preg_match("/\.(jpg|jpeg|gif|png|wmv|wma|mpg|mpeg|avi|swf|flv|mp3|asaf|wav|asx|mid|midi|asf)$/i", $file_info->source_filename)) { $path = sprintf("./files/attach/images/%s/%s/", $target_module_srl,$target_srl); $new_file = $path.$file_info->source_filename; } else { diff --git a/modules/importer/importer.admin.controller.php b/modules/importer/importer.admin.controller.php index ad07c41b1..75cfee760 100644 --- a/modules/importer/importer.admin.controller.php +++ b/modules/importer/importer.admin.controller.php @@ -780,7 +780,7 @@ if(file_exists($file_obj->file)) { // 이미지인지 기타 파일인지 체크하여 upload path 지정 - if(preg_match("/\.(jpg|jpeg|gif|png|wmv|wma|mpg|mpeg|avi|swf|flv|mp3|asaf|wav|asx|midi|asf)$/i", $file_obj->source_filename)) { + if(preg_match("/\.(jpg|jpeg|gif|png|wmv|wma|mpg|mpeg|avi|swf|flv|mp3|asaf|wav|asx|mid|midi|asf)$/i", $file_obj->source_filename)) { $path = sprintf("./files/attach/images/%s/%s", $module_srl,getNumberingPath($upload_target_srl,3)); $filename = $path.$file_obj->source_filename; $file_obj->direct_download = 'Y'; diff --git a/modules/importer/ttimport.class.php b/modules/importer/ttimport.class.php index 8d3b14881..907beec7b 100644 --- a/modules/importer/ttimport.class.php +++ b/modules/importer/ttimport.class.php @@ -285,7 +285,7 @@ $name = $xmlDoc->attachment->name->body; // 이미지인지 기타 파일인지 체크하여 upload path 지정 - if(preg_match("/\.(jpg|jpeg|gif|png|wmv|wma|mpg|mpeg|avi|swf|flv|mp3|asaf|wav|asx|midi|asf)$/i", $file_obj->source_filename)) { + if(preg_match("/\.(jpg|jpeg|gif|png|wmv|wma|mpg|mpeg|avi|swf|flv|mp3|asaf|wav|asx|mid|midi|asf)$/i", $file_obj->source_filename)) { $path = sprintf("./files/attach/images/%s/%s", $module_srl,getNumberingPath($upload_target_srl,3)); $filename = $path.$file_obj->source_filename; $file_obj->direct_download = 'Y'; From 6c518798007e68f092446b1fd241139592635526 Mon Sep 17 00:00:00 2001 From: misol Date: Wed, 7 Jan 2009 07:50:34 +0000 Subject: [PATCH 028/144] =?UTF-8?q?#17614142=20=EB=AF=B8=EB=94=94=EC=96=B4?= =?UTF-8?q?=20=ED=8C=8C=EC=9D=BC=20:=20=EC=A7=80=EC=9B=90=20=ED=99=95?= =?UTF-8?q?=EC=9E=A5=EC=9E=90=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: http://xe-core.googlecode.com/svn/sandbox@5270 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- modules/file/file.controller.php | 4 ++-- modules/importer/importer.admin.controller.php | 2 +- modules/importer/ttimport.class.php | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/file/file.controller.php b/modules/file/file.controller.php index 30ddab975..6ad6cf1ed 100644 --- a/modules/file/file.controller.php +++ b/modules/file/file.controller.php @@ -263,7 +263,7 @@ } // 이미지인지 기타 파일인지 체크하여 upload path 지정 - if(preg_match("/\.(jpg|jpeg|gif|png|wmv|wma|mpg|mpeg|avi|swf|flv|mp3|asaf|wav|asx|mid|midi|asf)$/i", $file_info['name'])) { + if(preg_match("/\.(jpg|jpeg|gif|png|wmv|wma|mpg|mpeg|avi|swf|flv|mp1|mp2|mp3|asaf|wav|asx|mid|midi|asf|mov|moov|qt|rm|ram|ra|rmm)$/i", $file_info['name'])) { $path = sprintf("./files/attach/images/%s/%s", $module_srl,getNumberingPath($upload_target_srl,3)); $filename = $path.$file_info['name']; $direct_download = 'Y'; @@ -423,7 +423,7 @@ $old_file = $file_info->uploaded_filename; // 이미지인지 기타 파일인지 체크하여 이동할 위치 정함 - if(preg_match("/\.(jpg|jpeg|gif|png|wmv|wma|mpg|mpeg|avi|swf|flv|mp3|asaf|wav|asx|mid|midi|asf)$/i", $file_info->source_filename)) { + if(preg_match("/\.(jpg|jpeg|gif|png|wmv|wma|mpg|mpeg|avi|swf|flv|mp1|mp2|mp3|asaf|wav|asx|mid|midi|asf|mov|moov|qt|rm|ram|ra|rmm)$/i", $file_info->source_filename)) { $path = sprintf("./files/attach/images/%s/%s/", $target_module_srl,$target_srl); $new_file = $path.$file_info->source_filename; } else { diff --git a/modules/importer/importer.admin.controller.php b/modules/importer/importer.admin.controller.php index 75cfee760..06f48ce46 100644 --- a/modules/importer/importer.admin.controller.php +++ b/modules/importer/importer.admin.controller.php @@ -780,7 +780,7 @@ if(file_exists($file_obj->file)) { // 이미지인지 기타 파일인지 체크하여 upload path 지정 - if(preg_match("/\.(jpg|jpeg|gif|png|wmv|wma|mpg|mpeg|avi|swf|flv|mp3|asaf|wav|asx|mid|midi|asf)$/i", $file_obj->source_filename)) { + if(preg_match("/\.(jpg|jpeg|gif|png|wmv|wma|mpg|mpeg|avi|swf|flv|mp1|mp2|mp3|asaf|wav|asx|mid|midi|asf|mov|moov|qt|rm|ram|ra|rmm)$/i", $file_obj->source_filename)) { $path = sprintf("./files/attach/images/%s/%s", $module_srl,getNumberingPath($upload_target_srl,3)); $filename = $path.$file_obj->source_filename; $file_obj->direct_download = 'Y'; diff --git a/modules/importer/ttimport.class.php b/modules/importer/ttimport.class.php index 907beec7b..3ada3a1ae 100644 --- a/modules/importer/ttimport.class.php +++ b/modules/importer/ttimport.class.php @@ -285,7 +285,7 @@ $name = $xmlDoc->attachment->name->body; // 이미지인지 기타 파일인지 체크하여 upload path 지정 - if(preg_match("/\.(jpg|jpeg|gif|png|wmv|wma|mpg|mpeg|avi|swf|flv|mp3|asaf|wav|asx|mid|midi|asf)$/i", $file_obj->source_filename)) { + if(preg_match("/\.(jpg|jpeg|gif|png|wmv|wma|mpg|mpeg|avi|swf|flv|mp1|mp2|mp3|asaf|wav|asx|mid|midi|asf|mov|moov|qt|rm|ram|ra|rmm)$/i", $file_obj->source_filename)) { $path = sprintf("./files/attach/images/%s/%s", $module_srl,getNumberingPath($upload_target_srl,3)); $filename = $path.$file_obj->source_filename; $file_obj->direct_download = 'Y'; From 33e3eff6cc9f571a5b5a03198f2bd6f71ed182c8 Mon Sep 17 00:00:00 2001 From: ngleader Date: Wed, 7 Jan 2009 09:27:41 +0000 Subject: [PATCH 029/144] bug fix git-svn-id: http://xe-core.googlecode.com/svn/sandbox@5271 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- modules/widget/widget.model.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/widget/widget.model.php b/modules/widget/widget.model.php index 9f62d73bd..d92cf1151 100644 --- a/modules/widget/widget.model.php +++ b/modules/widget/widget.model.php @@ -77,7 +77,7 @@ if(!$xml_obj) return; $buff = ''; -debugPrint($xml_obj); + if($xml_obj->version && $xml_obj->attrs->version == '0.2') { // 위젯의 제목, 버전 $buff .= sprintf('$widget_info->widget = "%s";', $widget); From 19b5b11af87d0980deea5951125af5804bb301fe Mon Sep 17 00:00:00 2001 From: misol Date: Wed, 7 Jan 2009 09:50:00 +0000 Subject: [PATCH 030/144] =?UTF-8?q?mov=20=EC=A7=80=EC=9B=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: http://xe-core.googlecode.com/svn/sandbox@5272 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- common/js/common.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/common/js/common.js b/common/js/common.js index e0078c0c8..01e88334e 100644 --- a/common/js/common.js +++ b/common/js/common.js @@ -485,9 +485,9 @@ function displayMultimedia(src, width, height, options) { html += '' + '' + ''; - } else if(/\.flv/i.test(src)) { + } else if(/\.flv/i.test(src) || /\.mov/i.test(src) || /\.moov/i.test(src)) { html = ''; - } else { + } else { html = ''; } document.writeln(html); From 2c81f19d99e42279d1d41214b30bb1899db0b888 Mon Sep 17 00:00:00 2001 From: ChanMyeong Date: Wed, 7 Jan 2009 09:54:06 +0000 Subject: [PATCH 031/144] planet em to px git-svn-id: http://xe-core.googlecode.com/svn/sandbox@5273 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- .../planet/skins/xe_planet/css/default.css | 128 +++--- modules/planet/skins/xe_planet/css/layout.css | 391 ------------------ modules/planet/skins/xe_planet/footer.html | 2 +- modules/planet/skins/xe_planet/header.html | 138 +++---- 4 files changed, 130 insertions(+), 529 deletions(-) delete mode 100644 modules/planet/skins/xe_planet/css/layout.css diff --git a/modules/planet/skins/xe_planet/css/default.css b/modules/planet/skins/xe_planet/css/default.css index ca504123d..dea7a28b9 100644 --- a/modules/planet/skins/xe_planet/css/default.css +++ b/modules/planet/skins/xe_planet/css/default.css @@ -27,11 +27,12 @@ button span{ position:absolute; width:0; height:0; font:0/0 Sans-serif; visibili .blind, legend {position:absolute; top:0; left:0; width:0; height:0; overflow:hidden; visibility:hidden; font-size:0 !important; line-height:0;} /* Layout */ +#planet{} #container {} -#header{ position:relative; z-index:30; clear:both; margin:0 0 20px 0;} -#header *{ margin:0; padding:0;} -#header li{ list-style:none;} -#body{ clear:both; z-index:20;} +#planetHeader{ position:relative; z-index:30; clear:both; margin:0 0 20px 0;} +#planetHeader *{ margin:0; padding:0;} +#planetHeader li{ list-style:none;} +#planetBody{ clear:both; z-index:20;} .nTop #navigation{ right:0; top:0 !important; z-index:100; } .nTop #navigation .gnb ul{ margin:0;} .nTop #navigation li{ list-style:none;} @@ -43,7 +44,7 @@ button span{ position:absolute; width:0; height:0; font:0/0 Sans-serif; visibili h1 { position:relative; top:-10px; white-space:nowrap; font-family:"Malgun Gothic", AppleGothic, Dotum, Sans-serif;} h1, x:-moz-any-link{ top:0;} h1, x:-moz-any-link, x:default{ top:-10px;} -h1 a{ font-weight:bold; font-size:30px; color:#000; letter-spacing:-3px; text-decoration:none !important;} +h1 a{ font-weight:bold; font-size:26px; color:#000; letter-spacing:-3px; text-decoration:none !important;} /* Time Navigation */ .timeNav{ font:11px Dotum, Tahoma; white-space:nowrap; color:#999;} @@ -54,41 +55,32 @@ h1 a{ font-weight:bold; font-size:30px; color:#000; letter-spacing:-3px; text-de .timeNav .next{ display:inline-block; font-size:18px; font-family:Arial; font-weight:bold; color:#000; padding:0 5px !important; text-decoration:none !important;} /* Footer */ -#footer{margin:0; clear:both; text-align:center; padding:30px 0;} -#footer *{margin:0; padding:0; color:#444; list-style:none; font:9px Verdana; line-height:normal;} -#footer a{text-decoration:none; color:#444;} -#footer a:visited{text-decoration:none; color:#666;} -#footer a:hover{text-decoration:underline;} -#footer address a{font-weight:bold; font-family:Tahoma; color:#00535d;} +#planetFooter{margin:0; clear:both; text-align:center; padding:30px 0;} +#planetFooter *{margin:0; padding:0; color:#444; list-style:none; font:9px Verdana; line-height:normal;} +#planetFooter a{text-decoration:none; color:#444;} +#planetFooter a:visited{text-decoration:none; color:#666;} +#planetFooter a:hover{text-decoration:underline;} +#planetFooter address a{font-weight:bold; font-family:Tahoma; color:#00535d;} /* ---------- Navigation ---------- */ /* Search */ -#header .search{ position:relative; top:2px; float:right; margin:0; padding:0; white-space:nowrap; text-align:right; *zoom:1;} -#header .search .inputText{ padding:4px 5px 2px 5px; height:21px; width:160px; border:1px solid #e7e7e7; vertical-align:top; font:bold 14px AppleGothic, Dotum, Gulim, Sans-serif;} -#header .search .inputText.focus{ border:3px solid #4ba300; height:17px; width:156px;} -#header .search .button{ top:1px;} -#header .search .button button{ padding:0 10px 0 8px; font-family:Dotum;} -#header .search .suggestion{ position:absolute; top:3px; left:174px; /* border:1px solid; */} -#header .search .suggestion .autoComplete{ position:absolute; top:0; left:0; width:23px; height:23px; background:#fff url(../images/buttonAutoComplete.gif) no-repeat center -10px;} -#header .search .suggestion ul.recommendation{ display:none; position:absolute; top:26px; left:-174px; width:198px; border:1px solid #e7e7e7; border-top:none; background:#fff;} -#header .search .suggestion li button{ width:100%; text-align:left; padding:5px 4px 2px 4px; font:.75em AppleGothic, Gulim, Dotum, Sans-serif;} -#header .search .suggestion li button:hover, -#header .search .suggestion li button:active, -#header .search .suggestion li button:focus{ background:#eee;} -#header .search .suggestion.open .autoComplete{ background-position:center 10px;} -#header .search .suggestion.open ul.recommendation{ display:block;} +#planetHeader .search{ position:relative; top:2px; float:right; margin:0; padding:0; white-space:nowrap; text-align:right; *zoom:1;} +#planetHeader .search .inputText{ padding:4px 5px 2px 5px; height:21px; width:160px; border:1px solid #e7e7e7; vertical-align:top; font:bold 14px AppleGothic, Dotum, Gulim, Sans-serif;} +#planetHeader .search .inputText.focus{ border:3px solid #4ba300; height:17px; width:156px;} +#planetHeader .search .button{ top:1px;} +#planetHeader .search .button button{ padding:0 10px 0 8px; font-family:Dotum;} /* GNB */ -#header .gnb{ position:relative; float:right; margin-left:20px; } -#header .gnb ul{ margin:0; padding:0; position:relative; float:left; overflow:hidden;} -#header .gnb ul li{ position:relative; float:left;} -#header .gnb ul li a{ position:relative; display:block; float:left; background:url(../images/buttonGnb.gif) no-repeat center top; padding:11px 25px 11px 25px; font:12px AppleGothic, Dotum, Gulim, Sans-serif; color:#fff !important; text-decoration:none !important; letter-spacing:-1px; white-space:nowrap;} -#header .gnb ul li.active a{ opacity:0.7; filter:alpha(opacity=70); font-weight:bold;} -#header .gnb ul li a:hover, -#header .gnb ul li a:active, -#header .gnb ul li a:focus{ opacity:0.9; filter:alpha(opacity=90);} -#header .gnb ul li.first a{ background-position:left top;} -#header .gnb ul li.last a{ background-position:right top;} +#planetHeader .gnb{ position:relative; float:right; margin-left:20px; } +#planetHeader .gnb ul{ margin:0; padding:0; position:relative; float:left; overflow:hidden;} +#planetHeader .gnb ul li{ position:relative; float:left;} +#planetHeader .gnb ul li a{ position:relative; display:block; float:left; background:url(../images/buttonGnb.gif) no-repeat center top; padding:11px 25px 11px 25px; font:12px AppleGothic, Dotum, Gulim, Sans-serif; color:#fff !important; text-decoration:none !important; letter-spacing:-1px; white-space:nowrap;} +#planetHeader .gnb ul li.active a{ opacity:0.7; filter:alpha(opacity=70); font-weight:bold;} +#planetHeader .gnb ul li a:hover, +#planetHeader .gnb ul li a:active, +#planetHeader .gnb ul li a:focus{ opacity:0.9; filter:alpha(opacity=90);} +#planetHeader .gnb ul li.first a{ background-position:left top;} +#planetHeader .gnb ul li.last a{ background-position:right top;} /* ---------- Content ---------- */ @@ -151,7 +143,7 @@ h1 a{ font-weight:bold; font-size:30px; color:#000; letter-spacing:-3px; text-de /* Personal Header */ .personalHeader{ position:relative; height:90px; background:url(../images/boxTryPlanet.gif) repeat-x 0 0; margin-bottom:15px;} .personalHeader *{ margin:0; padding:0; font-family:NanumGothic,"Malgun Gothic", AppleGothic, Dotum, Gulim, Sans-serif;} -.personalHeader h2{ position:absolute; top:15px; left:30px; padding-top:15px; font-size:2em; _zoom:1; padding-left:30px; background:url(../images/bgPerson.png) no-repeat; _behavior:url(./common/js/iePngFix.htc); } +.personalHeader h2{ position:absolute; top:15px; left:30px; padding-top:15px; font-size:24px; _zoom:1; padding-left:30px; background:url(../images/bgPerson.png) no-repeat; _behavior:url(./common/js/iePngFix.htc); } .personalHeader p{ position:absolute; top:46px; left:220px;} .personalHeader .leftCap, .personalHeader .rightCap{ position:absolute; display:block; top:0; width:5px; height:90px; overflow:hidden; background:url(../images/boxTryPlanet.gif) no-repeat; white-space:nowrap;} @@ -162,7 +154,7 @@ h1 a{ font-weight:bold; font-size:30px; color:#000; letter-spacing:-3px; text-de .searchHeader{ position:relative; height:90px; background:url(../images/boxTryPlanet.gif) repeat-x 0 0; margin-bottom:30px;} .searchHeader *{ margin:0; padding:0;} .searchHeader p{ position:absolute; top:27px; margin-left:80px; font-family:NanumGothic,"Malgun Gothic", AppleGothic, Dotum, Gulim, Sans-serif; color:#50606b;} -.searchHeader p strong{ font:bold 1.5em NanumGothic,"Malgun Gothic", AppleGothic, Dotum, Gulim, Sans-serif;} +.searchHeader p strong{ font:bold 18px NanumGothic,"Malgun Gothic", AppleGothic, Dotum, Gulim, Sans-serif;} .searchHeader .leftCap, .searchHeader .rightCap{ position:absolute; display:block; top:0; width:5px; height:90px; overflow:hidden; background:url(../images/boxTryPlanet.gif) no-repeat; white-space:nowrap;} .searchHeader .leftCap{ left:0; background-position:left bottom;} @@ -186,7 +178,7 @@ h1 a{ font-weight:bold; font-size:30px; color:#000; letter-spacing:-3px; text-de .myInfo .bl{ bottom:-1px; left:-1px; background-position:0 -4px;} .myInfo .br{ bottom:-1px; right:-1px; background-position:-4px -4px;} .myInfo button{ width:90px; height:60px; position:absolute; top:90px; left:50%; margin-left:80px; background:url(../images/buttonLogin.gif) no-repeat;} -.myInfo button span{ position:relative; display:block; *padding-top:15px; visibility:visible; width:auto; height:auto; text-align:center; font:bold 1.2em NanumGothic,"Malgun Gothic", AppleGothic, Dotum, Gulim, Sans-serif; color:#fff;} +.myInfo button span{ position:relative; display:block; *padding-top:15px; visibility:visible; width:auto; height:auto; text-align:center; font:bold 14px NanumGothic,"Malgun Gothic", AppleGothic, Dotum, Gulim, Sans-serif; color:#fff;} /* Tag Cloud */ .tagCloud{ display:none; padding:20px 20px 30px 20px; margin-bottom:15px; position:relative; border:1px solid #e9e9e9; *zoom:1;} @@ -236,7 +228,7 @@ h1 a{ font-weight:bold; font-size:30px; color:#000; letter-spacing:-3px; text-de .commentList .tagChoiceAfter{ display:none; position:absolute; top:45px; left:50%; width:289px; height:121px; text-align:center; margin-left:-145px;} .commentList .tagChoiceAfter.alert{ display:block;} -.commentList .tagChoiceAfter p{ position:absolute; top:0; left:0; width:289px; height:94px; _height /**/:121px; font-size:.75em; color:#fff; padding:37px 0 0 0; background:url(../images/boxTagChoice.png) no-repeat; _behavior:url(./common/js/iePngFix.htc);} +.commentList .tagChoiceAfter p{ position:absolute; top:0; left:0; width:289px; height:94px; _height /**/:121px; font-size:12px; color:#fff; padding:37px 0 0 0; background:url(../images/boxTagChoice.png) no-repeat; _behavior:url(./common/js/iePngFix.htc);} .commentList .tagChoiceAfter button, .commentList .tagChoiceAfter a{ position:relative; display:inline-block; top:60px; font-size:12px; color:#fff; text-decoration:none; vertical-align:top; cursor:pointer; _cursor /**/:hand;} .commentList .tagChoiceAfter button{ width:45px; height:23px; text-align:center; background:url(../images/buttonFixedBlack45.png) no-repeat; _behavior:url(./common/js/iePngFix.htc);} @@ -251,41 +243,41 @@ h1 a{ font-weight:bold; font-size:30px; color:#000; letter-spacing:-3px; text-de .commentBody{ position:relative; margin:10px 0; border:1px solid #d7dfe2; background:#fff; *zoom:1; clear:both;} .commentBody .comment{ position:relative; margin:0 15px; padding:15px 0 15px 0; clear:both; *zoom:1;} .commentBody .comment:after { content:""; display:block; width:0; height:0; font:0/0 Sans-serif; overflow:hidden; visibility:hidden; clear:both; float:none;} -.commentBody .comment .identity{ position:relative; width:98px; float:left; margin:0 -98px 0 0; font-size:1em; background:none; *zoom:1;} -.commentBody .comment .identity a{ position:relative; display:block; text-align:center; font-size:.75em; color:#fff !important; font-weight:bold;} +.commentBody .comment .identity{ position:relative; width:98px; float:left; margin:0 -98px 0 0; font-size:12px; background:none; *zoom:1;} +.commentBody .comment .identity a{ position:relative; display:block; text-align:center; font-size:12px; color:#fff !important; font-weight:bold;} .commentBody .comment .identity a img{ display:block; border:1px solid #ddd;} .commentBody .comment .identity a em{ position:absolute; width:96px; text-align:center; left:1px; bottom:1px; display:block; padding:5px 0; font-style:normal; background:#000; opacity:.6; filter:alpha(opacity=60); line-height:normal;} .commentBody .comment .tongue{ position:relative; margin-left:113px; *zoom:1;} -.commentBody .comment .tongue .post{ margin:0 0 7px 0; font:1.2em/1.4em NanumGothic,"Malgun Gothic", AppleGothic, Dotum, Gulim, Sans-serif;} +.commentBody .comment .tongue .post{ margin:0 0 7px 0; font:16px/1.6 NanumGothic,"Malgun Gothic", AppleGothic, Dotum, Gulim, Sans-serif;} .commentBody .comment .tongue .post a { font:1em NanumGothic,"Malgun Gothic", AppleGothic, Dotum, Gulim, Sans-serif; color:#06C;} .commentBody .comment .tongue .post strong{ background:#f7b100; font:normal 1em NanumGothic,"Malgun Gothic", AppleGothic, Dotum, Gulim, Sans-serif; color:#fff;} -.commentBody .comment .tongue .postScript{ margin:0 0 10px 0; font-size:.75em; color:#999;} +.commentBody .comment .tongue .postScript{ margin:0 0 10px 0; font-size:12px; color:#999;} .commentBody .comment .tongue .postScript strong{ font-family:Arial; letter-spacing:-1px; margin-right:5px;} .commentBody .comment .tongue .postExtra{ overflow:hidden; padding-top:10px; border-top:1px dotted #ccc; *zoom:1;} .commentBody .comment .tongue .postExtra *{ margin:0; padding:0;} .commentBody .comment .tongue .postExtra .tag { float:left;} -.commentBody .comment .tongue .postExtra .tag .time{ display:inline; margin-right:5px; color:#999; font:.7em AppleGothic, Dotum, Gulim, Sans-serif;} +.commentBody .comment .tongue .postExtra .tag .time{ display:inline; margin-right:5px; color:#999; font:11px AppleGothic, Dotum, Gulim, Sans-serif;} .commentBody .comment .tongue .postExtra .tag dl{ display:inline;} -.commentBody .comment .tongue .postExtra .tag dt{ text-align:center; padding:0 7px; margin-right:5px; display:inline; background:url(../images/bgTag.gif) no-repeat center; font:bold .7em Tahoma; color:#fff;} +.commentBody .comment .tongue .postExtra .tag dt{ text-align:center; padding:0 7px; margin-right:5px; display:inline; background:url(../images/bgTag.gif) no-repeat center; font:bold 11px Tahoma; color:#fff;} .commentBody .comment .tongue .postExtra .tag dd{ display:inline; position:relative;} -.commentBody .comment .tongue .postExtra .tag dd.tagRead a{ position:relative; margin-right:2px; font:.7em AppleGothic, Dotum, Gulim, Sans-serif; color:#999;} +.commentBody .comment .tongue .postExtra .tag dd.tagRead a{ position:relative; margin-right:2px; font:11px AppleGothic, Dotum, Gulim, Sans-serif; color:#999;} .commentBody .comment .tongue .postExtra .tag dd.tagRead a strong{ font:normal 1em AppleGothic, Dotum, Gulim, Sans-serif; background:#f7b100; color:#fff;} .commentBody .comment .tongue .postExtra .tag dd.tagRead .delete{ position:relative; top:-7px; left:-8px; display:none; width:12px; height:11px; margin-right:-12px; background:url(../images/buttonX.gif) no-repeat center;} .commentBody .comment .tongue .postExtra .tag dd.tagRead .delete.hover{ display:inline-block;} .commentBody .comment .tongue .postExtra .tag dd.tagRead .modify{ position:relative; width:13px; height:13px; background:url(../images/buttonModify.gif) no-repeat center; vertical-align:middle; *vertical-align:baseline; *top:-1px; *left:5px;} .commentBody .comment .tongue .postExtra .tag dd.tagModify{ display:none; top:2px;} .commentBody .comment .tongue .postExtra .tag dd.tagModify form{ display:inline;} -.commentBody .comment .tongue .postExtra .tag dd.tagModify .inputText{ border:1px solid #ccc; padding:2px 4px; height:13px; width:290px; font-size:.75em;} -.commentBody .comment .tongue .postExtra .tag dd.tagModify button{ height:19px; font-size:.7em; background:#eee; border:1px solid #ccc; margin-left:5px; vertical-align:top;} +.commentBody .comment .tongue .postExtra .tag dd.tagModify .inputText{ border:1px solid #ccc; padding:2px 4px; height:13px; width:290px; font-size:12px;} +.commentBody .comment .tongue .postExtra .tag dd.tagModify button{ height:19px; font-size:11px; background:#eee; border:1px solid #ccc; margin-left:5px; vertical-align:top;} .commentBody .comment .tongue .postExtra .tag.edit dd{ display:none;} .commentBody .comment .tongue .postExtra .tag.edit dd.tagModify{ display:inline;} .commentBody .comment .tongue .postExtra .sympathy{ float:right; position:relative; top:-2px;} .commentBody .comment .tongue .postExtra .sympathy span.btnPlus { display:block; float:left; margin-right:10px; padding-top:3px;} .commentBody .comment .tongue .postExtra .sympathy button { color:#999;} -.commentBody .comment .tongue .postExtra .sympathy .num{ position:relative; display:inline-block; width:22px; height:22px; padding-top:6px; letter-spacing:-1px; color:#fff; text-align:center; font:bold .7em AppleGothic, Dotum, Gulim, Sans-serif; background:url(../images/bgSympathy.gif) no-repeat center top; *margin-bottom:-10px;} +.commentBody .comment .tongue .postExtra .sympathy .num{ position:relative; display:inline-block; width:22px; height:22px; padding-top:6px; letter-spacing:-1px; color:#fff; text-align:center; font:bold 11px AppleGothic, Dotum, Gulim, Sans-serif; background:url(../images/bgSympathy.gif) no-repeat center top; *margin-bottom:-10px;} .commentBody .comment .tongue .postExtra .sympathy .num, x:-moz-any-link { padding-left:11px; padding-right:11px;} .commentBody .comment .tongue .postExtra .sympathy .num, x:-moz-any-link, x:default { padding-left:0; padding-right:0;} -.commentBody .comment .tongue .postExtra .sympathy a{ position:relative; *top:-2px; margin-right:1px; color:#999; padding-left:8px; font:.7em AppleGothic, Dotum, Gulim, Sans-serif; letter-spacing:-1px; background:url(../images/arrowReplyOpen.gif) no-repeat left 3px;} +.commentBody .comment .tongue .postExtra .sympathy a{ position:relative; *top:-2px; margin-right:1px; color:#999; padding-left:8px; font:11px AppleGothic, Dotum, Gulim, Sans-serif; letter-spacing:-1px; background:url(../images/arrowReplyOpen.gif) no-repeat left 3px;} /* Todo Manager */ .commentList .commentHeader h3.exTitle{ font-family:"Malgun Gothic", AppleGothic, Dotum, Gulim, Sans-serif; line-height:normal; background:none; float:left;} @@ -301,9 +293,9 @@ h1 a{ font-weight:bold; font-size:30px; color:#000; letter-spacing:-3px; text-de .commentBody .reply{ display:none; clear:both; padding:15px; background:#f3f3f3; *zoom:1;} .commentBody .reply.open{ display:block;} .commentBody .reply dl{ position:relative; clear:both; overflow:hidden; *zoom:1; margin:0 0 5px 0;} -.commentBody .reply dt{ float:left; width:83px; padding-left:15px; margin-right:-98px; font-size:.75em; font-weight:bold; color:#666;} +.commentBody .reply dt{ float:left; width:83px; padding-left:15px; margin-right:-98px; font-size:12px; font-weight:bold; color:#666;} .commentBody .reply dt a{ color:#a5b2c2; } -.commentBody .reply dd{ margin:0 80px 0 113px; font-size:.75em; color:#666; line-height:1.4em;} +.commentBody .reply dd{ margin:0 80px 0 113px; font-size:12px; color:#666; line-height:1.4em;} .commentBody .reply dd a{ text-decoration:underline; color:#333;} .commentBody .reply dd .time{ position:absolute; top:0; right:0;} .commentBody .reply dd input{ position:relative; border:1px solid #ccc; padding:4px 5px; width:96%; height:14px; vertical-align:top; font-size:1em; *zoom:1;} @@ -333,7 +325,7 @@ h1 a{ font-weight:bold; font-size:30px; color:#000; letter-spacing:-3px; text-de .authorHeader .thumb a:hover span, .authorHeader .thumb a:active span, .authorHeader .thumb a:focus span{ display:block;} -.authorHeader .thumb .file{ display:none; position:absolute; top:0; left:115px; background:#fff; border:2px solid #eee; padding:15px; height:66px; _height /**/:100px; width:446px; font-size:.75em;} +.authorHeader .thumb .file{ display:none; position:absolute; top:0; left:115px; background:#fff; border:2px solid #eee; padding:15px; height:66px; _height /**/:100px; width:446px; font-size:12px;} .authorHeader .thumb .file p{ margin-bottom:5px;} .authorHeader .thumb .file input{ padding:2px 4px; width:400px;} .authorHeader .thumb .file .buttonArea{ padding-top:10px;} @@ -364,16 +356,16 @@ h1 a{ font-weight:bold; font-size:30px; color:#000; letter-spacing:-3px; text-de .authorHeader .title *.edit .inputText, .authorHeader .title *.edit button{ display:inline; vertical-align:top;} .authorHeader .title .authorPersonality{ float:left;} -.authorHeader .title .authorPersonality a{ position:relative; float:left; color:#fff; font-size:.75em; font-family:AppleGothic, Dotum, Gulim, Sans-serif; text-decoration:none;} +.authorHeader .title .authorPersonality a{ position:relative; float:left; color:#fff; font-size:12px; font-family:AppleGothic, Dotum, Gulim, Sans-serif; text-decoration:none;} .authorHeader .title .addFavorite{ position:relative; top:-3px; float:right; clear:right; background:url(../images/iconAddFavorite.gif) no-repeat left center; padding-left:7px; } -.authorHeader .title .addFavorite button{ position:relative; *top:2px; width:80px; height:20px; font-size:.7em; font-family:AppleGothic, Dotum, Gulim, Sans-serif; color:#fff; text-align:right; letter-spacing:-1px;} +.authorHeader .title .addFavorite button{ position:relative; *top:2px; width:80px; height:20px; font-size:11px; font-family:AppleGothic, Dotum, Gulim, Sans-serif; color:#fff; text-align:right; letter-spacing:-1px;} .authorHeader .authorTag{ position:relative; border-top:1px solid #ddd; margin-left:120px; padding-top:10px; *zoom:1;} .authorHeader .authorTag dl{ position:relative; display:block; float:left;} -.authorHeader .authorTag dt{ text-align:center; padding:0 7px; margin-right:5px; display:inline; background:url(../images/bgTag.png) no-repeat center; _behavior:url(./common/js/iePngFix.htc); font:bold .7em Tahoma; color:#fff; *zoom:1;} +.authorHeader .authorTag dt{ text-align:center; padding:0 7px; margin-right:5px; display:inline; background:url(../images/bgTag.png) no-repeat center; _behavior:url(./common/js/iePngFix.htc); font:bold 11px Tahoma; color:#fff; *zoom:1;} .authorHeader .authorTag dd{ display:inline;} .authorHeader .authorTag.edit dd{ display:none;} -.authorHeader .authorTag dd a{ font-size:.7em; font-family:AppleGothic, Dotum, Gulim, Sans-serif; color:#fff; margin-right:2px;} +.authorHeader .authorTag dd a{ font-size:11px; font-family:AppleGothic, Dotum, Gulim, Sans-serif; color:#fff; margin-right:2px;} .authorHeader .authorTag dd .delete{ position:relative; top:-7px; left:-8px; display:none; width:12px; height:11px; margin-right:-12px; background:url(../images/buttonX.gif) no-repeat center;} .authorHeader .authorTag dd .delete span{ display:inline-block; width:0; height:0; font:0/0 Sans-serif; visibility:hidden;} .authorHeader .authorTag dd .delete.hover{ display:inline-block;} @@ -381,8 +373,8 @@ h1 a{ font-weight:bold; font-size:30px; color:#000; letter-spacing:-3px; text-de .authorHeader .authorTag dd.tagModify{ display:none;} .authorHeader .authorTag.edit dd.tagModify{ display:inline;} .authorHeader .authorTag dd.tagModify .inputText{ border:1px solid #ccc; padding:2px 4px; height:13px; width:290px;} -.authorHeader .authorTag dd.tagModify button{ height:19px; font-size:.7em; background:#eee; border:1px solid #ccc; margin-left:5px; vertical-align:top;} -.authorHeader .authorTag .planetUri{ position:relative; float:right; color:#fff; font-size:.7em; font-family:Tahoma Sans-serif;} +.authorHeader .authorTag dd.tagModify button{ height:19px; font-size:11px; background:#eee; border:1px solid #ccc; margin-left:5px; vertical-align:top;} +.authorHeader .authorTag .planetUri{ position:relative; float:right; color:#fff; font-size:11px; font-family:Tahoma Sans-serif;} .authorHeader .authorTag .rssFeed{ float:right; display:block; margin:0 0 0 5px; width:12px; height:12px; cursor:pointer; background:url(../images/rssFeed.png) no-repeat; _behavior:url(./common/js/iePngFix.htc);} .authorHeader .authorTag .rssFeed span{ position:absolute; width:0; height:0; overflow:hidden;} .authorHeader .tl, @@ -419,7 +411,7 @@ h1 a{ font-weight:bold; font-size:30px; color:#000; letter-spacing:-3px; text-de .authorHeader .apiMe2day .apiProtocol.open{ display:block;} .authorHeader .apiMe2day .apiProtocol.close{ display:none;} .authorHeader .apiMe2day .apiProtocol .summary{ font-weight:bold; margin-bottom:10px;} -.authorHeader .apiMe2day .apiProtocol dl{ font-size:.75em; overflow:hidden;} +.authorHeader .apiMe2day .apiProtocol dl{ font-size:12px; overflow:hidden;} .authorHeader .apiMe2day .apiProtocol dt{ float:left; clear:left; margin:0 4px 0 0; padding-top:3px;} .authorHeader .apiMe2day .apiProtocol dd{ clear:right; margin-bottom:2px;} .authorHeader .apiMe2day .apiProtocol dd input{ width:120px; border:1px solid #ccc; padding:2px 4px; *margin:-1px 0;} @@ -498,15 +490,15 @@ h1 a{ font-weight:bold; font-size:30px; color:#000; letter-spacing:-3px; text-de .authorList .authorBody .title{ position:relative; margin-left:120px; margin-bottom:10px; *zoom:1;} .authorList .authorBody .title h2{ margin-bottom:5px;} .authorList .authorBody .title h2 a{ font:bold 1em NanumGothic,"Malgun Gothic", AppleGothic, Dotum, Gulim, Sans-serif; color:#465f7d;} -.authorList .authorBody .title p{ color:#a2afbe; font-size:.75em;} -.authorList .authorBody .title .planetUri{ position:absolute; right:0; bottom:0; font-size:.7em; color:#999;} -.authorList .authorBody .authorTag{ position:relative; padding-top:10px; margin-left:120px; border-top:1px dotted #ccc; font-size:.75em; *zoom:1;} +.authorList .authorBody .title p{ color:#a2afbe; font-size:12px;} +.authorList .authorBody .title .planetUri{ position:absolute; right:0; bottom:0; font-size:11px; color:#999;} +.authorList .authorBody .authorTag{ position:relative; padding-top:10px; margin-left:120px; border-top:1px dotted #ccc; font-size:12px; *zoom:1;} .authorList .authorBody .authorTag dt{ display:inline;} .authorList .authorBody .authorTag dd{ display:inline;} .authorList .authorBody .authorTag dd a{ color:#747474;} .authorList .authorBody .authorTag dd a strong{ font-weight:normal; color:#fff; background:#ffba00;} .authorList .authorBody .authorTag .addFavorite{ position:absolute; top:7px; right:0; background:url(../images/iconAddFavorite.gif) no-repeat left center;} -.authorList .authorBody .authorTag .addFavorite button{ position:relative; *top:2px; width:80px; height:20px; font-size:.9em; color:#999; font-family:AppleGothic, Dotum, Gulim, Sans-serif; text-align:right; letter-spacing:-1px;} +.authorList .authorBody .authorTag .addFavorite button{ position:relative; *top:2px; width:80px; height:20px; font-size:11px; color:#999; font-family:AppleGothic, Dotum, Gulim, Sans-serif; text-align:right; letter-spacing:-1px;} .authorList .tl, .authorList .tr, .authorList .bl, @@ -541,7 +533,7 @@ h1 a{ font-weight:bold; font-size:30px; color:#000; letter-spacing:-3px; text-de .writePost .writeBody dd .inputText{ padding:3px 10px;} .writePost .writeBody dd.preview{ display:block; clear:both;} .writePost .writeBody dd.preview.off{ display:none;} -.writePost .writeBody dd.preview p{ padding:5px 10px; border:1px solid #ccc; width:96%; background:#fff; color:#000; opacity:.5; filter:alpha(opacity=50);} +.writePost .writeBody dd.preview p{ padding:5px 10px; border:1px solid #ccc; width:96%; background:#fff; color:#000; opacity:.5; filter:alpha(opacity=50); font-size:12px;} .writePost .writeBody dd.preview p a{ color:#00f;} .writePost .writeBody .writeOptions{ position:absolute; top:-8px; left:100%; margin-left:-105px;} .writePost .writeBody .writeOptions p{ white-space:nowrap; margin:0; padding:0;} @@ -565,15 +557,15 @@ h1 a{ font-weight:bold; font-size:30px; color:#000; letter-spacing:-3px; text-de .myFavoriteTag ul{ position:relative; padding:5px 0; overflow:hidden; *zoom:1;} .myFavoriteTag li{ position:relative; padding:0 6px 0 10px; left:-11px; display:inline; background:url(../images/lineVccc.gif) no-repeat left center; line-height:18px;} .myFavoriteTag li a, -.myFavoriteTag li strong{ font-size:.75em; white-space:nowrap;} +.myFavoriteTag li strong{ font-size:12px; white-space:nowrap;} .myFavoriteTag li strong{ color:#ffba00;} .myFavoriteTag li .delete{ position:relative; top:-7px; left:-6px; display:none; width:12px; height:11px; margin-right:-12px; background:url(../images/buttonX.gif) no-repeat center;} .myFavoriteTag li .delete span{ display:inline-block; width:0; height:0; font:0/0 Sans-serif; visibility:hidden;} .myFavoriteTag li .delete.hover{ display:inline-block;} .myFavoriteTag .addTag{ text-align:right;} -.myFavoriteTag .addTag .inputText{ border:1px solid #ccc; padding:3px 4px; color:#000; font-size:.75em; margin-right:5px;} +.myFavoriteTag .addTag .inputText{ border:1px solid #ccc; padding:3px 4px; color:#000; font-size:12px; margin-right:5px;} .myFavoriteTag .addTag .addFavorite{ display:inline-block; position:relative; background:url(../images/iconAddFavorite.gif) no-repeat left center;} -.myFavoriteTag .addTag .addFavorite button{ position:relative; *top:2px; width:80px; height:20px; font-size:.7em; font-family:AppleGothic, Dotum, Gulim, Sans-serif; color:#fff; text-align:right; letter-spacing:-1px;} +.myFavoriteTag .addTag .addFavorite button{ position:relative; *top:2px; width:80px; height:20px; font-size:11px; font-family:AppleGothic, Dotum, Gulim, Sans-serif; color:#fff; text-align:right; letter-spacing:-1px;} .myFavoriteTag .tl, .myFavoriteTag .tr, .myFavoriteTag .bl, diff --git a/modules/planet/skins/xe_planet/css/layout.css b/modules/planet/skins/xe_planet/css/layout.css deleted file mode 100644 index dcac00227..000000000 --- a/modules/planet/skins/xe_planet/css/layout.css +++ /dev/null @@ -1,391 +0,0 @@ -@charset "utf-8"; -/* NHN > UIT Center > Open UI Technology Team > Jeong Chan Myeong(dece24@nhncorp.com) */ - -/* Float Clear */ -.fClear { display:block; float:none; clear:both; margin:0; padding:0; width:0; height:0; overflow:hidden; font:0/0 Sans-serif; visibility:hidden; } /* Use it when you want to float clearing */ - -/* Container */ -#container { position:relative; margin:0 auto; height:auto !important; } /* alignCenter = margin:0 auto | alignLeft = margin:0 | alignRight = margin:0 0 0 auto */ - -/* Header */ -#header { } - -/* Body */ -#body { position:relative; } -#body:after { content:""; display:block; clear:both; } - -/* Content */ -#content { position:relative; } -#content .section { position:relative; } - -/* Navigation */ -#navigation { position:relative; } -#navigation .section { position:relative; } - -/* Extra */ -#extra { position:relative; } -#extra .section { position:relative; } - -/* Footer */ -#footer { position:relative; } - -/* ---------- Common Display ---------- */ -/* c = #content, n = #navigation, e = #extra */ -.c1 #navigation, -.c2 #navigation, -.c3 #navigation, -.c1 #extra, -.c2 #extra, -.c3 #extra -.cn #extra, -.nc #extra { display:none; } - -.cn #navigation, -.nc #navigation, -.ce #navigation, -.ec #navigation, -.ne #navigation, -.en #navigation, -.cne #navigation, -.ecn #navigation, -.nec #navigation, -.cen #navigation, -.nce #navigation, -.enc #navigation, -.cee #navigation, -.eec #navigation, -.ece #navigation, -.ce #extra, -.ec #extra, -.ne #extra, -.en #extra, -.cne #extra, -.ecn #extra, -.nec #extra, -.cen #extra, -.nce #extra, -.enc #extra, -.cee #extra, -.eec #extra, -.ece #extra { display:block; } - -#extra .section{ display:none; } -.e0 #extra { display:none;} -.e1 #extra, -.e2 #extra, -.e3 #extra, -.e4 #extra, -.e5 #extra, -.e1 #extra .extra1, -.e2 #extra .extra1, -.e2 #extra .extra2, -.e3 #extra .extra1, -.e3 #extra .extra2, -.e3 #extra .extra3, -.e4 #extra .extra1, -.e4 #extra .extra2, -.e4 #extra .extra3, -.e4 #extra .extra4, -.e5 #extra .extra1, -.e5 #extra .extra2, -.e5 #extra .extra3, -.e5 #extra .extra4, -.e5 #extra .extra5, -.cee #extra .section, -.eec #extra .section, -.ece #extra .section { display:block;} - -.nTop #navigation { display:block; } - -.ne #navigation, -.ne #extra, -.ne #extra .section { float:left; } -.en #navigation, -.en #extra, -.en #extra .section { float:right; } - -/* ---------- Fixed Layout Preset ---------- */ -/* c = #content, n = #navigation, e = #extra */ - -/* Width */ -.fixed #container { width:960px; } -.fixed #body { width:auto; } -.fixed #navigation, -.fixed #extra .section { width:200px; } -.fixed .c1 #content { width:100%; } -.fixed .c1 #navigation { width:300px; } -.fixed .c1 #extra { width:auto; } -.fixed .c1 #extra .section { width:300px; } -.fixed .c2 #content { width:740px; } -.fixed .c3 #content { width:520px;} -.fixed .cee #extra, -.fixed .eec #extra{ width:420px;} -.fixed .ece #extra { width:100%;} - -/* Floating 1 Columns */ -.fixed .c1 #content { clear:both; } - -.fixed .ne #navigation, -.fixed .ne #extra .extra1 { margin-right:30px; } - -.fixed .en #navigation, -.fixed .en #extra .extra1 { margin-left:30px; } - -/* Floating 2 Columns */ -.fixed .cn #content { float:left; } -.fixed .cn #navigation, -.fixed .cn #extra { float:right; } - -.fixed .nc #content { float:right; } -.fixed .nc #navigation, -.fixed .nc #extra { float:left; } - -.fixed .ce #content { float:left; } -.fixed .ce #navigation, -.fixed .ce #extra { float:right; *float:none; *left:20px; _left:17px; } - -.fixed .ec #content { float:right; } -.fixed .ec #navigation, -.fixed .ec #extra { float:left; *float:none; } - -/* Floating 3 Columns */ -.fixed .cne #content { float:left; margin-right:20px; } -.fixed .cne #navigation { float:left; } -.fixed .cne #extra { float:right; } - -.fixed .ecn #content { float:left; margin-right:-520px; left:220px; } -.fixed .ecn #navigation { float:right; } -.fixed .ecn #extra { float:left; } - -.fixed .nec #content { float:right; } -.fixed .nec #navigation { float:left; margin-right:20px; } -.fixed .nec #extra { float:left; } - -.fixed .cen #content { float:left; margin-right:20px; } -.fixed .cen #navigation { float:right; } -.fixed .cen #extra { float:left; } - -.fixed .nce #content { float:left; margin-right:-520px; left:220px; } -.fixed .nce #navigation { float:left; } -.fixed .nce #extra { float:right; } - -.fixed .enc #content { float:right; margin-left:20px; } -.fixed .enc #navigation { float:right; } -.fixed .enc #extra { float:left; } - -.fixed .cee #content { float:left; _margin-right:-3px; } -.fixed .cee #extra { float:right; *float:none; *left:20px; } -.fixed .cee .section { float:left; } -.fixed .cee .extra1 { margin-right:20px; } - -.fixed .eec #content { float:right; _margin-left:-3px; } -.fixed .eec #extra { float:left; *float:none; *left:0; } -.fixed .eec .section{ float:left;} -.fixed .eec .extra1{ margin-right:20px; } - -.fixed .ece #content { float:left; margin-right:-100%; left:220px;} -.fixed .ece #extra { float:none; } -.fixed .ece .extra1{ float:left; } -.fixed .ece .extra2{ float:right; } - -/* ---------- Liquid Layout Preset ---------- */ -/* c = #content, n = #navigation, e = #extra */ - -/* Width */ -.liquid #container { width:100%; } -.liquid #body { width:auto; } -.liquid .c1 #content { width:100%; } -.liquid .c1 #navigation { width:32%; } -.liquid .c1 #extra { width:66%; } -.liquid .c1 #extra .section { width:48.4%; } -.liquid .c2 #content { width:75%; } -.liquid .c2 #navigation, -.liquid .c2 #extra { width:23%; } -.liquid .c3 #content { width:56%; } -.liquid .c3 #navigation { width:20%; } -.liquid .c3 #extra { width:20%; } -.liquid .cee #extra, -.liquid .eec #extra { width:42%;} -.liquid .ece #extra { width:100%;} -.liquid .cee #extra .section, -.liquid .eec #extra .section{ width:48%; } -.liquid .ece #extra .section { width:20%; } - -/* Floating 1 Columns */ -.liquid .c1 #content { clear:both; } - -.liquid .ne #navigation { margin-right:2%; } -.liquid .ne #extra .extra1 { float:left; } -.liquid .ne #extra .extra2 { float:right; } - -.liquid .en #navigation { margin-left:2%; } -.liquid .en #extra .extra1 { float:right; } -.liquid .en #extra .extra2 { float:left; } - -/* Floating 2 Columns */ -.liquid .cn #content { float:left; } -.liquid .cn #navigation, -.liquid .cn #extra { float:right; } - -.liquid .nc #content { float:right; } -.liquid .nc #navigation, -.liquid .nc #extra { float:left; } - -.liquid .ce #content { float:left; _margin-right:-3px; } -.liquid .ce #navigation, -.liquid .ce #extra { float:right; *float:none; *left:2%; } - -.liquid .ec #content { float:right; } -.liquid .ec #navigation, -.liquid .ec #extra { float:left; *float:none; } - -/* Floating 3 Columns */ -.liquid .cne #content { float:left; margin-right:2%; } -.liquid .cne #navigation { float:left; } -.liquid .cne #extra { float:right; } - -.liquid .ecn #content { float:left; margin-right:-100%; left:22%; } -.liquid .ecn #navigation { float:right; } -.liquid .ecn #extra { float:left; } - -.liquid .nec #content { float:right; } -.liquid .nec #navigation { float:left; margin-right:2%; } -.liquid .nec #extra { float:left; } - -.liquid .cen #content { float:left; margin-right:2%; } -.liquid .cen #navigation { float:right; } -.liquid .cen #extra { float:left; } - -.liquid .nce #content { float:left; margin-right:-100%; left:22%; } -.liquid .nce #navigation { float:left; } -.liquid .nce #extra { float:right; } - -.liquid .enc #content { float:right; margin-left:2%; } -.liquid .enc #navigation { float:right; } -.liquid .enc #extra { float:left; } - -.liquid .cee #content { float:left; _margin-right:-3px; } -.liquid .cee #extra { float:right; *float:none; *left:2%; } -.liquid .cee .extra1 { float:left; } -.liquid .cee .extra2 { float:right; } - -.liquid .eec #content { float:right; _margin-left:-3px; } -.liquid .eec #extra { float:left; *float:none; *left:0; } -.liquid .eec .extra1{ float:left; } -.liquid .eec .extra2{ float:right; } - -.liquid .ece #content { float:left; margin-right:-100%; left:22%;} -.liquid .ece #extra { float:none; } -.liquid .ece .extra1{ float:left; } -.liquid .ece .extra2{ float:right; } - -/* ---------- Hybrid Layout Preset ---------- */ -/* c = #content, n = #navigation, e = #extra */ - -/* Width */ -.hybrid #container { width:100%; } -.hybrid #body { width:auto; } -.hybrid #content { width:100%; } -.hybrid #navigation { width:200px; } -.hybrid #extra { width:200px; } -.hybrid .c1 #navigation { width:300px; } -.hybrid .c1 #extra { width:auto; } -.hybrid .c1 #extra .section { width:300px; } -.hybrid .cee #extra, -.hybrid .eec #extra { width:420px;} -.hybrid .ece #extra { width:100%;} -.hybrid .cee #extra .section, -.hybrid .eec #extra .section, -.hybrid .ece #extra .section { width:200px; } - -/* Floating 1 Columns */ -.hybrid .c1 #content { clear:both; } - -.hybrid .ne #navigation, -.hybrid .ne #extra .extra1 { margin-right:30px; } - -.hybrid .en #navigation, -.hybrid .en #extra .extra1 { margin-left:30px; } - -/* Floating 2 Columns */ -.hybrid .cn #body { margin-right:220px; } -.hybrid .cn #content { float:left; margin-right:-100%; } -.hybrid .cn #navigation, -.hybrid .cn #extra { float:right; left:220px; clear:right; } - -.hybrid .nc #body { margin-left:220px; } -.hybrid .nc #content { float:right; margin-left:-100%; *margin-left:0; } -.hybrid .nc #navigation, -.hybrid .nc #extra { float:left; left:-220px; clear:left; } - -.hybrid .ce #body { margin-right:220px; } -.hybrid .ce #content { float:left; margin-right:-100%; } -.hybrid .ce #navigation, -.hybrid .ce #extra { float:right; left:220px; clear:right; *float:none; *left:100%; *margin-left:20px; *margin-right:-200px; } -.hybrid .ce #navigation { width:100% !important; right:-220px; } - -.hybrid .ec #body { margin-left:220px; } -.hybrid .ec #content { float:right; margin-left:-100%; _float:left; _margin-left:0; _margin-right:-100%; } -.hybrid .ec #navigation, -.hybrid .ec #extra { float:left; left:-220px; clear:left; *float:none; *margin-right:-200px; } -.hybrid .ec #navigation { width:100% !important; } - -/* Floating 3 Columns */ -.hybrid .cne #body { margin-right:440px; } -.hybrid .cne #content { float:left; } -.hybrid .cne #navigation { float:left; margin-right:-200px; left:20px; } -.hybrid .cne #extra { float:right; margin-left:-200px; left:440px; } - -.hybrid .ecn #body { margin-left:220px; margin-right:220px; } -.hybrid .ecn #content { float:left; margin-right:-100%; } -.hybrid .ecn #navigation { float:right; margin-left:-200px; left:220px; } -.hybrid .ecn #extra { float:left; left:-220px; } - -.hybrid .nec #body { margin-left:440px; } -.hybrid .nec #content { float:right; } -.hybrid .nec #navigation { float:left; margin-right:-200px; left:-440px; } -.hybrid .nec #extra { float:left; margin-right:-200px; left:-220px; } - -.hybrid .cen #body { margin-right:440px; } -.hybrid .cen #content { float:left; } -.hybrid .cen #navigation { float:right; margin-left:-200px; left:440px; } -.hybrid .cen #extra { float:left; margin-right:-200px; left:20px; } - -.hybrid .nce #body { margin-left:220px; margin-right:220px; } -.hybrid .nce #content { float:left; margin-right:-100%; } -.hybrid .nce #navigation { float:left; margin-right:-200px; left:-220px; } -.hybrid .nce #extra { float:right; right:-220px; } - -.hybrid .enc #body { margin-left:440px; } -.hybrid .enc #content { float:right; } -.hybrid .enc #navigation { float:right; margin-left:-200px; left:-20px; } -.hybrid .enc #extra { float:left; margin-right:-200px; left:-440px; } - -.hybrid .cee #body { margin-right:440px;} -.hybrid .cee #content { float:left; margin-right:-100%; } -.hybrid .cee #navigation { right:-440px;} -.hybrid .cee #extra { float:right; left:440px; *float:none; *left:100%; *margin-left:20px; *margin-right:-420px; } -.hybrid .cee .extra1 { float:left; } -.hybrid .cee .extra2 { float:right; } - -.hybrid .eec #body { margin-left:440px;} -.hybrid .eec #content { float:left; margin-right:-100%; } -.hybrid .eec #extra { float:left; left:-440px; *float:none; *margin-right:-420px; } -.hybrid .eec .section{ float:left;} -.hybrid .eec .extra1{ float:left; } -.hybrid .eec .extra2{ float:right; } - -.hybrid .ece #body { margin:0 220px; } -.hybrid .ece #content { float:left; margin-right:-100%; } -.hybrid .ece #navigation { right:-220px; } -.hybrid .ece #extra { float:none; } -.hybrid .ece .extra1{ float:left; left:-220px; margin-right:-200px; } -.hybrid .ece .extra2{ float:right; right:-220px; margin-left:-200px; } - -/* Navigation Top */ -.nTop #navigation { position:absolute; float:right !important; width:auto !important; margin:0 !important; *clear:none !important; overflow:visible; top:-4em; left:auto !important; right:0; } -.nTop #navigation .section { position:absolute; float:right; top:0; right:0; width:auto; margin:0; padding:0; } -.nTop #navigation .section:after { content:""; display:block; clear:both; width:0; height:0; overflow:hidden; visibility:hidden; font:0/0 Sans-serif;} -.nTop #navigation h2 { position:absolute; left:0; top:0; width:0; height:0; border:0; overflow:hidden; visibility:hidden; font:0/0 Sans-serif; } -.nTop #navigation ul.nav { position:relative; display:block; float:right; margin:0; padding:0; list-style:none; overflow:hidden; text-align:right; white-space:nowrap; } -.nTop #navigation ul.nav li { position:relative; left:-1px; display:inline; white-space:nowrap; border-left:1px solid #ccc; padding-left:5px; } diff --git a/modules/planet/skins/xe_planet/footer.html b/modules/planet/skins/xe_planet/footer.html index 64d09e3c9..fd6e6373b 100644 --- a/modules/planet/skins/xe_planet/footer.html +++ b/modules/planet/skins/xe_planet/footer.html @@ -1,7 +1,7 @@
    - diff --git a/modules/planet/skins/xe_planet/header.html b/modules/planet/skins/xe_planet/header.html index fa6880ce5..e32150f97 100644 --- a/modules/planet/skins/xe_planet/header.html +++ b/modules/planet/skins/xe_planet/header.html @@ -1,5 +1,4 @@ - - + @@ -22,79 +21,80 @@ -
    -
    -