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

Issue #2970 Bootstrap 3 pull-left/right combined with Bootstrap 4 float-left/right. News Email/Print icon default styles added.

Browse Source
This commit is contained in:
Cameron
2019-06-17 12:27:53 -07:00
parent d318b7a8fc
commit 26ff074ee5
28 changed files with 68 additions and 149 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
e107_plugins/news/templates/news_menu_template.php
View File

@@ -71,7 +71,7 @@ $NEWS_MENU_TEMPLATE['other']['end'] = "</div></div>";
$NEWS_MENU_TEMPLATE['other2']['caption'] = TD_MENU_L2;
$NEWS_MENU_TEMPLATE['other2']['start'] = "<ul class='media-list unstyled list-unstyled othernews2-block'>{SETIMAGE: w=100&h=100&crop=1}"; // set the {NEWSIMAGE} dimensions.
$NEWS_MENU_TEMPLATE['other2']['item'] = "<li class='media'>
<span class='media-object pull-left'>{NEWSTHUMBNAIL=placeholder}</span>
<span class='media-object pull-left float-left'>{NEWSTHUMBNAIL=placeholder}</span>
<div class='media-body'><h4>{NEWSTITLELINK}</h4>
<p class='text-right'><a class='btn btn-primary btn-othernews2' href='{NEWSURL}'>".LAN_READ_MORE." &raquo;</a></p>
</div>
@@ -104,7 +104,7 @@ $NEWS_MENU_TEMPLATE['carousel']['end'] = '
</div><!-- End Carousel Inner -->
</div>
<div id="news-carousel-titles" class="col-md-4 ">
<ul id="news-carousel-nav" class="nav nav-inverse nav-stacked pull-right ">{NAV}</ul>
<ul id="news-carousel-nav" class="nav nav-inverse nav-stacked pull-right float-right">{NAV}</ul>
</div>
</div><!-- End Carousel -->
</div>

97
e107_plugins/news/templates/news_template.php
View File

@@ -115,7 +115,7 @@ $NEWS_TEMPLATE['default']['item'] = '
$NEWS_WRAPPER['default']['item']['NEWSIMAGE: item=1'] = '<span class="news-images-main pull-left col-xs-12 col-sm-6 col-md-6">{---}</span>';
$NEWS_WRAPPER['default']['item']['NEWSIMAGE: item=1'] = '<span class="news-images-main pull-left float-left col-xs-12 col-sm-6 col-md-6">{---}</span>';
$NEWS_TEMPLATE['default']['caption'] = null; // add a value to user tablerender()
$NEWS_TEMPLATE['default']['start'] = '<!-- Default News Template -->';
@@ -167,101 +167,6 @@ $NEWS_TEMPLATE['2-column']['item'] = '<div class="item col-md-6">
$NEWS_TEMPLATE['2-column']['end'] = '</div>';
###### Default view item (temporary) ######
//$NEWS_MENU_TEMPLATE['view']['start'] = '<ul class="nav nav-list news-menu-months">';
//$NEWS_MENU_TEMPLATE['view']['end'] = '</ul>';
// As displayed by news.php?extend.1
//@XXX SEE news_view_template.php
/*
$NEWS_WRAPPER['view']['item']['NEWSIMAGE: item=1'] = '<span class="news-images-main pull-left col-xs-12 col-sm-6 col-md-6">{---}</span>';
$NEWS_TEMPLATE['view']['item'] = '
{SETIMAGE: w=900&h=600}
<div class="view-item">
<h2 class="news-title">{NEWS_TITLE: link=1}</h2>
<hr class="news-heading-sep">
<div class="row">
<div class="col-md-6"><small>{GLYPH=user} &nbsp;{NEWSAUTHOR} &nbsp; {GLYPH=time} &nbsp;{NEWSDATE=short} </small></div>
<div class="col-md-6 text-right options"><small>{GLYPH=tags} &nbsp;{NEWSTAGS} &nbsp; {GLYPH=folder-open} &nbsp;{NEWSCATEGORY} </small></div>
</div>
<hr>
<div class="body">
{NEWSIMAGE: item=1}
<p class="lead">{NEWS_SUMMARY}</p>
<div class="text-justify">
{NEWS_BODY=body}
</div>
<div class="news-videos-1">
{NEWSVIDEO: item=1}
{NEWSVIDEO: item=2}
{NEWSVIDEO: item=3}
</div>
<br />
{SETIMAGE: w=400&h=400}
<div class="row news-images-1">
<div class="col-md-6">{NEWSIMAGE: item=2}</div>
<div class="col-md-6">{NEWSIMAGE: item=3}</div>
</div>
<div class="row news-images-2">
<div class="col-md-6">{NEWSIMAGE: item=4}</div>
<div class="col-md-6">{NEWSIMAGE: item=5}</div>
</div>
{NEWSVIDEO: item=4}
{NEWSVIDEO: item=5}
<div class="body-extended text-justify">
{NEWS_BODY=extended}
</div>
</div>
<hr>
<div class="options hidden-print ">
<div class="btn-group">{NEWSCOMMENTLINK: glyph=comments&class=btn btn-default}{PRINTICON: class=btn btn-default}{ADMINOPTIONS: class=btn btn-default}{SOCIALSHARE}</div>
</div>
</div>
<hr />
{NEWSRELATED}
<hr>
{NEWSNAVLINK}
';
*/
/*
* <hr />
<h3>About the Author</h3>
<div class="media">
<div class="media-left">{SETIMAGE: w=80&h=80&crop=1}{NEWS_AUTHOR_AVATAR: shape=circle}</div>
<div class="media-body">
<h4>{NEWS_AUTHOR}</h4>
{NEWS_AUTHOR_SIGNATURE}
<a class="btn btn-xs btn-primary" href="{NEWS_AUTHOR_ITEMS_URL}">My Articles</a>
</div>
</div>
*/
//$NEWS_MENU_TEMPLATE['view']['separator'] = '<br />';
### Related 'start' - Options: Core 'single' shortcodes including {SETIMAGE}
### Related 'item' - Options: {RELATED_URL} {RELATED_IMAGE} {RELATED_TITLE} {RELATED_SUMMARY}
### Related 'end' - Options: Options: Core 'single' shortcodes including {SETIMAGE}

18
e107_plugins/news/templates/news_view_template.php
View File

@@ -19,7 +19,7 @@ $NEWS_VIEW_INFO = array(
// Default
$NEWS_VIEW_WRAPPER['default']['item']['NEWSIMAGE: item=1'] = '<span class="news-images-main pull-left col-xs-12 col-sm-6 col-md-6">{---}</span>';
$NEWS_VIEW_WRAPPER['default']['item']['NEWSIMAGE: item=1'] = '<span class="news-images-main pull-left float-left col-xs-12 col-sm-6 col-md-6">{---}</span>';
$NEWS_VIEW_TEMPLATE['default']['caption'] = null; // add a value to user tablerender()
@@ -75,7 +75,7 @@ $NEWS_VIEW_TEMPLATE['default']['item'] = '
<hr>
<div class="options hidden-print ">
<div class="btn-group">{NEWSCOMMENTLINK: glyph=comments&class=btn btn-default}{PRINTICON: class=btn btn-default}{ADMINOPTIONS: class=btn btn-default}{SOCIALSHARE}</div>
<div class="btn-group">{NEWSCOMMENTLINK: glyph=comments}{PRINTICON}{ADMINOPTIONS}{SOCIALSHARE}</div>
</div>
</div>
@@ -88,6 +88,20 @@ $NEWS_VIEW_TEMPLATE['default']['item'] = '
';
/*
* <hr />
<h3>About the Author</h3>
<div class="media">
<div class="media-left">{SETIMAGE: w=80&h=80&crop=1}{NEWS_AUTHOR_AVATAR: shape=circle}</div>
<div class="media-body">
<h4>{NEWS_AUTHOR}</h4>
{NEWS_AUTHOR_SIGNATURE}
<a class="btn btn-xs btn-primary" href="{NEWS_AUTHOR_ITEMS_URL}">My Articles</a>
</div>
</div>
*/
// @todo add more templates. eg. 'videos' , 'slideshow images', 'full width image' - help and ideas always appreciated.