mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-01-17 12:48:24 +01:00
Code Issues Releases Wiki Activity

New 'basic' nextprev template added and darkstrap tweaks

Browse Source
This commit is contained in:
Cameron 2013-03-17 02:57:09 -07:00
parent f8dd6bd1eb
commit 0dd2a038a3
4 changed files with 65 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
e107_core/templates/nextprev_template.php
View File

@ -37,6 +37,26 @@ $NEXTPREV_TEMPLATE['default_items_end'] = '';
//$NEXTPREV_TEMPLATE['default_separator'] = '<span class="nextprev-sep"><!-- --></span>';
$NEXTPREV_TEMPLATE['default_separator'] = '&nbsp;';
/* ************************************************************ */
// Basic template - as used in admin theme-manager - find themes.
//XXX FIXME - use $NEXTPREV_TEMPLATE['basic']['start'] format.??
$NEXTPREV_TEMPLATE['basic_start'] = '<!-- Start of Next/Prev --><div class="btn-group ">';
$NEXTPREV_TEMPLATE['basic_end'] = '</div><!-- End of Next/Prev -->';
$NEXTPREV_TEMPLATE['basic_nav_caption'] = '';
$NEXTPREV_TEMPLATE['basic_nav_first'] = '';
$NEXTPREV_TEMPLATE['basic_nav_prev'] = '<a class="btn btn-primary nextprev-item prev e-tip" href="{url}" title="{url_label}"><i class="icon-backward"></i></a>';
$NEXTPREV_TEMPLATE['basic_nav_last'] = '';
$NEXTPREV_TEMPLATE['basic_nav_next'] = '<a class="btn btn-primary nextprev-item next e-tip" href="{url}" title="{url_label}"><i class="icon-forward"></i></a>';
$NEXTPREV_TEMPLATE['basic_items_start'] = '';
$NEXTPREV_TEMPLATE['basic_item'] = '';
$NEXTPREV_TEMPLATE['basic_item_current'] = '<a class="btn btn-primary">{label}</a>';
$NEXTPREV_TEMPLATE['basic_items_end'] = '';
$NEXTPREV_TEMPLATE['basic_separator'] = '';
// ADMIN TEMPLATE see admin-ui.

42
e107_handlers/theme_handler.php
View File

@ -503,11 +503,25 @@ class themeHandler
$total = $xdata['@attributes']['total'];
$text = "
<form action='".e_SELF."?".e_QUERY."' id='core-plugin-list-form' method='get'>
<div class='e-search'>".$frm->search('srch', $srch, 'go', $filterName, $filterArray, $filterVal).$frm->hidden('mode','online')."</div>
</form>";
<form class='form-search' action='".e_SELF."?".e_QUERY."' id='core-plugin-list-form' method='get'>
<div class='clearfix'>
<div class='span2'>".$frm->search('srch', $srch, 'go', $filterName, $filterArray, $filterVal).$frm->hidden('mode','online')."</div>";
$amount =$limit;
if($total > $amount)
{
//$parms = $total.",".$amount.",".$from.",".e_SELF.'?mode='.$_GET['mode'].'&amp;frm=[FROM]';
$url = rawurlencode(e_SELF.'?mode='.$_GET['mode'].'&frm=[FROM]');
$parms = "total=".$total."&amount=".$amount."&current=".$from."&url=".$url."&caption=off&tmpl=basic&navcount=4&glyphs=1";
$text .= "<div class='span5' style='margin-left: 100px;margin-top:10px'>".$tp->parseTemplate("{NEXTPREV=$parms}",TRUE)."</div>";
}
$text .= "</div></div></form>";
// 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'].'&amp;frm=[FROM]';
echo"<div class='center'>".$tp->parseTemplate("{NEXTPREV=$parms}",TRUE)."</div>";
}
@ -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("<h2>".$path."</h2>");
$mes->addDebug(print_a($vars,true));
$mes->addDebug("<hr />");
// $mes->addDebug("<h2>".$path."</h2>");
// $mes->addDebug(print_a($vars,true));
// $mes->addDebug("<hr />");
}

8
e107_themes/bootstrap/admin_style.css
View File

@ -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;
}
/*

13
e107_web/js/bootstrap/css/darkstrap.css
View File

@ -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");
}