From 0dd2a038a32a834ea7c51220617238ea260a36be Mon Sep 17 00:00:00 2001 From: Cameron Date: Sun, 17 Mar 2013 02:57:09 -0700 Subject: [PATCH] New 'basic' nextprev template added and darkstrap tweaks --- e107_core/templates/nextprev_template.php | 20 +++++++++++ e107_handlers/theme_handler.php | 42 +++++++++++++++-------- e107_themes/bootstrap/admin_style.css | 8 +++-- e107_web/js/bootstrap/css/darkstrap.css | 13 +++++-- 4 files changed, 65 insertions(+), 18 deletions(-) diff --git a/e107_core/templates/nextprev_template.php b/e107_core/templates/nextprev_template.php index 1781d5434..1a903358b 100644 --- a/e107_core/templates/nextprev_template.php +++ b/e107_core/templates/nextprev_template.php @@ -37,6 +37,26 @@ $NEXTPREV_TEMPLATE['default_items_end'] = ''; //$NEXTPREV_TEMPLATE['default_separator'] = ''; $NEXTPREV_TEMPLATE['default_separator'] = ' '; +/* ************************************************************ */ + +// Basic template - as used in admin theme-manager - find themes. +//XXX FIXME - use $NEXTPREV_TEMPLATE['basic']['start'] format.?? + +$NEXTPREV_TEMPLATE['basic_start'] = '
'; +$NEXTPREV_TEMPLATE['basic_end'] = '
'; +$NEXTPREV_TEMPLATE['basic_nav_caption'] = ''; +$NEXTPREV_TEMPLATE['basic_nav_first'] = ''; +$NEXTPREV_TEMPLATE['basic_nav_prev'] = ''; +$NEXTPREV_TEMPLATE['basic_nav_last'] = ''; +$NEXTPREV_TEMPLATE['basic_nav_next'] = ''; +$NEXTPREV_TEMPLATE['basic_items_start'] = ''; +$NEXTPREV_TEMPLATE['basic_item'] = ''; +$NEXTPREV_TEMPLATE['basic_item_current'] = '{label}'; +$NEXTPREV_TEMPLATE['basic_items_end'] = ''; +$NEXTPREV_TEMPLATE['basic_separator'] = ''; + + + // ADMIN TEMPLATE see admin-ui. diff --git a/e107_handlers/theme_handler.php b/e107_handlers/theme_handler.php index 5fe20a53e..2c72ff59c 100644 --- a/e107_handlers/theme_handler.php +++ b/e107_handlers/theme_handler.php @@ -503,11 +503,25 @@ class themeHandler $total = $xdata['@attributes']['total']; $text = " -
-
".$frm->search('srch', $srch, 'go', $filterName, $filterArray, $filterVal).$frm->hidden('mode','online')."
-
"; - + "; + // print_a($xdata); //TODO use admin_ui including filter capabilities by sending search queries back to the xml script. @@ -586,18 +600,14 @@ class themeHandler { $mes->addInfo("No Themes found which match your search criteria"); } - $amount =$limit; + $ns->tablerender(TPVLAN_26.SEP."Available for Download", $text. $mes->render()); - if($total > $amount) - { - $parms = $total.",".$amount.",".$from.",".e_SELF.'?mode='.$_GET['mode'].'&frm=[FROM]'; - echo"
".$tp->parseTemplate("{NEXTPREV=$parms}",TRUE)."
"; - } + @@ -1758,6 +1768,10 @@ class themeHandler if(is_string($val['custompages'])) { $custom[$name] = array_filter(explode(" ", $val['custompages'])); + } + elseif(is_array($val['custompages'])) + { + $custom[$name] = $val['custompages']; } } @@ -1768,12 +1782,12 @@ class themeHandler $mes = e107::getMessage(); // DEBUG - if($path == "bootstrap" ) + if($path == "leasure" ) { - $mes->addDebug("

".$path."

"); - $mes->addDebug(print_a($vars,true)); - $mes->addDebug("
"); + // $mes->addDebug("

".$path."

"); + // $mes->addDebug(print_a($vars,true)); + // $mes->addDebug("
"); } diff --git a/e107_themes/bootstrap/admin_style.css b/e107_themes/bootstrap/admin_style.css index 7f94f34e2..57d89364e 100644 --- a/e107_themes/bootstrap/admin_style.css +++ b/e107_themes/bootstrap/admin_style.css @@ -756,7 +756,7 @@ ul#e-latest { line-height:17px } ul#e-latest li a span.badge { float:right; } ul#e-latest li a:hover { text-decoration: none; } -/* Bootstrap tags */ +/* Bootstrap tags input */ .tags { display: inline-block; margin-bottom:0px; @@ -783,7 +783,11 @@ span.tag button.close { padding-left:5px; } - +/* Theme Manager - Find online */ +.form-search > div > div > div > i.icon-search +{ + vertical-align:middle; +} /* diff --git a/e107_web/js/bootstrap/css/darkstrap.css b/e107_web/js/bootstrap/css/darkstrap.css index f331588a8..47d2f175e 100644 --- a/e107_web/js/bootstrap/css/darkstrap.css +++ b/e107_web/js/bootstrap/css/darkstrap.css @@ -145,9 +145,10 @@ textarea::-webkit-input-placeholder { [class^="icon-"], [class*=" icon-"] { - background-image: url("../img/glyphicons-halflings-white.png"); + background-image: url("../img/glyphicons-halflings.png"); } + .icon-white, .nav-pills > .active > a > [class^="icon-"], .nav-pills > .active > a > [class*=" icon-"], @@ -160,7 +161,15 @@ textarea::-webkit-input-placeholder { .dropdown-menu > .active > a > [class^="icon-"], .dropdown-menu > .active > a > [class*=" icon-"], .dropdown-submenu:hover > a > [class^="icon-"], -.dropdown-submenu:hover > a > [class*=" icon-"] { +.dropdown-submenu:hover > a > [class*=" icon-"], +h1 > [class^="icon-"], +h2 > [class^="icon-"], +h3 > [class^="icon-"], +h4 > [class^="icon-"], +h5 > [class^="icon-"], +.btn-primary > [class^="icon-"], +.nav-tabs > li > a > [class^="icon-"] +{ background-image: url("../img/glyphicons-halflings-white.png"); }