From 518abe69feb9e96c511faf9cb5545e9dfd651c3a Mon Sep 17 00:00:00 2001 From: Cameron Date: Thu, 20 Jun 2013 15:12:56 -0700 Subject: [PATCH] Bootstrap styling fixes. --- e107_core/shortcodes/single/nextprev.php | 7 +++ e107_core/templates/nextprev_template.php | 50 +++++++++++++++++++ e107_core/templates/signup_template.php | 2 +- .../templates/forum_viewtopic_template.php | 2 +- .../templates/news/news_template.php | 6 ++- e107_web/css/e107.css | 4 +- 6 files changed, 65 insertions(+), 6 deletions(-) diff --git a/e107_core/shortcodes/single/nextprev.php b/e107_core/shortcodes/single/nextprev.php index 0427f551b..f7be74665 100644 --- a/e107_core/shortcodes/single/nextprev.php +++ b/e107_core/shortcodes/single/nextprev.php @@ -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') diff --git a/e107_core/templates/nextprev_template.php b/e107_core/templates/nextprev_template.php index d7417ac28..b6e5d6d21 100644 --- a/e107_core/templates/nextprev_template.php +++ b/e107_core/templates/nextprev_template.php @@ -10,6 +10,9 @@ * Shortcodes are lowercase (simple parser) */ + + // XXX LEGACY DEFAULT. + $NEXTPREV_TEMPLATE['default_start'] = '
@@ -36,8 +39,55 @@ $NEXTPREV_TEMPLATE['default_items_end'] = ''; //$NEXTPREV_TEMPLATE['default_separator'] = ''; $NEXTPREV_TEMPLATE['default_separator'] = ' '; + +/* ****************** Default when Bootstrap is enabled ************** */ + +$NEXTPREV_TEMPLATE['bootstrap_start'] = "\n"; +$NEXTPREV_TEMPLATE['bootstrap_nav_caption'] = ''; + +$NEXTPREV_TEMPLATE['bootstrap_nav_first'] = '
  • {label}
    • '; +$NEXTPREV_TEMPLATE['bootstrap_nav_prev'] = '
    • '; +$NEXTPREV_TEMPLATE['bootstrap_nav_last'] = '
  • {label}
    • '; +$NEXTPREV_TEMPLATE['bootstrap_nav_next'] = '
    • '; + +$NEXTPREV_TEMPLATE['bootstrap_items_start'] = ''; +$NEXTPREV_TEMPLATE['bootstrap_item'] = '
  • {label}
    • '; +$NEXTPREV_TEMPLATE['bootstrap_item_current'] = '
  • {label}
    • '; +$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.?? diff --git a/e107_core/templates/signup_template.php b/e107_core/templates/signup_template.php index 2be315671..088ddc8f5 100755 --- a/e107_core/templates/signup_template.php +++ b/e107_core/templates/signup_template.php @@ -167,7 +167,7 @@ $sc_style['SIGNUP_EMAIL_CONFIRM']['post'] = " "; $sc_style['SIGNUP_XUP']['pre'] = "
    "; -$sc_style['SIGNUP_XUP']['post'] = "

    OR

    "; +$sc_style['SIGNUP_XUP']['post'] = "
    "; if(!defined($COPPA_TEMPLATE)) { diff --git a/e107_plugins/forum/templates/forum_viewtopic_template.php b/e107_plugins/forum/templates/forum_viewtopic_template.php index 89161b27d..b90a72738 100644 --- a/e107_plugins/forum/templates/forum_viewtopic_template.php +++ b/e107_plugins/forum/templates/forum_viewtopic_template.php @@ -370,7 +370,7 @@ $FORUM_VIEWTOPIC_TEMPLATE['thread'] = "
  • "; $FORUM_VIEWTOPIC_TEMPLATE['end'] = " -
    +
    {GOTOPAGES}
    {QUICKREPLY}
    {BUTTONSX}
    diff --git a/e107_themes/bootstrap/templates/news/news_template.php b/e107_themes/bootstrap/templates/news/news_template.php index 7d5905723..e78cbb160 100644 --- a/e107_themes/bootstrap/templates/news/news_template.php +++ b/e107_themes/bootstrap/templates/news/news_template.php @@ -15,6 +15,7 @@ $SC_WRAPPER['ADMINOPTIONS'] = "{---}"; $NEWS_TEMPLATE['default']['item'] = ' {SETIMAGE: w=600}
    +

    {NEWSTITLELINK}

    {NEWSDATE} @@ -26,7 +27,7 @@ $NEWS_TEMPLATE['default']['item'] = ' {PDFICON} {ADMINOPTIONS}
    - +
    {NEWSIMAGE} {NEWSBODY} @@ -67,6 +68,7 @@ $NEWS_TEMPLATE['list']['item'] = ' $NEWS_TEMPLATE['view']['item'] = ' {SETIMAGE: w=800}
    +

    {NEWSTITLE}

    {NEWSDATE} @@ -78,7 +80,7 @@ $NEWS_TEMPLATE['view']['item'] = ' {PDFICON} {ADMINOPTIONS}
    - +
    {NEWSIMAGE} {NEWSBODY} diff --git a/e107_web/css/e107.css b/e107_web/css/e107.css index a555faa95..d5ab31bdb 100644 --- a/e107_web/css/e107.css +++ b/e107_web/css/e107.css @@ -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 */ /*