mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-01 04:10:38 +02:00
Code Issues Releases Wiki Activity

Forum plugin - Fixed glyphicons on BS3

Browse Source
This commit is contained in:
Moc
2014-06-25 21:48:57 +02:00
parent 78436982fa
commit f7810c6860
2 changed files with 17 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
e107_plugins/forum/forum_viewforum.php
View File

@@ -672,6 +672,7 @@ function fadminoptions($thread_info)
{ {
$tVars = new e_vars; $tVars = new e_vars;
$e107 = e107::getInstance(); $e107 = e107::getInstance();
$tp = e107::getParser();
// $text = "<form method='post' action='".e_REQUEST_URI."' id='frmMod_{$forumId}_{$threadId}' style='margin:0;'>"; // $text = "<form method='post' action='".e_REQUEST_URI."' id='frmMod_{$forumId}_{$threadId}' style='margin:0;'>";
$text .= '<div class="btn-group"><button class="btn btn-mini dropdown-toggle" data-toggle="dropdown"> $text .= '<div class="btn-group"><button class="btn btn-mini dropdown-toggle" data-toggle="dropdown">
@@ -689,19 +690,19 @@ function fadminoptions($thread_info)
$lan = array('stick'=>'Stick','unstick'=>'Unstick','lock'=>"Lock", 'unlock'=>"Unlock"); $lan = array('stick'=>'Stick','unstick'=>'Unstick','lock'=>"Lock", 'unlock'=>"Unlock");
$icon = array( $icon = array(
'unstick' => "<i class='icon-chevron-down'></i>", 'unstick' => $tp->toGlyph('chevron-down'),
'stick' => "<i class='icon-chevron-up'></i>", 'stick' => $tp->toGlyph('chevron-up'),
'lock' => "<i class='icon-lock'></i>", 'lock' => $tp->toGlyph('lock'),
'unlock' => "<i class='icon-unlock'></i>", 'unlock' => $tp->toGlyph('unlock'),
); );
$text .= "<li><a href='".e_REQUEST_URI."' data-forum-action='delete' data-forum-thread='".$id."'>Delete <i class='icon-trash'></i></a></li>"; $text .= "<li><a href='".e_REQUEST_URI."' data-forum-action='delete' data-forum-thread='".$id."'>Delete ".$tp->toGlyph('trash');
$text .= "<li><a href='".e_REQUEST_URI."' data-forum-action='".$stickUnstick."' data-forum-thread='".$id."'>".$lan[$stickUnstick]." ".$icon[$stickUnstick]."</a></li>"; $text .= "<li><a href='".e_REQUEST_URI."' data-forum-action='".$stickUnstick."' data-forum-thread='".$id."'>".$lan[$stickUnstick]." ".$icon[$stickUnstick]."</a></li>";
$text .= "<li><a href='".e_REQUEST_URI."' data-forum-action='".$lockUnlock."' data-forum-thread='".$id."'>".$lan[$lockUnlock]." ".$icon[$lockUnlock]."</a></li>"; $text .= "<li><a href='".e_REQUEST_URI."' data-forum-action='".$lockUnlock."' data-forum-thread='".$id."'>".$lan[$lockUnlock]." ".$icon[$lockUnlock]."</a></li>";
$text .= "<li><a href='{$moveUrl}'>Move <i class='icon-move'></i></a></li>"; $text .= "<li><a href='{$moveUrl}'>Move ".$tp->toGlyph('move')."</i></a></li>";
/* /*
$text .= "<li><input type='image' ".IMAGE_admin_delete." name='deleteThread_{$threadId}' value='thread_action' onclick=\"return confirm_({$threadId})\" /> Delete</li>"; $text .= "<li><input type='image' ".IMAGE_admin_delete." name='deleteThread_{$threadId}' value='thread_action' onclick=\"return confirm_({$threadId})\" /> Delete</li>";

20
e107_plugins/forum/shortcodes/batch/view_shortcodes.php
View File

@@ -464,7 +464,7 @@ class plugin_forum_view_shortcodes extends e_shortcode
function sc_postoptions() function sc_postoptions()
{ {
$tp = e107::getParser();
// {EMAILITEM} {PRINTITEM} {REPORTIMG}{EDITIMG}{QUOTEIMG} // {EMAILITEM} {PRINTITEM} {REPORTIMG}{EDITIMG}{QUOTEIMG}
$text = '<div class="btn-group"> $text = '<div class="btn-group">
@@ -475,24 +475,24 @@ class plugin_forum_view_shortcodes extends e_shortcode
<ul class="dropdown-menu pull-right">'; <ul class="dropdown-menu pull-right">';
$text .= "<li><a href='".e_HTTP."email.php?plugin:forum.".$this->postInfo['post_thread']."'>".LAN_FORUM_2044." <i class='icon-envelope'></i></a></li>"; $text .= "<li><a href='".e_HTTP."email.php?plugin:forum.".$this->postInfo['post_thread']."'>".LAN_FORUM_2044." ".$tp->toGlyph('envelope')."</a></li>";
$text .= "<li><a href='".e_HTTP."print.php?plugin:forum.".$this->postInfo['post_thread']."'>".LAN_FORUM_2045." <i class='icon-print'></i></a></li>"; // FIXME $text .= "<li><a href='".e_HTTP."print.php?plugin:forum.".$this->postInfo['post_thread']."'>".LAN_FORUM_2045." ".$tp->toGlyph('print')."</a></li>"; // FIXME
if (USER) // Report if (USER) // Report
{ {
$text .= "<li><a href='".$this->e107->url->create('forum/thread/report', "id={$this->postInfo['post_thread']}&post={$this->postInfo['post_id']}")."'>".LAN_FORUM_2046." <i class='icon-flag'></i></a></li>"; $text .= "<li><a href='".$this->e107->url->create('forum/thread/report', "id={$this->postInfo['post_thread']}&post={$this->postInfo['post_id']}")."'>".LAN_FORUM_2046." ".$tp->toGlyph('flag')."</a></li>";
} }
// Edit // Edit
if ( (USER && $this->postInfo['post_user'] == USERID && $this->thread->threadInfo['thread_active'])) if ( (USER && $this->postInfo['post_user'] == USERID && $this->thread->threadInfo['thread_active']))
{ {
$text .= "<li><a href='".e107::getUrl()->create('forum/thread/edit', array('id' => $this->postInfo['post_id']))."'>".LAN_FORUM_2039." <i class='icon-edit'></i></a></li>"; $text .= "<li><a href='".e107::getUrl()->create('forum/thread/edit', array('id' => $this->postInfo['post_id']))."'>".LAN_FORUM_2039." ".$tp->toGlyph('edit')."</a></li>";
} }
if($this->forum->checkperm($this->postInfo['post_forum'], 'post')) if($this->forum->checkperm($this->postInfo['post_forum'], 'post'))
{ {
$text .= "<li><a href='".e107::getUrl()->create('forum/thread/quote', array('id' => $this->postInfo['post_id']))."'>".LAN_FORUM_2041." <i class='icon-share-alt'></i></a></li>"; $text .= "<li><a href='".e107::getUrl()->create('forum/thread/quote', array('id' => $this->postInfo['post_id']))."'>".LAN_FORUM_2041." ".$tp->toGlyph('share-alt')."</a></li>";
} }
@@ -503,18 +503,18 @@ class plugin_forum_view_shortcodes extends e_shortcode
if ((USER && $this->postInfo['post_user'] != USERID && $this->thread->threadInfo['thread_active'])) if ((USER && $this->postInfo['post_user'] != USERID && $this->thread->threadInfo['thread_active']))
{ {
$text .= "<li><a href='".e107::getUrl()->create('forum/thread/edit', array('id' => $this->postInfo['post_id']))."'>".LAN_FORUM_2039." <i class='icon-edit'></i></a></li>"; $text .= "<li><a href='".e107::getUrl()->create('forum/thread/edit', array('id' => $this->postInfo['post_id']))."'>".LAN_FORUM_2039." ".$tp->toGlyph('edit')."</a></li>";
} }
$text .= "<li><a href='".e_REQUEST_URI."' data-forum-action='deletepost' data-forum-post='".$this->postInfo['post_id']."'>".LAN_FORUM_2040." <i class='icon-trash'></i></a></li>"; $text .= "<li><a href='".e_REQUEST_URI."' data-forum-action='deletepost' data-forum-post='".$this->postInfo['post_id']."'>".LAN_FORUM_2040." ".$tp->toGlyph('trash')."</a></li>";
if ($type == 'thread') if ($type == 'thread')
{ {
$text .= "<li><a href='" . e107::getUrl()->create('forum/thread/move', array('id' => $this->postInfo['post_id']))."'>".LAN_FORUM_2042." <i class='icon-move'></i></a></a></li>"; $text .= "<li><a href='" . e107::getUrl()->create('forum/thread/move', array('id' => $this->postInfo['post_id']))."'>".LAN_FORUM_2042." ".$tp->toGlyph('move')."</a></a></li>";
} }
else else
{ {
$text .= "<li><a href='" . e107::getUrl()->create('forum/thread/split', array('id' => $this->postInfo['post_id']))."'>".LAN_FORUM_2043." <i class='icon-cut'></i></a></li>"; $text .= "<li><a href='" . e107::getUrl()->create('forum/thread/split', array('id' => $this->postInfo['post_id']))."'>".LAN_FORUM_2043." ".$tp->toGlyph('cut')."</a></li>";
} }
} }