r31k
/
bludit
2
0
Fork 0
Code Issues 1 Pull Requests Releases Wiki Activity

Font Awesome fixes

This commit is contained in:
dignajar 2016-01-16 21:45:16 -03:00
parent 26b1ee0cec
commit 942f4b6165
5 changed files with 20 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
kernel/admin/themes/default/css/font-awesome.min.css vendored Normal file
View File

File diff suppressed because one or more lines are too long

13
kernel/helpers/theme.class.php
View File

@ -122,7 +122,18 @@ class Theme {
public static function jquery($echo=true)
{
$tmp = '<script src="'.JQUERY.'"></script>'.PHP_EOL;
$tmp = '<script src="'.HTML_PATH_ADMIN_THEME_JS.'jquery.min.js'.'"></script>'.PHP_EOL;
if($echo) {
echo $tmp;
}
return $tmp;
}
public static function fontAwesome($echo=true, $online=false)
{
$tmp = '<link rel="stylesheet" href="'.HTML_PATH_ADMIN_THEME_CSS.'font-awesome.min.css'.'">'.PHP_EOL;
if($echo) {
echo $tmp;

4
plugins/simplemde/css/font-awesome.min.css vendored
View File

File diff suppressed because one or more lines are too long

2
plugins/simplemde/plugin.php
View File

@ -50,7 +50,7 @@ class pluginsimpleMDE extends Plugin {
$html .= '<link rel="stylesheet" href="'.$pluginPath.'css/simplemde.min.css">';
// Font-awesome is a dependency of SimpleMDE
$html .= '<link rel="stylesheet" href="'.$pluginPath.'css/font-awesome.min.css">';
$html .= '<link rel="stylesheet" href="'.HTML_PATH_ADMIN_THEME_CSS.'font-awesome.min.css">';
// SimpleMDE js
$html .= '<script src="'.$pluginPath.'js/simplemde.min.js"></script>';

6
themes/pure/php/post.php
View File

@ -20,11 +20,11 @@
<?php
echo $Language->get('Posted By').' ';
if( Text::isNotEmpty($Post->authorFirstName()) || Text::isNotEmpty($Post->authorLastName()) ) {
echo $Post->authorFirstName().' '.$Post->authorLastName();
if( Text::isNotEmpty($Post->user('firstName')) || Text::isNotEmpty($Post->user('lastName')) ) {
echo $Post->user('firstName').' '.$Post->user('lastName');
}
else {
echo $Post->username();
echo $Post->user('username');
}
?>
</span>