Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Forum icon sc template cleanup #5425

Open
wants to merge 12 commits into
base: master
Choose a base branch
from
Open

Forum icon sc template cleanup #5425

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
a1dc4b4
Merge branch 'e107inc:master' into master
rica-carv Jan 10, 2025
41cd2dd
Merge branch 'e107inc:master' into master
rica-carv Jan 10, 2025
5bbd9e7
Merge branch 'e107inc:master' into master
rica-carv Jan 15, 2025
a8a4ee8
Merge branch 'e107inc:master' into master
rica-carv Jan 16, 2025
a55bc5a
Merge branch 'e107inc:master' into master
rica-carv Jan 19, 2025
897592e
Merge branch 'e107inc:master' into master
rica-carv Jan 25, 2025
3424136
Merge branch 'e107inc:master' into master
rica-carv Jan 29, 2025
8bb032e
Merge branch 'e107inc:master' into master
rica-carv Jan 31, 2025
90650fe
Update viewforum_shortcodes.php
rica-carv Feb 2, 2025
fd8d668
Update forum_icons_template.php
rica-carv Feb 2, 2025
35a6b25
Update forum_icons_template.php
rica-carv Feb 3, 2025
da83349
Merge branch 'e107inc:master' into forum_icon_sc
rica-carv Feb 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion e107_plugins/forum/shortcodes/batch/viewforum_shortcodes.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -740,7 +740,8 @@ function sc_icon($parm)

if(!empty($parm))
{
return $this->keyIcon($parm);
// return $this->keyIcon($parm);
return e107::getParser()->parseTemplate($this->keyIcon($parm));
}


Expand Down
62 changes: 41 additions & 21 deletions e107_plugins/forum/templates/forum_icons_template.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,30 +12,50 @@

if (!defined('e107_INIT')) { exit(); }

$tp = e107::getParser();
//$tp = e107::getParser();
if(deftrue("FONTAWESOME", false)) {

define('IMAGE_e', 'e');
define('IMAGE_new', $tp->toGlyph('fa-star', 'size=2x'));
define('IMAGE_nonew', $tp->toGlyph('fa-comment', 'size=2x'));
define('IMAGE_new_small', $tp->toGlyph('fa-star'));
define('IMAGE_nonew_small', $tp->toGlyph('fa-comment'));
define('IMAGE_new_popular', $tp->toGlyph('fa-comments', 'size=2x'));
define('IMAGE_nonew_popular', $tp->toGlyph('fa-comments-o', 'size=2x'));
define('IMAGE_new_popular_small', $tp->toGlyph('fa-comments'));
define('IMAGE_nonew_popular_small', $tp->toGlyph('fa-comments-o'));
define('IMAGE_sticky', $tp->toGlyph('fa-thumb-tack', 'size=2x'));
define('IMAGE_stickyclosed', $tp->toGlyph('fa-lock', 'size=2x'));
define('IMAGE_sticky_small', $tp->toGlyph('fa-thumb-tack'));
define('IMAGE_stickyclosed_small', $tp->toGlyph('fa-lock'));
define('IMAGE_announce', $tp->toGlyph('fa-bullhorn', 'size=2x'));
define('IMAGE_announce_small', $tp->toGlyph('fa-bullhorn'));
define('IMAGE_closed_small', $tp->toGlyph('fa-lock'));
define('IMAGE_closed', $tp->toGlyph('fa-lock', 'size=2x'));
define('IMAGE_noreplies', $tp->toGlyph('fa-comment-o', 'size=2x'));
define('IMAGE_noreplies_small', $tp->toGlyph('fa-comment-o'));
define('IMAGE_track', $tp->toGlyph('fa-bell'));
define('IMAGE_untrack', $tp->toGlyph('fa-bell-o'));
//define('IMAGE_new', $tp->toGlyph('fa-star', 'size=2x'));
define('IMAGE_new', '{GLYPH:type=fa-star&size=2x}');
//define('IMAGE_nonew', $tp->toGlyph('fa-comment', 'size=2x'));
define('IMAGE_nonew', '{GLYPH:type=fa-comment&size=2x}');
//define('IMAGE_new_small', $tp->toGlyph('fa-star'));
define('IMAGE_new_small', '{GLYPH:type=fa-star}');
//define('IMAGE_nonew_small', $tp->toGlyph('fa-comment'));
define('IMAGE_nonew_small', '{GLYPH:type=fa-comment}');
//define('IMAGE_new_popular', $tp->toGlyph('fa-comments', 'size=2x'));
define('IMAGE_new_popular', '{GLYPH:type=fa-comments&size=2x}');
//define('IMAGE_nonew_popular', $tp->toGlyph('fa-comments-o', 'size=2x'));
define('IMAGE_nonew_popular', '{GLYPH:type=fa-comments-o%size=2x}');
//define('IMAGE_new_popular_small', $tp->toGlyph('fa-comments'));
define('IMAGE_new_popular_small', '{GLYPH:type=fa-comments}');
//define('IMAGE_nonew_popular_small', $tp->toGlyph('fa-comments-o'));
define('IMAGE_nonew_popular_small', '{GLYPH:type=fa-comments-o}');
//define('IMAGE_sticky', $tp->toGlyph('fa-thumb-tack', 'size=2x'));
define('IMAGE_sticky', '{GLYPH:type=fa-thumb-tack&size=2x}');
//define('IMAGE_stickyclosed', $tp->toGlyph('fa-lock', 'size=2x'));
define('IMAGE_stickyclosed', '{GLYPH:type=fa-lock&size=2x}');
//define('IMAGE_sticky_small', $tp->toGlyph('fa-thumb-tack'));
define('IMAGE_sticky_small', '{GLYPH:type=fa-thumb-tack}');
//define('IMAGE_stickyclosed_small', $tp->toGlyph('fa-lock'));
define('IMAGE_stickyclosed_small', '{GLYPH:type=fa-lock}');
//define('IMAGE_announce', $tp->toGlyph('fa-bullhorn', 'size=2x'));
define('IMAGE_announce', '{GLYPH:type=fa-bullhorn&size=2x}');
//define('IMAGE_announce_small', $tp->toGlyph('fa-bullhorn'));
define('IMAGE_announce_small', '{GLYPH:type=fa-bullhorn}');
//define('IMAGE_closed_small', $tp->toGlyph('fa-lock'));
define('IMAGE_closed_small', '{GLYPH:type=fa-lock}');
//define('IMAGE_closed', $tp->toGlyph('fa-lock', 'size=2x'));
define('IMAGE_closed', '{GLYPH:type=fa-lock&size=2x}');
//define('IMAGE_noreplies', $tp->toGlyph('fa-comment-o', 'size=2x'));
define('IMAGE_noreplies', '{GLYPH:type=fa-comment-o&size=2x}');
//define('IMAGE_noreplies_small', $tp->toGlyph('fa-comment-o'));
define('IMAGE_noreplies_small', '{GLYPH:type=fa-comment-o}');
//define('IMAGE_track', $tp->toGlyph('fa-bell'));
define('IMAGE_track', '{GLYPH:type=fa-bell}');
//define('IMAGE_untrack', $tp->toGlyph('fa-bell-o'));
define('IMAGE_untrack', '{GLYPH:type=fa-bell-o}');

} else {

Expand Down
Loading