summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorspider@app1 <spiderr@bitweaver.org>2016-05-17 17:02:14 -0400
committerspider@app1 <spiderr@bitweaver.org>2016-05-17 17:02:14 -0400
commita26697ebc4022482e243edf8c34e44e11e8b0485 (patch)
treed878851da5401e48adc64cab4563a8ecdb449ae8
parent7467696e4fa17ffaeacdb2b8d058a5a523af4eab (diff)
downloadthemes-a26697ebc4022482e243edf8c34e44e11e8b0485.tar.gz
themes-a26697ebc4022482e243edf8c34e44e11e8b0485.tar.bz2
themes-a26697ebc4022482e243edf8c34e44e11e8b0485.zip
change booticon to from div wrapper to span for clean nesting; unify smarty_modifier_bit_date_format
-rw-r--r--smartyplugins/function.booticon.php4
-rw-r--r--smartyplugins/modifier.bit_short_datetime.php2
2 files changed, 3 insertions, 3 deletions
diff --git a/smartyplugins/function.booticon.php b/smartyplugins/function.booticon.php
index 61ae7e2..b2bf208 100644
--- a/smartyplugins/function.booticon.php
+++ b/smartyplugins/function.booticon.php
@@ -36,7 +36,7 @@ function smarty_function_booticon( $pParams, $pFile ) {
$outstr .= '>';
}
- $outstr .= '<div class="'.$pParams['iname'];
+ $outstr .= '<span class="'.$pParams['iname'];
if( isset( $pParams["iclass"] ) ) {
$outstr .= ' '.$pParams["iclass"].'';
}
@@ -59,7 +59,7 @@ function smarty_function_booticon( $pParams, $pFile ) {
}
}
- $outstr .= '></div>';
+ $outstr .= '></span>';
if( !empty( $pParams['ilocation'] ) ) {
if( $pParams['ilocation'] == 'menu' && isset( $pParams['iexplain'] ) ) {
diff --git a/smartyplugins/modifier.bit_short_datetime.php b/smartyplugins/modifier.bit_short_datetime.php
index 08a3426..5fcaec2 100644
--- a/smartyplugins/modifier.bit_short_datetime.php
+++ b/smartyplugins/modifier.bit_short_datetime.php
@@ -19,7 +19,7 @@ function smarty_modifier_bit_short_datetime( $pString, $time='' ) {
if( !empty( $time ) && date( 'Ymd' ) == date( 'Ymd', $pString )) {
return smarty_modifier_bit_date_format( $pString, $gBitSystem->get_short_time_format(), '%H:%M %Z' );
} else {
- return smarty_modifier_bit_date_format( $pString, $gBitSystem->get_short_datetime_format(), '%a %d of %b, %Y (%H:%M %Z)' );
+ return smarty_modifier_bit_date_format( $pString, $gBitSystem->get_short_datetime_format(), '%d %b %Y (%H:%M %Z)' );
}
}
?>