mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-03 21:27:25 +02:00
Code Issues Releases Wiki Activity

FontAwesome version update. News shortcode wrapper issue corrected.

Browse Source
This commit is contained in:
Cameron
2016-03-10 15:13:32 -08:00
parent 4516bc910e
commit 1b2db4683e
6 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
e107_handlers/news_class.php
View File

@@ -373,11 +373,15 @@ class news {
// Retrieve batch sc object, set required vars // Retrieve batch sc object, set required vars
$wrapperKey = (!empty($param['template_key'])) ? 'news/'.$param['template_key'].'/item' : 'news/view/item';
$sc = e107::getScBatch('news') $sc = e107::getScBatch('news')
->wrapper('news/view/item') ->wrapper($wrapperKey)
->setScVar('news_item', $news) ->setScVar('news_item', $news)
->setScVar('param', $param); ->setScVar('param', $param);
$text = e107::getParser()->parseTemplate($NEWS_PARSE, true, $sc); $text = e107::getParser()->parseTemplate($NEWS_PARSE, true, $sc);
if ($mode == 'return') if ($mode == 'return')

1
e107_plugins/news/other_news2_menu.php
View File

@@ -116,6 +116,7 @@ $param['itemlink'] = defset('OTHERNEWS2_ITEMLINK','');
$param['thumbnail'] = OTHERNEWS2_THUMB; $param['thumbnail'] = OTHERNEWS2_THUMB;
$param['catlink'] = defset('OTHERNEWS2_CATLINK',''); $param['catlink'] = defset('OTHERNEWS2_CATLINK','');
$param['caticon'] = OTHERNEWS2_CATICON; $param['caticon'] = OTHERNEWS2_CATICON;
$param['template_key'] = 'news_menu/other2/item';
$style = defset('OTHERNEWS2_CELL','padding:0px;vertical-align:top'); $style = defset('OTHERNEWS2_CELL','padding:0px;vertical-align:top');
$nbr_cols = defset('OTHERNEWS2_COLS', 1); $nbr_cols = defset('OTHERNEWS2_COLS', 1);

1
e107_plugins/news/other_news_menu.php
View File

@@ -129,6 +129,7 @@ $param['itemlink'] = defset('OTHERNEWS_ITEMLINK');
$param['thumbnail'] = defset('OTHERNEWS_THUMB'); $param['thumbnail'] = defset('OTHERNEWS_THUMB');
$param['catlink'] = defset('OTHERNEWS_CATLINK'); $param['catlink'] = defset('OTHERNEWS_CATLINK');
$param['caticon'] = defset('OTHERNEWS_CATICON'); $param['caticon'] = defset('OTHERNEWS_CATICON');
$param['template_key'] = 'news_menu/other/item';
$style = defset('OTHERNEWS_CELL'); $style = defset('OTHERNEWS_CELL');
$nbr_cols = defset('OTHERNEWS_COLS'); $nbr_cols = defset('OTHERNEWS_COLS');

2
e107_plugins/tinymce4/wysiwyg.php
View File

@@ -617,7 +617,7 @@ class wysiwyg
$editorCSS = array( $editorCSS = array(
'https://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/css/bootstrap.min.css', 'https://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/css/bootstrap.min.css',
'http://maxcdn.bootstrapcdn.com/font-awesome/4.3.0/css/font-awesome.min.css', 'http://maxcdn.bootstrapcdn.com/font-awesome/4.5.0/css/font-awesome.min.css',
e_PLUGIN_ABS.'tinymce4/editor.css', e_PLUGIN_ABS.'tinymce4/editor.css',
); );

2
e107_themes/bootstrap3/admin_theme.php
View File

@@ -13,7 +13,7 @@ define('FONTAWESOME', 4);
e107::js("url", "https://cdn.jsdelivr.net/bootstrap/3.3.6/js/bootstrap.min.js", 'jquery', 2); e107::js("url", "https://cdn.jsdelivr.net/bootstrap/3.3.6/js/bootstrap.min.js", 'jquery', 2);
// e107::css('url', 'https://cdn.jsdelivr.net/bootstrap/3.3.5/css/bootstrap.min.css'); // e107::css('url', 'https://cdn.jsdelivr.net/bootstrap/3.3.5/css/bootstrap.min.css');
e107::css('url', 'https://cdn.jsdelivr.net/fontawesome/4.4.0/css/font-awesome.min.css'); e107::css('url', 'https://cdn.jsdelivr.net/fontawesome/4.5.0/css/font-awesome.min.css');
// Too slow. // Too slow.

3
news.php
View File

@@ -327,6 +327,7 @@ if ($action == 'cat' || $action == 'all' || vartrue($_GET['tag']))
$param['catlink'] = (defined("NEWSLIST_CATLINK")) ? NEWSLIST_CATLINK : ""; $param['catlink'] = (defined("NEWSLIST_CATLINK")) ? NEWSLIST_CATLINK : "";
$param['caticon'] = (defined("NEWSLIST_CATICON")) ? NEWSLIST_CATICON : defset('ICONSTYLE',''); $param['caticon'] = (defined("NEWSLIST_CATICON")) ? NEWSLIST_CATICON : defset('ICONSTYLE','');
$param['current_action'] = $action; $param['current_action'] = $action;
$param['template_key'] = 'list';
// NEW - allow news batch shortcode override (e.g. e107::getScBatch('news', 'myplugin', true); ) // NEW - allow news batch shortcode override (e.g. e107::getScBatch('news', 'myplugin', true); )
e107::getEvent()->trigger('news_list_parse', $newsList); e107::getEvent()->trigger('news_list_parse', $newsList);
@@ -502,6 +503,7 @@ if ($action == 'extend')
$param = array(); $param = array();
$param['current_action'] = $action; $param['current_action'] = $action;
$param['template_key'] = 'view';
if(vartrue($NEWSSTYLE)) if(vartrue($NEWSSTYLE))
{ {
@@ -852,6 +854,7 @@ else
// #### normal newsitems, rendered via render_newsitem(), the $query is changed above (no other changes made) --------- // #### normal newsitems, rendered via render_newsitem(), the $query is changed above (no other changes made) ---------
$param = array(); $param = array();
$param['current_action'] = $action; $param['current_action'] = $action;
$param['template_key'] = 'default';
// Get Correct Template // Get Correct Template
// XXX we use $NEWSLISTSTYLE above - correct as we are currently in list mode - XXX No this is not NEWSLISTSTYLE - which provides only summaries. // XXX we use $NEWSLISTSTYLE above - correct as we are currently in list mode - XXX No this is not NEWSLISTSTYLE - which provides only summaries.