diff options
| -rw-r--r-- | admin_media.php | 17 | ||||
| -rw-r--r-- | themes/_administration/theme.php | 32 | ||||
| -rw-r--r-- | themes/_custom/theme.php | 30 | ||||
| -rw-r--r-- | themes/clouds/theme.php | 32 | ||||
| -rw-r--r-- | themes/colors/theme.php | 33 | ||||
| -rw-r--r-- | themes/fab/theme.php | 32 | ||||
| -rw-r--r-- | themes/minimal/theme.php | 32 | ||||
| -rw-r--r-- | themes/webtrees/theme.php | 32 | ||||
| -rw-r--r-- | themes/xenea/theme.php | 32 |
9 files changed, 124 insertions, 148 deletions
diff --git a/admin_media.php b/admin_media.php index 4a7f758554..ba370b6afd 100644 --- a/admin_media.php +++ b/admin_media.php @@ -467,7 +467,9 @@ function all_media_files($media_folder, $media_path, $subfolders, $filter) { * @return string */ function mediaFileInfo($media_folder, $media_path, $file) { - $html = '<b>' . Filter::escapeHtml($file) . '</b>'; + $html = '<dl>'; + $html .= '<dt>' . I18N::translate('Filename') . '</dt>'; + $html .= '<dd>' . Filter::escapeHtml($file) . '</dd>'; $full_path = WT_DATA_DIR . $media_folder . $media_path . $file; if ($file && file_exists($full_path)) { @@ -475,18 +477,23 @@ function mediaFileInfo($media_folder, $media_path, $file) { if ($size !== false) { $size = (int) (($size + 1023) / 1024); // Round up to next KB $size = /* I18N: size of file in KB */ I18N::translate('%s KB', I18N::number($size)); - $html .= WT_Gedcom_Tag::getLabelValue('__FILE_SIZE__', $size); + $html .= '<dt>' . I18N::translate('File size') . '</dt>'; + $html .= '<dd>' . $size . '</dd>'; $imgsize = @getimagesize($full_path); if (is_array($imgsize)) { $imgsize = /* I18N: image dimensions, width × height */ I18N::translate('%1$s × %2$s pixels', I18N::number($imgsize['0']), I18N::number($imgsize['1'])); - $html .= WT_Gedcom_Tag::getLabelValue('__IMAGE_SIZE__', $imgsize); + $html .= '<dt>' . I18N::translate('Image dimensions') . '</dt>'; + $html .= '<dd>' . $imgsize . '</dd>'; } + $html .= '</dl>'; } else { - $html .= '<div class="error">' . I18N::translate('This media file exists, but cannot be accessed.') . '</div>'; + $html .= '</dl>'; + $html .= '<div class="alert alert-danger">' . I18N::translate('This media file exists, but cannot be accessed.') . '</div>'; } } else { - $html .= '<div class="error">' . I18N::translate('This media file does not exist.') . '</div>'; + $html .= '</dl>'; + $html .= '<div class="alert alert-danger">' . I18N::translate('This media file does not exist.') . '</div>'; } return $html; } diff --git a/themes/_administration/theme.php b/themes/_administration/theme.php index 4d82d00abf..caf144fe40 100644 --- a/themes/_administration/theme.php +++ b/themes/_administration/theme.php @@ -1,23 +1,19 @@ <?php namespace Fisharebest\Webtrees; -// Administration theme -// -// webtrees: online genealogy -// Copyright (C) 2015 webtrees development team. -// -// This program is free software; you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation; either version 2 of the License, or -// (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program; if not, write to the Free Software -// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA +/** + * webtrees: online genealogy + * Copyright (C) 2015 webtrees development team + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * You should have received a copy of the GNU General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + */ return new AdministrationTheme(); diff --git a/themes/_custom/theme.php b/themes/_custom/theme.php index 3f32d62ce5..92dac27357 100644 --- a/themes/_custom/theme.php +++ b/themes/_custom/theme.php @@ -1,22 +1,20 @@ <?php namespace Fisharebest\Webtrees; -// webtrees: online genealogy -// Copyright (C) 2015 webtrees development team. -// -// This program is free software; you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation; either version 2 of the License, or -// (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program; if not, write to the Free Software -// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA +/** + * webtrees: online genealogy + * Copyright (C) 2015 webtrees development team + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * You should have received a copy of the GNU General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + */ /** * Class CustomTheme - This is a template showing how to create a custom theme. diff --git a/themes/clouds/theme.php b/themes/clouds/theme.php index 53a739c42b..d935ffb1d1 100644 --- a/themes/clouds/theme.php +++ b/themes/clouds/theme.php @@ -1,23 +1,19 @@ <?php namespace Fisharebest\Webtrees; - // Clouds theme -// -// webtrees: online genealogy -// Copyright (C) 2015 webtrees development team. -// -// This program is free software; you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation; either version 2 of the License, or -// (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program; if not, write to the Free Software -// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA +/** + * webtrees: online genealogy + * Copyright (C) 2015 webtrees development team + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * You should have received a copy of the GNU General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + */ return new CloudsTheme; diff --git a/themes/colors/theme.php b/themes/colors/theme.php index 7e13411565..66c8c45b7f 100644 --- a/themes/colors/theme.php +++ b/themes/colors/theme.php @@ -1,24 +1,19 @@ <?php namespace Fisharebest\Webtrees; - // Colors theme -// -// webtrees: online genealogy -// Copyright (C) 2015 webtrees development team. -// -// This program is free software; you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation; either version 2 of the License, or -// (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program; if not, write to the Free Software -// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -// PNG Icons By: Alessandro Rei; License: GPL; www.deviantdark.com +/** + * webtrees: online genealogy + * Copyright (C) 2015 webtrees development team + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * You should have received a copy of the GNU General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + */ return new ColorsTheme; diff --git a/themes/fab/theme.php b/themes/fab/theme.php index 05e55aca0d..f4df9d6274 100644 --- a/themes/fab/theme.php +++ b/themes/fab/theme.php @@ -1,23 +1,19 @@ <?php namespace Fisharebest\Webtrees; - // FAB theme -// -// webtrees: online genealogy -// Copyright (C) 2015 webtrees development team. -// -// This program is free software; you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation; either version 2 of the License, or -// (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program; if not, write to the Free Software -// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA +/** + * webtrees: online genealogy + * Copyright (C) 2015 webtrees development team + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * You should have received a copy of the GNU General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + */ return new FabTheme; diff --git a/themes/minimal/theme.php b/themes/minimal/theme.php index aa28fbd60d..12c8ad1eee 100644 --- a/themes/minimal/theme.php +++ b/themes/minimal/theme.php @@ -1,23 +1,19 @@ <?php namespace Fisharebest\Webtrees; - // Minimal theme -// -// webtrees: online genealogy -// Copyright (C) 2015 webtrees development team. -// -// This program is free software; you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation; either version 2 of the License, or -// (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program; if not, write to the Free Software -// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA +/** + * webtrees: online genealogy + * Copyright (C) 2015 webtrees development team + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * You should have received a copy of the GNU General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + */ return new MinimalTheme; diff --git a/themes/webtrees/theme.php b/themes/webtrees/theme.php index ca4ba86203..d887e451f2 100644 --- a/themes/webtrees/theme.php +++ b/themes/webtrees/theme.php @@ -1,23 +1,19 @@ <?php namespace Fisharebest\Webtrees; - // Standard theme -// -// webtrees: online genealogy -// Copyright (C) 2015 webtrees development team. -// -// This program is free software; you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation; either version 2 of the License, or -// (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program; if not, write to the Free Software -// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA +/** + * webtrees: online genealogy + * Copyright (C) 2015 webtrees development team + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * You should have received a copy of the GNU General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + */ return new WebtreesTheme; diff --git a/themes/xenea/theme.php b/themes/xenea/theme.php index 95bb42e1ee..755d717bb1 100644 --- a/themes/xenea/theme.php +++ b/themes/xenea/theme.php @@ -1,23 +1,19 @@ <?php namespace Fisharebest\Webtrees; - // Xenea theme -// -// webtrees: online genealogy -// Copyright (C) 2015 webtrees development team. -// -// This program is free software; you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation; either version 2 of the License, or -// (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program; if not, write to the Free Software -// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA +/** + * webtrees: online genealogy + * Copyright (C) 2015 webtrees development team + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * You should have received a copy of the GNU General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + */ return new XeneaTheme; |