summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorturon <spider@turon>2014-12-05 23:35:12 -0500
committerturon <spider@turon>2014-12-05 23:35:12 -0500
commitd39c93826319535c1173192326d75d8649455b1c (patch)
treef713294285fefee6bdd9c3edec6b8b43d8c2722b
parent6783ab616fc7de7afc5a9a01dcb340d604c93a2c (diff)
parentaf9642184b7bfa1e3631152b675623e541160584 (diff)
downloadkernel-d39c93826319535c1173192326d75d8649455b1c.tar.gz
kernel-d39c93826319535c1173192326d75d8649455b1c.tar.bz2
kernel-d39c93826319535c1173192326d75d8649455b1c.zip
Merge branch 'master' of github.com:bitweaver/kernel
-rw-r--r--config_defaults_inc.php10
-rw-r--r--templates/admin_features.tpl4
2 files changed, 7 insertions, 7 deletions
diff --git a/config_defaults_inc.php b/config_defaults_inc.php
index 588d383..a8b29a4 100644
--- a/config_defaults_inc.php
+++ b/config_defaults_inc.php
@@ -215,11 +215,11 @@ if( empty( $gPreScan ) ) {
global $gThumbSizes;
if( empty( $gThumbSizes )) {
$gThumbSizes = array(
- 'large' => array( 'width' => 940, 'height' => 705 ),
- 'medium' => array( 'width' => 460, 'height' => 345 ),
- 'small' => array( 'width' => 220, 'height' => 165 ),
- 'avatar' => array( 'width' => 100, 'height' => 100 ),
- 'icon' => array( 'width' => 48, 'height' => 48 ),
+ 'large' => array( 'width' => 1200, 'height' => 900 ),
+ 'medium' => array( 'width' => 800, 'height' => 600 ),
+ 'small' => array( 'width' => 400, 'height' => 300 ),
+ 'avatar' => array( 'width' => 200, 'height' => 150 ),
+ 'icon' => array( 'width' => 100, 'height' => 100 ),
);
}
?>
diff --git a/templates/admin_features.tpl b/templates/admin_features.tpl
index f491bfd..88335f0 100644
--- a/templates/admin_features.tpl
+++ b/templates/admin_features.tpl
@@ -72,10 +72,10 @@
{jstab title="Miscellaneous"}
{legend legend="Date and Time Formats"}
<div class="form-group">
- <label class="checkbox">
+ {forminput label="checkbox"}
<input type="checkbox" name="site_display_reltime" id="site_display_reltime" {if $gBitSystem->isFeatureActive('site_display_reltime')}checked="checked"{/if} />Relative Time Display
{formhelp note="If enabled, the date and time will be displayed relative to the time of posting (on occasion), e.g., 'Yesterday' instead of 'January 1, 1970'. "}
- </label>
+ {/forminput}
</div>
<div class="form-group">