diff options
| -rw-r--r-- | admin/admin_liberty_inc.php | 21 | ||||
| -rw-r--r-- | templates/admin_liberty.tpl | 34 |
2 files changed, 22 insertions, 33 deletions
diff --git a/admin/admin_liberty_inc.php b/admin/admin_liberty_inc.php index 11425e1..d9635e7 100644 --- a/admin/admin_liberty_inc.php +++ b/admin/admin_liberty_inc.php @@ -1,4 +1,5 @@ <?php +/* i don't think this is working - xing $formLibertyCache = array( "liberty_cache_pages" => array( 'label' => 'External page cache', @@ -10,6 +11,7 @@ $formLibertyCache = array( ), ); $gBitSmarty->assign( 'formLibertyCache', $formLibertyCache ); + */ $formLibertyFeatures = array( "liberty_display_status" => array( @@ -70,15 +72,14 @@ $gBitSmarty->assign( 'attachmentStyleOptions', $attachmentStyleOptions ); $cacheTimes = array( - 0 => tra( "(no cache)" ), - 600 => "10 ".tra( "minutes" ), - 1800 => "30 ".tra( "minutes" ), - 3600 => "1 ".tra( "hour" ), - 7200 => "2 ".tra( "hours" ), - 14400 => "4 ".tra( "hours" ), - 28800 => "8 ".tra( "hours" ), - 86400 => "1 ".tra( "day" ), - 604800 => "1 ".tra( "week" ), + 0 => tra( "(no cache)" ), + 3600 => "1 ".tra( "hour" ), + 14400 => "4 ".tra( "hours" ), + 28800 => "8 ".tra( "hours" ), + 86400 => "1 ".tra( "day" ), + 604800 => "1 ".tra( "week" ), + 1209600 => "2 ".tra( "weeks" ), + 2419200 => "1 ".tra( "month" ), ); $gBitSmarty->assign( "cacheTimes", $cacheTimes ); @@ -115,7 +116,7 @@ $gBitSmarty->assign( 'thumbFormats', $thumbFormats ); $formValues = array( 'image_processor', 'liberty_attachment_link_format', 'comments_per_page', 'comments_default_ordering', 'comments_default_display_mode' ); if( !empty( $_REQUEST['change_prefs'] )) { - $formFeatures = array_merge( $formLibertyCache, $formLibertyFeatures, $formImageFeatures, $formCaptcha ); + $formFeatures = array_merge( $formLibertyFeatures, $formImageFeatures, $formCaptcha ); foreach( $formFeatures as $item => $data ) { simple_set_toggle( $item, LIBERTY_PKG_NAME ); } diff --git a/templates/admin_liberty.tpl b/templates/admin_liberty.tpl index 335c2d9..ef82766 100644 --- a/templates/admin_liberty.tpl +++ b/templates/admin_liberty.tpl @@ -2,6 +2,16 @@ {form} {jstabs} {jstab title="General Settings"} + {legend legend="Liberty Cache"} + <div class="row"> + {formlabel label="Liberty Cache" for="liberty_cache"} + {forminput} + {html_options name=liberty_cache id=liberty_cache values=$cacheTimes options=$cacheTimes selected=$gBitSystem->getConfig('liberty_cache')} + {formhelp note='Cache all parsed content. This will dramatically reduce load on the server if pages are called frequently.' page=''} + {/forminput} + </div> + {/legend} + {legend legend="Attachments"} <div class="row"> {formlabel label="Auto-Display Attachment Thumbnails" for="liberty_auto_display_attachment_thumbs"} @@ -14,7 +24,7 @@ <div class="row"> {formlabel label="Liberty Attachment Style" for="liberty_attachment_style"} {forminput} - {html_radios options=$attachmentStyleOptions values=$attachmentStyleOptions id=liberty_attachment_style name=liberty_attachment_style checked=$gBitSystem->getConfig('liberty_attachment_style') separator="<br />"} + {html_radios options=$attachmentStyleOptions values=$attachmentStyleOptions id=liberty_attachment_style name=liberty_attachment_style checked=$gBitSystem->getConfig('liberty_attachment_style', 'standard') separator="<br />"} {formhelp note=""} {/forminput} </div> @@ -61,28 +71,6 @@ {/legend} {/jstab} - {jstab title="Liberty Cache"} - {legend legend="Liberty Cache"} - <div class="row"> - {formlabel label="Liberty Cache" for="liberty_cache"} - {forminput} - {html_options name=liberty_cache id=liberty_cache values=$cacheTimes options=$cacheTimes selected=$gBitSystem->getConfig('liberty_cache')} - {formhelp note='Cache all parsed content. This will dramatically reduce load on the server if pages are called frequently.' page=''} - {/forminput} - </div> - - {foreach from=$formLibertyCache key=item item=output} - <div class="row"> - {formlabel label=`$output.label` for=$item} - {forminput} - {html_checkboxes name="$item" values="y" checked=$gBitSystem->getConfig($item) labels=false id=$item} - {formhelp note=`$output.note` page=`$output.page`} - {/forminput} - </div> - {/foreach} - {/legend} - {/jstab} - {jstab title="Image Processing System"} {legend legend="Image Processing System"} <input type="hidden" name="page" value="{$page}" /> |