mirror of
https://github.com/e107inc/e107.git
synced 2025-04-21 05:02:02 +02:00
GUI Glyph fixes and Bbcode button styling fixes.
This commit is contained in:
Cameron
parent
325c3f3f60
commit
58d2aa8ad3
@ -1016,33 +1016,33 @@ class media_admin_ui extends e_admin_ui
|
||||
$options['bbcode'] = ($this->getQuery('bbcode')=='img') ? 'img' : FALSE;
|
||||
|
||||
|
||||
$text = "
|
||||
|
||||
<ul class='nav nav-tabs'>
|
||||
<li class='active'><a data-toggle='tab' href='#core-media-select'>Choose from Library</a></li>
|
||||
<li><a data-toggle='tab' href='#core-media-upload'>Upload a File</a></li>";
|
||||
$text = "<ul class='nav nav-tabs'>\n";
|
||||
|
||||
if(varset($options['bbcode']))
|
||||
$text .= "<li class='active'><a data-toggle='tab' href='#core-media-select'>Choose from Library</a></li>\n";
|
||||
|
||||
if($this->getQuery('bbcode') != 'video' && $this->getQuery('bbcode') !='glyph')
|
||||
{
|
||||
|
||||
|
||||
|
||||
$text .= "<li><a data-toggle='tab' href='#core-media-upload'>Upload a File</a></li>";
|
||||
}
|
||||
|
||||
if(varset($options['bbcode']) == 'img')
|
||||
{
|
||||
$text .= "<li><a data-toggle='tab' href='#core-media-style'>Appearance</a></li>\n";
|
||||
}
|
||||
|
||||
if($this->getQuery('glyphs') == 1)
|
||||
if($this->getQuery('glyphs') == 1 || $this->getQuery('bbcode') == 'glyph')
|
||||
{
|
||||
$text .= "<li><a data-toggle='tab' href='#core-media-glyphs'>Glyphs</a></li>\n";
|
||||
}
|
||||
|
||||
if($this->getQuery('video') == 1)
|
||||
if($this->getQuery('video') == 1 || $this->getQuery('bbcode') == 'video')
|
||||
{
|
||||
$text .= "<li><a data-toggle='tab' href='#core-media-video'>Youtube</a></li>\n";
|
||||
}
|
||||
|
||||
|
||||
|
||||
if(varset($options['bbcode']))
|
||||
{
|
||||
$text .= "<li><a data-toggle='tab' href='#core-media-style'>Appearance</a></li>\n";
|
||||
}
|
||||
|
||||
if(varset($_GET['from']))
|
||||
{
|
||||
@ -1160,7 +1160,7 @@ class media_admin_ui extends e_admin_ui
|
||||
</div>";
|
||||
}
|
||||
|
||||
if($this->getQuery('glyphs') == 1)
|
||||
if($this->getQuery('glyphs') == 1 || $this->getQuery('bbcode') == 'glyph')
|
||||
{
|
||||
//TODO
|
||||
$text .= "<div class='tab-pane clearfix' id='core-media-glyphs' style='font-size:24px'>";
|
||||
@ -1173,7 +1173,7 @@ class media_admin_ui extends e_admin_ui
|
||||
|
||||
}
|
||||
|
||||
if($this->getQuery('video'))
|
||||
if($this->getQuery('video') || $this->getQuery('bbcode') == 'video')
|
||||
{
|
||||
$text .= "<div class='tab-pane clearfix' id='core-media-video' >";
|
||||
// $text .= "<div class='row-fluid'>";
|
||||
@ -1210,7 +1210,7 @@ class media_admin_ui extends e_admin_ui
|
||||
|
||||
$text .= "
|
||||
".$br."<input title='bbcode' type='{$type}' readonly='readonly' class='span11' id='bbcode_holder' name='bbcode_holder' value='' />
|
||||
".$br."<input title='html' type='{$type}' class='span11' readonly='readonly' id='html_holder' name='html_holder' value='' />
|
||||
".$br."<input title='html/wysiwyg' type='{$type}' class='span11' readonly='readonly' id='html_holder' name='html_holder' value='' />
|
||||
".$br."<input title='(preview) src' type='{$type}' class='span11' readonly='readonly' id='src' name='src' value='' />
|
||||
".$br."<input title='path (saved to db)' type='{$type}' class='span11' readonly='readonly' id='path' name='path' value='' />
|
||||
";
|
||||
|
||||
@ -317,6 +317,7 @@ class adminstyle_infopanel
|
||||
|
||||
function renderWebsiteStatus()
|
||||
{
|
||||
$tp = e107::getParser();
|
||||
/*
|
||||
// Settings button if needed.
|
||||
<div class="tab-header">
|
||||
@ -341,8 +342,8 @@ class adminstyle_infopanel
|
||||
|
||||
$dashboard = '
|
||||
<ul class="nav nav-tabs">
|
||||
<li class="active"><a href="#tab1" data-toggle="tab"><i class="icon-signal"></i> Stats</a></li>
|
||||
<li ><a href="#tab2" data-toggle="tab"><i class="icon-user"></i> Online ('.$this->renderOnlineUsers('count').')</a></li>
|
||||
<li class="active"><a href="#tab1" data-toggle="tab">'.$tp->toGlyph('fa-signal').' Stats</a></li>
|
||||
<li ><a href="#tab2" data-toggle="tab">'.$tp->toGlyph('fa-user').' Online ('.$this->renderOnlineUsers('count').')</a></li>
|
||||
</ul>
|
||||
|
||||
<div class="tab-content" style="min-height:300px">
|
||||
|
||||
@ -678,6 +678,8 @@ class admin_shortcodes
|
||||
if(!e107::isInstalled('pm')) return;
|
||||
|
||||
$sql = e107::getDb();
|
||||
$tp = e107::getParser();
|
||||
|
||||
$count = $sql->count('private_msg','(*)','WHERE pm_read = 0 AND pm_to='.USERID);
|
||||
|
||||
if ($count >0)
|
||||
@ -696,7 +698,7 @@ class admin_shortcodes
|
||||
$text = '<ul class="nav nav-pills">
|
||||
<li class="dropdown">
|
||||
<a class="dropdown-toggle" title="Messages" role="button" data-toggle="dropdown" href="#" >
|
||||
<i class="icon-envelope active"></i>'.$countDisp.'<b class="caret"></b>
|
||||
'.$tp->toGlyph('fa-envelope').$countDisp.'<b class="caret"></b>
|
||||
</a>
|
||||
<ul class="dropdown-menu" role="menu" >
|
||||
<li class="nav-header">Private Messages</li>
|
||||
@ -1725,7 +1727,7 @@ Inverse 10 <span class="badge badge-inverse">10</span>
|
||||
|
||||
$menu_vars['home']['text'] = ""; // ADLAN_53;
|
||||
$menu_vars['home']['link'] = e_HTTP.'index.php';
|
||||
$menu_vars['home']['image'] = "<i class='icon-home'></i>" ; // "<img src='".E_16_NAV_LEAV."' alt='".ADLAN_151."' class='icon S16' />";
|
||||
$menu_vars['home']['image'] = $tp->toGlyph('fa-home'); // "<i class='fa fa-home'></i>" ; // "<img src='".E_16_NAV_LEAV."' alt='".ADLAN_151."' class='icon S16' />";
|
||||
$menu_vars['home']['image_src'] = ADLAN_151;
|
||||
$menu_vars['home']['sort'] = 1;
|
||||
$menu_vars['home']['sub_class'] = 'sub';
|
||||
@ -1841,7 +1843,7 @@ Inverse 10 <span class="badge badge-inverse">10</span>
|
||||
|
||||
$menu_vars['logout']['text'] = ADMINNAME; // ""; // ADMINNAME;
|
||||
$menu_vars['logout']['link'] = '#';
|
||||
$menu_vars['logout']['image'] = "<i class='icon-user'></i>"; // "<img src='".E_16_NAV_LGOT."' alt='".ADLAN_151."' class='icon S16' />";
|
||||
$menu_vars['logout']['image'] = $tp->toGlyph('fa-user'); // "<i class='icon-user'></i>"; // "<img src='".E_16_NAV_LGOT."' alt='".ADLAN_151."' class='icon S16' />";
|
||||
$menu_vars['logout']['image_src'] = ADLAN_46;
|
||||
$menu_vars['logout']['sub'] = $tmp;
|
||||
}
|
||||
@ -1889,7 +1891,7 @@ Inverse 10 <span class="badge badge-inverse">10</span>
|
||||
|
||||
$menu_vars['language']['text'] = strtoupper(e_LAN); // e_LANGUAGE;
|
||||
$menu_vars['language']['link'] = '#';
|
||||
$menu_vars['language']['image'] = "<i class='icon-globe'></i>" ;
|
||||
$menu_vars['language']['image'] = $tp->toGlyph('fa-globe'); // "<i class='icon-globe'></i>" ;
|
||||
$menu_vars['language']['image_src'] = ADLAN_46;
|
||||
$menu_vars['language']['sub'] = $tmp;
|
||||
}
|
||||
|
||||
@ -47,7 +47,7 @@ class bbcode_shortcodes extends e_shortcode
|
||||
if(BOOTSTRAP)
|
||||
{
|
||||
$text = '<div class="btn-group">';
|
||||
$text .= '<a class="btn btn-small bbcode dropdown-toggle" data-toggle="dropdown" href="#" title="">';
|
||||
$text .= '<a class="btn dropdown-toggle" data-toggle="dropdown" href="#" title="">';
|
||||
$text .= "Format";
|
||||
$text .= ' <span class="caret"></span></a>';
|
||||
$text .= "<ul class='dropdown-menu'>\n";
|
||||
@ -85,8 +85,10 @@ class bbcode_shortcodes extends e_shortcode
|
||||
// $data = "[table]\n[tr]\n\t[td]Cell 1[/td]\n\t[td]Cell 2[/td]\n[/tr]\n[/table]"; // works with jquery, but not onclick.
|
||||
$data = "[table][tr][td]Cell 1[/td][td]Cell 2[/td][/tr][/table]";
|
||||
$event = $this->getEvent('addtext',$data,'Insert a table',1);
|
||||
$text = "<a {$event} class='e-bb' id='{$id}' data-function='insert' href='#{$this->var['tagid']}' data-bbcode='{$data}'>";
|
||||
$text .= "<img class='btn btn-small bbcode bbcode_buttons e-pointer' src='".e_IMAGE_ABS."bbcode/table.png' alt='' title='Insert a table' /></a>";
|
||||
$text = "<a {$event} class='btn' id='{$id}' data-function='insert' href='#{$this->var['tagid']}' title='Insert a table' data-bbcode='{$data}'>";
|
||||
// $text .= "<img class='btn btn-small bbcode bbcode_buttons e-pointer' src='".e_IMAGE_ABS."bbcode/table.png' alt='' title='Insert a table' />";
|
||||
$text .= $this->button(e_IMAGE_ABS."bbcode/table.png", 'table' );
|
||||
$text .= "</a>";
|
||||
return $text;
|
||||
}
|
||||
|
||||
@ -110,8 +112,13 @@ class bbcode_shortcodes extends e_shortcode
|
||||
// $data = "[list]\n[*]Item 1\n[*]Item 2\n[/list]"; // works with jquery, but not onclick.
|
||||
// $event = $this->getEvent($this->var['trigger'],$data,LANHELP_36);
|
||||
$event = $this->getEvent('addtext',$data,LANHELP_36);
|
||||
$text = "<a {$event} class='e-bb' id='{$id}' data-function='insert' href='#{$this->var['tagid']}' data-bbcode='{$data}'>";
|
||||
$text .= "<img class='btn btn-small bbcode_buttons e-pointer' src='".e_IMAGE_ABS."bbcode/list.png' alt='' title='".nl2br(LANHELP_36)."' /></a>";
|
||||
$text = "<a {$event} class='btn' id='{$id}' data-function='insert' href='#{$this->var['tagid']}' data-bbcode='{$data}' title='".$this->br2nl(LANHELP_36)."'>";
|
||||
|
||||
$text .= $this->button(e_IMAGE_ABS."bbcode/list.png", 'list', LANHELP_36);
|
||||
|
||||
// $text .= "<img class='btn btn-small bbcode_buttons e-pointer' src='".e_IMAGE_ABS."bbcode/list.png' alt='' title='".nl2br(LANHELP_36)."' />";
|
||||
|
||||
$text .= "</a>";
|
||||
return $text;
|
||||
}
|
||||
|
||||
@ -119,8 +126,12 @@ class bbcode_shortcodes extends e_shortcode
|
||||
{
|
||||
$data = "[youtube]*[/youtube]";
|
||||
$event = $this->getEvent('addinput',$data,LANHELP_48);
|
||||
$text = "<a {$event} class='e-bb' id='{$id}' data-function='input' href='#{$this->var['tagid']}' data-bbcode='{$data}'>";
|
||||
$text .="<img class='btn btn-small bbcode bbcode_buttons e-pointer' src='".e_IMAGE_ABS."bbcode/youtube.png' alt='' title='".nl2br(LANHELP_48)."' /></a>";
|
||||
$text = "<a {$event} class='btn ' id='{$id}' data-function='input' href='#{$this->var['tagid']}' title='".$this->br2nl(LANHELP_48)."' data-bbcode='{$data}'>";
|
||||
// $text .="<img class='btn btn-small bbcode bbcode_buttons e-pointer' src='".e_IMAGE_ABS."bbcode/youtube.png' alt='' title='".nl2br(LANHELP_48)."' />";
|
||||
|
||||
$text .= $this->button(e_IMAGE_ABS."bbcode/youtube.png", 'youtube', LANHELP_48);
|
||||
|
||||
$text .= "</a>";
|
||||
return $text;
|
||||
}
|
||||
|
||||
@ -128,10 +139,40 @@ class bbcode_shortcodes extends e_shortcode
|
||||
{
|
||||
$data = "[link=*]*[/link]";
|
||||
$event = $this->getEvent('addinput',$data,LANHELP_35);
|
||||
$text = "<a {$event} class='e-bb ' id='{$id}' data-function='input' href='#{$this->var['tagid']}' data-bbcode='{$data}'>\n";
|
||||
$text .="<img class='btn btn-small bbcode_buttons e-pointer' src='".e_IMAGE_ABS."bbcode/link.png' alt='' title='".nl2br(LANHELP_23)."' /></a>";
|
||||
$text = "<a {$event} class='btn e-bb ' id='{$id}' data-function='input' href='#{$this->var['tagid']}' title='".$this->br2nl(LANHELP_23)."' data-bbcode='{$data}'>\n";
|
||||
// $text .="<img class='btn btn-small bbcode_buttons e-pointer' src='".e_IMAGE_ABS."bbcode/link.png' alt='' title='".nl2br(LANHELP_23)."' />";
|
||||
|
||||
$text .= $this->button(e_IMAGE_ABS.'bbcode/link.png', 'link', LANHELP_23, $link);
|
||||
|
||||
$text .= "</a>";
|
||||
return $text;
|
||||
}
|
||||
|
||||
|
||||
|
||||
function button($image, $glyph='')
|
||||
{
|
||||
// $text .= "<button type='button' class='btn e-pointer' title='".$title."'>";
|
||||
|
||||
// $text .= ($link) ? $link : "";
|
||||
|
||||
if(deftrue('BOOTSTRAP') && $glyph && deftrue('FONTAWESOME'))
|
||||
{
|
||||
$text .= "<span class='fa fa-".$glyph."'></span>";
|
||||
}
|
||||
else
|
||||
{
|
||||
$text .="<img src='".$image."' alt='' style='max-height:18px' />";
|
||||
}
|
||||
|
||||
// $text .= ($link) ? "</a>" : "";
|
||||
|
||||
// $text .= "</button>";
|
||||
return $text;
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
||||
function bb_preimage($id)
|
||||
{
|
||||
@ -144,8 +185,10 @@ class bbcode_shortcodes extends e_shortcode
|
||||
{
|
||||
list($tag,$tmp) = explode("--",$this->var['tagid']); // works with $frm->bbarea to detect textarea from first half of tag.
|
||||
}
|
||||
$text = "<a class='e-modal' data-modal-caption='Media Manager' data-target='#uiModal' title='Media Manager : ".$this->var['template']."' id='{$id}' href='".e_ADMIN."image.php?mode=main&action=dialog&for=".$this->var['template']."&tagid=".$tag."&iframe=1&bbcode=img' >";
|
||||
$text .= "<img class='btn btn-small bbcode bbcode_buttons e-pointer' src='".e_IMAGE_ABS."bbcode/preimage.png' title='".LANHELP_45."' alt='' />";
|
||||
$text = "<a class='e-modal btn' data-modal-caption='Media Manager' data-target='#uiModal' title='Media Manager : ".$this->var['template']."' id='{$id}' href='".e_ADMIN."image.php?mode=main&action=dialog&for=".$this->var['template']."&tagid=".$tag."&iframe=1&bbcode=img' >";
|
||||
|
||||
$text .= $this->button(e_IMAGE_ABS."bbcode/preimage.png",'picture-o');
|
||||
// $text .= "<img class='btn btn-small bbcode bbcode_buttons e-pointer' src='".e_IMAGE_ABS."bbcode/preimage.png' title='".LANHELP_45."' alt='' />";
|
||||
$text .= "</a>\n";
|
||||
return $text;
|
||||
}
|
||||
@ -160,8 +203,10 @@ class bbcode_shortcodes extends e_shortcode
|
||||
{
|
||||
list($tag,$tmp) = explode("--",$this->var['tagid']); // works with $frm->bbarea to detect textarea from first half of tag.
|
||||
}
|
||||
$text = "<a class='e-modal' data-modal-caption='Media Manager' data-target='#uiModal' id='{$id}' href='".e_ADMIN."image.php?mode=main&action=dialog&for=_common_file&tagid=".$tag."&iframe=1&bbcode=file' >";
|
||||
$text .= "<img class='btn btn-small bbcode bbcode_buttons e-pointer' src='".e_IMAGE_ABS."bbcode/prefile.png' title='".LANHELP_39."' alt='' />";
|
||||
$text = "<a class='e-modal btn' data-modal-caption='Media Manager' data-target='#uiModal' id='{$id}' title='".LANHELP_39."' href='".e_ADMIN."image.php?mode=main&action=dialog&for=_common_file&tagid=".$tag."&iframe=1&bbcode=file' >";
|
||||
|
||||
$text .= $this->button(e_IMAGE_ABS."bbcode/prefile.png", 'file');
|
||||
// $text .= "<img class='btn btn-small bbcode bbcode_buttons e-pointer' src='".e_IMAGE_ABS."bbcode/prefile.png' title='".LANHELP_39."' alt='' />";
|
||||
$text .= "</a>\n";
|
||||
return $text;
|
||||
}
|
||||
@ -176,8 +221,10 @@ class bbcode_shortcodes extends e_shortcode
|
||||
$sizes = array(7,8,9,10,11,12,14,15,18,20,22,24,26,28,30,36);
|
||||
|
||||
$text = '<div class="btn-group">';
|
||||
$text .= '<a class="dropdown-toggle" data-toggle="dropdown" href="#" title="">';
|
||||
$text .= "<img class='btn btn-small bbcode_buttons e-pointer' src='".e_IMAGE_ABS."bbcode/fontsize.png' alt='' title='".LANHELP_22."' />\n";
|
||||
$text .= '<a class="btn dropdown-toggle" data-toggle="dropdown" href="#" title="'.LANHELP_22.'">';
|
||||
// $text .= "<img src='".e_IMAGE_ABS."bbcode/fontsize.png' alt='' />\n";
|
||||
$text .= $this->button(e_IMAGE_ABS."bbcode/fontsize.png", 'text-height');
|
||||
|
||||
$text .= '</a>';
|
||||
$text .= "<ul class='dropdown-menu'>\n";
|
||||
|
||||
@ -228,9 +275,12 @@ class bbcode_shortcodes extends e_shortcode
|
||||
{
|
||||
if(deftrue('BOOTSTRAP'))
|
||||
{
|
||||
$text = '<div class="btn-group" style="margin-left:0px">';
|
||||
$text .= '<a class="dropdown-toggle" data-toggle="dropdown" href="#">';
|
||||
$text .= "<img class='btn btn-small bbcode_buttons e-pointer' src='".e_IMAGE_ABS."bbcode/emotes.png' alt='' title=\"".LANHELP_44."\" />";
|
||||
$text = '<div class="btn-group" >';
|
||||
$text .= '<a class="btn dropdown-toggle" data-toggle="dropdown" href="#" title="'.LANHELP_44.'">';
|
||||
$text .= $this->button(e_IMAGE_ABS."bbcode/emotes.png","smile-o");
|
||||
// $text .= ' <span class="caret"></span>';
|
||||
|
||||
// $text .= "<img class='btn bbcode_buttons e-pointer' src='".e_IMAGE_ABS."bbcode/emotes.png' alt='' title=\"".LANHELP_44."\" />";
|
||||
$text .= '</a>';
|
||||
$text .= "<div class='dropdown-menu' style='white-space:normal;padding:10px; width:170px'>";
|
||||
|
||||
@ -294,7 +344,7 @@ class bbcode_shortcodes extends e_shortcode
|
||||
$event = $this->getEvent('expandit',$formid, LANHELP_22);
|
||||
|
||||
|
||||
$text = "<a {$event} class='e-bb' id='{id}' data-function='show' href='#{$this->var['tagid']}' title='".LANHELP_22."' data-bbcode='{$data}'>
|
||||
$text = "<a {$event} class='btn e-bb' id='{id}' data-function='show' href='#{$this->var['tagid']}' title='".LANHELP_22."' data-bbcode='{$data}'>
|
||||
<img class='bbcode_buttons e-pointer' src='".e_IMAGE_ABS."bbcode/fontcol.png' alt='' title='".LANHELP_21."' /></a>";
|
||||
|
||||
// return $text;
|
||||
@ -385,6 +435,10 @@ class bbcode_shortcodes extends e_shortcode
|
||||
return $text;
|
||||
}
|
||||
|
||||
private function br2nl($string)
|
||||
{
|
||||
return str_replace('<br />','\\n', $string);
|
||||
}
|
||||
|
||||
|
||||
|
||||
@ -432,34 +486,36 @@ class bbcode_shortcodes extends e_shortcode
|
||||
|
||||
// Format: $bbcode['UNIQUE_NAME'] = array(ONCLICK_FUNC, ONCLICK_VAR, HELPTEXT, ICON, INCLUDE_FUNC, INCLUDE_FUNCTION_VAR);
|
||||
|
||||
|
||||
// $bbcode['newpage'] = array($bbcode_func,"[newpage]", LANHELP_34, "newpage.png");
|
||||
$bbcode['link'] = array('addinput',"[link=".LANHELP_35."][/link]", LANHELP_23,"link.png");
|
||||
$bbcode['link'] = array('addinput', "[link=".LANHELP_35."][/link]", LANHELP_23, "link.png", 'link');
|
||||
// $bbcode['h'] = array($bbcode_func,"[h][/h]", LANHELP_50,"heading.png"); // FIXME bbcode icon
|
||||
// $bbcode['p'] = array($bbcode_func,"[p][/p]", LANHELP_49,"paragraph.png"); // FIXME bbcode icon
|
||||
$bbcode['b'] = array($bbcode_func,"[b][/b]", LANHELP_24,"bold.png");
|
||||
$bbcode['i'] = array($bbcode_func,"[i][/i]", LANHELP_25,"italic.png");
|
||||
$bbcode['u'] = array($bbcode_func,"[u][/u]", LANHELP_26,"underline.png");
|
||||
$bbcode['justify'] = array($bbcode_func,"[justify][/justify]", LANHELP_53,"justify.png"); // FIXME bbcode icon
|
||||
$bbcode['center'] = array($bbcode_func,"[center][/center]", LANHELP_28,"center.png");
|
||||
$bbcode['left'] = array($bbcode_func,"[left][/left]", LANHELP_29,"left.png");
|
||||
$bbcode['right'] = array($bbcode_func,"[right][/right]", LANHELP_30,"right.png");
|
||||
$bbcode['bq'] = array($bbcode_func,"[blockquote][/blockquote]", LANHELP_31,"blockquote.png");
|
||||
$bbcode['code'] = array($bbcode_func,"[code][/code]", LANHELP_32,"code.png");
|
||||
$bbcode['list'] = array($bbcode_func,"[list][/list]", LANHELP_36,"list.png");
|
||||
$bbcode['img'] = array($bbcode_func,"[img][/img]", LANHELP_27,"image.png");
|
||||
$bbcode['flash'] = array($bbcode_func,"[flash=width,height][/flash]", LANHELP_47,"flash.png");
|
||||
$bbcode['youtube'] = array($bbcode_func,"[youtube][/youtube]", LANHELP_48,"youtube.png");
|
||||
$bbcode['sanitised'] = array('', '', '');
|
||||
$bbcode['format'] = array('dropdown', '[format]', 'da',"<select><option>hello</option></select>");
|
||||
|
||||
$bbcode['nobr'] = array($bbcode_func,"[nobr][/nobr]", LANHELP_51, "nobr.png"); // FIXME bbcode icon
|
||||
$bbcode['br'] = array($bbcode_func,"[br]", LANHELP_52, "br.png"); // FIXME bbcode icon
|
||||
$bbcode['block'] = array($bbcode_func,"[block][/block]", LANHELP_54,"block.png"); // FIXME bbcode icon, interactive interface, theme hooks
|
||||
$bbcode['b'] = array($bbcode_func, "[b][/b]", LANHELP_24, "bold.png", 'bold');
|
||||
$bbcode['i'] = array($bbcode_func, "[i][/i]", LANHELP_25, "italic.png", 'italic');
|
||||
$bbcode['u'] = array($bbcode_func, "[u][/u]", LANHELP_26, "underline.png", 'underline');
|
||||
$bbcode['justify'] = array($bbcode_func, "[justify][/justify]", LANHELP_53, "justify.png", 'align-justify'); // FIXME bbcode icon
|
||||
$bbcode['center'] = array($bbcode_func, "[center][/center]", LANHELP_28, "center.png", 'align-center');
|
||||
$bbcode['left'] = array($bbcode_func, "[left][/left]", LANHELP_29, "left.png", 'align-left');
|
||||
$bbcode['right'] = array($bbcode_func, "[right][/right]", LANHELP_30, "right.png", 'align-right');
|
||||
// $bbcode['bq'] = array($bbcode_func, "[blockquote][/blockquote]", LANHELP_31, "blockquote.png", '');
|
||||
// $bbcode['code'] = array($bbcode_func, "[code][/code]", LANHELP_32, "code.png", '');
|
||||
$bbcode['list'] = array($bbcode_func, "[list][/list]", LANHELP_36, "list.png", 'list');
|
||||
$bbcode['img'] = array($bbcode_func, "[img][/img]", LANHELP_27, "image.png" , 'picture-o');
|
||||
$bbcode['flash'] = array($bbcode_func, "[flash=width,height][/flash]", LANHELP_47, "flash.png", 'flash');
|
||||
$bbcode['youtube'] = array($bbcode_func, "[youtube][/youtube]", LANHELP_48, "youtube.png", 'youtube');
|
||||
$bbcode['sanitised'] = array('', '', '');
|
||||
// $bbcode['format'] = array('dropdown', '[format]', 'da',"<select><option>hello</option></select>");
|
||||
|
||||
$bbcode['nobr'] = array($bbcode_func, "[nobr][/nobr]", LANHELP_51, "nobr.png"); // FIXME bbcode icon
|
||||
$bbcode['br'] = array($bbcode_func, "[br]", LANHELP_52, "br.png"); // FIXME bbcode icon
|
||||
$bbcode['block'] = array($bbcode_func, "[block][/block]", LANHELP_54,"block.png"); // FIXME bbcode icon, interactive interface, theme hooks
|
||||
|
||||
$bbcode['fontsize'] = array("expandit","size_selector_".$rand, LANHELP_22,"fontsize.png","Size_Select",'size_selector_'.$rand);
|
||||
$bbcode['fontcol'] = array("e-expandit","col_selector_".$rand, LANHELP_21,"fontcol.png","Color_Select",'col_selector_'.$rand);
|
||||
$bbcode['preimage'] = array("e-dialog","preimage_selector_".$rand, LANHELP_45.$imagedir_display,"preimage.png","PreImage_Select","preimage_selector_".$rand);
|
||||
$bbcode['prefile'] = array("expandit","prefile_selector_".$rand, LANHELP_39,"prefile.png","PreFile_Select",'prefile_selector_'.$rand);
|
||||
$bbcode['fontsize'] = array("expandit", "size_selector_".$rand, LANHELP_22,"fontsize.png","Size_Select",'size_selector_'.$rand);
|
||||
$bbcode['fontcol'] = array("e-expandit", "col_selector_".$rand, LANHELP_21,"fontcol.png","Color_Select",'col_selector_'.$rand);
|
||||
$bbcode['preimage'] = array("e-dialog", "preimage_selector_".$rand, LANHELP_45.$imagedir_display,"preimage.png","PreImage_Select","preimage_selector_".$rand);
|
||||
$bbcode['prefile'] = array("expandit", "prefile_selector_".$rand, LANHELP_39,"prefile.png","PreFile_Select",'prefile_selector_'.$rand);
|
||||
|
||||
if(!isset($iconpath[$parm]))
|
||||
{
|
||||
@ -511,14 +567,21 @@ class bbcode_shortcodes extends e_shortcode
|
||||
|
||||
if($_onclick_func == 'e-dialog')
|
||||
{ // $tagid = "news-body";
|
||||
$pre = "\n<a href='".e_ADMIN."image.php?mode=main&action=dialog&for=news&tagid=".$tagid."&iframe=1&bbcode=1' class='btn btn-small e-dialog' >";
|
||||
$pre = "\n<a href='".e_ADMIN."image.php?mode=main&action=dialog&for=news&tagid=".$tagid."&iframe=1&bbcode=1' class='btn e-dialog' >";
|
||||
$post = "</a>\n";
|
||||
}
|
||||
else
|
||||
{
|
||||
$pre = "<a class='btn e-pointer' title=\"".str_replace('<br />','\\n',($_helptxt))."\" onclick=\"{$_onclick_func}('".$_onclick_var."')\" ".($bbcode_helpactive ? "onmouseout=\"{$bbcode_help}(''{$bbcode_tag})\" onmouseover=\"{$bbcode_help}('".$_helptxt."'{$bbcode_tag})\"" : "" )." />";
|
||||
$post = "</a>\n"; // btn-small bbcode bbcode_buttons
|
||||
}
|
||||
|
||||
if($bbcode[$parm]) // default - insert text.
|
||||
{
|
||||
$text = $pre;
|
||||
$text .= "<img class='btn btn-small bbcode bbcode_buttons e-pointer' src='".$iconpath[$parm]."' alt='' title=\"".nl2br($_helptxt)."\" onclick=\"{$_onclick_func}('".$_onclick_var."')\" ".($bbcode_helpactive ? "onmouseout=\"{$bbcode_help}(''{$bbcode_tag})\" onmouseover=\"{$bbcode_help}('".$_helptxt."'{$bbcode_tag})\"" : "" )." />";
|
||||
|
||||
$text .= $this->button($iconpath[$parm], vartrue($bbcode[$parm][4]));
|
||||
|
||||
$text .= $post;
|
||||
}
|
||||
|
||||
|
||||
@ -281,7 +281,7 @@ class cpage_shortcodes extends e_shortcode
|
||||
|
||||
function sc_cmenuicon($parm='')
|
||||
{
|
||||
return e107::getParser()->toIcon($this->page['menu_icon']);
|
||||
return e107::getParser()->toIcon($this->page['menu_icon'], array('space'=>' '));
|
||||
}
|
||||
|
||||
|
||||
@ -322,7 +322,7 @@ class cpage_shortcodes extends e_shortcode
|
||||
$tp = e107::getParser();
|
||||
$row = $this->getBook();
|
||||
|
||||
return $tp->toIcon($row['chapter_icon']);
|
||||
return $tp->toIcon($row['chapter_icon'], array('space'=>' '));
|
||||
}
|
||||
|
||||
function sc_book_description()
|
||||
|
||||
@ -53,7 +53,7 @@ $BBCODE_TEMPLATE_SUBMITNEWS = "
|
||||
// -------- Admin Templates ----------------------
|
||||
|
||||
$BBCODE_TEMPLATE_ADMIN = "
|
||||
<div class='btn-group inline-text'>
|
||||
<div class='btn-toolbar'>
|
||||
{BB=link}{BB=b}{BB=i}{BB=u}{BB=img}{BB=format}{BB=left}{BB=center}{BB=right}{BB=justify}
|
||||
{BB=bq}{BB=list}{BB=table}{BB=fontcol}{BB=fontsize}{BB=emotes}
|
||||
{BB_PREIMAGEDIR}
|
||||
@ -62,7 +62,7 @@ $BBCODE_TEMPLATE_ADMIN = "
|
||||
";
|
||||
|
||||
$BBCODE_TEMPLATE_MAILOUT = "
|
||||
<div class='btn-group inline-text'>
|
||||
<div class='btn-toolbar'>
|
||||
{BB=link}{BB=b}{BB=i}{BB=u}{BB=img}{BB=left}{BB=center}{BB=right}{BB=justify}{BB=bq}{BB=list}{BB=fontcol}{BB=fontsize}{BB=emotes}
|
||||
{BB_PREIMAGEDIR}
|
||||
{BB=preimage}{BB=prefile}{BB=flash}{BB=shortcode}
|
||||
@ -72,7 +72,7 @@ $BBCODE_TEMPLATE_MAILOUT = "
|
||||
// $BBCODE_TEMPLATE_ADMIN .= "{BB=blank}";
|
||||
|
||||
$BBCODE_TEMPLATE_NEWSPOST = "
|
||||
<div class='btn-group inline-text'>
|
||||
<div class='btn-toolbar'>
|
||||
{BB=link}{BB=b}{BB=i}{BB=u}{BB=img}{BB=format}{BB=left}{BB=center}{BB=right}{BB=justify}
|
||||
{BB=bq}{BB=list}{BB=table}{BB=fontcol}{BB=fontsize}{BB=emotes}
|
||||
{BB_PREIMAGEDIR=news}
|
||||
@ -81,7 +81,7 @@ $BBCODE_TEMPLATE_NEWSPOST = "
|
||||
";
|
||||
|
||||
$BBCODE_TEMPLATE_CPAGE = "
|
||||
<div class='btn-group inline-text'>
|
||||
<div class='btn-toolbar'>
|
||||
{BB=link}{BB=b}{BB=i}{BB=u}{BB=img}{BB=format}{BB=left}{BB=center}{BB=right}{BB=justify}
|
||||
{BB=bq}{BB=list}{BB=table}{BB=fontcol}{BB=fontsize}{BB=emotes}
|
||||
{BB_PREIMAGEDIR=page}
|
||||
|
||||
@ -5338,7 +5338,7 @@ class e_admin_form_ui extends e_form
|
||||
".$filter_pre."
|
||||
<div class='row-fluid'>
|
||||
<div class='left form-inline span8' style='margin-top:10px;margin-bottom:-10px;'>
|
||||
".$this->text('searchquery', $current_query[0], 50, $input_options)."<i class='icon-search searchquery'></i>
|
||||
".$this->text('searchquery', $current_query[0], 50, $input_options)."<i class='fa fa-search searchquery'></i>
|
||||
".$this->select_open('filter_options', array('class' => 'e-tip tbox select filter', 'id' => false, 'title'=>'Filter the results below'))."
|
||||
".$this->option(LAN_FILTER_LABEL_DISPLAYALL, '')."
|
||||
".$this->option(LAN_FILTER_LABEL_CLEAR, '___reset___')."
|
||||
@ -5371,7 +5371,7 @@ class e_admin_form_ui extends e_form
|
||||
$def = deftrue('LAN_UI_USING_DATABASE_TABLE','Using [x] database table');
|
||||
$diz = e107::getParser()->lanVars($def, $lang); // "Using ".$lang." database table";
|
||||
$text .= "<span class='e-tip' title=\"".$diz."\">";
|
||||
$text .= '<i class="icon-hdd"></i> ';
|
||||
$text .= e107::getParser()->toGlyph('fa-hdd-o'); // '<i class="icon-hdd"></i> ';
|
||||
$text .= e107::getLanguage()->toNative($lang)."</span>";
|
||||
|
||||
}
|
||||
|
||||
@ -2692,6 +2692,17 @@ class e_parser
|
||||
return false;
|
||||
}
|
||||
|
||||
if(is_array($space))
|
||||
{
|
||||
$parm = $space;
|
||||
$space = varset($parm['space'],'');
|
||||
}
|
||||
else
|
||||
{
|
||||
$parm = array();
|
||||
}
|
||||
|
||||
|
||||
// Bootstrap 3 Glyph names.
|
||||
$bs3 = e107::getMedia()->getGlyphs('bs3','');
|
||||
|
||||
@ -2718,10 +2729,10 @@ class e_parser
|
||||
|
||||
if($type == 'fa')
|
||||
{
|
||||
$cls = str_replace('fa-', 'fa fa-', $cls);
|
||||
$cls = str_replace('fa-', 'fa fa-', $cls);
|
||||
$cls .= (vartrue($parm['size'])) ? ' fa-'.$parm['size'] : '';
|
||||
}
|
||||
|
||||
|
||||
// $text = (deftrue('BOOTSTRAP') === 3) ? "<span class='".$cls."'></span>" : "<i class='".$cls."'></i>"; // retain space.
|
||||
|
||||
$text = "<span class='".$cls."'></span>" ;
|
||||
@ -2756,7 +2767,7 @@ class e_parser
|
||||
|
||||
if(substr($icon,-6) == '.glyph') // Bootstrap or Font-Awesome.
|
||||
{
|
||||
return $this->toGlyph($icon);
|
||||
return $this->toGlyph($icon,$parm);
|
||||
}
|
||||
|
||||
if(strpos($icon,'e_MEDIA')!==FALSE)
|
||||
|
||||
@ -1363,9 +1363,9 @@ class e_form
|
||||
*/
|
||||
function search($name, $searchVal, $submitName, $filterName='', $filterArray=false, $filterVal=false)
|
||||
{
|
||||
$tp = e107::getParser();
|
||||
|
||||
|
||||
$text = '<span class="input-append e-search"><i class="icon-search"></i>
|
||||
$text = '<span class="input-append e-search">'.$tp->toGlyph('fa-search').'
|
||||
'.$this->text($name, $searchVal,20,'class=search-query').'
|
||||
<button class="btn btn-primary" name="'.$submitName.'" type="submit">'.LAN_GO.'</button>
|
||||
</span>';
|
||||
@ -2682,7 +2682,7 @@ class e_form
|
||||
// $value = '<img src="'.$tp->replaceConstants(vartrue($parms['pre']).$value, 'abs').'" alt="'.basename($value).'" class="icon'.(vartrue($parms['class']) ? ' '.$parms['class'] : '').'" />';
|
||||
}
|
||||
|
||||
$value = $tp->toIcon($value);
|
||||
$value = $tp->toIcon($value,array('size'=>'2x'));
|
||||
|
||||
break;
|
||||
|
||||
|
||||
@ -1236,7 +1236,7 @@ class e_navigation
|
||||
|
||||
if(vartrue($e107_vars[$act]['image_src']) && strstr($e107_vars[$act]['image_src'],'.glyph'))
|
||||
{
|
||||
$replace[9] = $tp->toGlyph($e107_vars[$act]['image_src']);
|
||||
$replace[9] = $tp->toGlyph($e107_vars[$act]['image_src'], array('space'=>' '));
|
||||
}
|
||||
else
|
||||
{
|
||||
@ -1741,7 +1741,7 @@ class navigation_shortcodes extends e_shortcode
|
||||
// else
|
||||
{
|
||||
//$path = e107::getParser()->replaceConstants($this->var['link_button'], 'full', TRUE);
|
||||
return $tp->toIcon($this->var['link_button']);
|
||||
return $tp->toIcon($this->var['link_button'],array('space'=>' '));
|
||||
// return "<img class='icon' src='".$path."' alt='' />";
|
||||
}
|
||||
|
||||
|
||||
@ -48,6 +48,30 @@ e-tabs fieldset { padding:0px ; padding-left:3px; border-top:0px;}
|
||||
.core-mainpanel-link-text { text-decoration: none; display:block; }
|
||||
|
||||
|
||||
div.bbcode-panel {
|
||||
|
||||
background-color: rgb(245, 245, 245);
|
||||
background-image: linear-gradient(to bottom, rgb(255, 255, 255), rgb(230, 230, 230));
|
||||
background-repeat: repeat-x;
|
||||
border-width: 1px;
|
||||
border-style: solid;
|
||||
-moz-border-top-colors: none;
|
||||
-moz-border-right-colors: none;
|
||||
-moz-border-bottom-colors: none;
|
||||
-moz-border-left-colors: none;
|
||||
border-image: none;
|
||||
border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgb(179, 179, 179);
|
||||
border-top-left-radius: 4px;
|
||||
border-top-right-radius: 4px;
|
||||
box-shadow: 0px 1px 0px rgba(255, 255, 255, 0.2) inset, 0px 1px 2px rgba(0, 0, 0, 0.05);
|
||||
padding:5px;
|
||||
}
|
||||
|
||||
.bbcode-panel .btn-toolbar {
|
||||
margin:0px 0px 5px 0px;
|
||||
}
|
||||
|
||||
|
||||
td.center, th.center { text-align:center }
|
||||
td.right, th.right { text-align:right }
|
||||
|
||||
|
||||
@ -4,6 +4,9 @@ if ( ! defined('e107_INIT')) { exit(); }
|
||||
define("SEP"," <span class='icon-play e-breadcrumb'></span> ");
|
||||
|
||||
// e107::lan('theme');
|
||||
|
||||
define('FONTAWESOME',4);
|
||||
|
||||
e107::js('core','bootstrap/js/bootstrap.min.js');
|
||||
e107::css('core','bootstrap/css/bootstrap.min.css');
|
||||
e107::css('core','bootstrap/css/bootstrap-responsive.min.css');
|
||||
|
||||
@ -235,4 +235,20 @@ div.e-comment-edit-save { margin-top:8px; padding: 5px }
|
||||
height: 100%;
|
||||
}
|
||||
|
||||
|
||||
div.bbcode-panel {
|
||||
|
||||
background-color: rgb(245, 245, 245);
|
||||
background-image: linear-gradient(to bottom, rgb(255, 255, 255), rgb(230, 230, 230));
|
||||
background-repeat: repeat-x;
|
||||
border-width: 1px;
|
||||
border-style: solid;
|
||||
-moz-border-top-colors: none;
|
||||
-moz-border-right-colors: none;
|
||||
-moz-border-bottom-colors: none;
|
||||
-moz-border-left-colors: none;
|
||||
border-image: none;
|
||||
border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgb(179, 179, 179);
|
||||
border-radius: 4px;
|
||||
box-shadow: 0px 1px 0px rgba(255, 255, 255, 0.2) inset, 0px 1px 2px rgba(0, 0, 0, 0.05);
|
||||
|
||||
}
|
||||
|
||||
@ -201,8 +201,8 @@ $(document).ready(function()
|
||||
|
||||
if(type == 'glyph')
|
||||
{
|
||||
preview = "<span class='" + src + "'></span>";
|
||||
$('#html_holder').val(preview);
|
||||
preview = "<span class='" + src + "'> </span>";
|
||||
$('#html_holder').val(preview) + ' ';
|
||||
$('#path').attr('value',path);
|
||||
}
|
||||
else if(type == 'file')
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user