mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-19 12:51:52 +02:00
Code Issues Releases Wiki Activity

Issue #435 - More Bootstrap 3 tweaks

Browse Source
This commit is contained in:
Cameron
2013-12-19 22:45:09 -08:00
parent 7874cd1060
commit 62509f09fb
7 changed files with 69 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
e107_core/shortcodes/batch/news_shortcodes.php
View File

@@ -228,10 +228,11 @@ class news_shortcodes extends e_shortcode
function sc_adminoptions()
{
$tp = e107::getParser();
if (ADMIN && getperms('H'))
{
//TODO - discuss - a pref for 'new browser window' loading, or a parm or leave 'new browser window' as default?
$default = (deftrue('BOOTSTRAP')) ? "<i class='icon-edit'></i>" : "<img src='".e_IMAGE_ABS."admin_images/edit_16.png' alt='".LAN_NEWS_25."' class='icon' />";
$default = (deftrue('BOOTSTRAP')) ? $tp->toGlyph('icon-edit.glyph',false) : "<img src='".e_IMAGE_ABS."admin_images/edit_16.png' alt='".LAN_NEWS_25."' class='icon' />";
$adop_icon = (file_exists(THEME."images/newsedit.png") ? "<img src='".THEME_ABS."images/newsedit.png' alt='".LAN_NEWS_25."' class='icon' />" : $default);
return " <a rel='external' href='".e_ADMIN_ABS."newspost.php?action=create&amp;sub=edit&amp;id=".$this->news_item['news_id']."' title=\"".LAN_NEWS_25."\">".$adop_icon."</a>\n";
@@ -489,7 +490,7 @@ class news_shortcodes extends e_shortcode
{
if(trim($val))
{
$words[] = "<a href='".e_BASE."news.php?tag=".$val."'><span class='label'>".$val."</span></a>";
$words[] = "<a href='".e_BASE."news.php?tag=".$val."'><span class='label label-default'>".$val."</span></a>";
}
}

2
e107_core/templates/navigation_template.php
View File

@@ -8,7 +8,7 @@
// TEMPLATE FOR {NAVIGATION=main}
$NAVIGATION_TEMPLATE['main']['start'] = '<ul class="nav nav-pills">';
$NAVIGATION_TEMPLATE['main']['start'] = '<ul class="nav navbar-nav">';
// Main Link
$NAVIGATION_TEMPLATE['main']['item'] = '