diff options
44 files changed, 793 insertions, 114 deletions
diff --git a/includes/functions/functions_charts.php b/includes/functions/functions_charts.php index 87975a7907..7baceb2d42 100644 --- a/includes/functions/functions_charts.php +++ b/includes/functions/functions_charts.php @@ -595,14 +595,13 @@ function print_url_arrow($id, $url, $label, $dir=2) { if ($TEXT_DIRECTION=="rtl" and $dir==0) $adir=1; if ($TEXT_DIRECTION=="rtl" and $dir==1) $adir=0; - // Labels include people's names, which may contain markup - $label=htmlspecialchars(strip_tags($label)); // arrow style 0 1 2 3 $array_style=array("larrow", "rarrow", "uarrow", "darrow"); $astyle=$array_style[$adir]; - echo "<a href=\"$url\" onmouseover=\"swap_image('".$astyle.$id."',$adir); window.status ='" . $label . "'; return true;\" onmouseout=\"swap_image('".$astyle.$id."',$adir); window.status=''; return true;\"><img id=\"".$astyle.$id."\" src=\"".$WT_IMAGES[$astyle]."\" alt=\"$label\" title=\"$label\"></a>"; + // Labels include people's names, which may contain markup + echo '<a href="'.$url.'" title="'.strip_tags($label).'" class="icon-'.$astyle.'"></a>'; } /** diff --git a/index_edit.php b/index_edit.php index 0749020ec7..c8722bb328 100644 --- a/index_edit.php +++ b/index_edit.php @@ -61,20 +61,18 @@ if (isset($_REQUEST['right'])) { } // Define all the icons we're going to use +$IconUarrow = 'icon-uarrow'; +$IconDarrow = 'icon-darrow'; if($TEXT_DIRECTION=='ltr') { - $IconUarrow = '<img src="'.$WT_IMAGES['uarrow'].'" width="20" height="20" alt="">'; - $IconDarrow = '<img src="'.$WT_IMAGES['darrow'].'" width="20" height="20" alt="">'; - $IconRarrow = '<img src="'.$WT_IMAGES['rarrow'].'" width="20" height="20" alt="">'; - $IconLarrow = '<img src="'.$WT_IMAGES['larrow'].'" width="20" height="20" alt="">'; - $IconRDarrow = '<img src="'.$WT_IMAGES['rdarrow'].'" width="20" height="20" alt="">'; - $IconLDarrow = '<img src="'.$WT_IMAGES['ldarrow'].'" width="20" height="20" alt="">'; + $IconRarrow = 'icon-rarrow'; + $IconLarrow = 'icon-larrow'; + $IconRDarrow = 'icon-rdarrow'; + $IconLDarrow = 'icon-ldarrow'; } else { - $IconUarrow = '<img src="'.$WT_IMAGES['uarrow'].'" width="20" height="20" alt="">'; - $IconDarrow = '<img src="'.$WT_IMAGES['darrow'].'" width="20" height="20" alt="">'; - $IconRarrow = '<img src="'.$WT_IMAGES['larrow'].'" width="20" height="20" alt="">'; - $IconLarrow = '<img src="'.$WT_IMAGES['rarrow'].'" width="20" height="20" alt="">'; - $IconRDarrow = '<img src="'.$WT_IMAGES['ldarrow'].'" width="20" height="20" alt="">'; - $IconLDarrow = '<img src="'.$WT_IMAGES['rdarrow'].'" width="20" height="20" alt="">'; + $IconRarrow = 'icon-larrow'; + $IconLarrow = 'icon-rarrow'; + $IconRDarrow = 'icon-ldarrow'; + $IconLDarrow = 'icon-rdarrow'; } $all_blocks=array(); @@ -272,9 +270,9 @@ echo '</tr>'; echo '<tr>'; // NOTE: Row 2 column 1: Up/Down buttons for left (main) block list echo '<td class="optionbox center vmiddle">'; - echo '<a onclick="move_up_block(\'main_select\');" title="', WT_I18N::translate('Move up'), '">', $IconUarrow, '</a>'; + echo '<a onclick="move_up_block(\'main_select\');" title="', WT_I18N::translate('Move up'), '"class="', $IconUarrow, '"></a>'; echo '<br>'; - echo '<a onclick="move_down_block(\'main_select\');" title="', WT_I18N::translate('Move down'), '">', $IconDarrow, '</a>'; + echo '<a onclick="move_down_block(\'main_select\');" title="', WT_I18N::translate('Move down'), '"class="', $IconDarrow, '"></a>'; echo '<br><br>'; echo help_link('block_move_up'); echo '</td>'; @@ -288,11 +286,11 @@ echo '<td class="optionbox center">'; echo '</td>'; // NOTE: Row 2 column 3: Left/Right buttons for left (main) block list echo '<td class="optionbox center vmiddle">'; - echo '<a onclick="move_left_right_block(\'main_select\', \'right_select\');" title="', WT_I18N::translate('Move Right'), '">', $IconRDarrow, '</a>'; + echo '<a onclick="move_left_right_block(\'main_select\', \'right_select\');" title="', WT_I18N::translate('Move Right'), '"class="', $IconRDarrow, '"></a>'; echo '<br>'; - echo '<a onclick="move_left_right_block(\'main_select\', \'available_select\');" title="', WT_I18N::translate('Remove'), '">', $IconRarrow, '</a>'; + echo '<a onclick="move_left_right_block(\'main_select\', \'available_select\');" title="', WT_I18N::translate('Remove'), '"class="', $IconRarrow, '"></a>'; echo '<br>'; - echo '<a onclick="move_left_right_block(\'available_select\', \'main_select\');" title="', WT_I18N::translate('Add'), '">', $IconLarrow, '</a>'; + echo '<a onclick="move_left_right_block(\'available_select\', \'main_select\');" title="', WT_I18N::translate('Add'), '"class="', $IconLarrow, '"></a>'; echo '<br><br>'; echo help_link('block_move_right'); echo '</td>'; @@ -306,11 +304,11 @@ echo '<td class="optionbox center">'; echo '</td>'; // NOTE: Row 2 column 5: Left/Right buttons for right block list echo '<td class="optionbox center vmiddle">'; - echo '<a onclick="move_left_right_block(\'right_select\', \'main_select\');" title="', WT_I18N::translate('Move Left'), '">', $IconLDarrow, '</a>'; + echo '<a onclick="move_left_right_block(\'right_select\', \'main_select\');" title="', WT_I18N::translate('Move Left'), '"class="', $IconLDarrow, '"></a>'; echo '<br>'; - echo '<a onclick="move_left_right_block(\'right_select\', \'available_select\');" title="', WT_I18N::translate('Remove'), '">', $IconLarrow, '</a>'; + echo '<a onclick="move_left_right_block(\'right_select\', \'available_select\');" title="', WT_I18N::translate('Remove'), '"class="', $IconLarrow, '"></a>'; echo '<br>'; - echo '<a onclick="move_left_right_block(\'available_select\', \'right_select\');" title="', WT_I18N::translate('Add'), '">', $IconRarrow, '</a>'; + echo '<a onclick="move_left_right_block(\'available_select\', \'right_select\');" title="', WT_I18N::translate('Add'), '"class="', $IconRarrow, '"></a>'; echo '<br><br>'; echo help_link('block_move_right'); echo '</td>'; @@ -324,9 +322,9 @@ echo '<td class="optionbox center">'; echo '</td>'; // NOTE: Row 2 column 7: Up/Down buttons for right block list echo '<td class="optionbox center vmiddle">'; - echo '<a onclick="move_up_block(\'right_select\');" title="', WT_I18N::translate('Move up'), '">', $IconUarrow, '</a>'; + echo '<a onclick="move_up_block(\'right_select\');" title="', WT_I18N::translate('Move up'), '"class="', $IconUarrow, '"></a>'; echo '<br>'; - echo '<a onclick="move_down_block(\'right_select\');" title="', WT_I18N::translate('Move down'), '">', $IconDarrow. '</a>'; + echo '<a onclick="move_down_block(\'right_select\');" title="', WT_I18N::translate('Move down'), '"class="', $IconDarrow, '"></a>'; echo '<br><br>'; echo help_link('block_move_up'); echo '</td>'; diff --git a/library/WT/Controller/Compact.php b/library/WT/Controller/Compact.php index 4bf039dc0d..0019bdfce9 100644 --- a/library/WT/Controller/Compact.php +++ b/library/WT/Controller/Compact.php @@ -127,19 +127,15 @@ class WT_Controller_Compact extends WT_Controller_Chart { } } - $text = ""; if ($pid) { $indi=WT_Person::getInstance($pid); $title=WT_I18N::translate('Compact tree of %s', $indi->getFullName()); $title=htmlspecialchars(strip_tags($title)); - $arrow_img = "<img id='arrow$n' src='".$WT_IMAGES[$arrow_dir."arrow"]."' align='middle' alt='$title' title='$title'>"; - $text .= "<a href=\"?rootid=".$pid; + $text = '<a class="icon-'.$arrow_dir.'arrow" title="'.$title.'" href="?rootid='.$pid; if ($this->show_thumbs) $text .= "&show_thumbs=".$this->show_thumbs; - $text .= "\" onmouseover=\"swap_image('arrow$n',".$arrow_swap[$arrow_dir].");\" onmouseout=\"swap_image('arrow$n',".$arrow_swap[$arrow_dir].");\" >"; - $text .= $arrow_img."</a>"; + $text .= "\" onmouseover=\"swap_image('arrow$n',".$arrow_swap[$arrow_dir].");\" onmouseout=\"swap_image('arrow$n',".$arrow_swap[$arrow_dir].");\" ></a>"; } else { - // -- arrow to empty box does not have a url attached. - $text = "<img id='arrow$n' src='".$WT_IMAGES[$arrow_dir."arrow"]."' align='middle' alt='".WT_I18N::translate('Compact tree')."' title='".WT_I18N::translate('Compact tree')."' style='visibility:hidden;'>"; + $text = '<i class="icon-'.$arrow_dir.'arrow"></i>'; } return $text; diff --git a/library/WT/Media.php b/library/WT/Media.php index d47c71ab63..0dcde3ea69 100644 --- a/library/WT/Media.php +++ b/library/WT/Media.php @@ -424,7 +424,6 @@ class WT_Media extends WT_GedcomRecord { return 'mediafirewall.php?mid='.$this->getXref().$thumbstr.$downloadstr.$separator.'ged='.rawurlencode(get_gedcom_from_id($this->ged_id)).$separator.'cb='.$this->getEtag($which); } else { // file is in standard media directory (or doesn't exist), no need to use media firewall script - // definitely don't want icons defined in $WT_IMAGES going through the media firewall if ($separator == '&') { return rawurlencode($this->getLocalFilename($which)); } else { diff --git a/library/WT/MenuBar.php b/library/WT/MenuBar.php index 7793c95bec..93c66de5c2 100644 --- a/library/WT/MenuBar.php +++ b/library/WT/MenuBar.php @@ -32,8 +32,6 @@ if (!defined('WT_WEBTREES')) { class WT_MenuBar { public static function getGedcomMenu() { - global $WT_IMAGES; - //-- main menu $menu = new WT_Menu(WT_I18N::translate('Home page'), 'index.php?ctype=gedcom&ged='.WT_GEDURL, 'menu-tree', 'down'); //-- gedcom list @@ -53,7 +51,7 @@ class WT_MenuBar { } public static function getMyPageMenu() { - global $WT_IMAGES, $PEDIGREE_FULL_DETAILS, $PEDIGREE_LAYOUT; + global $PEDIGREE_FULL_DETAILS, $PEDIGREE_LAYOUT; $showFull = ($PEDIGREE_FULL_DETAILS) ? 1 : 0; $showLayout = ($PEDIGREE_LAYOUT) ? 1 : 0; @@ -94,7 +92,7 @@ class WT_MenuBar { } public static function getChartsMenu() { - global $WT_IMAGES, $SEARCH_SPIDER, $controller; + global $SEARCH_SPIDER, $controller; if ($SEARCH_SPIDER) { return null; @@ -277,7 +275,6 @@ class WT_MenuBar { case 'pedigree_map': $submenu = new WT_Menu($menuName, 'module.php?ged='.WT_GEDURL.'&mod=googlemap&mod_action=pedigree_map&rootid='.$indi_xref, 'menu-chart-pedigree_map'); - $WT_IMAGES['pedigree_map']=WT_STATIC_URL.WT_MODULES_DIR.'googlemap/images/pedigree_map.gif'; $menu->addSubmenu($submenu); break; } diff --git a/modules_v3/charts/module.php b/modules_v3/charts/module.php index 9ca3eb9333..bef1ca37ee 100644 --- a/modules_v3/charts/module.php +++ b/modules_v3/charts/module.php @@ -41,7 +41,7 @@ class charts_WT_Module extends WT_Module implements WT_Module_Block { // Implement class WT_Module_Block public function getBlock($block_id, $template=true, $cfg=null) { - global $ctype, $WT_IMAGES, $PEDIGREE_FULL_DETAILS, $show_full, $bwidth, $bheight; + global $ctype, $PEDIGREE_FULL_DETAILS, $show_full, $bwidth, $bheight; $PEDIGREE_ROOT_ID=get_gedcom_setting(WT_GED_ID, 'PEDIGREE_ROOT_ID'); @@ -87,7 +87,7 @@ class charts_WT_Module extends WT_Module implements WT_Module_Block { $id=$this->getName().$block_id; $class=$this->getName().'_block'; if ($ctype=='gedcom' && WT_USER_GEDCOM_ADMIN || $ctype=='user' && WT_USER_ID) { - $title='<img class="adminicon" src="'.$WT_IMAGES['admin'].'" width="15" height="15" alt="'.WT_I18N::translate('Configure').'" onclick="modalDialog(\'block_edit.php?block_id='.$block_id.'\', \''.$this->getTitle().'\');">'; + $title='<i class="icon-admin" title="'.WT_I18N::translate('Configure').'" onclick="modalDialog(\'block_edit.php?block_id='.$block_id.'\', \''.$this->getTitle().'\');"></i>'; } else { $title=''; } diff --git a/modules_v3/gedcom_block/module.php b/modules_v3/gedcom_block/module.php index 0d81415343..885198ece7 100644 --- a/modules_v3/gedcom_block/module.php +++ b/modules_v3/gedcom_block/module.php @@ -41,17 +41,17 @@ class gedcom_block_WT_Module extends WT_Module implements WT_Module_Block { // Implement class WT_Module_Block public function getBlock($block_id, $template=true, $cfg=null) { - global $WT_IMAGES, $controller; + global $controller; $indi_xref=$controller->getSignificantIndividual()->getXref(); $id=$this->getName().$block_id; $class=$this->getName().'_block'; $title='<span dir="auto">'.get_gedcom_setting(WT_GED_ID, 'title').'</span>'; $content = '<table><tr>'; - $content .= '<td><a href="pedigree.php?rootid='.$indi_xref.'&ged='.WT_GEDURL.'"><img class="block" src="'.$WT_IMAGES['pedigree'].'" alt="'.WT_I18N::translate('Default chart').'" title="'.WT_I18N::translate('Default chart').'"><br>'.WT_I18N::translate('Default chart').'</a></td>'; - $content .= '<td><a href="individual.php?pid='.$indi_xref.'&ged='.WT_GEDURL.'"><img class="block" src="'.$WT_IMAGES['indis'].'" alt="'.WT_I18N::translate('Default individual').'"><br>'.WT_I18N::translate('Default individual').'</a></td>'; + $content .= '<td><a href="pedigree.php?rootid='.$indi_xref.'&ged='.WT_GEDURL.'"><i class="icon-pedigree"></i><br>'.WT_I18N::translate('Default chart').'</a></td>'; + $content .= '<td><a href="individual.php?pid='.$indi_xref.'&ged='.WT_GEDURL.'"><i class="icon-indis"></i><br>'.WT_I18N::translate('Default individual').'</a></td>'; if (get_site_setting('USE_REGISTRATION_MODULE') && WT_USER_ID==false) { - $content .= '<td><a href="'.WT_LOGIN_URL.'?action=register"><img class="block" src="'.$WT_IMAGES['user_add'].'" alt="'.WT_I18N::translate('Request new user account').'"><br>'.WT_I18N::translate('Request new user account').'</a></td>'; + $content .= '<td><a href="'.WT_LOGIN_URL.'?action=register"><i class="icon-user_add"></i><br>'.WT_I18N::translate('Request new user account').'</a></td>'; } $content .= "</tr>"; $content .= "</table>"; diff --git a/modules_v3/gedcom_news/module.php b/modules_v3/gedcom_news/module.php index d49d220c9f..3f038cf9a0 100644 --- a/modules_v3/gedcom_news/module.php +++ b/modules_v3/gedcom_news/module.php @@ -49,7 +49,7 @@ class gedcom_news_WT_Module extends WT_Module implements WT_Module_Block { // Implement class WT_Module_Block public function getBlock($block_id, $template=true, $cfg=null) { - global $ctype, $WT_IMAGES; + global $ctype; switch (safe_GET('action')) { case 'deletenews': @@ -84,7 +84,7 @@ class gedcom_news_WT_Module extends WT_Module implements WT_Module_Block { $id=$this->getName().$block_id; $class=$this->getName().'_block'; if ($ctype=='gedcom' && WT_USER_GEDCOM_ADMIN || $ctype=='user' && WT_USER_ID) { - $title='<img class="adminicon" src="'.$WT_IMAGES['admin'].'" width="15" height="15" alt="'.WT_I18N::translate('Configure').'" onclick="modalDialog(\'block_edit.php?block_id='.$block_id.'\', \''.$this->getTitle().'\');">'; + $title='<i class="icon-admin" title="'.WT_I18N::translate('Configure').'" onclick="modalDialog(\'block_edit.php?block_id='.$block_id.'\', \''.$this->getTitle().'\');"></i>'; } else { $title=''; } diff --git a/modules_v3/gedcom_stats/module.php b/modules_v3/gedcom_stats/module.php index a41bcdb8b1..8db74083f5 100644 --- a/modules_v3/gedcom_stats/module.php +++ b/modules_v3/gedcom_stats/module.php @@ -41,7 +41,7 @@ class gedcom_stats_WT_Module extends WT_Module implements WT_Module_Block { // Implement class WT_Module_Block public function getBlock($block_id, $template=true, $cfg=null) { - global $ctype, $WT_IMAGES, $top10_block_present; + global $ctype, $top10_block_present; $show_last_update =get_block_setting($block_id, 'show_last_update', true); $show_common_surnames=get_block_setting($block_id, 'show_common_surnames', true); @@ -74,7 +74,7 @@ class gedcom_stats_WT_Module extends WT_Module implements WT_Module_Block { $id=$this->getName().$block_id; $class=$this->getName().'_block'; if ($ctype=='gedcom' && WT_USER_GEDCOM_ADMIN || $ctype=='user' && WT_USER_ID) { - $title='<img class="adminicon" src="'.$WT_IMAGES['admin'].'" width="15" height="15" alt="'.WT_I18N::translate('Configure').'" onclick="modalDialog(\'block_edit.php?block_id='.$block_id.'\', \''.$this->getTitle().'\');">'; + $title='<i class="icon-admin" title="'.WT_I18N::translate('Configure').'" onclick="modalDialog(\'block_edit.php?block_id='.$block_id.'\', \''.$this->getTitle().'\');"></i>'; } else { $title=''; } diff --git a/modules_v3/googlemap/pedigree_map.php b/modules_v3/googlemap/pedigree_map.php index af896df814..b742005760 100644 --- a/modules_v3/googlemap/pedigree_map.php +++ b/modules_v3/googlemap/pedigree_map.php @@ -35,7 +35,7 @@ if (!defined('WT_WEBTREES')) { require WT_ROOT.WT_MODULES_DIR.'googlemap/defaultconfig.php'; -global $PEDIGREE_GENERATIONS, $MAX_PEDIGREE_GENERATIONS, $ENABLE_AUTOCOMPLETE, $SHOW_HIGHLIGHT_IMAGES, $WT_IMAGES; +global $PEDIGREE_GENERATIONS, $MAX_PEDIGREE_GENERATIONS, $ENABLE_AUTOCOMPLETE, $SHOW_HIGHLIGHT_IMAGES; // Default is show for both of these. diff --git a/modules_v3/googlemap/wt_v3_googlemap.js.php b/modules_v3/googlemap/wt_v3_googlemap.js.php index 86ecec0525..9aa2c02046 100644 --- a/modules_v3/googlemap/wt_v3_googlemap.js.php +++ b/modules_v3/googlemap/wt_v3_googlemap.js.php @@ -402,7 +402,7 @@ $STREETVIEW=get_module_setting('googlemap', 'GM_USE_STREETVIEW'); function loadMap() { <?php - global $GOOGLEMAP_MAP_TYPE, $PEDIGREE_GENERATIONS, $MAX_PEDIGREE_GENERATIONS, $ENABLE_AUTOCOMPLETE, $SHOW_HIGHLIGHT_IMAGES, $WT_IMAGES, $GEDCOM; + global $GOOGLEMAP_MAP_TYPE, $PEDIGREE_GENERATIONS, $MAX_PEDIGREE_GENERATIONS, $ENABLE_AUTOCOMPLETE, $SHOW_HIGHLIGHT_IMAGES, $GEDCOM; ?> // Create the map and mapOptions diff --git a/modules_v3/html/module.php b/modules_v3/html/module.php index 8f8174295f..7d9c6f45b9 100644 --- a/modules_v3/html/module.php +++ b/modules_v3/html/module.php @@ -41,7 +41,7 @@ class html_WT_Module extends WT_Module implements WT_Module_Block { // Implement class WT_Module_Block public function getBlock($block_id, $template=true, $cfg=null) { - global $ctype, $GEDCOM, $WT_IMAGES; + global $ctype, $GEDCOM; // Only show this block for certain languages $languages=get_block_setting($block_id, 'languages'); @@ -97,7 +97,7 @@ class html_WT_Module extends WT_Module implements WT_Module_Block { $id=$this->getName().$block_id; $class=$this->getName().'_block'; if ($ctype=='gedcom' && WT_USER_GEDCOM_ADMIN || $ctype=='user' && WT_USER_ID) { - $title='<img class="adminicon" src="'.$WT_IMAGES['admin'].'" width="15" height="15" alt="'.WT_I18N::translate('Configure').'" onclick="modalDialog(\'block_edit.php?block_id='.$block_id.'\', \''.$this->getTitle().'\');">'; + $title='<i class="icon-admin" title="'.WT_I18N::translate('Configure').'" onclick="modalDialog(\'block_edit.php?block_id='.$block_id.'\', \''.$this->getTitle().'\');"></i>'; } else { $title=''; } diff --git a/modules_v3/random_media/module.php b/modules_v3/random_media/module.php index d2212b8cac..dc19319422 100644 --- a/modules_v3/random_media/module.php +++ b/modules_v3/random_media/module.php @@ -181,7 +181,7 @@ class random_media_WT_Module extends WT_Module implements WT_Module_Block { $id=$this->getName().$block_id; $class=$this->getName().'_block'; if ($ctype=='gedcom' && WT_USER_GEDCOM_ADMIN || $ctype=='user' && WT_USER_ID) { - $title='<img class="adminicon" src="'.$WT_IMAGES['admin'].'" width="15" height="15" alt="'.WT_I18N::translate('Configure').'" onclick="modalDialog(\'block_edit.php?block_id='.$block_id.'\', \''.$this->getTitle().'\');">'; + $title='<i class="icon-admin" title="'.WT_I18N::translate('Configure').'" onclick="modalDialog(\'block_edit.php?block_id='.$block_id.'\', \''.$this->getTitle().'\');"></i>'; } else { $title=''; } diff --git a/modules_v3/recent_changes/module.php b/modules_v3/recent_changes/module.php index 827bcb9e8e..4de18cdf7c 100644 --- a/modules_v3/recent_changes/module.php +++ b/modules_v3/recent_changes/module.php @@ -43,8 +43,7 @@ class recent_changes_WT_Module extends WT_Module implements WT_Module_Block { // Implement class WT_Module_Block public function getBlock($block_id, $template=true, $cfg=null) { - global $ctype, $WT_IMAGES; - + global $ctype; require_once WT_ROOT.'includes/functions/functions_print_lists.php'; $days = get_block_setting($block_id, 'days', 7); @@ -69,7 +68,7 @@ class recent_changes_WT_Module extends WT_Module implements WT_Module_Block { $id = $this->getName() . $block_id; $class=$this->getName().'_block'; if ($ctype=='gedcom' && WT_USER_GEDCOM_ADMIN || $ctype=='user' && WT_USER_ID) { - $title='<img class="adminicon" src="'.$WT_IMAGES['admin'].'" width="15" height="15" alt="'.WT_I18N::translate('Configure').'" onclick="modalDialog(\'block_edit.php?block_id='.$block_id.'\', \''.$this->getTitle().'\');">'; + $title='<i class="icon-admin" title="'.WT_I18N::translate('Configure').'" onclick="modalDialog(\'block_edit.php?block_id='.$block_id.'\', \''.$this->getTitle().'\');"></i>'; } else { $title=''; } diff --git a/modules_v3/review_changes/module.php b/modules_v3/review_changes/module.php index bb41785440..2532322694 100644 --- a/modules_v3/review_changes/module.php +++ b/modules_v3/review_changes/module.php @@ -41,7 +41,7 @@ class review_changes_WT_Module extends WT_Module implements WT_Module_Block { // Implement class WT_Module_Block public function getBlock($block_id, $template=true, $cfg=null) { - global $ctype, $WT_IMAGES, $WEBTREES_EMAIL; + global $ctype, $WEBTREES_EMAIL; $changes=WT_DB::prepare( "SELECT 1". @@ -96,7 +96,7 @@ class review_changes_WT_Module extends WT_Module implements WT_Module_Block { $id=$this->getName().$block_id; $class=$this->getName().'_block'; if ($ctype=='gedcom' && WT_USER_GEDCOM_ADMIN || $ctype=='user' && WT_USER_ID) { - $title='<img class="adminicon" src="'.$WT_IMAGES['admin'].'" width="15" height="15" alt="'.WT_I18N::translate('Configure').'" onclick="modalDialog(\'block_edit.php?block_id='.$block_id.'\', \''.$this->getTitle().'\');">'; + $title='<i class="icon-admin" title="'.WT_I18N::translate('Configure').'" onclick="modalDialog(\'block_edit.php?block_id='.$block_id.'\', \''.$this->getTitle().'\');"></i>'; } else { $title=''; } diff --git a/modules_v3/stories/module.php b/modules_v3/stories/module.php index b12f6fa583..dea9614da0 100644 --- a/modules_v3/stories/module.php +++ b/modules_v3/stories/module.php @@ -321,8 +321,6 @@ class stories_WT_Module extends WT_Module implements WT_Module_Block, WT_Module_ } private function config() { - global $WT_IMAGES; - if (WT_USER_GEDCOM_ADMIN) { $controller=new WT_Controller_Base(); @@ -394,7 +392,7 @@ class stories_WT_Module extends WT_Module implements WT_Module_Block, WT_Module_ } private function show_list() { - global $controller, $WT_IMAGES; + global $controller; $controller=new WT_Controller_Base(); $controller->setPageTitle($this->getTitle()); diff --git a/modules_v3/todays_events/module.php b/modules_v3/todays_events/module.php index 4649885076..e928bb8506 100644 --- a/modules_v3/todays_events/module.php +++ b/modules_v3/todays_events/module.php @@ -41,7 +41,7 @@ class todays_events_WT_Module extends WT_Module implements WT_Module_Block { // Implement class WT_Module_Block public function getBlock($block_id, $template=true, $cfg=null) { - global $ctype, $WT_IMAGES; + global $ctype; require_once WT_ROOT.'includes/functions/functions_print_lists.php'; @@ -63,7 +63,7 @@ class todays_events_WT_Module extends WT_Module implements WT_Module_Block { $id=$this->getName().$block_id; $class=$this->getName().'_block'; if ($ctype=='gedcom' && WT_USER_GEDCOM_ADMIN || $ctype=='user' && WT_USER_ID) { - $title='<img class="adminicon" src="'.$WT_IMAGES['admin'].'" width="15" height="15" alt="'.WT_I18N::translate('Configure').'" onclick="modalDialog(\'block_edit.php?block_id='.$block_id.'\', \''.$this->getTitle().'\');">'; + $title='<i class="icon-admin" title="'.WT_I18N::translate('Configure').'" onclick="modalDialog(\'block_edit.php?block_id='.$block_id.'\', \''.$this->getTitle().'\');"></i>'; } else { $title=''; } diff --git a/modules_v3/todo/module.php b/modules_v3/todo/module.php index 9027351682..58aa64846c 100644 --- a/modules_v3/todo/module.php +++ b/modules_v3/todo/module.php @@ -41,7 +41,7 @@ class todo_WT_Module extends WT_Module implements WT_Module_Block { // Implement class WT_Module_Block public function getBlock($block_id, $template=true, $cfg=null) { - global $ctype, $WT_IMAGES, $controller; + global $ctype, $controller; $show_unassigned=get_block_setting($block_id, 'show_unassigned', true); $show_other =get_block_setting($block_id, 'show_other', true); @@ -58,7 +58,7 @@ class todo_WT_Module extends WT_Module implements WT_Module_Block { $id=$this->getName().$block_id; $class=$this->getName().'_block'; if ($ctype=='gedcom' && WT_USER_GEDCOM_ADMIN || $ctype=='user' && WT_USER_ID) { - $title='<img class="adminicon" src="'.$WT_IMAGES['admin'].'" width="15" height="15" alt="'.WT_I18N::translate('Configure').'" onclick="modalDialog(\'block_edit.php?block_id='.$block_id.'\', \''.$this->getTitle().'\');">'; + $title='<i class="icon-admin" title="'.WT_I18N::translate('Configure').'" onclick="modalDialog(\'block_edit.php?block_id='.$block_id.'\', \''.$this->getTitle().'\');"></i>'; } else { $title=''; } diff --git a/modules_v3/top10_givnnames/module.php b/modules_v3/top10_givnnames/module.php index 5911fbfd37..5f2f4546b9 100644 --- a/modules_v3/top10_givnnames/module.php +++ b/modules_v3/top10_givnnames/module.php @@ -41,7 +41,7 @@ class top10_givnnames_WT_Module extends WT_Module implements WT_Module_Block { // Implement class WT_Module_Block public function getBlock($block_id, $template=true, $cfg=null) { - global $TEXT_DIRECTION, $ctype, $WT_IMAGES, $controller; + global $TEXT_DIRECTION, $ctype, $controller; $num=get_block_setting($block_id, 'num', 10); $infoStyle=get_block_setting($block_id, 'infoStyle', 'table'); @@ -59,7 +59,7 @@ class top10_givnnames_WT_Module extends WT_Module implements WT_Module_Block { $id=$this->getName().$block_id; $class=$this->getName().'_block'; if ($ctype=='gedcom' && WT_USER_GEDCOM_ADMIN || $ctype=='user' && WT_USER_ID) { - $title='<img class="adminicon" src="'.$WT_IMAGES['admin'].'" width="15" height="15" alt="'.WT_I18N::translate('Configure').'" onclick="modalDialog(\'block_edit.php?block_id='.$block_id.'\', \''.$this->getTitle().'\');">'; + $title='<i class="icon-admin" title="'.WT_I18N::translate('Configure').'" onclick="modalDialog(\'block_edit.php?block_id='.$block_id.'\', \''.$this->getTitle().'\');"></i>'; } else { $title=''; } diff --git a/modules_v3/top10_pageviews/module.php b/modules_v3/top10_pageviews/module.php index 1edc0f46e1..3ca67654cc 100644 --- a/modules_v3/top10_pageviews/module.php +++ b/modules_v3/top10_pageviews/module.php @@ -41,7 +41,7 @@ class top10_pageviews_WT_Module extends WT_Module implements WT_Module_Block { // Implement class WT_Module_Block public function getBlock($block_id, $template=true, $cfg=null) { - global $ctype, $WT_IMAGES, $SHOW_COUNTER; + global $ctype, $SHOW_COUNTER; $count_placement=get_block_setting($block_id, 'count_placement', 'before'); $num=(int)get_block_setting($block_id, 'num', 10); @@ -57,7 +57,7 @@ class top10_pageviews_WT_Module extends WT_Module implements WT_Module_Block { $id=$this->getName().$block_id; $class=$this->getName().'_block'; if ($ctype=='gedcom' && WT_USER_GEDCOM_ADMIN || $ctype=='user' && WT_USER_ID) { - $title='<img class="adminicon" src="'.$WT_IMAGES['admin'].'" width="15" height="15" alt="'.WT_I18N::translate('Configure').'" onclick="modalDialog(\'block_edit.php?block_id='.$block_id.'\', \''.$this->getTitle().'\');">'; + $title='<i class="icon-admin" title="'.WT_I18N::translate('Configure').'" onclick="modalDialog(\'block_edit.php?block_id='.$block_id.'\', \''.$this->getTitle().'\');"></i>'; } else { $title=''; } diff --git a/modules_v3/top10_surnames/module.php b/modules_v3/top10_surnames/module.php index 8c9264c70a..d7fe307ad1 100644 --- a/modules_v3/top10_surnames/module.php +++ b/modules_v3/top10_surnames/module.php @@ -41,7 +41,7 @@ class top10_surnames_WT_Module extends WT_Module implements WT_Module_Block { // Implement class WT_Module_Block public function getBlock($block_id, $template=true, $cfg=null) { - global $ctype, $WT_IMAGES, $SURNAME_LIST_STYLE; + global $ctype, $SURNAME_LIST_STYLE; require_once WT_ROOT.'includes/functions/functions_print_lists.php'; @@ -80,7 +80,7 @@ class top10_surnames_WT_Module extends WT_Module implements WT_Module_Block { $id=$this->getName().$block_id; $class=$this->getName().'_block'; if ($ctype=='gedcom' && WT_USER_GEDCOM_ADMIN || $ctype=='user' && WT_USER_ID) { - $title='<img class="adminicon" src="'.$WT_IMAGES['admin'].'" width="15" height="15" alt="'.WT_I18N::translate('Configure').'" onclick="modalDialog(\'block_edit.php?block_id='.$block_id.'\', \''.$this->getTitle().'\');">'; + $title='<i class="icon-admin" title="'.WT_I18N::translate('Configure').'" onclick="modalDialog(\'block_edit.php?block_id='.$block_id.'\', \''.$this->getTitle().'\');"></i>'; } else { $title=''; } diff --git a/modules_v3/upcoming_events/module.php b/modules_v3/upcoming_events/module.php index ee7c860b67..1b0e741abb 100644 --- a/modules_v3/upcoming_events/module.php +++ b/modules_v3/upcoming_events/module.php @@ -41,7 +41,7 @@ class upcoming_events_WT_Module extends WT_Module implements WT_Module_Block { // Implement class WT_Module_Block public function getBlock($block_id, $template=true, $cfg=null) { - global $ctype, $WT_IMAGES; + global $ctype; require_once WT_ROOT.'includes/functions/functions_print_lists.php'; @@ -66,7 +66,7 @@ class upcoming_events_WT_Module extends WT_Module implements WT_Module_Block { $id=$this->getName().$block_id; $class=$this->getName().'_block'; if ($ctype=='gedcom' && WT_USER_GEDCOM_ADMIN || $ctype=='user' && WT_USER_ID) { - $title='<img class="adminicon" src="'.$WT_IMAGES['admin'].'" width="15" height="15" alt="'.WT_I18N::translate('Configure').'" onclick="modalDialog(\'block_edit.php?block_id='.$block_id.'\', \''.$this->getTitle().'\');">'; + $title='<i class="icon-admin" title="'.WT_I18N::translate('Configure').'" onclick="modalDialog(\'block_edit.php?block_id='.$block_id.'\', \''.$this->getTitle().'\');"></i>'; } else { $title=''; } diff --git a/modules_v3/user_blog/module.php b/modules_v3/user_blog/module.php index e72d620929..691b5e50b6 100644 --- a/modules_v3/user_blog/module.php +++ b/modules_v3/user_blog/module.php @@ -49,7 +49,7 @@ class user_blog_WT_Module extends WT_Module implements WT_Module_Block { // Implement class WT_Module_Block public function getBlock($block_id, $template=true, $cfg=null) { - global $ctype, $WT_IMAGES; + global $ctype; switch (safe_GET('action')) { case 'deletenews': diff --git a/modules_v3/user_welcome/module.php b/modules_v3/user_welcome/module.php index ee0ef60d24..ff13844850 100644 --- a/modules_v3/user_welcome/module.php +++ b/modules_v3/user_welcome/module.php @@ -41,18 +41,16 @@ class user_welcome_WT_Module extends WT_Module implements WT_Module_Block { // Implement class WT_Module_Block public function getBlock($block_id, $template=true, $cfg=null) { - global $WT_IMAGES; - $id=$this->getName().$block_id; $class=$this->getName().'_block'; $title = '<span dir="auto">'./* I18N: A greeting; %s is the user's name */ WT_I18N::translate('Welcome %s', getUserFullName(WT_USER_ID)).'</span>'; $content = '<table><tr>'; if (get_user_setting(WT_USER_ID, 'editaccount')) { - $content .= '<td><a href="edituser.php"><img class="block" src="'.$WT_IMAGES['mypage'].'" alt="'.WT_I18N::translate('My account').'"><br>'.WT_I18N::translate('My account').'</a></td>'; + $content .= '<td><a href="edituser.php"><i class="icon-mypage"></i><br>'.WT_I18N::translate('My account').'</a></td>'; } if (WT_USER_GEDCOM_ID) { - $content .= '<td><a href="pedigree.php?rootid='.WT_USER_GEDCOM_ID.'&ged='.WT_GEDURL.'"><img class="block" src="'.$WT_IMAGES['pedigree'].'" alt="'.WT_I18N::translate('My pedigree').'" title="'.WT_I18N::translate('My pedigree').'"><br>'.WT_I18N::translate('My pedigree').'</a></td>'; - $content .= '<td><a href="individual.php?pid='.WT_USER_GEDCOM_ID.'&ged='.WT_GEDURL.'"><img class="block" src="'.$WT_IMAGES['indis'].'" alt="'.WT_I18N::translate('My individual record').'"><br>'.WT_I18N::translate('My individual record').'</a></td>'; + $content .= '<td><a href="pedigree.php?rootid='.WT_USER_GEDCOM_ID.'&ged='.WT_GEDURL.'"><i class="icon-pedigree"></i><br>'.WT_I18N::translate('My pedigree').'</a></td>'; + $content .= '<td><a href="individual.php?pid='.WT_USER_GEDCOM_ID.'&ged='.WT_GEDURL.'"><i class="icon-indis"></i><br>'.WT_I18N::translate('My individual record').'</a></td>'; } $content .= '</tr>'; $content .= '</table>'; diff --git a/modules_v3/yahrzeit/module.php b/modules_v3/yahrzeit/module.php index b816e5518a..83103176a5 100644 --- a/modules_v3/yahrzeit/module.php +++ b/modules_v3/yahrzeit/module.php @@ -41,7 +41,7 @@ class yahrzeit_WT_Module extends WT_Module implements WT_Module_Block { // Implement class WT_Module_Block public function getBlock($block_id, $template=true, $cfg=null) { - global $ctype, $WT_IMAGES, $controller; + global $ctype, $controller; $days=get_block_setting($block_id, 'days', 7); $infoStyle=get_block_setting($block_id, 'infoStyle', 'table'); @@ -60,7 +60,7 @@ class yahrzeit_WT_Module extends WT_Module implements WT_Module_Block { $id=$this->getName().$block_id; $class=$this->getName().'_block'; if ($ctype=='gedcom' && WT_USER_GEDCOM_ADMIN || $ctype=='user' && WT_USER_ID) { - $title='<img class="adminicon" src="'.$WT_IMAGES['admin'].'" width="15" height="15" alt="'.WT_I18N::translate('Configure').'" onclick="modalDialog(\'block_edit.php?block_id='.$block_id.'\', \''.$this->getTitle().'\');">'; + $title='<i class="icon-admin" title="'.WT_I18N::translate('Configure').'" onclick="modalDialog(\'block_edit.php?block_id='.$block_id.'\', \''.$this->getTitle().'\');"></i>'; } else { $title=''; } @@ -154,7 +154,7 @@ class yahrzeit_WT_Module extends WT_Module implements WT_Module_Block { $content .= '<th>'.WT_Gedcom_Tag::getLabel('NAME').'</th>'; $content .= '<th>'.WT_Gedcom_Tag::getLabel('DEAT').'</th>'; $content .= '<th>DEAT</th>'; - $content .= '<th><img src="'.$WT_IMAGES['reminder'].'" alt="'.WT_I18N::translate('Anniversary').'" title="'.WT_I18N::translate('Anniversary').'"></th>'; + $content .= '<th><i class="icon-reminder" title="'.WT_I18N::translate('Anniversary').'"></i></th>'; $content .= '<th>'.WT_Gedcom_Tag::getLabel('_YART').'</th>'; $content .= '<th>_YART</th>'; $content .= '</tr></thead><tbody>'; diff --git a/themes/_administration/header.php b/themes/_administration/header.php index 1930ce9544..8284860b98 100644 --- a/themes/_administration/header.php +++ b/themes/_administration/header.php @@ -49,7 +49,7 @@ echo '<body id="body">', // Header '<div id="admin_head" class="ui-widget-content">', - '<img src="', $WT_IMAGES['webtrees'], '" alt="', WT_WEBTREES, '">', + '<i class="icon-webtrees"></i>', '<div id="title"><a href="admin.php">', WT_I18N::translate('Administration'), '</a></div>', '<div id="links">', '<a href="index.php">', WT_I18N::translate('My page'), '</a> | ', diff --git a/themes/_administration/style.css b/themes/_administration/style.css index 00951c38a4..1b1fc7de4b 100644 --- a/themes/_administration/style.css +++ b/themes/_administration/style.css @@ -463,6 +463,103 @@ table#story_table {width:100%} .icon-close {background-position:-86px -205px; width:12px; height:12px;} #page_help .icon-help-15 {background-position:-45px 0; width:24px; height:24px;} /* switch to larger version icon-help-24 */ -/* These two needed for now to suppress standard help icons */ -.help {cursor:help; display:inline; margin-left:5px; padding-right:15px; padding-bottom:5px;} -.icon {display:none;} +/* Icons */ +[class^="icon-"], [class*=" icon-"] {display:inline-block;vertical-align:text-bottom;background-repeat:no-repeat;} +.icon-add {width:14px;height:15px;background-image:url("images/add.png");} +.icon-admin {width:25px;height:25px;background-image:url("images/admin.png");} +.icon-button_addmedia {width:18px;height:16px;background-image:url("images/buttons/addmedia.png");} +.icon-button_addnote {width:17px;height:15px;background-image:url("images/buttons/addnote.png");} +.icon-button_addrepository {width:15px;height:15px;background-image:url("images/buttons/addrepository.png");} +.icon-button_addsource {width:18px;height:16px;background-image:url("images/buttons/addsource.png");} +.icon-button_calendar {width:19px;height:15px;background-image:url("images/buttons/calendar.png");} +.icon-button_family {width:14px;height:15px;background-image:url("images/buttons/family.png");} +.icon-button_find_facts {width:20px;height:20px;background-image:url("images/buttons/find_facts.png");} +.icon-button_head {width:12px;height:18px;background-image:url("images/buttons/head.png");} +.icon-button_indi {width:11px;height:15px;background-image:url("images/buttons/indi.png");} +.icon-button_keyboard {width:30px;height:15px;background-image:url("images/buttons/keyboard.png");} +.icon-button_media {width:18px;height:16px;background-image:url("images/buttons/media.png");} +.icon-button_note {width:17px;height:15px;background-image:url("images/buttons/note.png");} +.icon-button_place {width:15px;height:15px;background-image:url("images/buttons/place.png");} +.icon-button_repository {width:15px;height:15px;background-image:url("images/buttons/repository.png");} +.icon-button_source {width:18px;height:16px;background-image:url("images/buttons/source.png");} +.icon-cfamily {width:25px;height:25px;background-image:url("images/cfamily.png");} +.icon-childless {width:25px;height:25px;background-image:url("images/childless.png");} +.icon-children {width:16px;height:16px;background-image:url("images/children.png");} +.icon-clippings {width:25px;height:25px;background-image:url("images/clippings.png");} +.icon-darrow {width:20px;height:20px;background-image:url("images/darrow.png");} +.icon-darrow2 {width:20px;height:20px;background-image:url("images/darrow2.png");} +.icon-ddarrow {width:20px;height:20px;background-image:url("images/ddarrow.png");} +.icon-default_image_F {width:99px;height:106px;background-image:url("images/silhouette_female.png");} +.icon-default_image_M {width:99px;height:99px;background-image:url("images/silhouette_male.png");} +.icon-default_image_U {width:100px;height:97px;background-image:url("images/silhouette_unknown.png");} +.icon-dline {width:200px;height:200px;background-image:url("images/dline.png");} +.icon-dline2 {width:200px;height:200px;background-image:url("images/dline2.png");} +.icon-edit_indi {width:25px;height:25px;background-image:url("images/edit_indi.png");} +.icon-fam-list {width:25px;height:25px;background-image:url("images/sfamily.png");} +.icon-hline {width:10px;height:3px;background-image:url("images/hline.png");} +.icon-indi-list {width:25px;height:25px;background-image:url("images/indis.png");} +.icon-indis {width:25px;height:25px;background-image:url("images/indis.png");} +.icon-larrow {width:20px;height:20px;background-image:url("images/larrow.png");} +.icon-larrow2 {width:20px;height:20px;background-image:url("images/larrow2.png");} +.icon-ldarrow {width:20px;height:20px;background-image:url("images/ldarrow.png");} +.icon-lists {width:25px;height:25px;background-image:url("images/lists.png");} +.icon-lsdnarrow {width:48px;height:48px;background-image:url("images/lifespan-down.png");} +.icon-lsltarrow {width:48px;height:48px;background-image:url("images/lifespan-left.png");} +.icon-lsrtarrow {width:48px;height:48px;background-image:url("images/lifespan-right.png");} +.icon-lsuparrow {width:48px;height:48px;background-image:url("images/lifespan-up.png");} +.icon-media {width:25px;height:25px;background-image:url("images/media.png");} +.icon-media-list {width:25px;height:25px;background-image:url("images/media.png");} +.icon-media_audio {width:48px;height:64px;background-image:url("images/media/audio.png");} +.icon-media_doc {width:50px;height:32px;background-image:url("images/media/doc.png");} +.icon-media_flash {width:59px;height:63px;background-image:url("images/media/flash.png");} +.icon-media_flashrem {width:68px;height:68px;background-image:url("images/media/flashrem.png");} +.icon-media_ged {width:50px;height:32px;background-image:url("images/media/ged.png");} +.icon-media_globe {width:76px;height:62px;background-image:url("images/media/globe.png");} +.icon-media_html {width:50px;height:32px;background-image:url("images/media/html.png");} +.icon-media_pdf {width:50px;height:32px;background-image:url("images/media/pdf.png");} +.icon-media_picasa {width:62px;height:62px;background-image:url("images/media/picasa.png");} +.icon-media_tex {width:50px;height:32px;background-image:url("images/media/tex.png");} +.icon-media_wmv {width:62px;height:62px;background-image:url("images/media/wmv.png");} +.icon-media_wmvrem {width:68px;height:68px;background-image:url("images/media/wmvrem.png");} +.icon-minus {width:11px;height:11px;background-image:url("images/minus.png");} +.icon-mypage {width:25px;height:25px;background-image:url("images/mypage.png");} +.icon-note {width:50px;height:50px;background-image:url("images/notes.png");} +.icon-note-list {width:50px;height:50px;background-image:url("images/notes.png");} +.icon-patriarch {width:25px;height:25px;background-image:url("images/patriarch.png");} +.icon-pedigree {width:25px;height:25px;background-image:url("images/pedigree.png");} +.icon-place {width:25px;height:25px;background-image:url("images/place.png");} +.icon-plus {width:11px;height:11px;background-image:url("images/plus.png");} +.icon-rarrow {width:20px;height:20px;background-image:url("images/rarrow.png");} +.icon-rarrow2 {width:20px;height:20px;background-image:url("images/rarrow2.png");} +.icon-rdarrow {width:20px;height:20px;background-image:url("images/rdarrow.png");} +.icon-reminder {width:15px;height:12px;background-image:url("images/reminder.png");} +.icon-remove {width:16px;height:16px;background-image:url("images/delete.png");} +.icon-reorder {width:16px;height:16px;background-image:url("images/reorder_images.png");} +.icon-repo-list {width:25px;height:25px;background-image:url("images/repository.png");} +.icon-repository {width:25px;height:25px;background-image:url("images/repository.png");} +.icon-rings {width:9px;height:9px;background-image:url("images/rings.png");} +.icon-search {width:25px;height:25px;background-image:url("images/search.png");} +.icon-selected {width:12px;height:12px;background-image:url("images/selected.png");} +.icon-sex_f_15x15 {width:15px;height:15px;background-image:url("images/sex_f_15x15.png");} +.icon-sex_f_9x9 {width:9px;height:9px;background-image:url("images/sex_f_9x9.png");} +.icon-sex_m_15x15 {width:15px;height:15px;background-image:url("images/sex_m_15x15.png");} +.icon-sex_m_9x9 {width:9px;height:9px;background-image:url("images/sex_m_9x9.png");} +.icon-sex_u_15x15 {width:15px;height:15px;background-image:url("images/sex_u_15x15.png");} +.icon-sex_u_9x9 {width:9px;height:9px;background-image:url("images/sex_u_9x9.png");} +.icon-sfamily {width:25px;height:25px;background-image:url("images/sfamily.png");} +.icon-source {width:25px;height:25px;background-image:url("images/source.png");} +.icon-source-list {width:25px;height:25px;background-image:url("images/source.png");} +.icon-spacer {width:10px;height:10px;background-image:url("images/spacer.png");} +.icon-stop {width:20px;height:20px;background-image:url("images/stop.png");} +.icon-target {width:15px;height:15px;background-image:url("images/buttons/target.png");} +.icon-tree {width:25px;height:25px;background-image:url("images/tree.png");} +.icon-uarrow {width:20px;height:20px;background-image:url("images/uarrow.png");} +.icon-uarrow2 {width:20px;height:20px;background-image:url("images/uarrow2.png");} +.icon-udarrow {width:20px;height:20px;background-image:url("images/udarrow.png");} +.icon-user_add {width:25px;height:25px;background-image:url("images/user_add.png");} +.icon-vline {width:3px;height:10px;background-image:url("images/vline.png");} +.icon-warning {width:17px;height:17px;background-image:url("images/warning.png");} +.icon-webtrees {width:240px;height:50px;background-image:url("images/header.png");} +.icon-wiki {width:16px;height:16px;background-image:url("images/w_button.png");} +.icon-zoomin {width:25px;height:25px;background-image:url("images/zoomin.png");} +.icon-zoomout {width:25px;height:25px;background-image:url("images/zoomout.png");} diff --git a/themes/clouds/footer.php b/themes/clouds/footer.php index 731b4d75be..481e089344 100644 --- a/themes/clouds/footer.php +++ b/themes/clouds/footer.php @@ -35,8 +35,7 @@ if ($view!='simple') { echo contact_links(); echo '<br>'; echo '<p class="logo">'; - echo '<a href="', WT_WEBTREES_URL, '" target="_blank">'; - echo '<img src="', $WT_IMAGES['webtrees'], '" width="100" height="21" alt="', WT_WEBTREES, '" title="', WT_WEBTREES, ' ', WT_VERSION_TEXT, '"></a>'; + echo '<a href="', WT_WEBTREES_URL, '" target="_blank" class="icon-webtrees" title="', WT_WEBTREES, ' ', WT_VERSION_TEXT, '"></a>'; echo '</p>'; if (WT_DEBUG || get_gedcom_setting(WT_GED_ID, 'SHOW_STATS')) { echo execution_stats(); diff --git a/themes/clouds/style.css b/themes/clouds/style.css index cb10eeffe3..bcf4926cb2 100644 --- a/themes/clouds/style.css +++ b/themes/clouds/style.css @@ -705,6 +705,7 @@ top: 50px; left: 0; } +.compact_view {cursor:url('images/zoomin.png'),n-resize;} .compact_view p { font-size:90%; margin:0; @@ -2842,3 +2843,104 @@ html[dir='rtl'] #search-page-table .value {margin:0 170px 0 0;} z-index:1; } } + +/* Icons */ +[class^="icon-"], [class*=" icon-"] {display:inline-block;vertical-align:text-bottom;background-repeat:no-repeat;} +.icon-add {width:14px;height:15px;background-image:url("images/add.png");} +.icon-admin {width:22px;height:22px;background-image:url("images/admin.png");} +.icon-cfamily {width:22px;height:22px;background-image:url("images/cfamily.png");} +.icon-childless {width:25px;height:25px;background-image:url("images/childless.png");} +.icon-children {width:16px;height:16px;background-image:url("images/children.png");} +.icon-clippings {width:22px;height:22px;background-image:url("images/clippings.png");} +.icon-darrow {width:20px;height:20px;background-image:url("images/darrow.png");} +a.icon-darrow:hover {width:20px;height:20px;background-image:url("images/darrow2.png");} +.icon-ddarrow {width:20px;height:20px;background-image:url("images/ddarrow.png");} +.icon-default_image_F {width:99px;height:106px;background-image:url("images/silhouette_female.png");} +.icon-default_image_M {width:99px;height:99px;background-image:url("images/silhouette_male.png");} +.icon-default_image_U {width:100px;height:97px;background-image:url("images/silhouette_unknown.png");} +.icon-dline {width:200px;height:200px;background-image:url("images/dline.png");} +.icon-dline2 {width:200px;height:200px;background-image:url("images/dline2.png");} +.icon-edit_indi {width:22px;height:22px;background-image:url("images/edit_indi.png");} +.icon-fam-list {width:22px;height:22px;background-image:url("images/sfamily.png");} +.icon-hline {width:10px;height:3px;background-image:url("images/hline.png");} +.icon-indis {width:22px;height:22px;background-image:url("images/indis.png");} +.icon-indi-list {width:22px;height:22px;background-image:url("images/indis.png");} +.icon-larrow {width:20px;height:20px;background-image:url("images/larrow.png");} +a.icon-larrow:hover {width:20px;height:20px;background-image:url("images/larrow2.png");} +.icon-ldarrow {width:20px;height:20px;background-image:url("images/ldarrow.png");} +.icon-lsdnarrow {width:48px;height:48px;background-image:url("images/lifespan-down.png");} +.icon-lsltarrow {width:48px;height:48px;background-image:url("images/lifespan-left.png");} +.icon-lsrtarrow {width:48px;height:48px;background-image:url("images/lifespan-right.png");} +.icon-lsuparrow {width:48px;height:48px;background-image:url("images/lifespan-up.png");} +.icon-media {width:32px;height:32px;background-image:url("images/media.png");} +.icon-media-list {width:32px;height:32px;background-image:url("images/media.png");} +.icon-minus {width:11px;height:11px;background-image:url("images/minus.png");} +.icon-mypage {width:22px;height:22px;background-image:url("images/mypage.png");} +.icon-note {width:22px;height:22px;background-image:url("images/notes.png");} +.icon-note-list {width:22px;height:22px;background-image:url("images/notes.png");} +.icon-patriarch {width:25px;height:25px;background-image:url("images/patriarch.png");} +.icon-pedigree {width:22px;height:22px;background-image:url("images/pedigree.png");} +.icon-place {width:22px;height:22px;background-image:url("images/place.png");} +.icon-plus {width:11px;height:11px;background-image:url("images/plus.png");} +.icon-rarrow {width:20px;height:20px;background-image:url("images/rarrow.png");} +a.icon-rarrow:hover {width:20px;height:20px;background-image:url("images/rarrow2.png");} +.icon-rdarrow {width:20px;height:20px;background-image:url("images/rdarrow.png");} +.icon-reminder {width:15px;height:12px;background-image:url("images/reminder.png");} +.icon-remove {width:16px;height:16px;background-image:url("images/delete.png");} +.icon-reorder {width:16px;height:16px;background-image:url("images/reorder_images.png");} +.icon-repository {width:22px;height:22px;background-image:url("images/repository.png");} +.icon-repo-list {width:22px;height:22px;background-image:url("images/repository.png");} +.icon-rings {width:9px;height:9px;background-image:url("images/rings.png");} +.icon-search {width:16px;height:16px;background-image:url("images/go.png");} +.icon-selected {width:12px;height:12px;background-image:url("images/selected.png");} +.icon-sex_f_15x15 {width:15px;height:15px;background-image:url("images/sex_f_15x15.png");} +.icon-sex_f_9x9 {width:9px;height:9px;background-image:url("images/sex_f_9x9.png");} +.icon-sex_m_15x15 {width:15px;height:15px;background-image:url("images/sex_m_15x15.png");} +.icon-sex_m_9x9 {width:9px;height:9px;background-image:url("images/sex_m_9x9.png");} +.icon-sex_u_15x15 {width:15px;height:15px;background-image:url("images/sex_u_15x15.png");} +.icon-sex_u_9x9 {width:9px;height:9px;background-image:url("images/sex_u_9x9.png");} +.icon-sfamily {width:22px;height:22px;background-image:url("images/sfamily.png");} +.icon-source {width:25px;height:25px;background-image:url("images/source.png");} +.icon-source-list {width:25px;height:25px;background-image:url("images/source.png");} +.icon-spacer {width:10px;height:10px;background-image:url("images/spacer.png");} +.icon-stop {width:20px;height:20px;background-image:url("images/stop.png");} +.icon-target {width:15px;height:15px;background-image:url("images/buttons/target.png");} +.icon-tree {width:20px;height:20px;background-image:url("images/gedcom.png");} +.icon-uarrow {width:20px;height:20px;background-image:url("images/uarrow.png");} +a.icon-uarrow:hover {width:20px;height:20px;background-image:url("images/uarrow2.png");} +.icon-udarrow {width:20px;height:20px;background-image:url("images/udarrow.png");} +.icon-user_add {width:22px;height:22px;background-image:url("images/user_add.png");} +.icon-vline {width:3px;height:10px;background-image:url("images/vline.png");} +.icon-warning {width:17px;height:17px;background-image:url("images/warning.png");} +.icon-webtrees {width:100px;height:21px;background-image:url("images/webtrees.png");} +.icon-wiki {width:16px;height:16px;background-image:url("images/w_button.png");} +.icon-zoomin {width:25px;height:25px;background-image:url("images/zoomin.png");} +.icon-zoomout {width:25px;height:25px;background-image:url("images/zoomout.png");} +.icon-button_addmedia {width:18px;height:16px;background-image:url("images/buttons/addmedia.png");} +.icon-button_addnote {width:17px;height:15px;background-image:url("images/buttons/addnote.png");} +.icon-button_addrepository {width:15px;height:15px;background-image:url("images/buttons/addrepository.png");} +.icon-button_addsource {width:18px;height:16px;background-image:url("images/buttons/addsource.png");} +.icon-button_calendar {width:19px;height:15px;background-image:url("images/buttons/calendar.png");} +.icon-button_family {width:14px;height:15px;background-image:url("images/buttons/family.png");} +.icon-button_find_facts {width:20px;height:20px;background-image:url("images/buttons/find_facts.png");} +.icon-button_head {width:12px;height:18px;background-image:url("images/buttons/head.png");} +.icon-button_indi {width:11px;height:15px;background-image:url("images/buttons/indi.png");} +.icon-button_keyboard {width:30px;height:15px;background-image:url("images/buttons/keyboard.png");} +.icon-button_media {width:18px;height:16px;background-image:url("images/buttons/media.png");} +.icon-button_note {width:17px;height:15px;background-image:url("images/buttons/note.png");} +.icon-button_place {width:15px;height:15px;background-image:url("images/buttons/place.png");} +.icon-button_repository {width:15px;height:15px;background-image:url("images/buttons/repository.png");} +.icon-button_source {width:18px;height:16px;background-image:url("images/buttons/source.png");} +.icon-media_audio {width:48px;height:64px;background-image:url("images/media/audio.png");} +.icon-media_doc {width:50px;height:32px;background-image:url("images/media/doc.png");} +.icon-media_flash {width:59px;height:63px;background-image:url("images/media/flash.png");} +.icon-media_flashrem {width:68px;height:68px;background-image:url("images/media/flashrem.png");} +.icon-media_ged {width:50px;height:32px;background-image:url("images/media/ged.png");} +.icon-media_globe {width:76px;height:62px;background-image:url("images/media/globe.png");} +.icon-media_html {width:50px;height:32px;background-image:url("images/media/html.png");} +.icon-media_pdf {width:50px;height:32px;background-image:url("images/media/pdf.png");} +.icon-media_picasa {width:62px;height:62px;background-image:url("images/media/picasa.png");} +.icon-media_tex {width:50px;height:32px;background-image:url("images/media/tex.png");} +.icon-media_wmv {width:62px;height:62px;background-image:url("images/media/wmv.png");} +.icon-media_wmvrem {width:68px;height:68px;background-image:url("images/media/wmvrem.png");} +.icon-pedigree_map {width:24px;height:24px;background-image:url("../../modules_v3/googlemap/images/pedigree_map.gif");} diff --git a/themes/clouds/templates/compactbox_template.php b/themes/clouds/templates/compactbox_template.php index 94c83550b8..0f2a95a580 100644 --- a/themes/clouds/templates/compactbox_template.php +++ b/themes/clouds/templates/compactbox_template.php @@ -33,7 +33,7 @@ if (!defined('WT_WEBTREES')) { } echo '<div id="out-', $boxID ,'" ', $outBoxAdd, '> - <div class="compact_view" style="cursor:url(\''.$WT_IMAGES["zoomin"].'\'),n-resize;">', + <div class="compact_view">', $thumbnail, '<a onclick="event.cancelBubble=true;" href="individual.php?pid=', $pid, '&ged=', rawurlencode($GEDCOM), '" title="',strip_tags($name.$addname),'"> <span id="namedef-',$boxID, '" class="name',$style,' ',$classfacts,'">', $shortname, '</span> diff --git a/themes/colors/css/colors.css b/themes/colors/css/colors.css index f55a05b308..3ac16c6e44 100644 --- a/themes/colors/css/colors.css +++ b/themes/colors/css/colors.css @@ -322,6 +322,7 @@ html[dir='rtl'] #relationship_chart{margin-right:10px;} .button{width:60px;} .center{text-align:center;} +.compact_view {cursor:url('../images/zoomin.png'),n-resize;} .compact_view p{font-size:90%;margin:0;} .gedcom_table{border:1px solid #999;margin:0;width:99%;} @@ -894,3 +895,105 @@ html[dir='rtl'] #search-page-table .value{margin:0 170px 0 0;} .lifespan_outer{position:relative;width:auto;height:auto;overflow:visible;border:none;} .lifespan_people{position:absolute;width:auto;left:-10px;top:-60px;z-index:1;} } + +/* Icons */ +[class^="icon-"], [class*=" icon-"] {display:inline-block;vertical-align:text-bottom;background-repeat:no-repeat;} +.icon-add {width:14px;height:15px;background-image:url("../images/add.png");} +.icon-admin {width:22px;height:22px;background-image:url("../images/admin.png");} +.icon-cfamily {width:32px;height:32px;background-image:url("../images/cfamily.png");} +.icon-childless {width:25px;height:25px;background-image:url("../images/childless.png");} +.icon-children {width:16px;height:16px;background-image:url("../images/children.png");} +.icon-clippings {width:32px;height:32px;background-image:url("../images/clippings.png");} +.icon-darrow {width:20px;height:20px;background-image:url("../images/darrow.png");} +a.icon-darrow:hover {width:20px;height:20px;background-image:url("../images/darrow2.png");} +.icon-ddarrow {width:20px;height:20px;background-image:url("../images/ddarrow.png");} +.icon-default_image_F {width:99px;height:106px;background-image:url("../images/silhouette_female.png");} +.icon-default_image_M {width:99px;height:99px;background-image:url("../images/silhouette_male.png");} +.icon-default_image_U {width:100px;height:97px;background-image:url("../images/silhouette_unknown.png");} +.icon-dline {width:200px;height:200px;background-image:url("../images/dline.png");} +.icon-dline2 {width:200px;height:200px;background-image:url("../images/dline2.png");} +.icon-edit_indi {width:22px;height:22px;background-image:url("../images/edit_indi.png");} +.icon-fam-list {width:32px;height:32px;background-image:url("../images/sfamily.png");} +.icon-hline {width:10px;height:3px;background-image:url("../images/hline.png");} +.icon-indis {width:32px;height:32px;background-image:url("../images/indis.png");} +.icon-indi-list {width:32px;height:32px;background-image:url("../images/indis.png");} +.icon-larrow {width:20px;height:20px;background-image:url("../images/larrow.png");} +a.icon-larrow:hover {width:20px;height:20px;background-image:url("../images/larrow2.png");} +.icon-ldarrow {width:20px;height:20px;background-image:url("../images/ldarrow.png");} +.icon-lsdnarrow {width:48px;height:48px;background-image:url("../images/lifespan-down.png");} +.icon-lsltarrow {width:48px;height:48px;background-image:url("../images/lifespan-left.png");} +.icon-lsrtarrow {width:48px;height:48px;background-image:url("../images/lifespan-right.png");} +.icon-lsuparrow {width:48px;height:48px;background-image:url("../images/lifespan-up.png");} +.icon-media {width:32px;height:32px;background-image:url("../images/media.png");} +.icon-media-list {width:32px;height:32px;background-image:url("../images/media.png");} +.icon-minus {width:11px;height:11px;background-image:url("../images/minus.png");} +.icon-mypage {width:32px;height:32px;background-image:url("../images/mypage.png");} +.icon-note {width:33px;height:35px;background-image:url("../images/notes.png");} +.icon-note-list {width:33px;height:35px;background-image:url("../images/notes.png");} +.icon-patriarch {width:32px;height:32px;background-image:url("../images/patriarch.png");} +.icon-pedigree {width:32px;height:32px;background-image:url("../images/pedigree.png");} +.icon-place {width:32px;height:17px;background-image:url("../images/place.png");} +.icon-plus {width:11px;height:11px;background-image:url("../images/plus.png");} +.icon-rarrow {width:20px;height:20px;background-image:url("../images/rarrow.png");} +a.icon-rarrow:hover {width:20px;height:20px;background-image:url("../images/rarrow2.png");} +.icon-rdarrow {width:20px;height:20px;background-image:url("../images/rdarrow.png");} +.icon-reminder {width:15px;height:12px;background-image:url("../images/reminder.png");} +.icon-remove {width:16px;height:16px;background-image:url("../images/delete.png");} +.icon-reorder {width:16px;height:16px;background-image:url("../images/reorder_images.png");} +.icon-repository {width:22px;height:22px;background-image:url("../images/repository.png");} +.icon-repo-list {width:22px;height:22px;background-image:url("../images/repository.png");} +.icon-rings {width:9px;height:9px;background-image:url("../images/rings.png");} +.icon-search {width:16px;height:16px;background-image:url("../images/go.png");} +.icon-selected {width:12px;height:12px;background-image:url("../images/selected.png");} +.icon-sex_f_15x15 {width:15px;height:15px;background-image:url("../images/sex_f_15x15.png");} +.icon-sex_f_9x9 {width:9px;height:9px;background-image:url("../images/sex_f_9x9.png");} +.icon-sex_m_15x15 {width:15px;height:15px;background-image:url("../images/sex_m_15x15.png");} +.icon-sex_m_9x9 {width:9px;height:9px;background-image:url("../images/sex_m_9x9.png");} +.icon-sex_u_15x15 {width:15px;height:15px;background-image:url("../images/sex_u_15x15.png");} +.icon-sex_u_9x9 {width:9px;height:9px;background-image:url("../images/sex_u_9x9.png");} +.icon-sfamily {width:32px;height:32px;background-image:url("../images/sfamily.png");} +.icon-source {width:32px;height:32px;background-image:url("../images/source.png");} +.icon-source-list {width:32px;height:32px;background-image:url("../images/source.png");} +.icon-spacer {width:10px;height:10px;background-image:url("../images/spacer.png");} +.icon-stop {width:20px;height:20px;background-image:url("../images/stop.png");} +.icon-target {width:15px;height:15px;background-image:url("../images/buttons/target.png");} +.icon-tree {width:20px;height:20px;background-image:url("../images/gedcom.png");} +.icon-uarrow {width:20px;height:20px;background-image:url("../images/uarrow.png");} +a.icon-uarrow:hover {width:20px;height:20px;background-image:url("../images/uarrow2.png");} +.icon-udarrow {width:20px;height:20px;background-image:url("../images/udarrow.png");} +.icon-user_add {width:32px;height:32px;background-image:url("../images/user_add.png");} +.icon-vline {width:3px;height:10px;background-image:url("../images/vline.png");} +.icon-warning {width:17px;height:17px;background-image:url("../images/warning.png");} +.icon-webtrees {width:100px;height:21px;background-image:url("../images/webtrees.png");} +.icon-wiki {width:16px;height:16px;background-image:url("../images/w_button.png");} +.icon-zoomin {width:25px;height:25px;background-image:url("../images/zoomin.png");} +.icon-zoomout {width:25px;height:25px;background-image:url("../images/zoomout.png");} +.icon-button_addmedia {width:18px;height:16px;background-image:url("../images/buttons/addmedia.png");} +.icon-button_addnote {width:17px;height:15px;background-image:url("../images/buttons/addnote.png");} +.icon-button_addrepository {width:15px;height:15px;background-image:url("../images/buttons/addrepository.png");} +.icon-button_addsource {width:18px;height:16px;background-image:url("../images/buttons/addsource.png");} +.icon-button_calendar {width:19px;height:15px;background-image:url("../images/buttons/calendar.png");} +.icon-button_family {width:14px;height:15px;background-image:url("../images/buttons/family.png");} +.icon-button_find_facts {width:20px;height:20px;background-image:url("../images/buttons/find_facts.png");} +.icon-button_head {width:12px;height:18px;background-image:url("../images/buttons/head.png");} +.icon-button_indi {width:11px;height:15px;background-image:url("../images/buttons/indi.png");} +.icon-button_keyboard {width:30px;height:15px;background-image:url("../images/buttons/keyboard.png");} +.icon-button_media {width:18px;height:16px;background-image:url("../images/buttons/media.png");} +.icon-button_note {width:17px;height:15px;background-image:url("../images/buttons/note.png");} +.icon-button_place {width:15px;height:15px;background-image:url("../images/buttons/place.png");} +.icon-button_repository {width:15px;height:15px;background-image:url("../images/buttons/repository.png");} +.icon-button_source {width:18px;height:16px;background-image:url("../images/buttons/source.png");} +.icon-media_audio {width:48px;height:48px;background-image:url("../images/media/audio.png");} +.icon-media_doc {width:48px;height:48px;background-image:url("../images/media/doc.png");} +.icon-media_flash {width:48px;height:48px;background-image:url("../images/media/flash.png");} +.icon-media_flashrem {width:48px;height:48px;background-image:url("../images/media/flashrem.png");} +.icon-media_ged {width:48px;height:48px;background-image:url("../images/media/ged.png");} +.icon-media_globe {width:76px;height:62px;background-image:url("../images/media/globe.png");} +.icon-media_html {width:48px;height:48px;background-image:url("../images/media/www.png");} +.icon-media_picasa {width:48px;height:48px;background-image:url("../images/media/picasa.png");} +.icon-media_pdf {width:48px;height:48px;background-image:url("../images/media/pdf.png");} +.icon-media_tex {width:48px;height:48px;background-image:url("../images/media/tex.png");} +.icon-media_wmv {width:48px;height:48px;background-image:url("../images/media/wmv.png");} +.icon-media_wmvrem {width:48px;height:48px;background-image:url("../images/media/wmvrem.png");} +.icon-pedigree_map {width:24px;height:24px;background-image:url("../../../modules_v3/googlemap/images/pedigree_map.gif");} + diff --git a/themes/colors/footer.php b/themes/colors/footer.php index 8efac480b0..9dbe918a93 100644 --- a/themes/colors/footer.php +++ b/themes/colors/footer.php @@ -35,8 +35,7 @@ if ($view!='simple') { echo contact_links(); echo '<br>'; echo '<p class="logo">'; - echo '<a href="', WT_WEBTREES_URL, '" target="_blank">'; - echo '<img src="', $WT_IMAGES['webtrees'], '" width="100" height="21" alt="', WT_WEBTREES, '" title="', WT_WEBTREES, ' ', WT_VERSION_TEXT, '"></a>'; + echo '<a href="', WT_WEBTREES_URL, '" target="_blank" class="icon-webtrees" title="', WT_WEBTREES, ' ', WT_VERSION_TEXT, '"></a>'; echo '</p>'; if (WT_DEBUG || get_gedcom_setting(WT_GED_ID, 'SHOW_STATS')) { echo execution_stats(); diff --git a/themes/colors/templates/compactbox_template.php b/themes/colors/templates/compactbox_template.php index 94c83550b8..0f2a95a580 100644 --- a/themes/colors/templates/compactbox_template.php +++ b/themes/colors/templates/compactbox_template.php @@ -33,7 +33,7 @@ if (!defined('WT_WEBTREES')) { } echo '<div id="out-', $boxID ,'" ', $outBoxAdd, '> - <div class="compact_view" style="cursor:url(\''.$WT_IMAGES["zoomin"].'\'),n-resize;">', + <div class="compact_view">', $thumbnail, '<a onclick="event.cancelBubble=true;" href="individual.php?pid=', $pid, '&ged=', rawurlencode($GEDCOM), '" title="',strip_tags($name.$addname),'"> <span id="namedef-',$boxID, '" class="name',$style,' ',$classfacts,'">', $shortname, '</span> diff --git a/themes/fab/style.css b/themes/fab/style.css index fa7a6b367c..296abd3b51 100644 --- a/themes/fab/style.css +++ b/themes/fab/style.css @@ -310,6 +310,7 @@ html[dir="rtl"] .pedigree_image { left:0; } +.compact_view {cursor:url('images/zoomin.png'),n-resize;} .compact_view p {font-size:90%; margin:0;} .thumbnail { @@ -515,7 +516,7 @@ right:10px; margin:2px; } -.icon, .adminicon { +.icon { padding-left:0; padding-right:5pt; } @@ -1428,3 +1429,108 @@ html[dir='rtl'] #search-page-table .value {margin:0 170px 0 0;} /* ======= Who is online block ========== */ .logged_in_list{margin:5px 0 0 0;padding:0;line-height:20px;} .mailto{background-image:url(images/email.png); background-repeat:no-repeat; cursor:help; margin:0 3px; font-size: 14px;} + +/* Icons */ +[class^="icon-"], [class*=" icon-"] {display:inline-block;vertical-align:text-bottom;background-repeat:no-repeat;} +.icon-add {width:14px;height:15px;background-image:url("images/add.png");} +.icon-admin {width:30px;height:30px;background-image:url("images/admin.png");} +.icon-button_addmedia {width:18px;height:16px;background-image:url("images/buttons/addmedia.png");} +.icon-button_addnote {width:17px;height:15px;background-image:url("images/buttons/addnote.png");} +.icon-button_addrepository {width:15px;height:15px;background-image:url("images/buttons/addrepository.png");} +.icon-button_addsource {width:18px;height:16px;background-image:url("images/buttons/addsource.png");} +.icon-button_calendar {width:19px;height:15px;background-image:url("images/buttons/calendar.png");} +.icon-button_family {width:14px;height:15px;background-image:url("images/buttons/family.png");} +.icon-button_find_facts {width:20px;height:20px;background-image:url("images/buttons/find_facts.png");} +.icon-button_head {width:12px;height:18px;background-image:url("images/buttons/head.png");} +.icon-button_indi {width:11px;height:15px;background-image:url("images/buttons/indi.png");} +.icon-button_keyboard {width:30px;height:15px;background-image:url("images/buttons/keyboard.png");} +.icon-button_media {width:18px;height:16px;background-image:url("images/buttons/media.png");} +.icon-button_note {width:17px;height:15px;background-image:url("images/buttons/note.png");} +.icon-button_place {width:15px;height:15px;background-image:url("images/buttons/place.png");} +.icon-button_repository {width:15px;height:15px;background-image:url("images/buttons/repository.png");} +.icon-button_source {width:18px;height:16px;background-image:url("images/buttons/source.png");} +.icon-cfamily {width:24px;height:24px;background-image:url("images/cfamily.png");} +.icon-childless {width:25px;height:25px;background-image:url("images/childless.png");} +.icon-children {width:16px;height:16px;background-image:url("images/children.png");} +.icon-clippings {width:24px;height:24px;background-image:url("images/clippings.png");} +.icon-darrow {width:20px;height:20px;background-image:url("images/darrow.png");} +a.icon-darrow:hover {width:20px;height:20px;background-image:url("images/darrow2.png");} +.icon-ddarrow {width:20px;height:20px;background-image:url("images/ddarrow.png");} +.icon-default_image_F {width:99px;height:106px;background-image:url("images/silhouette_female.png");} +.icon-default_image_M {width:99px;height:99px;background-image:url("images/silhouette_male.png");} +.icon-default_image_U {width:100px;height:97px;background-image:url("images/silhouette_unknown.png");} +.icon-dline {width:200px;height:200px;background-image:url("images/dline.png");} +.icon-dline2 {width:200px;height:200px;background-image:url("images/dline2.png");} +.icon-edit_indi {width:25px;height:25px;background-image:url("images/edit_indi.png");} +.icon-fam-list {width:24px;height:24px;background-image:url("images/sfamily.png");} +.icon-hline {width:10px;height:3px;background-image:url("images/hline.png");} +.icon-indis {width:24px;height:24px;background-image:url("images/indis.png");} +.icon-indi-list {width:50px;height:50px;background-image:url("images/indis.png");} +.icon-larrow {width:20px;height:20px;background-image:url("images/larrow.png");} +a.icon-larrow:hover {width:20px;height:20px;background-image:url("images/larrow2.png");} +.icon-ldarrow {width:20px;height:20px;background-image:url("images/ldarrow.png");} +.icon-lsdnarrow {width:48px;height:48px;background-image:url("images/lifespan-down.png");} +.icon-lsltarrow {width:48px;height:48px;background-image:url("images/lifespan-left.png");} +.icon-lsrtarrow {width:48px;height:48px;background-image:url("images/lifespan-right.png");} +.icon-lsuparrow {width:48px;height:48px;background-image:url("images/lifespan-up.png");} +.icon-media {width:24px;height:24px;background-image:url("images/media.png");} +.icon-media-list {width:24px;height:24px;background-image:url("images/media.png");} +.icon-media_audio {width:48px;height:64px;background-image:url("images/media/audio.png");} +.icon-media_doc {width:50px;height:32px;background-image:url("images/media/doc.png");} +.icon-media_flash {width:59px;height:63px;background-image:url("images/media/flash.png");} +.icon-media_flashrem {width:68px;height:68px;background-image:url("images/media/flashrem.png");} +.icon-media_ged {width:50px;height:32px;background-image:url("images/media/ged.png");} +.icon-media_globe {width:76px;height:62px;background-image:url("images/media/globe.png");} +.icon-media_html {width:50px;height:32px;background-image:url("images/media/html.png");} +.icon-media_pdf {width:50px;height:32px;background-image:url("images/media/pdf.png");} +.icon-media_picasa {width:62px;height:62px;background-image:url("images/media/picasa.png");} +.icon-media_tex {width:50px;height:32px;background-image:url("images/media/tex.png");} +.icon-media_wmv {width:62px;height:62px;background-image:url("images/media/wmv.png");} +.icon-media_wmvrem {width:68px;height:68px;background-image:url("images/media/wmvrem.png");} +.icon-minus {width:11px;height:11px;background-image:url("images/minus.png");} +.icon-mypage {width:25px;height:25px;background-image:url("images/mypage.png");} +.icon-note {width:16px;height:16px;background-image:url("images/notes.png");} +.icon-note-list {width:16px;height:16px;background-image:url("images/notes.png");} +.icon-patriarch {width:24px;height:24px;background-image:url("images/patriarch.png");} +.icon-pedigree {width:24px;height:24px;background-image:url("images/pedigree.png");} +.icon-pin-in {width:16px;height:16px;background-image:url("images/pin-in.png");} +.icon-pin-out {width:16px;height:16px;background-image:url("images/pin-out.png");} +.icon-place {width:24px;height:24px;background-image:url("images/place.png");} +.icon-plus {width:11px;height:11px;background-image:url("images/plus.png");} +.icon-rarrow {width:20px;height:20px;background-image:url("images/rarrow.png");} +a.icon-rarrow:hover {width:20px;height:20px;background-image:url("images/rarrow2.png");} +.icon-rdarrow {width:20px;height:20px;background-image:url("images/rdarrow.png");} +.icon-reminder {width:15px;height:12px;background-image:url("images/reminder.png");} +.icon-remove {width:14px;height:15px;background-image:url("images/remove.png");} +.icon-reorder {width:16px;height:16px;background-image:url("images/reorder_images.png");} +.icon-repository {width:30px;height:30px;background-image:url("images/repository.png");} +.icon-repo-list {width:30px;height:30px;background-image:url("images/repository.png");} +.icon-rings {width:9px;height:9px;background-image:url("images/rings.png");} +.icon-search {width:24px;height:24px;background-image:url("images/search.png");} +.icon-selected {width:12px;height:12px;background-image:url("images/selected.png");} +.icon-sex_f_15x15 {width:15px;height:15px;background-image:url("images/sex_f_15x15.png");} +.icon-sex_f_9x9 {width:9px;height:9px;background-image:url("images/sex_f_9x9.png");} +.icon-sex_m_15x15 {width:15px;height:15px;background-image:url("images/sex_m_15x15.png");} +.icon-sex_m_9x9 {width:9px;height:9px;background-image:url("images/sex_m_9x9.png");} +.icon-sex_u_15x15 {width:15px;height:15px;background-image:url("images/sex_u_15x15.png");} +.icon-sex_u_9x9 {width:9px;height:9px;background-image:url("images/sex_u_9x9.png");} +.icon-sfamily {width:24px;height:24px;background-image:url("images/sfamily.png");} +.icon-slide_close {width:22px;height:20px;background-image:url("images/close.png");} +.icon-slide_open {width:20px;height:22px;background-image:url("images/open.png");} +.icon-source {width:24px;height:24px;background-image:url("images/source.png");} +.icon-source-list {width:24px;height:24px;background-image:url("images/source.png");} +.icon-spacer {width:10px;height:10px;background-image:url("images/spacer.png");} +.icon-stop {width:20px;height:20px;background-image:url("images/stop.png");} +.icon-target {width:15px;height:15px;background-image:url("images/buttons/target.png");} +.icon-tree {width:24px;height:24px;background-image:url("images/gedcom.png");} +.icon-uarrow {width:20px;height:20px;background-image:url("images/uarrow.png");} +a.icon-uarrow:hover {width:20px;height:20px;background-image:url("images/uarrow2.png");} +.icon-udarrow {width:20px;height:20px;background-image:url("images/udarrow.png");} +.icon-user_add {width:24px;height:24px;background-image:url("images/user_add.png");} +.icon-vline {width:3px;height:10px;background-image:url("images/vline.png");} +.icon-warning {width:17px;height:17px;background-image:url("images/warning.png");} +.icon-webtrees {width:100px;height:21px;background-image:url("images/webtrees.png");} +.icon-wiki {width:16px;height:16px;background-image:url("images/w_button.png");} +.icon-zoomin {width:25px;height:25px;background-image:url("images/zoomin.png");} +.icon-zoomout {width:25px;height:25px;background-image:url("images/zoomout.png");} +.icon-pedigree_map {width:24px;height:24px;background-image:url("../../modules_v3/googlemap/images/pedigree_map.gif");} diff --git a/themes/fab/templates/compactbox_template.php b/themes/fab/templates/compactbox_template.php index 94c83550b8..0f2a95a580 100644 --- a/themes/fab/templates/compactbox_template.php +++ b/themes/fab/templates/compactbox_template.php @@ -33,7 +33,7 @@ if (!defined('WT_WEBTREES')) { } echo '<div id="out-', $boxID ,'" ', $outBoxAdd, '> - <div class="compact_view" style="cursor:url(\''.$WT_IMAGES["zoomin"].'\'),n-resize;">', + <div class="compact_view">', $thumbnail, '<a onclick="event.cancelBubble=true;" href="individual.php?pid=', $pid, '&ged=', rawurlencode($GEDCOM), '" title="',strip_tags($name.$addname),'"> <span id="namedef-',$boxID, '" class="name',$style,' ',$classfacts,'">', $shortname, '</span> diff --git a/themes/minimal/footer.php b/themes/minimal/footer.php index dbd164da1a..89731cba62 100644 --- a/themes/minimal/footer.php +++ b/themes/minimal/footer.php @@ -33,8 +33,7 @@ if ($view!='simple') { echo '<div id="footer" class="', $TEXT_DIRECTION, ' width99 center">'; echo contact_links(); echo '<p class="logo">'; - echo '<a href="', WT_WEBTREES_URL, '" target="_blank">'; - echo '<img src="', $WT_IMAGES['webtrees'], '" width="100" height="21" alt="', WT_WEBTREES, '" title="', WT_WEBTREES, ' ', WT_VERSION_TEXT, ' ', '"></a>'; + echo '<a href="', WT_WEBTREES_URL, '" target="_blank" class="icon-webtrees" title="', WT_WEBTREES, ' ', WT_VERSION_TEXT, '"></a>'; echo '</p>'; if (WT_DEBUG || get_gedcom_setting(WT_GED_ID, 'SHOW_STATS')) { echo execution_stats(); diff --git a/themes/minimal/style.css b/themes/minimal/style.css index 2e4ce2b64f..6056820349 100644 --- a/themes/minimal/style.css +++ b/themes/minimal/style.css @@ -589,17 +589,10 @@ html[dir="rtl"] .pedigree_image { margin-right: 15px; } -.adminicon { - border: none; - padding-left: 0; - padding-right: 5pt; -} - -html[dir='rtl'] .icon, html[dir='rtl'] .adminicon { +html[dir='rtl'] .icon { padding-left: 5pt; padding-right: 0; } - .link { font-size: 11px; text-align: center; @@ -949,6 +942,7 @@ left:auto; vertical-align: top; } +.compact_view {cursor:url('images/zoomin.png'),n-resize;} .compact_view p {font-size:90%; margin:0;} .listlog { @@ -1849,3 +1843,96 @@ html[dir='rtl'] #search-page-table .value {margin:0 170px 0 0;} } #CB_All {display:none;} } + +/* Icons */ +[class^="icon-"], [class*=" icon-"] {display:inline-block;vertical-align:text-bottom;background-repeat:no-repeat;} +.icon-add {width:14px;height:15px;background-image:url("images/add.png");} +.icon-admin {width:25px;height:25px;background-image:url("images/admin.png");} +.icon-button_addmedia {width:18px;height:16px;background-image:url("images/buttons/addmedia.png");} +.icon-button_addnote {width:17px;height:15px;background-image:url("images/buttons/addnote.png");} +.icon-button_addrepository {width:15px;height:15px;background-image:url("images/buttons/addrepository.png");} +.icon-button_addsource {width:18px;height:16px;background-image:url("images/buttons/addsource.png");} +.icon-button_calendar {width:19px;height:15px;background-image:url("images/buttons/calendar.png");} +.icon-button_family {width:14px;height:15px;background-image:url("images/buttons/family.png");} +.icon-button_find_facts {width:20px;height:20px;background-image:url("images/buttons/find_facts.png");} +.icon-button_head {width:12px;height:18px;background-image:url("images/buttons/head.png");} +.icon-button_indi {width:11px;height:15px;background-image:url("images/buttons/indi.png");} +.icon-button_keyboard {width:30px;height:15px;background-image:url("images/buttons/keyboard.png");} +.icon-button_media {width:18px;height:16px;background-image:url("images/buttons/media.png");} +.icon-button_note {width:17px;height:15px;background-image:url("images/buttons/note.png");} +.icon-button_place {width:15px;height:15px;background-image:url("images/buttons/place.png");} +.icon-button_repository {width:15px;height:15px;background-image:url("images/buttons/repository.png");} +.icon-button_source {width:18px;height:16px;background-image:url("images/buttons/source.png");} +.icon-cfamily {width:24px;height:24px;background-image:url("images/cfamily.png");} +.icon-childless {width:25px;height:25px;background-image:url("images/childless.png");} +.icon-children {width:16px;height:16px;background-image:url("images/children.png");} +.icon-clippings {width:24px;height:24px;background-image:url("images/clippings.png");} +.icon-darrow {width:20px;height:20px;background-image:url("images/darrow.png");} +a.icon-darrow:hover {width:20px;height:20px;background-image:url("images/darrow2.png");} +.icon-ddarrow {width:20px;height:20px;background-image:url("images/ddarrow.png");} +.icon-default_image_F {width:99px;height:106px;background-image:url("images/silhouette_female.png");} +.icon-default_image_M {width:99px;height:99px;background-image:url("images/silhouette_male.png");} +.icon-default_image_U {width:100px;height:97px;background-image:url("images/silhouette_unknown.png");} +.icon-dline {width:200px;height:200px;background-image:url("images/dline.png");} +.icon-dline2 {width:200px;height:200px;background-image:url("images/dline2.png");} +.icon-hline {width:10px;height:3px;background-image:url("images/hline.png");} +.icon-indis {width:24px;height:24px;background-image:url("images/indis.png");} +.icon-larrow {width:20px;height:20px;background-image:url("images/larrow.png");} +a.icon-larrow:hover {width:20px;height:20px;background-image:url("images/larrow2.png");} +.icon-ldarrow {width:20px;height:20px;background-image:url("images/ldarrow.png");} +.icon-lsdnarrow {width:48px;height:48px;background-image:url("images/lifespan-down.png");} +.icon-lsltarrow {width:48px;height:48px;background-image:url("images/lifespan-left.png");} +.icon-lsrtarrow {width:48px;height:48px;background-image:url("images/lifespan-right.png");} +.icon-lsuparrow {width:48px;height:48px;background-image:url("images/lifespan-up.png");} +.icon-media {width:24px;height:24px;background-image:url("images/media.png");} +.icon-media_audio {width:48px;height:64px;background-image:url("images/media/audio.png");} +.icon-media_doc {width:50px;height:32px;background-image:url("images/media/doc.png");} +.icon-media_flash {width:59px;height:63px;background-image:url("images/media/flash.png");} +.icon-media_flashrem {width:68px;height:68px;background-image:url("images/media/flashrem.png");} +.icon-media_ged {width:50px;height:32px;background-image:url("images/media/ged.png");} +.icon-media_globe {width:76px;height:62px;background-image:url("images/media/globe.png");} +.icon-media_html {width:50px;height:32px;background-image:url("images/media/html.png");} +.icon-media_pdf {width:50px;height:32px;background-image:url("images/media/pdf.png");} +.icon-media_picasa {width:62px;height:62px;background-image:url("images/media/picasa.png");} +.icon-media_tex {width:50px;height:32px;background-image:url("images/media/tex.png");} +.icon-media_wmv {width:62px;height:62px;background-image:url("images/media/wmv.png");} +.icon-media_wmvrem {width:68px;height:68px;background-image:url("images/media/wmvrem.png");} +.icon-minus {width:11px;height:11px;background-image:url("images/minus.png");} +.icon-mypage {width:25px;height:25px;background-image:url("images/mypage.png");} +.icon-note {width:16px;height:16px;background-image:url("images/notes.png");} +.icon-patriarch {width:25px;height:25px;background-image:url("images/patriarch.png");} +.icon-pedigree {width:24px;height:24px;background-image:url("images/pedigree.png");} +.icon-pedigree_map {width:24px;height:24px;background-image:url("../../modules_v3/googlemap/images/pedigree_map.gif");} +.icon-place {width:24px;height:24px;background-image:url("images/place.png");} +.icon-plus {width:11px;height:11px;background-image:url("images/plus.png");} +.icon-rarrow {width:20px;height:20px;background-image:url("images/rarrow.png");} +a.icon-rarrow:hover {width:20px;height:20px;background-image:url("images/rarrow2.png");} +.icon-rdarrow {width:20px;height:20px;background-image:url("images/rdarrow.png");} +.icon-reminder {width:15px;height:12px;background-image:url("images/reminder.png");} +.icon-remove {width:14px;height:15px;background-image:url("images/remove.png");} +.icon-repository {width:25px;height:25px;background-image:url("images/repository.png");} +.icon-rings {width:9px;height:9px;background-image:url("images/rings.png");} +.icon-search {width:24px;height:24px;background-image:url("images/search.png");} +.icon-selected {width:12px;height:12px;background-image:url("images/selected.png");} +.icon-sex_f_15x15 {width:15px;height:15px;background-image:url("images/sex_f_15x15.png");} +.icon-sex_f_9x9 {width:9px;height:9px;background-image:url("images/sex_f_9x9.png");} +.icon-sex_m_15x15 {width:15px;height:15px;background-image:url("images/sex_m_15x15.png");} +.icon-sex_m_9x9 {width:9px;height:9px;background-image:url("images/sex_m_9x9.png");} +.icon-sex_u_15x15 {width:15px;height:15px;background-image:url("images/sex_u_15x15.png");} +.icon-sex_u_9x9 {width:9px;height:9px;background-image:url("images/sex_u_9x9.png");} +.icon-sfamily {width:24px;height:24px;background-image:url("images/sfamily.png");} +.icon-source {width:24px;height:24px;background-image:url("images/source.png");} +.icon-spacer {width:10px;height:10px;background-image:url("images/spacer.png");} +.icon-stop {width:16px;height:17px;background-image:url("images/stop.png");} +.icon-target {width:15px;height:15px;background-image:url("images/buttons/target.png");} +.icon-tree {width:24px;height:24px;background-image:url("images/gedcom.png");} +.icon-uarrow {width:20px;height:20px;background-image:url("images/uarrow.png");} +a.icon-uarrow:hover {width:20px;height:20px;background-image:url("images/uarrow2.png");} +.icon-udarrow {width:20px;height:20px;background-image:url("images/udarrow.png");} +.icon-user_add {width:24px;height:24px;background-image:url("images/user_add.png");} +.icon-vline {width:3px;height:10px;background-image:url("images/vline.png");} +.icon-warning {width:17px;height:17px;background-image:url("images/warning.png");} +.icon-webtrees {width:100px;height:21px;background-image:url("images/webtrees.png");} +.icon-wiki {width:16px;height:16px;background-image:url("images/w_button.png");} +.icon-zoomin {width:25px;height:25px;background-image:url("images/zoomin.png");} +.icon-zoomout {width:25px;height:25px;background-image:url("images/zoomout.png");} diff --git a/themes/minimal/templates/compactbox_template.php b/themes/minimal/templates/compactbox_template.php index 94c83550b8..0f2a95a580 100644 --- a/themes/minimal/templates/compactbox_template.php +++ b/themes/minimal/templates/compactbox_template.php @@ -33,7 +33,7 @@ if (!defined('WT_WEBTREES')) { } echo '<div id="out-', $boxID ,'" ', $outBoxAdd, '> - <div class="compact_view" style="cursor:url(\''.$WT_IMAGES["zoomin"].'\'),n-resize;">', + <div class="compact_view">', $thumbnail, '<a onclick="event.cancelBubble=true;" href="individual.php?pid=', $pid, '&ged=', rawurlencode($GEDCOM), '" title="',strip_tags($name.$addname),'"> <span id="namedef-',$boxID, '" class="name',$style,' ',$classfacts,'">', $shortname, '</span> diff --git a/themes/webtrees/footer.php b/themes/webtrees/footer.php index f40c9f05d8..ff41e48feb 100644 --- a/themes/webtrees/footer.php +++ b/themes/webtrees/footer.php @@ -33,8 +33,7 @@ if ($view!='simple') { echo '<div id="footer">'; echo contact_links(); echo '<p class="logo">'; - echo '<a href="', WT_WEBTREES_URL, '" target="_blank">'; - echo '<img src="', $WT_IMAGES['webtrees'], '" width="100" height="21" alt="', WT_WEBTREES, '" title="', WT_WEBTREES, ' ', WT_VERSION_TEXT , '"></a>'; + echo '<a href="', WT_WEBTREES_URL, '" target="_blank" class="icon-webtrees" title="', WT_WEBTREES, ' ', WT_VERSION_TEXT, '"></a>'; echo '</p>'; if (WT_DEBUG || get_gedcom_setting(WT_GED_ID, 'SHOW_STATS')) { diff --git a/themes/webtrees/header.php b/themes/webtrees/header.php index 66715420ce..6d23a130ab 100644 --- a/themes/webtrees/header.php +++ b/themes/webtrees/header.php @@ -86,7 +86,7 @@ if ($view!='simple') { '<input type="hidden" name="action" value="general">', '<input type="hidden" name="topsearch" value="yes">', '<input type="text" name="query" size="25" placeholder="', WT_I18N::translate('Search'), '" dir="auto">', - '<input type="image" class="image" src="', $WT_IMAGES['search'], '" alt="', WT_I18N::translate('Search'), '" title="', WT_I18N::translate('Search'), '">', + '<input type="image" class="image" src="', WT_THEME_DIR, 'images/search.png"', WT_I18N::translate('Search'), '" title="', WT_I18N::translate('Search'), '">', '</form>', '</div>'; $menu_items=array( diff --git a/themes/webtrees/style.css b/themes/webtrees/style.css index cbdd7b3c7b..0d57f31835 100644 --- a/themes/webtrees/style.css +++ b/themes/webtrees/style.css @@ -126,7 +126,7 @@ a:hover .nameZoom {color:#f00; font-weight:bold; font-size:14px;} html[dir="rtl"] .pedigree_image {float:right; margin:0 0 0 4px;} .pedigree_form {width:45px;} .thumbnail {height:auto; padding:3px;} -.icon, .adminicon {border:none;} +.icon {border:none;} .sublinks_table {border:solid #81a9cb 1px; background-color:#edf7fd;} .sublinks_cell {font-size:12px; background-color:#edf7fd;} @@ -200,6 +200,7 @@ html[dir='rtl'] #ancestry_chart li {margin:0; padding:0 2px 0 0; left:auto;} .person4 {background-color:#f55; border:outset #f55 1px; vertical-align:top;} .person5 {background-color:#5f5; border:outset #5f5 1px; vertical-align:top;} +.compact_view {cursor:url('images/zoomin.png'),n-resize;} .compact_view p {font-size:90%; margin:0;} .listlog {line-height:20pt;} @@ -848,3 +849,104 @@ html[dir='rtl'] #search-page-table .value {margin:0 170px 0 0;} .lifespan_people {position:absolute; width:auto; left:-10px; top:-60px; z-index:1;} #CB_All {display:none;} } + +/* Icons */ +[class^="icon-"], [class*=" icon-"] {display:inline-block;vertical-align:text-bottom;background-repeat:no-repeat;} +.icon-add {width:14px;height:15px;background-image:url("images/add.png");} +.icon-admin {width:15px;height:15px;background-image:url("images/admin.png");} +.icon-button_addmedia {width:18px;height:16px;background-image:url("images/buttons/addmedia.png");} +.icon-button_addnote {width:17px;height:15px;background-image:url("images/buttons/addnote.png");} +.icon-button_addrepository {width:15px;height:15px;background-image:url("images/buttons/addrepository.png");} +.icon-button_addsource {width:18px;height:16px;background-image:url("images/buttons/addsource.png");} +.icon-button_calendar {width:19px;height:15px;background-image:url("images/buttons/calendar.png");} +.icon-button_family {width:14px;height:15px;background-image:url("images/buttons/family.png");} +.icon-button_find_facts {width:20px;height:20px;background-image:url("images/buttons/find_facts.png");} +.icon-button_head {width:12px;height:18px;background-image:url("images/buttons/head.png");} +.icon-button_indi {width:11px;height:15px;background-image:url("images/buttons/indi.png");} +.icon-button_keyboard {width:30px;height:15px;background-image:url("images/buttons/keyboard.png");} +.icon-button_media {width:18px;height:16px;background-image:url("images/buttons/media.png");} +.icon-button_note {width:17px;height:15px;background-image:url("images/buttons/note.png");} +.icon-button_place {width:15px;height:15px;background-image:url("images/buttons/place.png");} +.icon-button_repository {width:15px;height:15px;background-image:url("images/buttons/repository.png");} +.icon-button_source {width:18px;height:16px;background-image:url("images/buttons/source.png");} +.icon-cfamily {width:20px;height:20px;background-image:url("images/family.png");} +.icon-childless {width:25px;height:25px;background-image:url("images/childless.png");} +.icon-children {width:16px;height:16px;background-image:url("images/children.png");} +.icon-clippings {width:22px;height:22px;background-image:url("images/clippings.png");} +.icon-darrow {width:20px;height:20px;background-image:url("images/darrow.png");} +a.icon-darrow:hover {width:20px;height:20px;background-image:url("images/darrow2.png");} +.icon-ddarrow {width:20px;height:20px;background-image:url("images/ddarrow.png");} +.icon-default_image_F {width:99px;height:106px;background-image:url("images/silhouette_female.png");} +.icon-default_image_M {width:99px;height:99px;background-image:url("images/silhouette_male.png");} +.icon-default_image_U {width:100px;height:97px;background-image:url("images/silhouette_unknown.png");} +.icon-dline {width:200px;height:200px;background-image:url("images/dline.png");} +.icon-dline2 {width:200px;height:200px;background-image:url("images/dline2.png");} +.icon-edit_indi {width:20px;height:20px;background-image:url("images/edit_indi.png");} +.icon-fam-list {width:20px;height:20px;background-image:url("images/family.png");} +.icon-hline {width:10px;height:3px;background-image:url("images/hline.png");} +.icon-indi-list {width:20px;height:20px;background-image:url("images/indis.png");} +.icon-indis {width:20px;height:20px;background-image:url("images/indis.png");} +.icon-larrow {width:20px;height:20px;background-image:url("images/larrow.png");} +a.icon-larrow:hover {width:20px;height:20px;background-image:url("images/larrow2.png");} +.icon-ldarrow {width:20px;height:20px;background-image:url("images/ldarrow.png");} +.icon-lsdnarrow {width:48px;height:48px;background-image:url("images/lifespan-down.png");} +.icon-lsltarrow {width:48px;height:48px;background-image:url("images/lifespan-left.png");} +.icon-lsrtarrow {width:48px;height:48px;background-image:url("images/lifespan-right.png");} +.icon-lsuparrow {width:48px;height:48px;background-image:url("images/lifespan-up.png");} +.icon-media {width:20px;height:20px;background-image:url("images/media.png");} +.icon-media-list {width:20px;height:20px;background-image:url("images/media.png");} +.icon-media_audio {width:48px;height:48px;background-image:url("images/media/audio.png");} +.icon-media_doc {width:48px;height:48px;background-image:url("images/media/doc.png");} +.icon-media_flash {width:48px;height:48px;background-image:url("images/media/flash.png");} +.icon-media_flashrem {width:48px;height:48px;background-image:url("images/media/flashrem.png");} +.icon-media_ged {width:48px;height:48px;background-image:url("images/media/unknown.png");} +.icon-media_globe {width:48px;height:48px;background-image:url("images/media/www.png");} +.icon-media_html {width:48px;height:48px;background-image:url("images/media/www.png");} +.icon-media_pdf {width:48px;height:48px;background-image:url("images/media/pdf.png");} +.icon-media_picasa {width:48px;height:48px;background-image:url("images/media/picasa.png");} +.icon-media_tex {width:48px;height:48px;background-image:url("images/media/tex.png");} +.icon-media_wmv {width:48px;height:48px;background-image:url("images/media/wmv.png");} +.icon-media_wmvrem {width:48px;height:48px;background-image:url("images/media/wmvrem.png");} +.icon-minus {width:11px;height:11px;background-image:url("images/minus.png");} +.icon-mypage {width:24px;height:24px;background-image:url("images/mypage.png");} +.icon-note {width:20px;height:20px;background-image:url("images/notes.png");} +.icon-note-list {width:20px;height:20px;background-image:url("images/notes.png");} +.icon-patriarch {width:20px;height:20px;background-image:url("images/patriarch.png");} +.icon-pedigree {width:20px;height:20px;background-image:url("images/pedigree.png");} +.icon-pedigree_map {width:24px;height:24px;background-image:url("../../modules_v3/googlemap/images/pedigree_map.gif");} +.icon-place {width:20px;height:20px;background-image:url("images/place.png");} +.icon-plus {width:11px;height:11px;background-image:url("images/plus.png");} +.icon-rarrow {width:20px;height:20px;background-image:url("images/rarrow.png");} +a.icon-rarrow:hover {width:20px;height:20px;background-image:url("images/rarrow2.png");} +.icon-rdarrow {width:20px;height:20px;background-image:url("images/rdarrow.png");} +.icon-reminder {width:15px;height:12px;background-image:url("images/reminder.png");} +.icon-remove {width:20px;height:20px;background-image:url("images/remove.png");} +.icon-reorder {width:16px;height:16px;background-image:url("images/reorder_images.png");} +.icon-repo-list {width:20px;height:20px;background-image:url("images/repository.png");} +.icon-repository {width:20px;height:20px;background-image:url("images/repository.png");} +.icon-rings {width:9px;height:9px;background-image:url("images/rings.png");} +.icon-search {width:17px;height:17px;background-image:url("images/search.png");} +.icon-selected {width:12px;height:12px;background-image:url("images/selected.png");} +.icon-sex_f_15x15 {width:15px;height:15px;background-image:url("images/sex_f_15x15.png");} +.icon-sex_f_9x9 {width:9px;height:9px;background-image:url("images/sex_f_9x9.png");} +.icon-sex_m_15x15 {width:15px;height:15px;background-image:url("images/sex_m_15x15.png");} +.icon-sex_m_9x9 {width:9px;height:9px;background-image:url("images/sex_m_9x9.png");} +.icon-sex_u_15x15 {width:15px;height:15px;background-image:url("images/sex_u_15x15.png");} +.icon-sex_u_9x9 {width:9px;height:9px;background-image:url("images/sex_u_9x9.png");} +.icon-sfamily {width:20px;height:20px;background-image:url("images/family.png");} +.icon-source {width:20px;height:20px;background-image:url("images/source.png");} +.icon-source-list {width:20px;height:20px;background-image:url("images/source.png");} +.icon-spacer {width:10px;height:10px;background-image:url("images/spacer.png");} +.icon-stop {width:20px;height:20px;background-image:url("images/stop.png");} +.icon-target {width:15px;height:15px;background-image:url("images/buttons/target.png");} +.icon-tree {width:20px;height:20px;background-image:url("images/tree.png");} +.icon-uarrow {width:20px;height:20px;background-image:url("images/uarrow.png");} +a.icon-uarrow:hover {width:20px;height:20px;background-image:url("images/uarrow2.png");} +.icon-udarrow {width:20px;height:20px;background-image:url("images/udarrow.png");} +.icon-user_add {width:20px;height:20px;background-image:url("images/user_add.png");} +.icon-vline {width:3px;height:10px;background-image:url("images/vline.png");} +.icon-warning {width:17px;height:17px;background-image:url("images/warning.png");} +.icon-webtrees {width:100px;height:21px;background-image:url("images/webtrees_s.png");} +.icon-wiki {width:16px;height:16px;background-image:url("images/w_button.png");} +.icon-zoomin {width:25px;height:25px;background-image:url("images/zoomin.png");} +.icon-zoomout {width:25px;height:25px;background-image:url("images/zoomout.png");} diff --git a/themes/webtrees/templates/compactbox_template.php b/themes/webtrees/templates/compactbox_template.php index 94c83550b8..0f2a95a580 100644 --- a/themes/webtrees/templates/compactbox_template.php +++ b/themes/webtrees/templates/compactbox_template.php @@ -33,7 +33,7 @@ if (!defined('WT_WEBTREES')) { } echo '<div id="out-', $boxID ,'" ', $outBoxAdd, '> - <div class="compact_view" style="cursor:url(\''.$WT_IMAGES["zoomin"].'\'),n-resize;">', + <div class="compact_view">', $thumbnail, '<a onclick="event.cancelBubble=true;" href="individual.php?pid=', $pid, '&ged=', rawurlencode($GEDCOM), '" title="',strip_tags($name.$addname),'"> <span id="namedef-',$boxID, '" class="name',$style,' ',$classfacts,'">', $shortname, '</span> diff --git a/themes/xenea/footer.php b/themes/xenea/footer.php index 2f8ab77a69..4f511be400 100644 --- a/themes/xenea/footer.php +++ b/themes/xenea/footer.php @@ -33,8 +33,7 @@ if ($view!='simple') { echo '<div id="footer" class="', $TEXT_DIRECTION, ' width99 center">'; echo contact_links(); echo '<p class="logo">'; - echo '<a href="', WT_WEBTREES_URL, '" target="_blank">'; - echo '<img src="', $WT_IMAGES['webtrees'], '" width="100" height="21" alt="', WT_WEBTREES, '" title="', WT_WEBTREES, ' ', WT_VERSION_TEXT, '"></a>'; + echo '<a href="', WT_WEBTREES_URL, '" target="_blank" class="icon-webtrees" title="', WT_WEBTREES, ' ', WT_VERSION_TEXT, '"></a>'; echo '</p>'; if (WT_DEBUG || get_gedcom_setting(WT_GED_ID, 'SHOW_STATS')) { echo execution_stats(); diff --git a/themes/xenea/style.css b/themes/xenea/style.css index 16bbee6e80..2e628511a7 100644 --- a/themes/xenea/style.css +++ b/themes/xenea/style.css @@ -634,13 +634,13 @@ html[dir="rtl"] .pedigree_image { padding:5px; } -.icon, .adminicon { +.icon { border:none; padding-left:0; padding-right:5px; } -html[dir='rtl'] .icon, html[dir='rtl'] .adminicon { +html[dir='rtl'] .icon { padding-left:5px; padding-right:0; } @@ -1084,6 +1084,7 @@ left:auto; vertical-align:top; } +.compact_view {cursor:url('images/zoomin.png'),n-resize;} .compact_view p {font-size:90%; margin:0;} .listlog { @@ -2009,3 +2010,105 @@ html[dir='rtl'] #search-page-table .value {margin:0 170px 0 0;} } #CB_All {display:none;} } + +/* Icons */ +[class^="icon-"], [class*=" icon-"] {display:inline-block;vertical-align:text-bottom;background-repeat:no-repeat;} +.icon-add {width:14px;height:15px;background-image:url("images/add.png");} +.icon-admin {width:25px;height:25px;background-image:url("images/admin.png");} +.icon-cfamily {width:25px;height:25px;background-image:url("images/cfamily.png");} +.icon-childless {width:25px;height:25px;background-image:url("images/childless.png");} +.icon-children {width:16px;height:16px;background-image:url("images/children.png");} +.icon-clippings {width:25px;height:25px;background-image:url("images/clippings.png");} +.icon-darrow {width:20px;height:20px;background-image:url("images/darrow.png");} +a.icon-darrow:hover {width:20px;height:20px;background-image:url("images/darrow2.png");} +.icon-ddarrow {width:20px;height:20px;background-image:url("images/ddarrow.png");} +.icon-default_image_F {width:99px;height:106px;background-image:url("images/silhouette_female.png");} +.icon-default_image_M {width:99px;height:99px;background-image:url("images/silhouette_male.png");} +.icon-default_image_U {width:100px;height:97px;background-image:url("images/silhouette_unknown.png");} +.icon-dline {width:200px;height:200px;background-image:url("images/dline.png");} +.icon-dline2 {width:200px;height:200px;background-image:url("images/dline2.png");} +.icon-edit_indi {width:25px;height:25px;background-image:url("images/edit_indi.png");} +.icon-fam-list {width:25px;height:25px;background-image:url("images/sfamily.png");} +.icon-hline {width:10px;height:3px;background-image:url("images/hline.png");} +.icon-indis {width:25px;height:25px;background-image:url("images/indis.png");} +.icon-indi-list {width:25px;height:25px;background-image:url("images/indis.png");} +.icon-larrow {width:20px;height:20px;background-image:url("images/larrow.png");} +a.icon-larrow:hover {width:20px;height:20px;background-image:url("images/larrow2.png");} +.icon-ldarrow {width:20px;height:20px;background-image:url("images/ldarrow.png");} +.icon-lists {width:25px;height:25px;background-image:url("images/lists.png");} +.icon-lsdnarrow {width:48px;height:48px;background-image:url("images/lifespan-down.png");} +.icon-lsltarrow {width:48px;height:48px;background-image:url("images/lifespan-left.png");} +.icon-lsrtarrow {width:48px;height:48px;background-image:url("images/lifespan-right.png");} +.icon-lsuparrow {width:48px;height:48px;background-image:url("images/lifespan-up.png");} +.icon-media {width:25px;height:25px;background-image:url("images/media.png");} +.icon-media-list {width:25px;height:25px;background-image:url("images/media.png");} +.icon-minus {width:11px;height:11px;background-image:url("images/minus.png");} +.icon-mypage {width:25px;height:25px;background-image:url("images/mypage.png");} +.icon-note {width:50px;height:50px;background-image:url("images/notes.png");} +.icon-note-list {width:50px;height:50px;background-image:url("images/notes.png");} +.icon-patriarch {width:25px;height:25px;background-image:url("images/patriarch.png");} +.icon-pedigree {width:25px;height:25px;background-image:url("images/pedigree.png");} +.icon-place {width:25px;height:25px;background-image:url("images/place.png");} +.icon-plus {width:11px;height:11px;background-image:url("images/plus.png");} +.icon-rarrow {width:20px;height:20px;background-image:url("images/rarrow.png");} +a.icon-rarrow:hover {width:20px;height:20px;background-image:url("images/rarrow2.png");} +.icon-rdarrow {width:20px;height:20px;background-image:url("images/rdarrow.png");} +.icon-reminder {width:15px;height:12px;background-image:url("images/reminder.png");} +.icon-remove {width:16px;height:16px;background-image:url("images/delete.png");} +.icon-reorder {width:16px;height:16px;background-image:url("images/reorder_images.png");} +.icon-repository {width:25px;height:25px;background-image:url("images/repository.png");} +.icon-repo-list {width:25px;height:25px;background-image:url("images/repository.png");} +.icon-rings {width:9px;height:9px;background-image:url("images/rings.png");} +.icon-search {width:25px;height:25px;background-image:url("images/search.png");} +.icon-selected {width:12px;height:12px;background-image:url("images/selected.png");} +.icon-sex_f_15x15 {width:15px;height:15px;background-image:url("images/sex_f_15x15.png");} +.icon-sex_f_9x9 {width:9px;height:9px;background-image:url("images/sex_f_9x9.png");} +.icon-sex_m_15x15 {width:15px;height:15px;background-image:url("images/sex_m_15x15.png");} +.icon-sex_m_9x9 {width:9px;height:9px;background-image:url("images/sex_m_9x9.png");} +.icon-sex_u_15x15 {width:15px;height:15px;background-image:url("images/sex_u_15x15.png");} +.icon-sex_u_9x9 {width:9px;height:9px;background-image:url("images/sex_u_9x9.png");} +.icon-sfamily {width:25px;height:25px;background-image:url("images/sfamily.png");} +.icon-source {width:25px;height:25px;background-image:url("images/source.png");} +.icon-source-list {width:25px;height:25px;background-image:url("images/source.png");} +.icon-spacer {width:10px;height:10px;background-image:url("images/spacer.png");} +.icon-stop {width:20px;height:20px;background-image:url("images/stop.png");} +.icon-tree {width:25px;height:25px;background-image:url("images/tree.png");} +.icon-uarrow {width:20px;height:20px;background-image:url("images/uarrow.png");} +a.icon-uarrow:hover {width:20px;height:20px;background-image:url("images/uarrow2.png");} +.icon-udarrow {width:20px;height:20px;background-image:url("images/udarrow.png");} +.icon-user_add {width:25px;height:25px;background-image:url("images/user_add.png");} +.icon-vline {width:3px;height:10px;background-image:url("images/vline.png");} +.icon-warning {width:17px;height:17px;background-image:url("images/warning.png");} +.icon-webtrees {width:100px;height:21px;background-image:url("images/webtrees.png");} +.icon-wiki {width:16px;height:16px;background-image:url("images/w_button.png");} +.icon-zoomin {width:25px;height:25px;background-image:url("images/zoomin.png");} +.icon-zoomout {width:25px;height:25px;background-image:url("images/zoomout.png");} +.icon-button_addmedia {width:18px;height:16px;background-image:url("images/buttons/addmedia.png");} +.icon-button_addnote {width:17px;height:15px;background-image:url("images/buttons/addnote.png");} +.icon-button_addrepository {width:15px;height:15px;background-image:url("images/buttons/addrepository.png");} +.icon-button_addsource {width:18px;height:16px;background-image:url("images/buttons/addsource.png");} +.icon-button_calendar {width:19px;height:15px;background-image:url("images/buttons/calendar.png");} +.icon-button_family {width:14px;height:15px;background-image:url("images/buttons/family.png");} +.icon-button_find_facts {width:20px;height:20px;background-image:url("images/buttons/find_facts.png");} +.icon-button_head {width:12px;height:18px;background-image:url("images/buttons/head.png");} +.icon-button_indi {width:11px;height:15px;background-image:url("images/buttons/indi.png");} +.icon-button_keyboard {width:30px;height:15px;background-image:url("images/buttons/keyboard.png");} +.icon-button_media {width:18px;height:16px;background-image:url("images/buttons/media.png");} +.icon-button_note {width:17px;height:15px;background-image:url("images/buttons/note.png");} +.icon-button_place {width:15px;height:15px;background-image:url("images/buttons/place.png");} +.icon-button_repository {width:15px;height:15px;background-image:url("images/buttons/repository.png");} +.icon-button_source {width:18px;height:16px;background-image:url("images/buttons/source.png");} +.icon-target {width:15px;height:15px;background-image:url("images/buttons/target.png");} +.icon-media_audio {width:48px;height:64px;background-image:url("images/media/audio.png");} +.icon-media_doc {width:50px;height:32px;background-image:url("images/media/doc.png");} +.icon-media_flash {width:59px;height:63px;background-image:url("images/media/flash.png");} +.icon-media_flashrem {width:68px;height:68px;background-image:url("images/media/flashrem.png");} +.icon-media_ged {width:50px;height:32px;background-image:url("images/media/ged.png");} +.icon-media_globe {width:76px;height:62px;background-image:url("images/media/globe.png");} +.icon-media_html {width:50px;height:32px;background-image:url("images/media/html.png");} +.icon-media_pdf {width:50px;height:32px;background-image:url("images/media/pdf.png");} +.icon-media_picasa {width:62px;height:62px;background-image:url("images/media/picasa.png");} +.icon-media_tex {width:50px;height:32px;background-image:url("images/media/tex.png");} +.icon-media_wmv {width:62px;height:62px;background-image:url("images/media/wmv.png");} +.icon-media_wmvrem {width:68px;height:68px;background-image:url("images/media/wmvrem.png");} +.icon-pedigree_map {width:24px;height:24px;background-image:url("../../modules_v3/googlemap/images/pedigree_map.gif");} |