diff --git a/common/css/xe.css b/common/css/xe.css index f24e1bf20..1823a4c8d 100644 --- a/common/css/xe.css +++ b/common/css/xe.css @@ -29,7 +29,7 @@ .btnArea:after{content:"";display:block;clear:both} .btnArea .etc{float:left} /* Popup Menu Area */ -#popup_menu_area{position:absolute;background:#fff;border:1px solid #e9e9e9;border-radius:5px;padding:10px;line-height:1.3;box-shadow:0 0 6px #666;filter:progid:DXImageTransform.Microsoft.Shadow(color=#999999,direction=135, strength=5)} +#popup_menu_area{position:absolute;background:#fff;border:1px solid #e9e9e9;border-radius:5px;padding:10px;line-height:1.3;box-shadow:0 0 6px #666;font-size:12px;filter:progid:DXImageTransform.Microsoft.Shadow(color=#999999,direction=135, strength=5)} #popup_menu_area ul{list-style:none;margin:0;padding:0} #popup_menu_area li{margin:0;padding:0} #popup_menu_area a{text-decoration:none;color:#333} @@ -44,8 +44,8 @@ body>.message{margin:1em} .message.info, .message.error, .message.update{padding-left:55px} -.message.info{border-color:#E0E8EC;background:#EDF9FF url(../../common/tpl/images/msg.Info.png) no-repeat 1em .5em} -.message.error{border-color:#EFDCDC;background:#FFECEC url(../../common/tpl/images/msg.error.png) no-repeat 1em .5em} -.message.update{border-color:#EAE9DC;background:#FFFDEF url(../../common/tpl/images/msg.update.png) no-repeat 1em .5em} +.message.info{border-color:#E0E8EC;background:#EDF9FF url(../../common/img/msg.Info.png) no-repeat 1em .5em} +.message.error{border-color:#EFDCDC;background:#FFECEC url(../../common/img/msg.error.png) no-repeat 1em .5em} +.message.update{border-color:#EAE9DC;background:#FFFDEF url(../../common/img/msg.update.png) no-repeat 1em .5em} /* Waiting for server response */ -.wfsr{display:none;position:absolute;position:fixed;left:0;top:0;z-index:100; border:1px solid #EAE9DC;background:#FFFDEF url(../../common/tpl/images/msg.update.png) no-repeat 1em .5em;margin:1em;padding:1em 1em 1em 55px;border-radius:5px;line-height:1.4;font-size:12px} +.wfsr{display:none;position:absolute;position:fixed;left:0;top:0;z-index:100; border:1px solid #EAE9DC;background:#FFFDEF url(../../common/img/msg.update.png) no-repeat 1em .5em;margin:1em;padding:1em 1em 1em 55px;border-radius:5px;line-height:1.4;font-size:12px} diff --git a/common/css/xe.min.css b/common/css/xe.min.css index df75662be..e6b2a8ec7 100644 --- a/common/css/xe.min.css +++ b/common/css/xe.min.css @@ -29,7 +29,7 @@ .btnArea:after{content:"";display:block;clear:both} .btnArea .etc{float:left} /* Popup Menu Area */ -#popup_menu_area{position:absolute;background:#fff;border:1px solid #e9e9e9;border-radius:5px;padding:10px;line-height:1.3;box-shadow:0 0 6px #666;filter:progid:DXImageTransform.Microsoft.Shadow(color=#999999,direction=135, strength=5)} +#popup_menu_area{position:absolute;background:#fff;border:1px solid #e9e9e9;border-radius:5px;padding:10px;line-height:1.3;box-shadow:0 0 6px #666;font-size:12px;filter:progid:DXImageTransform.Microsoft.Shadow(color=#999999,direction=135, strength=5)} #popup_menu_area ul{list-style:none;margin:0;padding:0} #popup_menu_area li{margin:0;padding:0} #popup_menu_area a{text-decoration:none;color:#333} @@ -44,8 +44,8 @@ body>.message{margin:1em} .message.info, .message.error, .message.update{padding-left:55px} -.message.info{border-color:#E0E8EC;background:#EDF9FF url(../../common/tpl/images/msg.Info.png) no-repeat 1em .5em} -.message.error{border-color:#EFDCDC;background:#FFECEC url(../../common/tpl/images/msg.error.png) no-repeat 1em .5em} -.message.update{border-color:#EAE9DC;background:#FFFDEF url(../../common/tpl/images/msg.update.png) no-repeat 1em .5em} +.message.info{border-color:#E0E8EC;background:#EDF9FF url(../../common/img/msg.Info.png) no-repeat 1em .5em} +.message.error{border-color:#EFDCDC;background:#FFECEC url(../../common/img/msg.error.png) no-repeat 1em .5em} +.message.update{border-color:#EAE9DC;background:#FFFDEF url(../../common/img/msg.update.png) no-repeat 1em .5em} /* Waiting for server response */ -.wfsr{display:none;position:absolute;position:fixed;left:0;top:0;z-index:100; border:1px solid #EAE9DC;background:#FFFDEF url(../../common/tpl/images/msg.update.png) no-repeat 1em .5em;margin:1em;padding:1em 1em 1em 55px;border-radius:5px;line-height:1.4;font-size:12px} +.wfsr{display:none;position:absolute;position:fixed;left:0;top:0;z-index:100; border:1px solid #EAE9DC;background:#FFFDEF url(../../common/img/msg.update.png) no-repeat 1em .5em;margin:1em;padding:1em 1em 1em 55px;border-radius:5px;line-height:1.4;font-size:12px} diff --git a/common/tpl/images/flvplayer.swf b/common/img/flvplayer.swf similarity index 100% rename from common/tpl/images/flvplayer.swf rename to common/img/flvplayer.swf diff --git a/common/img/icon.bubble.png b/common/img/icon.bubble.png new file mode 100644 index 000000000..82f6f3aad Binary files /dev/null and b/common/img/icon.bubble.png differ diff --git a/common/tpl/images/msg.Info.png b/common/img/msg.Info.png similarity index 100% rename from common/tpl/images/msg.Info.png rename to common/img/msg.Info.png diff --git a/common/tpl/images/msg.error.png b/common/img/msg.error.png similarity index 100% rename from common/tpl/images/msg.error.png rename to common/img/msg.error.png diff --git a/common/tpl/images/msg.update.png b/common/img/msg.update.png similarity index 100% rename from common/tpl/images/msg.update.png rename to common/img/msg.update.png diff --git a/common/js/common.js b/common/js/common.js index 7d8e0d372..1fb96c485 100644 --- a/common/js/common.js +++ b/common/js/common.js @@ -397,7 +397,7 @@ function _displayMultimedia(src, width, height, options) { if(/\.(gif|jpg|jpeg|bmp|png)$/i.test(src)){ html = ''; } else if(/\.flv$/i.test(src) || /\.mov$/i.test(src) || /\.moov$/i.test(src) || /\.m4v$/i.test(src)) { - html = ''; + html = ''; } else if(/\.swf/i.test(src)) { clsid = 'clsid:D27CDB6E-AE6D-11cf-96B8-444553540000'; diff --git a/common/js/xe.js b/common/js/xe.js index 7b13ea31f..bfa44f002 100644 --- a/common/js/xe.js +++ b/common/js/xe.js @@ -684,7 +684,7 @@ function _displayMultimedia(src, width, height, options) { if(/\.(gif|jpg|jpeg|bmp|png)$/i.test(src)){ html = ''; } else if(/\.flv$/i.test(src) || /\.mov$/i.test(src) || /\.moov$/i.test(src) || /\.m4v$/i.test(src)) { - html = ''; + html = ''; } else if(/\.swf/i.test(src)) { clsid = 'clsid:D27CDB6E-AE6D-11cf-96B8-444553540000'; diff --git a/common/js/xe.min.js b/common/js/xe.min.js index 8c11ca618..5845fe90a 100644 --- a/common/js/xe.min.js +++ b/common/js/xe.min.js @@ -682,7 +682,7 @@ function _displayMultimedia(src, width, height, options) { if(/\.(gif|jpg|jpeg|bmp|png)$/i.test(src)){ html = ''; } else if(/\.flv$/i.test(src) || /\.mov$/i.test(src) || /\.moov$/i.test(src) || /\.m4v$/i.test(src)) { - html = ''; + html = ''; } else if(/\.swf/i.test(src)) { clsid = 'clsid:D27CDB6E-AE6D-11cf-96B8-444553540000'; diff --git a/common/tpl/images/blank.gif b/common/tpl/images/blank.gif deleted file mode 100644 index 35d42e808..000000000 Binary files a/common/tpl/images/blank.gif and /dev/null differ diff --git a/common/tpl/images/buttonBlack.gif b/common/tpl/images/buttonBlack.gif deleted file mode 100644 index 8873a99e5..000000000 Binary files a/common/tpl/images/buttonBlack.gif and /dev/null differ diff --git a/common/tpl/images/buttonBlue.gif b/common/tpl/images/buttonBlue.gif deleted file mode 100644 index 7e3a7f763..000000000 Binary files a/common/tpl/images/buttonBlue.gif and /dev/null differ diff --git a/common/tpl/images/buttonGo.gif b/common/tpl/images/buttonGo.gif deleted file mode 100644 index 8f4a53c6e..000000000 Binary files a/common/tpl/images/buttonGo.gif and /dev/null differ diff --git a/common/tpl/images/buttonGreen.gif b/common/tpl/images/buttonGreen.gif deleted file mode 100644 index 241fd57d6..000000000 Binary files a/common/tpl/images/buttonGreen.gif and /dev/null differ diff --git a/common/tpl/images/buttonLeft2.gif b/common/tpl/images/buttonLeft2.gif deleted file mode 100644 index 12764bd98..000000000 Binary files a/common/tpl/images/buttonLeft2.gif and /dev/null differ diff --git a/common/tpl/images/buttonRed.gif b/common/tpl/images/buttonRed.gif deleted file mode 100644 index d017d5949..000000000 Binary files a/common/tpl/images/buttonRed.gif and /dev/null differ diff --git a/common/tpl/images/buttonRight2.gif b/common/tpl/images/buttonRight2.gif deleted file mode 100644 index e4c85f1bf..000000000 Binary files a/common/tpl/images/buttonRight2.gif and /dev/null differ diff --git a/common/tpl/images/buttonSet.gif b/common/tpl/images/buttonSet.gif deleted file mode 100755 index 3e13945cb..000000000 Binary files a/common/tpl/images/buttonSet.gif and /dev/null differ diff --git a/common/tpl/images/buttonWhite.gif b/common/tpl/images/buttonWhite.gif deleted file mode 100644 index 4d5e40cef..000000000 Binary files a/common/tpl/images/buttonWhite.gif and /dev/null differ diff --git a/common/tpl/images/calendar.gif b/common/tpl/images/calendar.gif deleted file mode 100644 index 96a8bd14f..000000000 Binary files a/common/tpl/images/calendar.gif and /dev/null differ diff --git a/common/tpl/images/folder.gif b/common/tpl/images/folder.gif deleted file mode 100644 index eb129763d..000000000 Binary files a/common/tpl/images/folder.gif and /dev/null differ diff --git a/common/tpl/images/form_buttons.gif b/common/tpl/images/form_buttons.gif deleted file mode 100755 index b54b2694f..000000000 Binary files a/common/tpl/images/form_buttons.gif and /dev/null differ diff --git a/common/tpl/images/form_buttons.png b/common/tpl/images/form_buttons.png deleted file mode 100755 index 4ca99a35e..000000000 Binary files a/common/tpl/images/form_buttons.png and /dev/null differ diff --git a/common/tpl/images/iconAdd.gif b/common/tpl/images/iconAdd.gif deleted file mode 100644 index c4a7757f0..000000000 Binary files a/common/tpl/images/iconAdd.gif and /dev/null differ diff --git a/common/tpl/images/iconCheckGreen.gif b/common/tpl/images/iconCheckGreen.gif deleted file mode 100644 index e51b02626..000000000 Binary files a/common/tpl/images/iconCheckGreen.gif and /dev/null differ diff --git a/common/tpl/images/iconCheckYellow.gif b/common/tpl/images/iconCheckYellow.gif deleted file mode 100644 index e4eb0fbd1..000000000 Binary files a/common/tpl/images/iconCheckYellow.gif and /dev/null differ diff --git a/common/tpl/images/iconWrite.gif b/common/tpl/images/iconWrite.gif deleted file mode 100644 index 60a047473..000000000 Binary files a/common/tpl/images/iconWrite.gif and /dev/null differ diff --git a/common/tpl/images/iconX.gif b/common/tpl/images/iconX.gif deleted file mode 100644 index 0e9a830e1..000000000 Binary files a/common/tpl/images/iconX.gif and /dev/null differ diff --git a/common/tpl/images/icon_next.gif b/common/tpl/images/icon_next.gif deleted file mode 100644 index 511165bb4..000000000 Binary files a/common/tpl/images/icon_next.gif and /dev/null differ diff --git a/common/tpl/images/icon_nnext.gif b/common/tpl/images/icon_nnext.gif deleted file mode 100644 index 4d6ace35e..000000000 Binary files a/common/tpl/images/icon_nnext.gif and /dev/null differ diff --git a/common/tpl/images/icon_pprev.gif b/common/tpl/images/icon_pprev.gif deleted file mode 100644 index 6b04fad16..000000000 Binary files a/common/tpl/images/icon_pprev.gif and /dev/null differ diff --git a/common/tpl/images/icon_prev.gif b/common/tpl/images/icon_prev.gif deleted file mode 100644 index 97d4531ca..000000000 Binary files a/common/tpl/images/icon_prev.gif and /dev/null differ diff --git a/common/tpl/images/imgfolder.gif b/common/tpl/images/imgfolder.gif deleted file mode 100644 index e6d880347..000000000 Binary files a/common/tpl/images/imgfolder.gif and /dev/null differ diff --git a/common/tpl/images/info.png b/common/tpl/images/info.png deleted file mode 100644 index f253a8e34..000000000 Binary files a/common/tpl/images/info.png and /dev/null differ diff --git a/common/tpl/images/loading.gif b/common/tpl/images/loading.gif deleted file mode 100644 index cecabda03..000000000 Binary files a/common/tpl/images/loading.gif and /dev/null differ diff --git a/common/tpl/images/widget.gif b/common/tpl/images/widget.gif deleted file mode 100644 index ccd3ea82c..000000000 Binary files a/common/tpl/images/widget.gif and /dev/null differ diff --git a/common/tpl/images/widget_bg.jpg b/common/tpl/images/widget_bg.jpg deleted file mode 100755 index 62c0e5d5a..000000000 Binary files a/common/tpl/images/widget_bg.jpg and /dev/null differ diff --git a/common/tpl/images/widget_text.gif b/common/tpl/images/widget_text.gif deleted file mode 100755 index ad260736b..000000000 Binary files a/common/tpl/images/widget_text.gif and /dev/null differ