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

Bootstrap styling fixes.

Browse Source
This commit is contained in:
Cameron
2013-06-20 15:12:56 -07:00
parent 0fb38d426f
commit 518abe69fe
6 changed files with 65 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
e107_core/shortcodes/single/nextprev.php
View File

@@ -115,6 +115,13 @@ function nextprev_shortcode($parm = '')
$tprefix = 'dropdown';
//$parm['amount'] = 'all';
}
if($tprefix == 'default' && deftrue('BOOTSTRAP'))
{
$tprefix = 'bootstrap';
}
$tprefix .= '_';
if($parm['amount'] === 'all')

50
e107_core/templates/nextprev_template.php
View File

@@ -10,6 +10,9 @@
* Shortcodes are lowercase (simple parser)
*/
// XXX LEGACY DEFAULT.
$NEXTPREV_TEMPLATE['default_start'] = '
<!-- Start of Next/Prev -->
<div class="btn-group nextprev ">
@@ -36,8 +39,55 @@ $NEXTPREV_TEMPLATE['default_items_end'] = '';
//$NEXTPREV_TEMPLATE['default_separator'] = '<span class="nextprev-sep"><!-- --></span>';
$NEXTPREV_TEMPLATE['default_separator'] = '&nbsp;';
/* ****************** Default when Bootstrap is enabled ************** */
$NEXTPREV_TEMPLATE['bootstrap_start'] = "<!-- Start of Next/Prev -->\n<div class='pagination'>\n<ul>";
$NEXTPREV_TEMPLATE['bootstrap_end'] = "</ul></div><!-- End of Next/Prev -->";
$NEXTPREV_TEMPLATE['bootstrap_nav_caption'] = '';
$NEXTPREV_TEMPLATE['bootstrap_nav_first'] = '<li><a class="first" href="{url}" title="{url_label}">{label}</a></li>';
$NEXTPREV_TEMPLATE['bootstrap_nav_prev'] = '<li><a class="prev" href="{url}" title="{url_label}">{label}</a></li>';
$NEXTPREV_TEMPLATE['bootstrap_nav_last'] = '<li><a class="last" href="{url}" title="{url_label}">{label}</a></li>';
$NEXTPREV_TEMPLATE['bootstrap_nav_next'] = '<li><a class="next" href="{url}" title="{url_label}">{label}</a></li>';
$NEXTPREV_TEMPLATE['bootstrap_items_start'] = '';
$NEXTPREV_TEMPLATE['bootstrap_item'] = '<li><a href="{url}" title="{url_label}">{label}</a></li>';
$NEXTPREV_TEMPLATE['bootstrap_item_current'] = '<li class="active disabled"><a href="#" onclick="return false;" title="{url_label}">{label}</a></li>';
$NEXTPREV_TEMPLATE['bootstrap_items_end'] = '';
$NEXTPREV_TEMPLATE['bootstrap_separator'] = '';
/* ************************************************************ */
// Basic template - as used in admin theme-manager - find themes.
//XXX FIXME - use $NEXTPREV_TEMPLATE['basic']['start'] format.??

2
e107_core/templates/signup_template.php
View File

@@ -167,7 +167,7 @@ $sc_style['SIGNUP_EMAIL_CONFIRM']['post'] = "
</tr>";
$sc_style['SIGNUP_XUP']['pre'] = "<div class='center' style='display:block;padding:10px'>";
$sc_style['SIGNUP_XUP']['post'] = "<h2 class='divider'><span>OR</span></h2></div>";
$sc_style['SIGNUP_XUP']['post'] = "<h2 class='signup-divider'><span>OR</span></h2></div>";
if(!defined($COPPA_TEMPLATE))
{

2
e107_plugins/forum/templates/forum_viewtopic_template.php
View File

@@ -370,7 +370,7 @@ $FORUM_VIEWTOPIC_TEMPLATE['thread'] = "
<li class='divider'></li>";
$FORUM_VIEWTOPIC_TEMPLATE['end'] = "</ul>
<div class='row clearfix'>
<div class='row-fluid clearfix'>
<div class='span3 pull-left'>{GOTOPAGES}</div>
<div class='span6 center'>{QUICKREPLY}</div>
<div class='span3 pull-right right '>{BUTTONSX}</div>

6
e107_themes/bootstrap/templates/news/news_template.php
View File

@@ -15,6 +15,7 @@ $SC_WRAPPER['ADMINOPTIONS'] = "<small>{---}</small>";
$NEWS_TEMPLATE['default']['item'] = '
{SETIMAGE: w=600}
<div class="view-item">
<div class="page-header">
<h2>{NEWSTITLELINK}</h2>
<div class="post-meta">
<small><i class="icon-calendar"></i>{NEWSDATE}</small>
@@ -26,7 +27,7 @@ $NEWS_TEMPLATE['default']['item'] = '
{PDFICON}
{ADMINOPTIONS}
</div>
</div>
<div class="body">
{NEWSIMAGE}
{NEWSBODY}
@@ -67,6 +68,7 @@ $NEWS_TEMPLATE['list']['item'] = '
$NEWS_TEMPLATE['view']['item'] = '
{SETIMAGE: w=800}
<div class="view-item">
<div class="page-header">
<h2>{NEWSTITLE}</h2>
<div class="post-meta">
<small><i class="icon-calendar"></i>{NEWSDATE}</small>
@@ -78,7 +80,7 @@ $NEWS_TEMPLATE['view']['item'] = '
{PDFICON}
{ADMINOPTIONS}
</div>
</div>
<div class="body">
{NEWSIMAGE}
{NEWSBODY}

4
e107_web/css/e107.css
View File

@@ -198,8 +198,8 @@ div.e-comment-edit-save { margin-top:8px; padding: 5px }
background: red;
}
*/
.divider { border-bottom: 1px solid silver; font-size: 18px; margin-bottom: 30px; position: relative; text-align: center; }
.divider span { padding: 0 15px; position: relative; top: 10px; }
.signup-divider { border-bottom: 1px solid silver; font-size: 18px; margin-bottom: 30px; position: relative; text-align: center; }
.signup-divider span { padding: 0 15px; position: relative; top: 10px; }
/* Used to hide elements when JavaScript is enabled: old e_css.php */
/*