From 34045a94d66dd3badda28171d1369754762344e1 Mon Sep 17 00:00:00 2001 From: chschy Date: Mon, 5 Nov 2012 01:12:18 +0000 Subject: [PATCH] edite component git-svn-id: http://xe-core.googlecode.com/svn/branches/maserati@12108 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- .../editor/components/emoticon/tpl/popup.css | 7 +- .../editor/components/emoticon/tpl/popup.html | 26 ++-- .../components/image_gallery/tpl/popup.css | 2 +- .../components/image_gallery/tpl/popup.html | 81 +++++++++++ .../image_gallery/tpl/popup.min.css | 2 +- .../components/image_link/tpl/popup.css | 1 + .../components/image_link/tpl/popup.html | 129 +++++++++--------- .../components/multimedia_link/tpl/popup.css | 2 + .../components/multimedia_link/tpl/popup.html | 94 +++++++------ 9 files changed, 219 insertions(+), 125 deletions(-) diff --git a/modules/editor/components/emoticon/tpl/popup.css b/modules/editor/components/emoticon/tpl/popup.css index d091d39fe..734cce3e0 100644 --- a/modules/editor/components/emoticon/tpl/popup.css +++ b/modules/editor/components/emoticon/tpl/popup.css @@ -1,6 +1,5 @@ @charset "utf-8"; - @import url(../../../../../modules/admin/tpl/css/admin.css); -img.emoticon { margin:10px 10px 0 0; cursor:pointer; } -.emoticonList { position:absolute; right:40px; top:4px;} - +@import url(../../../../../common/css/bootstrap.css); +img.emoticon{ margin:10px 10px 0 0; cursor:pointer} +#emoticons{padding:0 10px 20px 10px} diff --git a/modules/editor/components/emoticon/tpl/popup.html b/modules/editor/components/emoticon/tpl/popup.html index 4c0d9d757..3fe5aa7c7 100644 --- a/modules/editor/components/emoticon/tpl/popup.html +++ b/modules/editor/components/emoticon/tpl/popup.html @@ -1,11 +1,15 @@ - - -

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

-
- -
-
+ + +
+

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

+
+
+ +
+
+
+
diff --git a/modules/editor/components/image_gallery/tpl/popup.css b/modules/editor/components/image_gallery/tpl/popup.css index 405940dfb..07ec5644c 100644 --- a/modules/editor/components/image_gallery/tpl/popup.css +++ b/modules/editor/components/image_gallery/tpl/popup.css @@ -1,6 +1,6 @@ @charset "utf-8"; @import url(../../../../../modules/admin/tpl/css/admin.css); - +@import url(../../../../../common/css/bootstrap.css); li { float:left; list-style:none; margin-right:5px; } img.bg_preview_color { diff --git a/modules/editor/components/image_gallery/tpl/popup.html b/modules/editor/components/image_gallery/tpl/popup.html index 1d1ad084e..c56e2e243 100644 --- a/modules/editor/components/image_gallery/tpl/popup.html +++ b/modules/editor/components/image_gallery/tpl/popup.html @@ -76,3 +76,84 @@ {$lang->about_component} +
+

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

+
+ + +
+ +
+ px +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ px +
+
+
+ +
+
+ +
+
    +
  • blank
    • +
  • #
    • +
+
+
+
+ +
+
+ +
+
    +
  • blank
    • +
  • #
    • +
+
+
+
+ +
+ +

{$lang->about_image_list}

+
+
+
+
+ + {$lang->about_component} +
+
+ + + diff --git a/modules/editor/components/image_gallery/tpl/popup.min.css b/modules/editor/components/image_gallery/tpl/popup.min.css index 7da195434..5b0f523ef 100644 --- a/modules/editor/components/image_gallery/tpl/popup.min.css +++ b/modules/editor/components/image_gallery/tpl/popup.min.css @@ -3,4 +3,4 @@ * @brief Slideshow type image gallery plugin * @author NHN (developers@xpressengine.com) **/ -@charset "utf-8";@import "../../../../../modules/admin/tpl/css/admin.css";li{float:left;list-style:none;margin-right:5px}img.bg_preview_color{width:30px;height:16px;border:1px solid #000000;background-color:#FFFFFF}img.border_preview_color{width:30px;height:16px;border:1px solid #EEEEEE;background-color:#000000}img.color_icon{width:14px;height:14px;border:1px solid #FFFFFF}img.color_icon_over{width:14px;height:14px;border:1px solid #000000;cursor:pointer}.editor_color_box{clear:both;height:65px;width:400px;border:1px solid #DDDDDD;padding:2px}.image_list{width:100%;border:1px solid #EEEEEE;height:200px !important} \ No newline at end of file +@charset "utf-8";@import "../../../../../modules/admin/tpl/css/admin.css";@import url(../../../../../common/css/bootstrap.css);li{float:left;list-style:none;margin-right:5px}img.bg_preview_color{width:30px;height:16px;border:1px solid #000000;background-color:#FFFFFF}img.border_preview_color{width:30px;height:16px;border:1px solid #EEEEEE;background-color:#000000}img.color_icon{width:14px;height:14px;border:1px solid #FFFFFF}img.color_icon_over{width:14px;height:14px;border:1px solid #000000;cursor:pointer}.editor_color_box{clear:both;height:65px;width:400px;border:1px solid #DDDDDD;padding:2px}.image_list{width:100%;border:1px solid #EEEEEE;height:200px !important} diff --git a/modules/editor/components/image_link/tpl/popup.css b/modules/editor/components/image_link/tpl/popup.css index 35a990cc9..42130c17e 100644 --- a/modules/editor/components/image_link/tpl/popup.css +++ b/modules/editor/components/image_link/tpl/popup.css @@ -1,5 +1,6 @@ @charset "utf-8"; @import url(../../../../../modules/admin/tpl/css/admin.css); +@import url(../../../../../common/css/bootstrap.css); .image_align { margin:0px 0px 5px 0px; diff --git a/modules/editor/components/image_link/tpl/popup.html b/modules/editor/components/image_link/tpl/popup.html index f4f7601b5..d95a2336c 100644 --- a/modules/editor/components/image_link/tpl/popup.html +++ b/modules/editor/components/image_link/tpl/popup.html @@ -1,86 +1,83 @@ -

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

-
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
{$lang->image_url}
{$lang->image_scale} -
    -
  • px
    • -
  • px
    • -
    • -
-
URL
{$lang->urllink_open_window} {$lang->about_url_link_open_window}
{$lang->image_alt}
{$lang->image_align} -
- +
+

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

+ +
+ +
+ +
+
+
+ +
+ px + px + +
+
+
+ +
+ +
+
+
+ +
+ {$lang->about_url_link_open_window} +
+
+
+ +
+ +
+
+
+ +
-
- -
- -
- -
- -
- -
-
-
{$lang->image_border}px
{$lang->image_margin}px
-
- - {$lang->about_component} -
- - + +
+ +
+ px +
+
+
+ +
+ px +
+
+
+
+ + {$lang->about_component} +
+
+ +
diff --git a/modules/editor/components/multimedia_link/tpl/popup.css b/modules/editor/components/multimedia_link/tpl/popup.css index e4e3745ef..5384d2f06 100644 --- a/modules/editor/components/multimedia_link/tpl/popup.css +++ b/modules/editor/components/multimedia_link/tpl/popup.css @@ -1,2 +1,4 @@ @charset "utf-8"; @import url(../../../../../modules/admin/tpl/css/admin.css); +@import url(../../../../../common/css/bootstrap.css); + diff --git a/modules/editor/components/multimedia_link/tpl/popup.html b/modules/editor/components/multimedia_link/tpl/popup.html index 1fe7446b3..225e230ed 100644 --- a/modules/editor/components/multimedia_link/tpl/popup.html +++ b/modules/editor/components/multimedia_link/tpl/popup.html @@ -6,45 +6,55 @@ -

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

-
- - - - - - - - - - - - - - - - - - - - - - - - - - -
{$lang->multimedia_url}
{$lang->multimedia_caption}
{$lang->multimedia_width}
px
{$lang->multimedia_height}
px
{$lang->multimedia_auto_start}
{$lang->multimedia_wmode}
 - -

{$lang->about_ccl_allow_modification}

-
-
- - {$lang->about_component} -
- -
+
+

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

+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ px +
+
+
+ +
+ px +
+
+
+ +
+ +
+
+
+ +
+ +

{$lang->about_ccl_allow_modification}

+
+
+
+
+ + {$lang->about_component} +
+
+
+