diff options
| -rw-r--r-- | library/WT/Controller/Media.php | 17 | ||||
| -rw-r--r-- | medialist.php | 295 | ||||
| -rw-r--r-- | themes/clouds/css-1.5.1/style.css | 28 | ||||
| -rw-r--r-- | themes/colors/css-1.5.1/css/colors.css | 31 | ||||
| -rw-r--r-- | themes/fab/css-1.5.1/style.css | 34 | ||||
| -rw-r--r-- | themes/minimal/css-1.5.1/style.css | 16 | ||||
| -rw-r--r-- | themes/webtrees/css-1.5.1/style.css | 20 | ||||
| -rw-r--r-- | themes/xenea/css-1.5.1/style.css | 27 |
8 files changed, 202 insertions, 266 deletions
diff --git a/library/WT/Controller/Media.php b/library/WT/Controller/Media.php index 80b456f224..169bf749e0 100644 --- a/library/WT/Controller/Media.php +++ b/library/WT/Controller/Media.php @@ -134,14 +134,16 @@ class WT_Controller_Media extends WT_Controller_GedcomRecord { } /** - * edit menu items used in album tab and media list + * edit menu items used in media list */ static function getMediaListMenu($mediaobject) { - $html='<div id="lightbox-menu"><ul class="makeMenu lb-menu">'; - $menu = new WT_Menu(WT_I18N::translate('Edit details'), '#', 'lb-image_edit'); + $html='<div class="lightbox-menu"><ul class="makeMenu lb-menu">'; + $menu = new WT_Menu(WT_I18N::translate('Edit details')); + $menu->addClass('', '', 'lb-image_edit'); $menu->addOnclick("return window.open('addmedia.php?action=editmedia&pid=".$mediaobject->getXref()."', '_blank', edit_window_specs);"); - $html.=$menu->getMenuAsList().'</ul><ul class="makeMenu lb-menu">'; - $menu = new WT_Menu(WT_I18N::translate('Set link'), '#', 'lb-image_link'); + $html.=$menu->getMenuAsList(); + $menu = new WT_Menu(WT_I18N::translate('Set link')); + $menu->addClass('', '', 'lb-image_link'); $menu->addOnclick("return ilinkitem('".$mediaobject->getXref()."','person')"); $submenu = new WT_Menu(WT_I18N::translate('To individual'), '#'); $submenu->addOnclick("return ilinkitem('".$mediaobject->getXref()."','person')"); @@ -152,8 +154,9 @@ class WT_Controller_Media extends WT_Controller_GedcomRecord { $submenu = new WT_Menu(WT_I18N::translate('To source'), '#'); $submenu->addOnclick("return ilinkitem('".$mediaobject->getXref()."','source')"); $menu->addSubMenu($submenu); - $html.=$menu->getMenuAsList().'</ul><ul class="makeMenu lb-menu">'; - $menu = new WT_Menu(WT_I18N::translate('View details'), $mediaobject->getHtmlUrl(), 'lb-image_view'); + $html.=$menu->getMenuAsList(); + $menu = new WT_Menu(WT_I18N::translate('View details'), $mediaobject->getHtmlUrl()); + $menu->addClass('', '', 'lb-image_view'); $html.=$menu->getMenuAsList(); $html.='</ul></div>'; return $html; diff --git a/medialist.php b/medialist.php index 4311a6e6c0..bde47bbd7b 100644 --- a/medialist.php +++ b/medialist.php @@ -171,197 +171,146 @@ if ($search) { $ct = '0'; } - echo '<div align="center">', WT_I18N::translate('Media Objects found'), ' ', $ct, ' <br><br>'; + echo '<div><p style="text-align:center">', WT_I18N::translate('Media Objects found'), ' ', $ct, '</p>'; if ($ct>0) { - $currentPage = ((int) ($start / $max)) + 1; - $lastPage = (int) (($ct + $max - 1) / $max); + $currentPage = ((int) ($start / $max)) + 1; + $lastPage = (int) (($ct + $max - 1) / $max); - echo '<table class="list_table">'; - // echo page back, page number, page forward controls - echo '<tr><td colspan="2">'; - echo '<table class="list_table_controls">'; - echo '<tr>'; - echo '<td>'; - if ($TEXT_DIRECTION=='ltr') { - if ($ct>$max) { - if ($currentPage > 1) { - echo '<a href="medialist.php?action=no&search=no&folder=', rawurlencode($folder), '&sortby=', $sortby, '&subdirs=', $subdirs, '&filter=', rawurlencode($filter), '&columns=', $columns, '&apply_filter=', $apply_filter, '&start=0&max=', $max, '" class="icon-ldarrow"></a>'; - } - if ($start>0) { - $newstart = $start-$max; - if ($start<0) $start = 0; - echo '<a href="medialist.php?action=no&search=no&folder=', rawurlencode($folder), '&sortby=', $sortby, '&subdirs=', $subdirs, '&filter=', rawurlencode($filter), '&;columns=', $columns, '&apply_filter=', $apply_filter, '&start=', $newstart, '&max=', $max, '" class="icon-larrow"></a>'; - } - } - } else { - if ($ct>$max) { - if ($currentPage < $lastPage) { - $lastStart = ((int) ($ct / $max)) * $max; - echo '<a href="medialist.php?action=no&search=no&folder=', rawurlencode($folder), '&sortby=', $sortby, '&subdirs=', $subdirs, '&filter=', rawurlencode($filter), '&columns=', $columns, '&apply_filter=', $apply_filter, '&start=', $lastStart, '&max=', $max, '" class="icon-rdarrow"></a>'; - } - if ($start+$max < $ct) { - $newstart = $start+$count; - if ($start<0) $start = 0; - echo '<a href="medialist.php?action=no&search=no&folder=', rawurlencode($folder), '&sortby=', $sortby, '&subdirs=', $subdirs, '&filter=', rawurlencode($filter), '&columns=', $columns, '&apply_filter=', $apply_filter, '&start=', $newstart, '&max=', $max, '" class="icon-rarrow"></a>'; - } - } - } - echo '</td>'; - echo '<td>', WT_I18N::translate('Page %s of %s', $currentPage, $lastPage), '</td>'; - echo '<td>'; - if ($TEXT_DIRECTION=='ltr') { - if ($ct>$max) { - if ($start+$max < $ct) { - $newstart = $start+$count; - if ($start<0) $start = 0; - echo '<a href="medialist.php?action=no&search=no&folder=', rawurlencode($folder), '&sortby=', $sortby, '&subdirs=', $subdirs, '&filter=', rawurlencode($filter), '&columns=', $columns, '&apply_filter=', $apply_filter, '&start=', $newstart, '&max=', $max, '"class="icon-rarrow"></a>'; - } - if ($currentPage < $lastPage) { - $lastStart = ((int) ($ct / $max)) * $max; - echo '<a href="medialist.php?action=no&search=no&folder=', rawurlencode($folder), '&sortby=', $sortby, '&subdirs=', $subdirs, '&filter=', rawurlencode($filter), '&columns=', $columns, '&apply_filter=', $apply_filter, '&start=', $lastStart, '&max=', $max, '" class="icon-rdarrow"></a>'; - } - } - } else { - if ($ct>$max) { - if ($start>0) { - $newstart = $start-$max; - if ($start<0) $start = 0; - echo '<a href="medialist.php?action=no&search=no&folder=', rawurlencode($folder), '&sortby=', $sortby, '&subdirs=', $subdirs, '&filter=', rawurlencode($filter), '&columns=', $columns, '&apply_filter=', $apply_filter, '&start=', $newstart, '&max=', $max, '" class="icon-larrow"></a>'; - } - if ($currentPage > 1) { - $lastStart = ((int) ($ct / $max)) * $max; - echo '<a href="medialist.php?action=no&search=no&folder=', rawurlencode($folder), '&sortby=', $sortby, '&subdirs=', $subdirs, '&filter=', rawurlencode($filter), '&columns=', $columns, '&apply_filter=', $apply_filter, '&start=0&max=', $max, '" class="icon-ldarrow"></a>'; - } - } - } - echo '</td>'; - echo '</tr></table></td></tr>'; - - echo '<tr>'; - for ($i=$start, $n=0; $i<$start+$count; ++$i) { - $mediaobject = $medialist[$i]; - - if ($columns == '1') echo '<td class="list_value_wrap" width="80%">'; - if ($columns == '2') echo '<td class="list_value_wrap" width="50%">'; + echo '<table class="list_table width100">'; + // Display controls twice - at the top and bottom of the table + foreach (array('thead', 'tfoot') as $tsection) { + echo '<', $tsection, '><tr><td colspan="2">'; - echo '<table><tr><td valign="top" style="white-space:normal;">'; - echo $mediaobject->displayImage(); - echo '</td><td class="list_value_wrap" style="border:none;" width="100%">'; - if (WT_USER_CAN_EDIT) { - echo WT_Controller_Media::getMediaListMenu($mediaobject); - } - // If sorting by title, highlight the title. If sorting by filename, highlight the filename - if ($sortby=='title') { - echo '<p><b><a href="', $mediaobject->getHtmlUrl(), '">'; - echo $mediaobject->getFullName(); - echo '</a></b></p>'; - } else { - echo '<p><b><a href="', $mediaobject->getHtmlUrl(), '">'; - echo basename($mediaobject->getFilename()); - echo '</a></b></p>'; - echo WT_Gedcom_Tag::getLabelValue('TITL', $mediaobject->getFullName()); - } - // Show file details - if ($mediaobject->isExternal()) { - echo WT_Gedcom_Tag::getLabelValue('URL', $mediaobject->getFilename()); - } else { - if ($mediaobject->fileExists()) { - if (WT_USER_CAN_EDIT || WT_USER_CAN_ACCEPT) { - echo WT_Gedcom_Tag::getLabelValue('FILE', $mediaobject->getFilename()); + echo '<table class="list_table_controls"><tr><td>'; + if ($TEXT_DIRECTION=='ltr') { + if ($ct>$max) { + if ($currentPage > 1) { + echo '<a href="medialist.php?action=no&search=no&folder=', rawurlencode($folder), '&sortby=', $sortby, '&subdirs=', $subdirs, '&filter=', rawurlencode($filter), '&columns=', $columns, '&apply_filter=', $apply_filter, '&start=0&max=', $max, '" class="icon-ldarrow"></a>'; + } + if ($start>0) { + $newstart = $start-$max; + if ($start<0) $start = 0; + echo '<a href="medialist.php?action=no&search=no&folder=', rawurlencode($folder), '&sortby=', $sortby, '&subdirs=', $subdirs, '&filter=', rawurlencode($filter), '&;columns=', $columns, '&apply_filter=', $apply_filter, '&start=', $newstart, '&max=', $max, '" class="icon-larrow"></a>'; + } + } + } else { + if ($ct>$max) { + if ($currentPage < $lastPage) { + $lastStart = ((int) ($ct / $max)) * $max; + echo '<a href="medialist.php?action=no&search=no&folder=', rawurlencode($folder), '&sortby=', $sortby, '&subdirs=', $subdirs, '&filter=', rawurlencode($filter), '&columns=', $columns, '&apply_filter=', $apply_filter, '&start=', $lastStart, '&max=', $max, '" class="icon-rdarrow"></a>'; + } + if ($start+$max < $ct) { + $newstart = $start+$count; + if ($start<0) $start = 0; + echo '<a href="medialist.php?action=no&search=no&folder=', rawurlencode($folder), '&sortby=', $sortby, '&subdirs=', $subdirs, '&filter=', rawurlencode($filter), '&columns=', $columns, '&apply_filter=', $apply_filter, '&start=', $newstart, '&max=', $max, '" class="icon-rarrow"></a>'; + } } - echo WT_Gedcom_Tag::getLabelValue('FORM', $mediaobject->mimeType()); - echo WT_Gedcom_Tag::getLabelValue('__FILE_SIZE__', $mediaobject->getFilesize()); - $imgsize = $mediaobject->getImageAttributes(); - if ($imgsize['WxH']) { - echo WT_Gedcom_Tag::getLabelValue('__IMAGE_SIZE__', $imgsize['WxH']); + } + echo '</td>'; + echo '<td>', WT_I18N::translate('Page %s of %s', $currentPage, $lastPage), '</td>'; + echo '<td>'; + if ($TEXT_DIRECTION=='ltr') { + if ($ct>$max) { + if ($start+$max < $ct) { + $newstart = $start+$count; + if ($start<0) $start = 0; + echo '<a href="medialist.php?action=no&search=no&folder=', rawurlencode($folder), '&sortby=', $sortby, '&subdirs=', $subdirs, '&filter=', rawurlencode($filter), '&columns=', $columns, '&apply_filter=', $apply_filter, '&start=', $newstart, '&max=', $max, '" class="icon-rarrow"></a>'; + } + if ($currentPage < $lastPage) { + $lastStart = ((int) ($ct / $max)) * $max; + echo '<a href="medialist.php?action=no&search=no&folder=', rawurlencode($folder), '&sortby=', $sortby, '&subdirs=', $subdirs, '&filter=', rawurlencode($filter), '&columns=', $columns, '&apply_filter=', $apply_filter, '&start=', $lastStart, '&max=', $max, '" class="icon-rdarrow"></a>'; + } } } else { - echo '<p class="ui-state-error">', /* I18N: %s is a filename */ WT_I18N::translate('The file “%s” does not exist.', $mediaobject->getFilename()), '</p>'; + if ($ct>$max) { + if ($start>0) { + $newstart = $start-$max; + if ($start<0) $start = 0; + echo '<a href="medialist.php?action=no&search=no&folder=', rawurlencode($folder), '&sortby=', $sortby, '&subdirs=', $subdirs, '&filter=', rawurlencode($filter), '&columns=', $columns, '&apply_filter=', $apply_filter, '&start=', $newstart, '&max=', $max, '" class="icon-larrow"></a>'; + } + if ($currentPage > 1) { + $lastStart = ((int) ($ct / $max)) * $max; + echo '<a href="medialist.php?action=no&search=no&folder=', rawurlencode($folder), '&sortby=', $sortby, '&subdirs=', $subdirs, '&filter=', rawurlencode($filter), '&columns=', $columns, '&apply_filter=', $apply_filter, '&start=0&max=', $max, '" class="icon-ldarrow"></a>'; + } + } } + echo '</td></tr></table>'; + + echo '</td></tr></', $tsection, '>'; } - echo '<br>'; - echo '<div style="white-space: normal; width: 95%;">'; - echo print_fact_sources($mediaobject->getGedcom(), 1); - echo print_fact_notes($mediaobject->getGedcom(), 1); - echo '</div>'; - foreach ($mediaobject->linkedIndividuals('OBJE') as $individual) { - echo '<a href="' . $individual->getHtmlUrl() . '">' . WT_I18N::translate('View person') . ' — ' . $individual->getFullname().'</a><br>'; - } - foreach ($mediaobject->linkedFamilies('OBJE') as $family) { - echo '<a href="' . $family->getHtmlUrl() . '">' . WT_I18N::translate('View family') . ' — ' . $family->getFullname().'</a><br>'; - } - foreach ($mediaobject->linkedSources('OBJE') as $source) { - echo '<a href="' . $source->getHtmlUrl() . '">' . WT_I18N::translate('View source') . ' — ' . $source->getFullname().'</a><br>'; - } - echo '</td></tr></table>'; - echo '</td>'; - if ((++$n) % $columns == 0) { - echo '</tr><tr>'; - } - } // end media loop - echo '</tr>'; - // echo page back, page number, page forward controls - echo '<tr><td colspan="2">'; - echo '<table class="list_table width100">'; - echo '<tr>'; - echo '<td class="width30">'; - if ($TEXT_DIRECTION=='ltr') { - if ($ct>$max) { - if ($currentPage > 1) { - echo '<a href="medialist.php?action=no&search=no&folder=', rawurlencode($folder), '&sortby=', $sortby, '&subdirs=', $subdirs, '&filter=', rawurlencode($filter), '&columns=', $columns, '&apply_filter=', $apply_filter, '&start=0&max=', $max, '" class="icon-ldarrow"></a>'; - } - if ($start>0) { - $newstart = $start-$max; - if ($start<0) $start = 0; - echo '<a href="medialist.php?action=no&search=no&folder=', rawurlencode($folder), '&sortby=', $sortby, '&subdirs=', $subdirs, '&filter=', rawurlencode($filter), '&columns=', $columns, '&apply_filter=', $apply_filter, '&start=', $newstart, '&max=', $max, '" class="icon-larrow"></a>'; + + echo '<tbody><tr>'; + for ($i=$start, $n=0; $i<$start+$count; ++$i) { + $mediaobject = $medialist[$i]; + + if ($columns == '1') echo '<td class="list_value_wrap width80">'; + if ($columns == '2') echo '<td class="list_value_wrap width50">'; + + echo '<table><tr><td style="vertical-align:top; white-space:normal;">'; + echo $mediaobject->displayImage(); + echo '</td><td class="list_value_wrap width100" style="border:none; padding-left:5px">'; + if (WT_USER_CAN_EDIT) { + echo WT_Controller_Media::getMediaListMenu($mediaobject); } - } - } else { - if ($ct>$max) { - if ($currentPage < $lastPage) { - $lastStart = ((int) ($ct / $max)) * $max; - echo '<a href="medialist.php?action=no&search=no&folder=', rawurlencode($folder), '&sortby=', $sortby, '&subdirs=', $subdirs, '&filter=', rawurlencode($filter), '&columns=', $columns, '&apply_filter=', $apply_filter, '&start=', $lastStart, '&max=', $max, '" class="icon-rdarrow"></a>'; + // If sorting by title, highlight the title. If sorting by filename, highlight the filename + if ($sortby=='title') { + echo '<p><b><a href="', $mediaobject->getHtmlUrl(), '">'; + echo $mediaobject->getFullName(); + echo '</a></b></p>'; + } else { + echo '<p><b><a href="', $mediaobject->getHtmlUrl(), '">'; + echo basename($mediaobject->getFilename()); + echo '</a></b></p>'; + echo WT_Gedcom_Tag::getLabelValue('TITL', $mediaobject->getFullName()); } - if ($start+$max < $ct) { - $newstart = $start+$count; - if ($start<0) $start = 0; - echo '<a href="medialist.php?action=no&search=no&folder=', rawurlencode($folder), '&sortby=', $sortby, '&subdirs=', $subdirs, '&filter=', rawurlencode($filter), '&columns=', $columns, '&apply_filter=', $apply_filter, '&start=', $newstart, '&max=', $max, '" class="icon-rarrow"></a>'; + // Show file details + if ($mediaobject->isExternal()) { + echo WT_Gedcom_Tag::getLabelValue('URL', $mediaobject->getFilename()); + } else { + if ($mediaobject->fileExists()) { + if (WT_USER_CAN_EDIT || WT_USER_CAN_ACCEPT) { + echo WT_Gedcom_Tag::getLabelValue('FILE', $mediaobject->getFilename()); + } + echo WT_Gedcom_Tag::getLabelValue('FORM', $mediaobject->mimeType()); + echo WT_Gedcom_Tag::getLabelValue('__FILE_SIZE__', $mediaobject->getFilesize()); + $imgsize = $mediaobject->getImageAttributes(); + if ($imgsize['WxH']) { + echo WT_Gedcom_Tag::getLabelValue('__IMAGE_SIZE__', $imgsize['WxH']); + } + } else { + echo '<p class="ui-state-error">', /* I18N: %s is a filename */ WT_I18N::translate('The file “%s” does not exist.', $mediaobject->getFilename()), '</p>'; + } } - } - } - echo '</td>'; - echo '<td align="center">', WT_I18N::translate('Page %s of %s', $currentPage, $lastPage), '</td>'; - echo '<td class="width30">'; - if ($TEXT_DIRECTION=='ltr') { - if ($ct>$max) { - if ($start+$max < $ct) { - $newstart = $start+$count; - if ($start<0) $start = 0; - echo '<a href="medialist.php?action=no&search=no&folder=', rawurlencode($folder), '&sortby=', $sortby, '&subdirs=', $subdirs, '&filter=', rawurlencode($filter), '&columns=', $columns, '&apply_filter=', $apply_filter, '&start=', $newstart, '&max=', $max, '" class="icon-rarrow"></a>'; + echo '<br>'; + echo '<div style="white-space: normal; width: 95%;">'; + echo print_fact_sources($mediaobject->getGedcom(), 1); + echo print_fact_notes($mediaobject->getGedcom(), 1); + echo '</div>'; + foreach ($mediaobject->linkedIndividuals('OBJE') as $individual) { + echo '<a href="' . $individual->getHtmlUrl() . '">' . WT_I18N::translate('View person') . ' — ' . $individual->getFullname().'</a><br>'; } - if ($currentPage < $lastPage) { - $lastStart = ((int) ($ct / $max)) * $max; - echo '<a href="medialist.php?action=no&search=no&folder=', rawurlencode($folder), '&sortby=', $sortby, '&subdirs=', $subdirs, '&filter=', rawurlencode($filter), '&columns=', $columns, '&apply_filter=', $apply_filter, '&start=', $lastStart, '&max=', $max, '" class="icon-rdarrow"></a>'; + foreach ($mediaobject->linkedFamilies('OBJE') as $family) { + echo '<a href="' . $family->getHtmlUrl() . '">' . WT_I18N::translate('View family') . ' — ' . $family->getFullname().'</a><br>'; } - } - } else { - if ($ct>$max) { - if ($start>0) { - $newstart = $start-$max; - if ($start<0) $start = 0; - echo '<a href="medialist.php?action=no&search=no&folder=', rawurlencode($folder), '&sortby=', $sortby, '&subdirs=', $subdirs, '&filter=', rawurlencode($filter), '&columns=', $columns, '&apply_filter=', $apply_filter, '&start=', $newstart, '&max=', $max, '" class="icon-larrow"></a>'; + foreach ($mediaobject->linkedSources('OBJE') as $source) { + echo '<a href="' . $source->getHtmlUrl() . '">' . WT_I18N::translate('View source') . ' — ' . $source->getFullname().'</a><br>'; } - if ($currentPage > 1) { - $lastStart = ((int) ($ct / $max)) * $max; - echo '<a href="medialist.php?action=no&search=no&folder=', rawurlencode($folder), '&sortby=', $sortby, '&subdirs=', $subdirs, '&filter=', rawurlencode($filter), '&columns=', $columns, '&apply_filter=', $apply_filter, '&start=0&max=', $max, '" class="icon-ldarrow"></a>'; + echo '</td></tr></table>'; + echo '</td>'; + if ((++$n) % $columns == 0) { + echo '</tr><tr>'; } + } // end media loop + + // An odd number of media objects in two columns requires an empty cell + if ($columns == 2 && $n%2 == 1) { + echo '<td> </td>'; } + + echo '</tr></tbody>'; + echo '</table>'; } - echo '</td>'; - echo '</tr></table></td></tr>'; - echo '</table><br>'; - } echo '</div> </div>'; } diff --git a/themes/clouds/css-1.5.1/style.css b/themes/clouds/css-1.5.1/style.css index 3b1add0e25..5b1335fdd3 100644 --- a/themes/clouds/css-1.5.1/style.css +++ b/themes/clouds/css-1.5.1/style.css @@ -797,12 +797,6 @@ margin:0; width:99%; } -/* style needed for lightbox album icons */ -#medialist-page .list_value_wrap a {background:none;} -#lb-image_edit a, #lb-image_link a, #lb-image_view a {color:#000000;padding-left:5px;} -#lb-image_link a:hover {color:red;} -.lb-menu > li:hover > ul {top:28px!important;} - /* person boxes are used in various charts */ .person_box,.person_boxF,.person_boxNN { @@ -1661,21 +1655,23 @@ html[dir=rtl] #branches-page ol {margin-right: 40px;} margin:10px; } /* ============== medialist.php ======================= */ -#lightbox-menu {margin-bottom:60px;} -.lb-menu {position:relative; float:left; list-style-type:none; margin:0;} +.lb-menu {display:inline-block; margin:0;} .lb-menu ul {list-style-type:none;} -.lb-menu li {font-weight:normal; float:left; top:0;} -.lb-menu > li ul {display:none;width:80px;} -.lb-menu > li:hover ul {display:block; top:36px;} +.lb-menu > li {font-weight:normal; float:left; top:0;} +.lb-menu > li ul {display:none;} +.lb-menu > li:hover ul {display:block; top:36px;} .lb-menu a {display:block;} .lb-menu li a {padding-top:24px;} .lb-menu li li a {padding:1px 10px 1px 5px;} -html[dir=rtl] .lb-menu {float:right;} -html[dir=rtl] .lb-menu li {float:right;} +.makeMenu.lb-menu li:before{content:"";} +.lb-image_edit, .lb-image_link{padding-right:5px;} +.lb-menu > li:hover > ul {top:28px!important;} +html[dir=rtl] .lb-menu > li {float:right;} + +.lb-image_edit {background:url(images/image_edit.png) no-repeat 50% 20%;} +.lb-image_link {background:url(images/image_link.png) no-repeat 50% 20%;} +.lb-image_view {background:url(images/image_view.png) no-repeat 50% 20%;} -li#lb-image_edit {background:url(images/image_edit.png) no-repeat 50% 20%;} -li#lb-image_link {background:url(images/image_link.png) no-repeat 50% 20%;} -li#lb-image_view {background:url(images/image_view.png) no-repeat 50% 20%;} /* ============== login.php ======================= */ #login-form a:hover { color:red; diff --git a/themes/colors/css-1.5.1/css/colors.css b/themes/colors/css-1.5.1/css/colors.css index f1654a3535..6972471711 100644 --- a/themes/colors/css-1.5.1/css/colors.css +++ b/themes/colors/css-1.5.1/css/colors.css @@ -353,12 +353,6 @@ html[dir=rtl] #relationship_chart {margin-right:10px;} .compact_view p {font-size:90%;margin:0;} .gedcom_table {border:1px solid #999999;margin:0;width:99%;} -/* style needed for lightbox album icons */ -#medialist-page .list_value_wrap a {background:none;} -#lb-image_edit a, #lb-image_link a, #lb-image_view a {color:#000000;padding-left:5px;} -#lb-image_link a:hover {color:#ff0000;} -.lb-menu > li:hover > ul {top:28px!important;} - /* person boxes for charts */ .person_box {background:#ddddff;border:1px solid #aaaaaa;border-radius:3px;padding:3px;} .person_boxF {background:#ffdddd;border:1px solid #aaaaaa;border-radius:3px;padding:3px;} @@ -613,23 +607,26 @@ html[dir=rtl] .theme_form li ul li {float:right;} #field_table select {min-width:100px;} /* ============== medialist.php ======================= */ -#lightbox-menu {margin-bottom:60px;} -.lb-menu {position:relative; float:left; list-style-type:none; margin:0;} +.lb-menu {display:inline-block; margin:0;} .lb-menu ul {list-style-type:none;} -.lb-menu li {font-weight:normal; float:left; top:0;} -.lb-menu > li ul {display:none;width:80px;} -.lb-menu > li:hover ul {display:block; top:36px;} +.lb-menu > li {font-weight:normal; float:left; top:0;} +.lb-menu > li ul {display:none;} +.lb-menu > li:hover ul {display:block; top:36px;} .lb-menu a {display:block;} .lb-menu li a {padding-top:24px;} .lb-menu li li a {padding:1px 10px 1px 5px;} -html[dir=rtl] .lb-menu {float:right;} -html[dir=rtl] .lb-menu li {float:right;} +.lb-menu {float:none;} +.lb-menu li:before{content:"";} +.makeMenu.lb-menu li a {color:#000;} +.lb-image_edit, .lb-image_link {padding-right:5px;} +.lb-menu > li:hover > ul {top:28px!important;} +html[dir=rtl] .lb-menu > li {float:right;} -li#lb-image_edit {background:url(../images/image_edit.png) no-repeat 50% 20%;} -li#lb-image_link {background:url(../images/image_link.png) no-repeat 50% 20%;} -li#lb-image_view {background:url(../images/image_view.png) no-repeat 50% 20%;} +.list_value_wrap .lb-image_edit {background:url(../images/image_edit.png) no-repeat 50% 20%;} +.list_value_wrap .lb-image_link {background:url(../images/image_link.png) no-repeat 50% 20%;} +.list_value_wrap .lb-image_view {background:url(../images/image_view.png) no-repeat 50% 20%;} -/* login.php */ +/* ============== login.php ======================= */ #login-register-page h2,#login-box,#register-box {text-align:center;} #login-register-page .warning {margin:20px auto;text-align:center;} diff --git a/themes/fab/css-1.5.1/style.css b/themes/fab/css-1.5.1/style.css index 55da475fc9..7eb3d9d730 100644 --- a/themes/fab/css-1.5.1/style.css +++ b/themes/fab/css-1.5.1/style.css @@ -1196,47 +1196,43 @@ html[dir=rtl] .person_box_template i[class^="icon-silhouette"] { } /* ============== medialist.php ======================= */ -#lightbox-menu { - margin-bottom: 60px; -} .lb-menu { - position: relative; - float: left; - list-style-type: none; - margin: 0 10px; + display: inline-block; + margin: 0; } .lb-menu ul { + display: block; list-style-type: none; } -.lb-menu li { +.lb-menu > li { font-weight: normal; float: left; top: 0; } +.lb-menu li:first-child { + padding-left: 0; +} .lb-menu > li ul { display: none; - width: 80px; } .lb-menu > li:hover ul { - display: block; - top: 36px; -} -.lb-menu a { - display: block; + display: block; top: 36px; } .lb-menu li a { - padding-top: 12px; + padding-top: 24px; } .lb-menu li li a { padding: 1px 10px 1px 5px; } -html[dir=rtl] .lb-menu { - float: right; +.makeMenu.lb-menu li:before{ + content: ""; } -html[dir=rtl] .lb-menu li { +.lb-image_edit, .lb-image_link{ + padding-right: 5px; +} +html[dir=rtl] .lb-menu > li { float: right; } - /* ============== login.php ======================= */ #login-register-page h2 { text-align: center; diff --git a/themes/minimal/css-1.5.1/style.css b/themes/minimal/css-1.5.1/style.css index 47c91388ad..49b07d207d 100644 --- a/themes/minimal/css-1.5.1/style.css +++ b/themes/minimal/css-1.5.1/style.css @@ -1149,16 +1149,14 @@ html[dir=rtl] .person_box_template i[class^="icon-silhouette"] { .list_table_controls td {min-width:40px;text-align:center;} /* ============== medialist.php ======================= */ -#lightbox-menu {margin-bottom:60px;} -.lb-menu {position:relative; float:left; list-style-type:none; margin:0;} -.lb-menu ul {list-style-type:none;} -.lb-menu li {font-weight:normal; float:left; top:0;} -.lb-menu > li ul {display:none;width:80px;} -.lb-menu > li:hover ul {display:block; top:36px;} -.lb-menu a {display:block;} +.lb-menu {display:inline-block; margin:0;} +.lb-menu ul {display:block;list-style-type:none;} +.lb-menu > li {font-weight:normal; float:left; margin-right:2px; top:0;} +.lb-menu li:first-child {padding-left:0;} +.lb-menu > li ul {display:none;} +.lb-menu > li:hover ul {display:block; top:36px;} .lb-menu li li a {padding:1px 10px 1px 5px;} -html[dir=rtl] .lb-menu {float:right;} -html[dir=rtl] .lb-menu li {float:right;} +html[dir=rtl] .lb-menu > li {float:right;} /* ============== login.php ======================= */ #login-register-page h2 {text-align:center;} diff --git a/themes/webtrees/css-1.5.1/style.css b/themes/webtrees/css-1.5.1/style.css index 9ffcbaed8c..f59210f8a5 100644 --- a/themes/webtrees/css-1.5.1/style.css +++ b/themes/webtrees/css-1.5.1/style.css @@ -373,21 +373,21 @@ html[dir=rtl] .person_box_template i[class^="icon-silhouette"] { .list_table_controls td {min-width:40px;text-align:center;} /* ============== medialist.php ======================= */ -#lightbox-menu {margin-bottom:60px;} -.lb-menu {position:relative; float:left; list-style-type:none; margin:0;} -.lb-menu ul {list-style-type:none;} -.lb-menu li {font-weight:normal; float:left; top:0;} -.lb-menu > li ul {display:none;width:80px;} +.lb-menu {display:inline-block; margin:0;} +.lb-menu ul {display:block;list-style-type:none;} +.lb-menu > li {font-weight:normal; float:left; top:0;} +.lb-menu li:first-child {padding-left:0;} +.lb-menu > li ul {display:none;} .lb-menu > li:hover ul {display:block; top:36px;} .lb-menu a {display:block;} .lb-menu li a {padding-top:24px;} .lb-menu li li a {padding:1px 10px 1px 5px;} -html[dir=rtl] .lb-menu {float:right;} -html[dir=rtl] .lb-menu li {float:right;} +.makeMenu.lb-menu li{border:none;} +html[dir=rtl] .lb-menu > li {float:right;} -li#lb-image_edit {background:url(images/image_edit.png) no-repeat 50% 20%;} -li#lb-image_link {background:url(images/image_link.png) no-repeat 50% 20%;} -li#lb-image_view {background:url(images/image_view.png) no-repeat 50% 20%;} +.lb-image_edit {background:url(images/image_edit.png) no-repeat 50% 20%;} +.lb-image_link {background:url(images/image_link.png) no-repeat 50% 20%;} +.lb-image_view {background:url(images/image_view.png) no-repeat 50% 20%;} /* ============== login.php ======================= */ #login-register-page h2 {text-align:center;} diff --git a/themes/xenea/css-1.5.1/style.css b/themes/xenea/css-1.5.1/style.css index 94ae114089..3ddd574cf8 100644 --- a/themes/xenea/css-1.5.1/style.css +++ b/themes/xenea/css-1.5.1/style.css @@ -1456,21 +1456,22 @@ html[dir=rtl] .person_box_template i[class^="icon-silhouette"] { .list_table_controls td {min-width:40px;text-align:center;} /* ============== medialist.php ======================= */ -#lightbox-menu {margin-bottom:60px;} -.lb-menu {position:relative; float:left; list-style-type:none; margin:0;} -.lb-menu ul {list-style-type:none;} -.lb-menu li {font-weight:normal; float:left; top:0;} -.lb-menu > li ul {display:none;width:80px;} +.lb-menu {display:inline-block; margin:0;} +.lb-menu ul {display:block;list-style-type:none;} +.lb-menu > li {font-weight:normal; float:left; top:0;} +.lb-menu li:first-child {padding-left:0;} +.lb-menu > li ul {display:none;} .lb-menu > li:hover ul {display:block; top:36px;} .lb-menu a {display:block;} -.lb-menu li a {padding-top:24px;} +.lb-menu li a {color:#0000ff;font-weight:normal;padding-top:24px;} +.lb-menu li a:hover {color:#ff0000;font-weight:normal} .lb-menu li li a {padding:1px 10px 1px 5px;} -html[dir=rtl] .lb-menu {float:right;} -html[dir=rtl] .lb-menu li {float:right;} +.lb-image_edit, .lb-image_link {padding-right:5px;} +html[dir=rtl] .lb-menu > li {float:right;} -li#lb-image_edit {background:url(images/image_edit.png) no-repeat 50% 20%;} -li#lb-image_link {background:url(images/image_link.png) no-repeat 50% 20%;} -li#lb-image_view {background:url(images/image_view.png) no-repeat 50% 20%;} +.lb-image_edit {background:url(images/image_edit.png) no-repeat 50% 20%;} +.lb-image_link {background:url(images/image_link.png) no-repeat 50% 20%;} +.lb-image_view {background:url(images/image_view.png) no-repeat 50% 20%;} /* ============== login.php ======================= */ #login-register-page h2 {text-align:center;} @@ -2088,10 +2089,6 @@ a.icon-uarrow:hover {width:20px;height:20px;background-image:url(images/u #indi_mainimage .icon-silhouette-M {width: 99px; height: 99px; background-image:url(images/silhouette_male.png);} #indi_mainimage .icon-silhouette-U {width:100px; height: 97px; background-image:url(images/silhouette_unknown.png);} -/* style needed for lightbox album icons */ -#medialist-page .list_value_wrap a {color:#0000ff;font-weight:normal} -#medialist-page .list_value_wrap a:hover {color:#ff0000;font-weight:normal} - /* Edit interface pop-ups*/ #edit_interface-page h4 {color:#555555;margin:5px;} #edit_interface-page .optionbox span {margin:0 5px;} |