Skip to content

Commit

Permalink
UI(material-icons): use CSS classes instead of ligatures to display i…
Browse files Browse the repository at this point in the history 
…cons

Change-Id: I19787600416d1ded89942124272f9de8acda64ec
  • Loading branch information
@andi34
andi34 committed Oct 29, 2022
1 parent d3d8fa2 commit bc1ef45
Show file tree
Hide file tree
Showing 27 changed files with 177 additions and 172 deletions.
7 changes: 4 additions & 3 deletions admin/debugpanel.php
View file
Expand Up @@ -42,6 +42,7 @@
<link rel="stylesheet" type="text/css" href="../node_modules/normalize.css/normalize.css">
<link rel="stylesheet" type="text/css" href="../node_modules/font-awesome/css/font-awesome.css">
<link rel="stylesheet" type="text/css" href="../node_modules/material-icons/iconfont/material-icons.css">
<link rel="stylesheet" type="text/css" href="../node_modules/material-icons/css/material-icons.css">
<link rel="stylesheet" type="text/css" href="../node_modules/selectize/dist/css/selectize.css">
<link rel="stylesheet" type="text/css" href="../resources/css/<?php echo $config['ui']['style']; ?>_admin.css?v=<?php echo $config['photobooth']['version']; ?>">
<?php if (is_file("../private/overrides.css")): ?>
Expand All @@ -68,14 +69,14 @@ function html_src_indent($num)
html_src_indent($indent++);
echo '<div class="admintopnavbar">';
html_src_indent($indent);
echo $config['icons']['admin_back'];
echo '<i class="' . $config['icons']['admin_back'] . '" id="admintopnavbarback"></i>';
if(isset($_SESSION['auth']) && $_SESSION['auth'] === true)
{
html_src_indent($indent);
echo $config['icons']['admin_signout'];
echo '<i class="' . $config['icons']['admin_signout'] . '" id="admintopnavbarlogout"></i>';
}
html_src_indent($indent);
echo $config['icons']['admin_menutoggle'];
echo '<i class="' . $config['icons']['admin_menutoggle'] . '" id="admintopnavbarmenutoggle"></i>';
html_src_indent($indent);
echo '<i class="setting_section_heading"><span data-i18n="debugpanel">Debug Panel</span></i>';
html_src_indent(--$indent);
Expand Down
3 changes: 2 additions & 1 deletion admin/diskusage.php
View file
Expand Up @@ -45,6 +45,7 @@
<link rel="stylesheet" href="../node_modules/normalize.css/normalize.css" />
<link rel="stylesheet" href="../node_modules/font-awesome/css/font-awesome.css" />
<link rel="stylesheet" type="text/css" href="../node_modules/material-icons/iconfont/material-icons.css">
<link rel="stylesheet" type="text/css" href="../node_modules/material-icons/css/material-icons.css">
<link rel="stylesheet" href="../resources/css/login.css?v=<?php echo $config['photobooth']['version']; ?>" />
<?php if (is_file("../private/overrides.css")): ?>
<link rel="stylesheet" href="../private/overrides.css?v=<?php echo $config['photobooth']['version']; ?>" />
Expand All @@ -54,7 +55,7 @@
<body class="loginbody">
<div class="login-panel <?php echo $uiShape; ?>">
<h2><?=$config['ui']['branding']?> <span data-i18n="disk_usage"></span></h2>
<a class="btn btn--tiny btn--flex <?php echo $btnShape; ?> back-to-admin" href="./"><?php echo $config['icons']['admin_back_short'] ?></a>
<a class="btn btn--tiny btn--flex <?php echo $btnShape; ?> back-to-admin" href="./"><i class="<?php echo $config['icons']['admin_back_short'] ?>"></i></a>
<button class="btn btn--tiny btn--flex <?php echo $btnShape; ?> download-zip-btn ">
<span data-i18n="download_zip"></span>
</button>
Expand Down
27 changes: 14 additions & 13 deletions admin/index.php
View file
Expand Up @@ -36,6 +36,7 @@
<link rel="stylesheet" type="text/css" href="../node_modules/normalize.css/normalize.css">
<link rel="stylesheet" type="text/css" href="../node_modules/font-awesome/css/font-awesome.css">
<link rel="stylesheet" type="text/css" href="../node_modules/material-icons/iconfont/material-icons.css">
<link rel="stylesheet" type="text/css" href="../node_modules/material-icons/css/material-icons.css">
<link rel="stylesheet" type="text/css" href="../node_modules/selectize/dist/css/selectize.css">
<link rel="stylesheet" type="text/css" href="../resources/css/<?php echo $config['ui']['style']; ?>_admin.css?v=<?php echo $config['photobooth']['version']; ?>">
<?php if (is_file("../private/overrides.css")): ?>
Expand Down Expand Up @@ -101,14 +102,14 @@ function isElementHidden($element_class, $setting)
html_src_indent($indent++);
echo '<div class="admintopnavbar">';
html_src_indent($indent);
echo $config['icons']['admin_back'];
echo '<i class="' . $config['icons']['admin_back'] . '" id="admintopnavbarback"></i>';
if(isset($_SESSION['auth']) && $_SESSION['auth'] === true)
{
html_src_indent($indent);
echo ' ' . $config['icons']['admin_signout'];
echo ' <i class="' . $config['icons']['admin_signout'] . '" id="admintopnavbarlogout"></i>';
}
html_src_indent($indent);
echo ' ' . $config['icons']['admin_menutoggle'];
echo ' <i class="' . $config['icons']['admin_menutoggle'] . '" id="admintopnavbarmenutoggle"></i>';
html_src_indent(--$indent);
echo '</div>';

Expand Down Expand Up @@ -146,11 +147,11 @@ function isElementHidden($element_class, $setting)
<form autocomplete="off">

<div class="admincontent" id="admincontentpage">
<button class="save-admin-btn <?php echo $btnShape; ?>" id="save-admin-btn">
<button class="save-admin-btn <?php echo $btnShape; ?>" id="save-admin-btn">
<span class="save"><span data-i18n="save"></span></span>
<span class="saving"><?php echo $config['icons']['admin_save']; ?><span data-i18n="saving"></span></span>
<span class="success"><?php echo $config['icons']['admin_save_success']; ?><span data-i18n="success"></span></span>
<span class="error"><?php echo $config['icons']['admin_save_error']; ?><span data-i18n="saveerror"></span></span>
<span class="saving"><i class="<?php echo $config['icons']['admin_save']; ?>"></i><span data-i18n="saving"></span></span>
<span class="success"><i class="<?php echo $config['icons']['admin_save_success']; ?>"></i><span data-i18n="success"></span></span>
<span class="error"><i class="<?php echo $config['icons']['admin_save_error']; ?>"></i><span data-i18n="saveerror"></span></span>
</button>
<?php

Expand Down Expand Up @@ -249,15 +250,15 @@ function isElementHidden($element_class, $setting)
switch ($key) {
case 'reset_button':
echo '<span class="save"><span data-i18n="reset"></span></span>';
echo '<span class="saving">' . $config['icons']['admin_save'] . '<span data-i18n="saving"></span></span>';
echo '<span class="success">' . $config['icons']['admin_save_success'] . '<span data-i18n="success"></span></span>';
echo '<span class="error">' . $config['icons']['admin_save_error'] . '<span data-i18n="saveerror"></span></span>';
echo '<span class="saving"><i class="' . $config['icons']['admin_save'] . '"></i><span data-i18n="saving"></span></span>';
echo '<span class="success"><i class="' . $config['icons']['admin_save_success'] . '"></i><span data-i18n="success"></span></span>';
echo '<span class="error"><i class="' . $config['icons']['admin_save_error'] . '"></i><span data-i18n="saveerror"></span></span>';
break;
case 'database_rebuild':
case 'check_version':
echo '<span class="saving">' . $config['icons']['admin_save'] . '<span data-i18n="busy"></span></span>';
echo '<span class="success">' . $config['icons']['admin_save_success'] . '<span data-i18n="success"></span></span>';
echo '<span class="error">' . $config['icons']['admin_save_error'] . '<span data-i18n="saveerror"></span></span>';
echo '<span class="saving"><i class="' . $config['icons']['admin_save'] . '"></i><span data-i18n="busy"></span></span>';
echo '<span class="success"><i class="' . $config['icons']['admin_save_success'] . '"></i><span data-i18n="success"></span></span>';
echo '<span class="error"><i class="' . $config['icons']['admin_save_error'] . '"></i><span data-i18n="saveerror"></span></span>';
echo '<span class="text" data-i18n="'.$setting['placeholder'].'"></span>';
break;
default:
Expand Down
7 changes: 4 additions & 3 deletions chromakeying.php
View file
Expand Up @@ -50,6 +50,7 @@
<link rel="stylesheet" href="node_modules/normalize.css/normalize.css" />
<link rel="stylesheet" href="node_modules/font-awesome/css/font-awesome.css" />
<link rel="stylesheet" href="node_modules/material-icons/iconfont/material-icons.css">
<link rel="stylesheet" href="node_modules/material-icons/css/material-icons.css">
<link rel="stylesheet" href="resources/css/<?php echo $config['ui']['style']; ?>_chromakeying.css?v=<?php echo $config['photobooth']['version']; ?>" />
<?php if (is_file("private/overrides.css")): ?>
<link rel="stylesheet" href="private/overrides.css?v=<?php echo $config['photobooth']['version']; ?>" />
Expand All @@ -75,13 +76,13 @@
</div>

<div class="chroma-control-bar">
<a class="<?php echo $btnClass; ?> rotaryfocus" id="save-chroma-btn" href="#"><?php echo $config['icons']['save']; ?> <span data-i18n="save"></span></a>
<a class="<?php echo $btnClass; ?> rotaryfocus" id="save-chroma-btn" href="#"><i class="<?php echo $config['icons']['save']; ?>"></i> <span data-i18n="save"></span></a>

<?php if ($config['print']['from_chromakeying']): ?>
<a class="<?php echo $btnClass; ?> rotaryfocus" id="print-btn" href="#"><?php echo $config['icons']['print']; ?> <span data-i18n="print"></span></a>
<a class="<?php echo $btnClass; ?> rotaryfocus" id="print-btn" href="#"><i class="<?php echo $config['icons']['print']; ?>"></i> <span data-i18n="print"></span></a>
<?php endif; ?>

<a class="<?php echo $btnClass; ?> rotaryfocus" id="close-btn" href="#"><?php echo $config['icons']['close']; ?> <span data-i18n="close"></span></a>
<a class="<?php echo $btnClass; ?> rotaryfocus" id="close-btn" href="#"><i class="<?php echo $config['icons']['close']; ?>"></i> <span data-i18n="close"></span></a>
</div>
<?php else:?>
<div style="text-align:center;padding-top:250px">
Expand Down
87 changes: 43 additions & 44 deletions config/config.inc.php
View file
Expand Up @@ -344,50 +344,49 @@


// I C O N S
$config['icons']['admin_back'] = '<i class="fa fa-long-arrow-left fa-3x" id="admintopnavbarback"></i>';
$config['icons']['admin_back_short'] = '<i class="fa fa-arrow-left"></i>';
$config['icons']['admin_menutoggle'] = '<i class="fa fa-bars fa-3x" id="admintopnavbarmenutoggle"></i>';
$config['icons']['admin_save'] = '<i class="fa fa-circle-o-notch fa-spin fa-fw"></i>';
$config['icons']['admin_save_success'] = '<i class="fa fa-check"></i>';
$config['icons']['admin_save_error'] = '<i class="fa fa-times"></i>';
$config['icons']['admin_signout'] = '<i class="fa fa-sign-out fa-3x" id="admintopnavbarlogout"></i>';
$config['icons']['admin'] = '<i class="fa fa-cog"></i>';
$config['icons']['home'] = '<i class="fa fa-home"></i>';
$config['icons']['gallery'] = '<i class="fa fa-picture-o"></i>';
$config['icons']['dependencies'] = '<i class="fa fa-list-ul"></i>';
$config['icons']['update'] = '<i class="fa fa-tasks"></i>';
$config['icons']['slideshow'] = '<i class="fa fa-play"></i>';
$config['icons']['livechroma'] = '<i class="fa fa-paint-brush"></i>';
$config['icons']['faq'] = '<i class="fa fa-question-circle" aria-hidden="true"></i>';
$config['icons']['manual'] = '<i class="fa fa-info-circle" aria-hidden="true"></i>';
$config['icons']['telegram'] = '<i class="fa fa-telegram" aria-hidden="true"></i>';
$config['icons']['cups'] = '<i class="fa fa-print" aria-hidden="true"></i>';
$config['icons']['take_picture'] = '<i class="fa fa-camera"></i>';
$config['icons']['take_collage'] = '<i class="fa fa-th-large"></i>';
$config['icons']['close'] = '<i class="fa fa-times"></i>';
$config['icons']['refresh'] = '<i class="fa fa-refresh"></i>';
$config['icons']['delete'] = '<i class="fa fa-trash"></i>';
$config['icons']['print'] = '<i class="fa fa-print"></i>';
$config['icons']['save'] = '<i class="fa fa-floppy-o"></i>';
$config['icons']['download'] = '<i class="fa fa-download"></i>';
$config['icons']['qr'] = '<i class="fa fa-qrcode"></i>';
$config['icons']['mail'] = '<i class="fa fa-envelope"></i>';
$config['icons']['mail_close'] = '<i class="fa fa-times" id="send-mail-close"></i>';
$config['icons']['mail_submit'] = '<i class="fa fa-spinner fa-spin"></i>';
$config['icons']['filter'] = '<i class="fa fa-magic"></i>';
$config['icons']['chroma'] = '<i class="fa fa-paint-brush"></i>';
$config['icons']['fullscreen'] = '<i class="fa fa-arrows-alt"></i>';
$config['icons']['share'] = '<i class="fa fa-share-alt" aria-hidden="true"></i>';
$config['icons']['zoom'] = '<i class="fa fa-search-plus" aria-hidden="true"></i>';
$config['icons']['logout'] = '<i class="fa fa-sign-out"></i>';
$config['icons']['date'] = '<i class="fa fa-clock-o"></i>';
$config['icons']['spinner'] = '<i class="fa fa-cog fa-spin"></i>';
$config['icons']['update_git'] = '<i class="fa fa-play-circle"></i>';
$config['icons_class']['close'] = 'fa fa-times';
$config['icons_class']['password_visibility'] = 'fa fa-eye';
$config['icons_class']['password_toggle'] = 'fa-eye fa-eye-slash';
$config['icons_class']['slideshow_play'] = 'fa fa-play';
$config['icons_class']['slideshow_toggle'] = 'fa-play fa-pause';
$config['icons']['admin_back'] = 'fa fa-long-arrow-left fa-3x';
$config['icons']['admin_back_short'] = 'fa fa-arrow-left';
$config['icons']['admin_menutoggle'] = 'fa fa-bars fa-3x';
$config['icons']['admin_save'] = 'fa fa-circle-o-notch fa-spin fa-fw';
$config['icons']['admin_save_success'] = 'fa fa-check';
$config['icons']['admin_save_error'] = 'fa fa-times';
$config['icons']['admin_signout'] = 'fa fa-sign-out fa-3x';
$config['icons']['admin'] = 'fa fa-cog';
$config['icons']['home'] = 'fa fa-home';
$config['icons']['gallery'] = 'fa fa-picture-o';
$config['icons']['dependencies'] = 'fa fa-list-ul';
$config['icons']['update'] = 'fa fa-tasks';
$config['icons']['slideshow'] = 'fa fa-play';
$config['icons']['livechroma'] = 'fa fa-paint-brush';
$config['icons']['faq'] = 'fa fa-question-circle';
$config['icons']['manual'] = 'fa fa-info-circle';
$config['icons']['telegram'] = 'fa fa-telegram';
$config['icons']['cups'] = 'fa fa-print';
$config['icons']['take_picture'] = 'fa fa-camera';
$config['icons']['take_collage'] = 'fa fa-th-large';
$config['icons']['close'] = 'fa fa-times';
$config['icons']['refresh'] = 'fa fa-refresh';
$config['icons']['delete'] = 'fa fa-trash';
$config['icons']['print'] = 'fa fa-print';
$config['icons']['save'] = 'fa fa-floppy-o';
$config['icons']['download'] = 'fa fa-download';
$config['icons']['qr'] = 'fa fa-qrcode';
$config['icons']['mail'] = 'fa fa-envelope';
$config['icons']['mail_close'] = 'fa fa-times';
$config['icons']['mail_submit'] = 'fa fa-spinner fa-spin';
$config['icons']['filter'] = 'fa fa-magic';
$config['icons']['chroma'] = 'fa fa-paint-brush';
$config['icons']['fullscreen'] = 'fa fa-arrows-alt';
$config['icons']['share'] = 'fa fa-share-alt';
$config['icons']['zoom'] = 'fa fa-search-plus';
$config['icons']['logout'] = 'fa fa-sign-out';
$config['icons']['date'] = 'fa fa-clock-o';
$config['icons']['spinner'] = 'fa fa-cog fa-spin';
$config['icons']['update_git'] = 'fa fa-play-circle';
$config['icons']['password_visibility'] = 'fa fa-eye';
$config['icons']['password_toggle'] = 'fa-eye fa-eye-slash';
$config['icons']['slideshow_play'] = 'fa fa-play';
$config['icons']['slideshow_toggle'] = 'fa-play fa-pause';


// J P E G Q U A L I T Y
Expand Down
5 changes: 3 additions & 2 deletions dependencies.php
View file
Expand Up @@ -46,6 +46,7 @@
<link rel="stylesheet" href="node_modules/normalize.css/normalize.css" />
<link rel="stylesheet" href="node_modules/font-awesome/css/font-awesome.css" />
<link rel="stylesheet" href="node_modules/material-icons/iconfont/material-icons.css">
<link rel="stylesheet" href="node_modules/material-icons/css/material-icons.css">
<link rel="stylesheet" href="resources/css/<?php echo $config['ui']['style']; ?>_style.css?v=<?php echo $config['photobooth']['version']; ?>" />
<link rel="stylesheet" href="resources/css/update.css?v=<?php echo $config['photobooth']['version']; ?>" />
<?php if (is_file("private/overrides.css")): ?>
Expand All @@ -61,9 +62,9 @@
</div>

<div>
<a href="./" class="<?php echo $btnClass; ?>"><?php echo $config['icons']['home']; ?> <span data-i18n="home"></span></a>
<a href="./" class="<?php echo $btnClass; ?>"><i class="<?php echo $config['icons']['home']; ?>"></i> <span data-i18n="home"></span></a>

<a href="admin" class="<?php echo $btnClass; ?>"><?php echo $config['icons']['admin']; ?> <span data-i18n="admin_panel"></span></a>
<a href="admin" class="<?php echo $btnClass; ?>"><i class="<?php echo $config['icons']['admin']; ?>"></i> <span data-i18n="admin_panel"></span></a>
</div>

<script type="text/javascript" src="node_modules/jquery/dist/jquery.min.js"></script>
Expand Down
1 change: 1 addition & 0 deletions gallery.php
View file
Expand Up @@ -51,6 +51,7 @@
<link rel="stylesheet" href="node_modules/normalize.css/normalize.css" />
<link rel="stylesheet" href="node_modules/font-awesome/css/font-awesome.css" />
<link rel="stylesheet" href="node_modules/material-icons/iconfont/material-icons.css">
<link rel="stylesheet" href="node_modules/material-icons/css/material-icons.css">
<link rel="stylesheet" href="vendor/PhotoSwipe/dist/photoswipe.css" />
<link rel="stylesheet" href="vendor/PhotoSwipe/dist/default-skin/default-skin.css" />
<link rel="stylesheet" href="resources/css/<?php echo $config['ui']['style']; ?>_style.css?v=<?php echo $config['photobooth']['version']; ?>" />
Expand Down

0 comments on commit bc1ef45

Please sign in to comment.