From 0f24141743db7fbdfde83b456693dbea42724dc3 Mon Sep 17 00:00:00 2001 From: Michael M Slusarz Date: Mon, 7 Sep 2009 11:14:49 -0600 Subject: [PATCH] Move close image loading into CSS --- imp/compose-dimp.php | 1 - imp/compose.php | 2 +- imp/templates/chunks/message.php | 8 ++------ imp/templates/imp/compose.html | 2 +- imp/templates/index/index-dimp.inc | 5 ++--- imp/themes/graphics/close.png | Bin 0 -> 235 bytes imp/themes/screen-dimp.css | 8 +------- imp/themes/screen.css | 5 ++++- imp/themes/silver/graphics/close.png | Bin 0 -> 655 bytes imp/themes/silver/screen.css | 4 ++++ imp/themes/tango-blue/graphics/close.png | Bin 0 -> 518 bytes imp/themes/tango-blue/screen.css | 4 ++++ 12 files changed, 19 insertions(+), 20 deletions(-) create mode 100644 imp/themes/graphics/close.png create mode 100644 imp/themes/silver/graphics/close.png create mode 100644 imp/themes/tango-blue/graphics/close.png diff --git a/imp/compose-dimp.php b/imp/compose-dimp.php index 7ce03c0a2..e9f06f3e8 100644 --- a/imp/compose-dimp.php +++ b/imp/compose-dimp.php @@ -304,7 +304,6 @@ if ($get_sig && !empty($sig)) { $t = new Horde_Template(IMP_TEMPLATES . '/imp/'); $t->setOption('gettext', true); $t->set('title', $title); -$t->set('closelink', Horde::img('close.png', 'X', array('id' => 'compose_close'), $registry->getImageDir('horde'))); $compose_result = IMP_Views_Compose::showCompose(array( 'folder' => $folder, diff --git a/imp/compose.php b/imp/compose.php index b8f96e190..8e7866cee 100644 --- a/imp/compose.php +++ b/imp/compose.php @@ -31,7 +31,7 @@ function _popupSuccess() { $menu = new Horde_Menu(Horde_Menu::MASK_NONE); $menu->add(Horde::applicationUrl('compose.php'), _("New Message"), 'compose.png'); - $menu->add('', _("Close this window"), 'close.png', $GLOBALS['registry']->getImageDir('horde'), '', 'window.close();'); + $menu->add('', _("Close this window"), 'close.png', '', '', 'window.close();'); require IMP_TEMPLATES . '/common-header.inc'; $success_template = new Horde_Template(); $success_template->set('menu', $menu->render()); diff --git a/imp/templates/chunks/message.php b/imp/templates/chunks/message.php index a9b53480f..517f075f1 100644 --- a/imp/templates/chunks/message.php +++ b/imp/templates/chunks/message.php @@ -6,13 +6,9 @@ * did not receive this file, see http://www.fsf.org/copyleft/gpl.html. */ -$horde_img = $registry->getImageDir('horde'); - -$close_img = Horde::img('close.png', 'X', array(), $horde_img); $menu_view = $prefs->getValue('menu_view'); $show_text = ($menu_view == 'text' || $menu_view == 'both'); - // Small utility function to simplify creating dimpactions buttons. // As of right now, we don't show text only links. function _createDAfmsg($text, $image, $id, $class = '', $show_text = true) @@ -30,7 +26,7 @@ function _createDAfmsg($text, $image, $id, $class = '', $show_text = true)
-
+
@@ -58,7 +54,7 @@ function _createDAfmsg($text, $image, $id, $class = '', $show_text = true)
-
+
getImageDir('horde') ?>
diff --git a/imp/templates/imp/compose.html b/imp/templates/imp/compose.html index 77d6e2c6c..f965b9005 100644 --- a/imp/templates/imp/compose.html +++ b/imp/templates/imp/compose.html @@ -2,7 +2,7 @@
-
+
diff --git a/imp/templates/index/index-dimp.inc b/imp/templates/index/index-dimp.inc index 62e9fcf3d..e84524cd7 100644 --- a/imp/templates/index/index-dimp.inc +++ b/imp/templates/index/index-dimp.inc @@ -177,9 +177,8 @@ function _simpleButton($id, $text, $image, $imagedir = null)
- - 'qsearch_close', 'style' => 'display:none', 'title' => _("Clear Search")), $hordeimg) ?> - + +
diff --git a/imp/themes/graphics/close.png b/imp/themes/graphics/close.png new file mode 100644 index 0000000000000000000000000000000000000000..e135bc7bf2ebff95133b6df9748843767d044a5a GIT binary patch literal 235 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbL!aez;VD=P!LjEsz|tgNM_Wk^U! zXlQ6rQBg-nM_*sxvSrIwty;Bv_wM7zk3W9=_}{;O|Ns9788XYU7f3Od1o;IsI6S+N z2IQo9x;TbZ+)6#~$#=kjgZY3?Y^KJ)|JmFwoD*Noc9$ve;`E;MRlVrY?w%bBzHj$# zm(5U;Y(4Jknie{ZF=m0{Oob)2lNsz6ifWn26flH4&UCod+E~jp(e7GDUUS9WZ9itr eNc(I4pLzCWp1^fG_Fn|r$l&Sf=d#Wzp$PzlPglAC literal 0 HcmV?d00001 diff --git a/imp/themes/screen-dimp.css b/imp/themes/screen-dimp.css index 704384a80..ca2d84f8c 100644 --- a/imp/themes/screen-dimp.css +++ b/imp/themes/screen-dimp.css @@ -801,12 +801,6 @@ a.address:hover img { #qsearch form { display: inline; } -.qsearchClose { - display: -moz-inline-stack; - display: inline-block; - margin-left: -2px; - width: 17px; -} #qsearch_icon { height: 16px; width: 16px; @@ -822,7 +816,7 @@ a.address:hover img { padding: 0; } #qsearch_close { - margin-top: -1px; + padding: 0; } .qsearchFocus, .qsearchFocus #qsearch_icon { background-color: #fff !important; diff --git a/imp/themes/screen.css b/imp/themes/screen.css index cb7f166f5..6fa678e8c 100644 --- a/imp/themes/screen.css +++ b/imp/themes/screen.css @@ -575,7 +575,7 @@ td.addressTr span.loadingImg { white-space: nowrap; } -.downloadAtc, .downloadZipAtc, .saveImgAtc, .stripAtc, .foldersImg { +.downloadAtc, .downloadZipAtc, .saveImgAtc, .closeImg, .stripAtc, .foldersImg { display: -moz-inline-stack; display: inline-block; height: 16px; @@ -596,6 +596,9 @@ td.addressTr span.loadingImg { .stripAtc { background-image: url("graphics/delete.png"); } +.closeImg { + background-image: url("graphics/close.png"); +} #itipconflicts tr.itipcollision { background-color: #f00; diff --git a/imp/themes/silver/graphics/close.png b/imp/themes/silver/graphics/close.png new file mode 100644 index 0000000000000000000000000000000000000000..1514d51a3cf1b67e1c5b9ada36f1fd474e2d214a GIT binary patch literal 655 zcmV;A0&x9_P)uEoyT++I zn$b9r%cFfhHe2K68PkBu*@^<$y+7xQ$wJ~;c5aBx$R=xq*41Wo zhwQus_VOgm0hughj}MhOvs#{>Vg09Y8WxjWUJY5YW zJ?&8eG!59Cz=|E%Ns@013KLWOLV)CObIIj_5{>{#k%TEAMs_GbdDV`x-iYsGH z#=Z{USAQA>NY(}X7=3{K8#dnSF-Q}QlMiV*ii zyO#IQtCM20Ysk8Z)#%Ph=ezfwE1B7R`T_XL9?M$$k=cBzeb;P0RllJvm&^akJ|2$& zXaOpUdM`^TOQnD?0KqxTW&>%uV+v`8{0b!r zk5^YHP3v(2j~5r1g9FTH1RCfaNgyGK zI#hE262r5zZUyfq6PQdo<~42uY&M%Vere*(=P#f3`p&@3AEt*DvUi(Ro&W#<07*qo IM6N<$f?S%`;{X5v literal 0 HcmV?d00001 diff --git a/imp/themes/tango-blue/screen.css b/imp/themes/tango-blue/screen.css index a9260aff0..f00b49656 100644 --- a/imp/themes/tango-blue/screen.css +++ b/imp/themes/tango-blue/screen.css @@ -6,3 +6,7 @@ color: #000; background: #fff; } + +.closeImg { + background-image: url("graphics/close.png"); +} -- 2.11.0