Merge pull request #158 from bergware/6.4-wip

Allow font-awesome icons in header buttons
This commit is contained in:
tom mortensen
2017-08-29 00:25:28 -05:00
committed by GitHub
8 changed files with 11 additions and 8 deletions
+1 -1
View File
@@ -1,6 +1,6 @@
Menu="Buttons"
Title="Feedback"
Icon="feedback.png"
Icon="comment-o"
Tag="commenting"
---
<?PHP
+1 -1
View File
@@ -1,6 +1,6 @@
Menu="Buttons"
Title="Help"
Icon="help.png"
Icon="question-circle-o"
---
<?PHP
/* Copyright 2005-2017, Lime Technology
+1 -1
View File
@@ -1,6 +1,6 @@
Menu="Buttons"
Title="Info"
Icon="info.png"
Icon="tv"
---
<?PHP
/* Copyright 2005-2017, Lime Technology
+1 -1
View File
@@ -1,6 +1,6 @@
Menu="Buttons"
Title="Log"
Icon="log.png"
Icon="file-text-o"
---
<?PHP
/* Copyright 2005-2017, Lime Technology
+1 -1
View File
@@ -29,7 +29,7 @@ $path = $_GET['path'];
$user = $_GET['user'];
$list = [];
$all = $docroot.preg_replace('/([\'" &()[\]\\\\])/','\\\\$1',$dir).'/*';
$fix = explode('/',trim_slash($dir))[2];
$fix = substr($dir,0,4)=='/mnt' ? explode('/',trim_slash($dir))[2] : 'flash';
exec("shopt -s dotglob; stat -L -c'%F|%n|%s|%Y' $all 2>/dev/null",$file);
if ($user) {
@@ -311,9 +311,10 @@ echo "<div id='nav-right'>";
$pages = find_pages('Buttons');
foreach ($pages as $page) {
eval("?>{$page['text']}");
if (empty($page['Link']))
echo "<div id='nav-item' class='{$page['name']}'><a href='#' onclick='{$page['name']}();return false;'><img src='/{$page['root']}/icons/{$page['Icon']}' class='system'>{$page['Title']}</a></div>";
else
if (empty($page['Link'])) {
$icon = substr($page['Icon'],-4)=='.png' ? "<img src='/{$page['root']}/icons/{$page['Icon']}' class='system'>" : "<i class='system fa fa-{$page['Icon']}'></i>";
echo "<div id='nav-item' class='{$page['name']}'><a href='#' onclick='{$page['name']}();return false;'>$icon{$page['Title']}</a></div>";
} else
echo "<div id='{$page['Link']}'></div>";
}
if ($notify['display']) {
+1
View File
@@ -78,6 +78,7 @@ form+p{display:none}
#nav-item.InfoButton a:before{content:'\f05a'}
#nav-item.LogButton a:before{content:'\f14b'}
#nav-item.PowerButton a:before{content:'\f011'}
#nav-item a i{display:none}
#nav-user{display:block;float:left;text-align:center;border:none}
#nav-user.probe{font-size:11px;margin-left:3px;margin-right:8px}
#nav-tub1{position:fixed;top:56px;left:330px}
+1
View File
@@ -78,6 +78,7 @@ form+p{display:none}
#nav-item.InfoButton a:before{content:'\f05a'}
#nav-item.LogButton a:before{content:'\f14b'}
#nav-item.PowerButton a:before{content:'\f011'}
#nav-item a i{display:none}
#nav-user{display:block;float:left;text-align:center;border:none}
#nav-user.probe{font-size:11px;margin-left:3px;margin-right:8px}
#nav-tub1{position:fixed;top:56px;left:330px}