Menu
▾
▴
[Tikiwiki-cvs/svn] SF.net SVN: tikiwiki:[16823] trunk/templates/tiki-admin-include-general.tpl
|
From: <lu...@us...> - 2009-02-18 02:57:13
|
Revision: 16823
http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=16823&view=rev
Author: luciash
Date: 2009-02-18 02:18:59 +0000 (Wed, 18 Feb 2009)
Log Message:
-----------
[ENH] commiting the AdminUIRevamp improvements by ricks99 (http://dev.tikiwiki.org/Regrouping+the+General+Admin+page)
Modified Paths:
--------------
trunk/templates/tiki-admin-include-general.tpl
Modified: trunk/templates/tiki-admin-include-general.tpl
===================================================================
--- trunk/templates/tiki-admin-include-general.tpl 2009-02-18 01:18:36 UTC (rev 16822)
+++ trunk/templates/tiki-admin-include-general.tpl 2009-02-18 02:18:59 UTC (rev 16823)
@@ -33,36 +33,24 @@
</legend>
<div id="content{$focus}" style="display:{if !isset($smarty.session.tiki_cookie_jar.show_content.$focus) and $smarty.session.tiki_cookie_jar.show_content.$focus neq 'y'}none{else}block{/if};">
{/if}
- <table class="admin">
- <tr>
- <td style="width:40%" class="form">{tr}Tikiwiki version{/tr} : </td>
- <td class="form">
- {$tiki_version}<br />
- {button href="tiki-install.php" _text="{tr}Reset or upgrade your database{/tr}"}
- </td>
- </tr>
- <tr><td colspan="2"><hr /></td></tr>
- <tr>
- <td class="form"><label for="general-homepages">{tr}Use group homepages{/tr}:</label></td>
- <td><input type="checkbox" name="useGroupHome" id="general-homepages"
- {if $prefs.useGroupHome eq 'y'}checked="checked"{/if}/>
- </td>
- </tr>
- <tr>
- <td class="form"><label for="general-gogrouphome">{tr}Go to group homepage only if login from default homepage{/tr}:</label></td>
- <td><input type="checkbox" name="limitedGoGroupHome" id="general-gogrouphome"{if $prefs.limitedGoGroupHome eq 'y'}checked="checked"{/if}/>
- </td>
- </tr>
- <tr>
- <td class="form"><label for="general-uri">{tr}Use URI as Home Page{/tr}:</label></td>
- <td><input type="checkbox" name="useUrlIndex" id="general-uri"
- {if $prefs.useUrlIndex eq 'y'}checked="checked"{/if}/>
- <input type="text" name="urlIndex" value="{$prefs.urlIndex|escape}" size="50" />
- </td>
- </tr><tr>
- <td class="form"><label for="general-homepage">{tr}Home page{/tr}:</label></td>
- <td><select name="tikiIndex" id="general-homepage">
+<h2>{tr}General Preferences{/tr}</h2>
+<div style="padding:5px;" align="left">{tr}Tikiwiki version{/tr}: <strong>{$tiki_version}</strong>
+ {button href="tiki-install.php" _text="{tr}Reset or upgrade your database{/tr}"}
+</div>
+
+<fieldset><legend>{tr}Home Page{/tr}</legend>
+<div style="padding:5px;">
+<div style="float:left;padding-right:10px;"><input type="checkbox" name="useGroupHome" id="general-homepages"{if $prefs.useGroupHome eq 'y'} checked="checked"{/if} onclick="flip('group_homepages');" /></div>
+<div align="left"><label for="general-homepages">{tr}Use group homepages{/tr}.</label></div>
+<div id="group_homepages" style="display:{if $prefs.useGroupHome eq 'y'}block{else}none{/if};margin-left:30px;padding:5px;">
+ <div style="float:left;padding-right:10px;"><input type="checkbox" name="limitedGoGroupHome" id="general-gogrouphome"{if $prefs.limitedGoGroupHome eq 'y'}checked="checked"{/if}/></div>
+ <div align="left"><label for="general-gogrouphome">{tr}Go to group homepage only if login from default homepage{/tr}.</label></div>
+</div>
+</div>
+<div style="padding:5px" align="left">
+<div id="tiki_home_page" style="display:{if $prefs.useUrlIndex eq 'y'}none{else}block{/if};">{tr}Use TikiWiki feature as homepage{/tr}:
+ <select name="tikiIndex" id="general-homepage">
<option value="tiki-index.php"
{if $prefs.site_tikiIndex eq 'tiki-index.php'}selected="selected"{/if}>
{tr}Wiki{/tr}</option>
@@ -93,11 +81,16 @@
<option value="tiki-custom_home.php"
{if $prefs.site_tikiIndex eq 'tiki-custom_home.php'}selected="selected"{/if}>{tr}Custom home{/tr}</option>
{/if}
- </select>
- </td>
- </tr><tr><td colspan="2"><hr/></td></tr><tr>
- <td class="form"><label for="general-os">{tr}OS{/tr}:</label></td>
- <td><select name="system_os" id="general-os">
+ </select>
+<br />{tr}or{/tr}<br /></div>
+ <div style="float:left;padding-right:10px;"><input type="checkbox" name="useUrlIndex" id="general-uri" {if $prefs.useUrlIndex eq 'y'}checked="checked" {/if}onclick="flip('tiki_home_page');" /></div>
+ <div><label for="general-uri">{tr}Use different URL as home page{/tr}</label>:<br /><input type="text" name="urlIndex" value="{$prefs.urlIndex|escape}" size="50" /></div>
+</div>
+
+</fieldset>
+
+<fieldset><legend>{tr}Miscellaneous{/tr}</legend>
+<div style="padding:5px;" align="left"><label for="general-os">{tr}Server OS{/tr}</label>:<select name="system_os" id="general-os">
<option value="unix"
{if $prefs.system_os eq 'unix'}selected="selected"{/if}>{tr}Unix{/tr}</option>
<option value="windows"
@@ -105,52 +98,58 @@
<option value="unknown"
{if $prefs.system_os eq 'unknown'}selected="selected"{/if}>{tr}Unknown/Other{/tr}</option>
</select>
- </td>
- </tr><tr>
- <td class="form"><label for="smarty-security">{tr}Enable Smarty Security (e.g. do not allow php code in smarty templates){/tr}:</label></td>
- <td><input type="checkbox" name="smarty_security" id="smarty-security"
- {if $prefs.smarty_security eq 'y'}checked="checked"{/if}/>
- </td>
- </tr><tr>
- <td class="form"><label for="general-error">{tr}PHP error reporting level:{/tr}</label></td>
- <td><select name="error_reporting_level" id="general-error">
- <option value="0" {if $prefs.error_reporting_level eq 0}selected="selected"{/if}>{tr}No error reporting{/tr}</option>
- <option value="2047" {if $prefs.error_reporting_level eq 2047}selected="selected"{/if}>{tr}Report all PHP errors{/tr}</option>
- <option value="2039" {if $prefs.error_reporting_level eq 2039}selected="selected"{/if}>{tr}Report all errors except notices{/tr}</option>
- </select>
- <br />
+</div>
+<div style="padding:5px;">
+ <div style="float:left;padding-right:10px;"><input type="checkbox" name="smarty_security" id="smarty-security"{if $prefs.smarty_security eq 'y'} checked="checked"{/if} /></div>
+ <div align="left"><label for="smarty-security">{tr}Smarty Security{/tr}</label><br /><em>({tr}Do not allow php code in smarty templates{/tr}.)</em></div>
+</div>
+<div style="padding:5px;">
+ <div style="float:left;padding-right:10px;"><input type="checkbox" id="feature_pear_date" name="feature_pear_date"{if $prefs.feature_pear_date eq 'y'} checked="checked"{/if} /></div>
+ <div align="left"><label for="feature_pear_date">{tr}Use PEAR::Date library{/tr}.</label></div>
+</div>
+<div style="padding:5px;" align="left"><label for="general-charset">{tr}Default charset for sending mail{/tr}:</label>
+ <select name="default_mail_charset" id="general-charset">
+ <option value="utf-8" {if $prefs.default_mail_charset eq "utf-8"}selected="selected"{/if}>utf-8</option>
+ <option value="iso-8859-1" {if $prefs.default_mail_charset eq "iso-8859-1"}selected="selected"{/if}>iso-8859-1</option>
+ </select>
+</div>
+<div style="padding:5px;" align="left"><label for="mail_crlf">{tr}Mail end of line{/tr}:</label>
+ <select name="mail_crlf" id="mail_crlf">
+ <option value="CRLF" {if $prefs.mail_crlf eq "CRLF"}selected="selected"{/if}>CRLF {tr}(standard){/tr}</option>
+ <option value="LF" {if $prefs.mail_crlf eq "LF"}selected="selected"{/if}>LF {tr}(some Unix MTA){/tr}</option>
+ </select>
+</div>
+</fieldset>
- <input type="checkbox" name="error_reporting_adminonly"{if $prefs.error_reporting_adminonly eq 'y'} checked="checked"{/if} />
- {tr}visible to admin only{/tr}<br />
- <input type="checkbox" name="smarty_notice_reporting"{if $prefs.smarty_notice_reporting eq 'y'} checked="checked"{/if} />
- {tr}smarty notice reporting{/tr}
- </td>
- </tr><tr>
- <td class="form"><label for="feature_pear_date">{tr}Use PEAR::Date library:{/tr}</label></td>
- <td><input type="checkbox" id="feature_pear_date" name="feature_pear_date"{if $prefs.feature_pear_date eq 'y'} checked="checked"{/if} /></td>
- </tr><tr>
- <td class="form"><label for="log_mail">{tr}Log Mail in Tiki Logs:{/tr}</label></td>
- <td><input type="checkbox" id="log_mail" name="log_mail"{if $prefs.log_mail eq 'y'} checked="checked"{/if} /></td>
- </tr><tr>
- <td class="form"><label for="log_sql">{tr}Log SQL:{/tr}</label></td>
- <td><input type="checkbox" id="log_sql" name="log_sql"{if $prefs.log_sql eq 'y'} checked="checked"{/if} /></td></tr>
- <tr><td class="form">{tr}Log queries using more than seconds:{/tr}</td><td><input type="text" name="log_sql_perf_min" value="{$prefs.log_sql_perf_min}" /></td>
- </tr><tr>
- <td class="form"><label for="general-charset">{tr}Default charset for sending mail:{/tr}</label></td>
- <td><select name="default_mail_charset" id="general-charset">
- <option value="utf-8" {if $prefs.default_mail_charset eq "utf-8"}selected="selected"{/if}>utf-8</option>
- <option value="iso-8859-1" {if $prefs.default_mail_charset eq "iso-8859-1"}selected="selected"{/if}>iso-8859-1</option>
- </select>
- </td>
- </tr><tr>
- <td class="form"><label for="mail_crlf">{tr}Mail end of line:{/tr}</label></td>
- <td><select name="mail_crlf" id="mail_crlf">
- <option value="CRLF" {if $prefs.mail_crlf eq "CRLF"}selected="selected"{/if}>CRLF {tr}(standard){/tr}</option>
- <option value="LF" {if $prefs.mail_crlf eq "LF"}selected="selected"{/if}>LF {tr}(some Unix MTA){/tr}</option>
- </select>
- </td>
- </tr>
- </table>
+<fieldset><legend>{tr}Logging and Reporting{/tr}</legend>
+<div style="padding:5px" align="left">
+ <label for="general-error">{tr}PHP error reporting level:{/tr}</label>
+ <select name="error_reporting_level" id="general-error">
+ <option value="0" {if $prefs.error_reporting_level eq 0}selected="selected"{/if}>{tr}No error reporting{/tr}</option>
+ <option value="2047" {if $prefs.error_reporting_level eq 2047}selected="selected"{/if}>{tr}Report all PHP errors{/tr}</option>
+ <option value="2039" {if $prefs.error_reporting_level eq 2039}selected="selected"{/if}>{tr}Report all errors except notices{/tr}</option>
+ </select>
+ <div style="margin-left:20px;padding:5px;">
+ <div style="float:left;padding-right:10px;"><input type="checkbox" id="error_reporting_adminonly" name="error_reporting_adminonly"{if $prefs.error_reporting_adminonly eq 'y'} checked="checked"{/if} /></div>
+ <div align="left"><label for="error_reporting_adminonly">{tr}Visible to Admin only{/tr}</label>.</div>
+<br />
+ <div style="float:left;padding-right:10px;"><input type="checkbox" id="smarty_notice_reporting" name="smarty_notice_reporting"{if $prefs.smarty_notice_reporting eq 'y'} checked="checked"{/if} /></div>
+ <div align="left"><label for="smarty_notice_reporting">{tr}Include Smarty notices{/tr}</label>.</div>
+ </div>
+</div>
+<div style="padding:5px;">
+ <div style="float:left;padding-right:10px;"><input type="checkbox" id="log_mail" name="log_mail"{if $prefs.log_mail eq 'y'} checked="checked"{/if} /></div>
+ <div align="left"><label for="log_mail">{tr}Log mail in Tiki logs{/tr}.</label></div>
+</div>
+<div style="padding:5px;">
+ <div style="float:left;padding-right:10px;"><input type="checkbox" id="log_sql" name="log_sql"{if $prefs.log_sql eq 'y'} checked="checked"{/if} onclick="flip('log_sql_queries');" /></div>
+ <div align="left"><label for="log_sql">{tr}Log SQL{/tr}.</label></div>
+</div>
+<div id="log_sql_queries" align="left" style="margin-left:20px;padding:5px;;display:{if $prefs.log_sql eq 'y'}display{else}none{/if};">
+{tr}Log queries using more than{/tr} <input type="text" name="log_sql_perf_min" value="{$prefs.log_sql_perf_min}" size="5" /> {tr}seconds{/tr}<br /><em>{tr}This may impact performance{/tr}.</em>
+</div>
+</fieldset>
+
{if $prefs.feature_tabs neq 'y'}</div>{/if}
</fieldset>
@@ -164,138 +163,112 @@
</legend>
<div id="content{$focus}" style="display:{if !isset($smarty.session.tiki_cookie_jar.show_content.$focus) and $smarty.session.tiki_cookie_jar.show_content.$focus neq 'y'}none{else}block{/if};">
{/if}
-
- <table class="admin" width="100%">
- <tr>
- <td class="form" >
- <label for="general-access">{tr}Disallow access to the site (except for those with permission){/tr}:</label></td>
- <td ><input type="checkbox" name="site_closed" id="general-access"
- {if $prefs.site_closed eq 'y'}checked="checked"{/if}/>
- </td>
- </tr><tr>
- <td class="form">
- <label for="general-site_closed">{tr}Message to display when site is closed{/tr}:</label></td>
- <td><input type="text" name="site_closed_msg" id="general-site_closed"
- value="{$prefs.site_closed_msg}" size="60"/></td>
- </tr>
-
- <tr>
- <td colspan="2"><hr/></td>
- </tr>
+<h2>{tr}General Settings{/tr}</h2>
+<fieldset><legend>{tr}Site Access{/tr}</legend>
+<div style="padding:5px;">
+<div style="margin:0px;float:left;padding-right:10px"><input type="checkbox" name="site_closed" id="general-access" {if $prefs.site_closed eq 'y'}checked="checked" {/if}onclick="flip('close_site_message');" /></div>
+<div align="left"><label for="general-access">{tr}Close site (except for those with permission){/tr}.</label></div>
+<div align="left" id="close_site_message" style="display:{if $prefs.site_closed eq 'y'}block{else}none{/if};margin-left:30px;padding:5px;">
+ <div><label for="general-site_closed">{tr}Message to display{/tr}:</label><br /><input type="text" name="site_closed_msg" id="general-site_closed" value="{$prefs.site_closed_msg}" size="60"/></div>
+</div></div>
- <tr>
- <td class="form" >
- <label for="general-load">{tr}Disallow access when load is above the threshold (except for those with permission){/tr}:</label></td>
- <td ><input type="checkbox" name="use_load_threshold" id="general-load"
- {if $prefs.use_load_threshold eq 'y'}checked="checked"{/if}/>
- </td>
- </tr><tr>
- <td class="form"><label for="general-max_load">{tr}Max average server load threshold in the last minute{/tr}:</label></td>
- <td><input type="text" name="load_threshold" id="general-max_load" value="{$prefs.load_threshold}" size="5" /></td>
- </tr><tr>
- <td class="form"><label for="general-load_mess">{tr}Message to display when server is too busy{/tr}:</label></td>
- <td><input type="text" name="site_busy_msg" id="general-load_mess" value="{$prefs.site_busy_msg}" size="60" /></td>
- </tr>
- <tr><td colspan="2">
-
- <table width="100%">
- <tr><td colspan="5"><hr/></td></tr>
- <tr>
- <td class="form"><label for="general-cache_ext_pages">{tr}Use cache for external pages{/tr}:</label></td>
- <td><input type="checkbox" name="cachepages" id="general-cache_ext_pages"
- {if $prefs.cachepages eq 'y'}checked="checked"{/if}/>
- </td>
- <td> </td>
- <td class="form"><label for="general-cache_ext_imgs">{tr}Use cache for external images{/tr}:</label></td>
- <td><input type="checkbox" name="cacheimages" id="general-cache_ext_imgs"
- {if $prefs.cacheimages eq 'y'}checked="checked"{/if}/>
- </td>
- </tr><tr>
- <td class="form"><label for="general-gzip">
- {if $prefs.feature_help eq 'y'}<a href="{$prefs.helpurl}Compression" target="tikihelp" class="tikihelp" title="{tr}Tikiwiki.org help{/tr}:" >{/if}
- {tr}Use gzipped output{/tr}
- {if $prefs.feature_help eq 'y'}</a>{/if}
- :</label>
- {if $gzip_handler ne 'none'}
- <br /><div class="highlight">
- {tr}output compression is active.{/tr}<br />
- {tr}compression is handled by{/tr}: {$gzip_handler}
- </div>{/if}
- </td>
- <td><input type="checkbox" name="feature_obzip" id="general-gzip" {if $prefs.feature_obzip eq 'y'}checked="checked"{/if}/></td>
- <td> </td>
- <td class="form"><label for="general-pageviews">{tr}Count admin pageviews{/tr}:</label></td>
- <td><input type="checkbox" name="count_admin_pvs" id="general-pageviews" {if $prefs.count_admin_pvs eq 'y'}checked="checked"{/if}/></td>
- </tr>
- </table>
- </td></tr>
+<div style="padding:5px;">
+<div style="float:left;padding-right:10px;margin:0px;"><input type="checkbox" name="use_load_threshold" id="general-load" {if $prefs.use_load_threshold eq 'y'}checked="checked" {/if}onclick="flip('close_threshold_message');" /></div>
+<div align="left"><label for="general-load">{tr}Close site when server load is above the threshold (except for those with permission){/tr}.</label></div>
+<div align="left" id="close_threshold_message" style="display:{if $prefs.use_load_threshold eq 'y'}block{else}none{/if};margin-left:30px;padding:5px;">
+ <div align="left">
+<label for="general-max_load">{tr}Maximum average server load threshold in the last minute{/tr}:</label><input type="text" name="load_threshold" id="general-max_load" value="{$prefs.load_threshold}" size="5" />
+ </div>
- <tr>
- <td colspan="2"><hr/></td>
- </tr>
-
- <tr>
- <td class="form"><label for="general-browser_title">{tr}Browser title{/tr}:</label></td>
- <td><input type="text" name="siteTitle" id="general-browser_title" value="{$prefs.siteTitle|escape}" size="40" /></td>
- </tr><tr>
- <td class="form"><label for="general-temp">{tr}Temporary directory{/tr}:</label></td>
- <td><input type="text" name="tmpDir" id="general-temp" value="{$prefs.tmpDir|escape}" size="50" /></td>
- </tr><tr>
- <td class="form"><label for="general-send_email">{tr}Sender Email{/tr}:</label></td>
- <td><input type="text" name="sender_email" id="general-send_email" value="{$prefs.sender_email|escape}" size="50" /></td>
- </tr>
- <tr>
- <td class="form"><label for="general-contact">{tr}Contact user{/tr}:</label></td>
- <td><input type="text" name="contact_user" id="general-contact" value="{$prefs.contact_user|escape}" size="40" /></td>
- </tr><tr>
- <td class="form"><label for="contact_anon">{tr}Allow anonymous users to "Contact Us"{/tr}:</label></td>
- <td><input type="checkbox" name="contact_anon" id="contact_anon"
- {if $prefs.contact_anon eq 'y'}checked="checked"{/if}/>
+ <div><label for="general-load_mess">{tr}Message to display{/tr}:<br /><input type="text" name="site_busy_msg" id="general-load_mess" value="{$prefs.site_busy_msg}" size="60" /></div>
+</div>
+</div>
+
+<div style="padding:5px;">
+ <div style="float:left;padding-right:10px;margin:0px;"><input type="checkbox" name="use_proxy" id="general-proxy" {if $prefs.use_proxy eq 'y'}checked="checked" {/if}onclick="flip('use_proxy_settings');" /></div>
+ <div align="left"><label for="general-proxy">{tr}Use proxy{/tr}.</label></div>
+ <div align="left" id="use_proxy_settings" style="display:{if $prefs.use_proxy eq 'y'}block{else}none{/if};margin-left:30px;padding:5px;">
+ <div><label for="general-proxy_host">{tr}Host{/tr}:</label><input type="text" name="proxy_host" id="general-proxy_host" value="{$prefs.proxy_host|escape}" size="40" /></div>
+ <div><label for="general-proxy_port">{tr}Port{/tr}:</label><input size="5" type="text" name="proxy_port" id="general-proxy_port" value="{$prefs.proxy_port|escape}" /></div>
+ </div>
+</div>
+</fieldset>
+
+<fieldset><legend>{tr}Performance{/tr}</legend>
+<div style="padding:5px;">
+ <div style="float:left;padding-right:10px;"><input type="checkbox" name="cachepages" id="general-cache_ext_pages" {if $prefs.cachepages eq 'y'}checked="checked" {/if}/></div>
+ <div align="left"><label for="general-cache_ext_pages">{tr}Cache external pages{/tr}</label>.</div>
+</div>
+<div style="padding:5px;">
+ <div style="float:left;padding-right:10px;"><input type="checkbox" name="cacheimages" id="general-cache_ext_imgs" {if $prefs.cacheimages eq 'y'}checked="checked" {/if}/></div>
+ <div align="left"><label for="general-cache_ext_imgs">{tr}Cache external images{/tr}</label>.</div>
+</div>
+<div style="padding:5px;">
+ <div style="float:left;padding-right:10px;"><input type="checkbox" name="feature_obzip" id="general-gzip" {if $prefs.feature_obzip eq 'y'}checked="checked" {/if}/></div>
+ <div align="left"><label for="general-gzip">{tr}GZip output{/tr}</label>.{if $prefs.feature_help eq 'y'}
+ <a href="{$prefs.helpurl}Compression" target="tikihelp" class="tikihelp" title="{tr}Tikiwiki.org help{/tr}:">{icon _id=help}</a>{/if}
+{if $gzip_handler ne 'none'}
+ <br /><div class="highlight" style="margin-left:30px;">
+ {tr}Output compression is active.{/tr}<br />
+ {tr}Compression is handled by{/tr}: {$gzip_handler}.</div>
+{/if}
+ </div>
+</div>
+</fieldset>
+
+<fieldset><legend>{tr}Session{/tr}</legend>
+<div style="padding:5px;">
+ <div style="float:left;padding-right:10px;"><input type="checkbox" name="session_db" id="general-session_db" {if $prefs.session_db eq 'y'}checked="checked" {/if}/></div>
+ <div align="left"><label for="general-session_db">{tr}Store session data in database{/tr}.</label></div>
+</div>
+<div style="padding:5px;">
+ <div align="left"><label for="general-session_life">{tr}Session lifetime{/tr}:</label> <input size="5" type="text" name="session_lifetime" id="general-session_life" value="{$prefs.session_lifetime|escape}" /> {tr}minutes{/tr}</div>
+</div>
+</fieldset>
+
+<fieldset><legend>{tr}Contact{/tr}</legend>
{if $prefs.feature_contact ne 'y'}
- {tr}contact feature disabled{/tr}
+<div style="padding:5px;" align="left">{icon _id=information style="vertical-align:middle"} {tr}The "Contact Us" feature is disabled.{/tr} <a href="tiki-admin.php?page=features" title="{tr}Features{/tr}">{tr}Enable now{/tr}</a>.</div>
{/if}
- </td>
- </tr><tr>
- <td class="form"><label for="general-session_db">{tr}Store session data in database{/tr}:</label></td>
- <td><input type="checkbox" name="session_db" id="general-session_db"
- {if $prefs.session_db eq 'y'}checked="checked"{/if}/>
- </td>
- </tr><tr>
- <td class="form"><label for="general-session_life">{tr}Session lifetime in minutes{/tr}:</label></td>
- <td><input size="5" type="text" name="session_lifetime" id="general-session_life" value="{$prefs.session_lifetime|escape}" /></td>
- </tr><tr>
- <td class="form"><label for="general-proxy">{tr}Use proxy{/tr}:</label></td>
- <td><input type="checkbox" name="use_proxy" id="general-proxy"
- {if $prefs.use_proxy eq 'y'}checked="checked"{/if}/>
- </td>
- </tr><tr>
- <td class="form"><label for="general-proxy_host">{tr}Proxy Host{/tr}:</label></td>
- <td><input type="text" name="proxy_host" id="general-proxy_host" value="{$prefs.proxy_host|escape}" size="40" /></td>
- </tr><tr>
- <td class="form"><label for="general-proxy_port">{tr}Proxy port{/tr}:</label></td>
- <td><input size="5" type="text" name="proxy_port" id="general-proxy_port" value="{$prefs.proxy_port|escape}" /></td>
- </tr><tr>
- <td class="form"><label for="general-ip_can_be_checked">{tr}IP can be used to identify anonymous voting(only for some intranet){/tr}:</label></td>
- <td><input type="checkbox" name="ip_can_be_checked" id="general-ip_can_be_checked"{if $prefs.ip_can_be_checked} checked="checked"{/if} /></td>
- </tr><tr>
- <td class="form"><label for="general-max_records">{tr}Maximum number of records in listings{/tr}:</label></td>
- <td><input size="5" type="text" name="maxRecords" id="general-max_records"
- value="{$prefs.maxRecords|escape}" /></td>
- </tr><tr>
- <td class="form"><label for="feature_help">{tr}Help System{/tr}:</label></td>
- <td><input type="checkbox" name="feature_help" id="feature_help" {if $prefs.feature_help eq 'y'}checked="checked"{/if} /></td>
+<div style="padding:5px;">
+ <div style="float:left;padding-right:10px;"><input type="checkbox" name="contact_anon" id="contact_anon" {if $prefs.contact_anon eq 'y'}checked="checked" {/if}{if $prefs.feature_contact ne 'y'}disabled="disabled" {/if}/></div>
+ <div align="left"><label for="contact_anon">{tr}Allow anonymous visitors to use the "Contact Us"{/tr} feature.</label></div>
+</div>
+<div style="padding:5px;">
+ <div align="left"><label for="general-contact">{tr}Contact user{/tr}</label>:<br /><input type="text" name="contact_user" id="general-contact" value="{$prefs.contact_user|escape}" size="40" {if $prefs.feature_contact ne 'y'}disabled="disabled" {/if}/></div>
+</div>
+</fieldset>
- </tr><tr>
- <td class="form"><label for="general-helpurl">{tr}Help URL{/tr}:</label></td>
- <td><input type="text" name="helpurl" id="general-helpurl" value="{$prefs.helpurl|escape}" size="40" /></td>
+<fieldset><legend>{tr}Miscellaneous{/tr}</legend>
+<div style="padding:5px;">
+ <div style="float:left;padding-right:10px;"><input type="checkbox" name="count_admin_pvs" id="general-pageviews" {if $prefs.count_admin_pvs eq 'y'}checked="checked" {/if}/></div>
+ <div align="left"><label for="general-pageviews">{tr}Count admin pageviews{/tr}</label>.</div>
+</div>
+<div style="padding:5px;">
+ <div align="left"><label for="general-browser_title">{tr}Browser title{/tr}:</label><br /><input type="text" name="siteTitle" id="general-browser_title" value="{$prefs.siteTitle|escape}" size="50" /></div>
+</div>
+<div style="padding:5px;">
+ <div align="left"><label for="general-temp">{tr}Temporary directory{/tr}:</label><br /><input type="text" name="tmpDir" id="general-temp" value="{$prefs.tmpDir|escape}" size="50" /></div>
+</div>
+<div style="padding:5px;">
+ <div align="left"><label for="general-send_email">{tr}Sender email{/tr}:</label><br /><input type="text" name="sender_email" id="general-send_email" value="{$prefs.sender_email|escape}" size="50" /></div>
+</div>
+<div style="padding:5px;">
+ <div align="left"><label for="general-max_records">{tr}Maximum number of records in listings{/tr}:</label> <input size="5" type="text" name="maxRecords" id="general-max_records" value="{$prefs.maxRecords|escape}" /></div>
+</div>
+<div style="padding:5px;">
+ <div style="float:left;padding-right:10px;"><input type="checkbox" name="feature_help" id="feature_help" {if $prefs.feature_help eq 'y'}checked="checked" {/if}onclick="flip('use_help_system');" /></div>
+ <div align="left"><label for="feature_help">{tr}Help System{/tr}:</label></div>
+ <div align="left" id="use_help_system" style="display:{if $prefs.feature_help eq 'y'}block{else}none{/if};margin-left:30px;padding:5px;">
+ <div><label for="general-helpurl">{tr}Help URL{/tr}:</label> <input type="text" name="helpurl" id="general-helpurl" value="{$prefs.helpurl|escape}" size="40" /><br />
+ <em>{tr}The default help system may not be complete.{/tr} {tr}You can help with the TikiWiki documentation.{/tr}</em></div>
+ </div>
+</div>
+</fieldset>
- </tr><tr>
- <td class="form"></td>
- <td>{tr}Please expect not found help-pages with the default-URL.{/tr}<br />
- {tr}Any help with the documentation is welcome.{/tr}</td>
- </tr>
- </table>
+
+
{if $prefs.feature_tabs neq 'y'}</div>{/if}
</fieldset>
@@ -307,29 +280,34 @@
<span>{tr}Release Check{/tr}</span>
</a>
</legend>
- <div id="layout" style="display:{if !isset($smarty.session.tiki_cookie_jar.show_layout) and $smarty.session.tiki_cookie_jar.show_layout neq 'y'}none{else}block{/if};">
- {/if}
- <table class="admin" width="100%">
- <tr>
- <td class="form"><label for="general-versioncheck">{tr}Release check{/tr}</label></td>
- <td><input type="checkbox" id="general-versioncheck" name="feature_version_checks" {if $prefs.feature_version_checks eq 'y'}checked="checked"{/if}/></td>
- </tr>
- <tr>
- <td class="form">{tr}Check frequency{/tr}:</td>
- <td>
- <select name="tiki_version_check_frequency">
+ <div id="layout" style="display:{if !isset($smarty.session.tiki_cookie_jar.show_layout) and $smarty.session.tiki_cookie_jar.show_layout neq 'y'}none{else}block{/if};">{/if}
+
+<h2>{tr}Release Check{/tr}</h2>
+
+<div style="padding:5px;">
+ <div align="left">{tr}TikiWiki version{/tr}: {$tiki_version}</div>
+</div>
+
+<div style="padding:5px;">
+ <div style="float:left;padding-right:10px;"><input type="checkbox" id="general-versioncheck" name="feature_version_checks" {if $prefs.feature_version_checks eq 'y'}checked="checked"{/if}onclick="flip('check_for_updates');" /></div>
+ <div align="left"><label for="general-versioncheck">{tr}Check for updates automatically{/tr}.</label></div>
+ <div align="left" id="check_for_updates" style="display:{if $prefs.feature_version_checks eq 'y'}block{else}none{/if};margin-left:30px;padding:5px;">
+ <div>{tr}Check frequency{/tr}:
+ <select name="tiki_version_check_frequency">
<option value="86400"{if $prefs.tiki_version_check_frequency eq 86400} selected="selected"{/if}>{tr}Each day{/tr}</option>
<option value="604800"{if $prefs.tiki_version_check_frequency eq 604800} selected="selected"{/if}>{tr}Each week{/tr}</option>
<option value="2592000"{if $prefs.tiki_version_check_frequency eq 2592000} selected="selected"{/if}>{tr}Each month{/tr}</option>
- </select>
- </td>
- </tr>
- <tr>
- <td class="form"></td>
- <td>{tr}Release checks are made when you browse admin main page only{/tr}
- <br /><a href="tiki-admin.php?page=general&forcecheck=1">{tr}Force immediate check{/tr}</a></td>
- </tr>
- </table>
+ </select>
+ </div>
+ <em>{tr}TikiWiki will check for updates when you access the main Administration page{/tr}.</em>
+ </div>
+</div>
+
+<div style="padding:5px">
+{button href="tiki-admin.php?page=general&forcecheck=1" _text="{tr}Check for updates now{/tr}."}
+</div>
+
+
{if $prefs.feature_tabs neq 'y'}</div>{/if}
</fieldset>
@@ -342,44 +320,45 @@
</a>
</legend>
<div id="layout" style="display:{if !isset($smarty.session.tiki_cookie_jar.show_layout) and $smarty.session.tiki_cookie_jar.show_layout neq 'y'}none{else}block{/if};">{/if}
- <table class="admin" width="100%">
- <tr>
- <td class="form" ><label for="general-timezone">{tr}Default timezone{/tr}:</label></td>
- <td ><select name="server_timezone" id="general-timezone">
+
+<h2>{tr}Date and Time Formats{/tr}</h2>
+<div style="padding:5px;">
+ <div align="left"><label for="general-timezone">{tr}Default timezone{/tr}:</label><br />
+ <select name="server_timezone" id="general-timezone">
{foreach key=tz item=tzinfo from=$timezones}
{math equation="floor(x / (3600000))" x=$tzinfo.offset assign=offset}{math equation="(x - (y*3600000)) / 60000" y=$offset x=$tzinfo.offset assign=offset_min format="%02d"}
<option value="{$tz}"{if $prefs.server_timezone eq $tz} selected="selected"{/if}>{$tz|escape:"html"} (UTC{if $offset >= 0}+{/if}{$offset}h{if $offset_min gt 0}{$offset_min}{/if})</option>
{/foreach}
- </select></td>
- </tr><tr>
- <td class="form" ><label for="general-long_date">{tr}Long date format{/tr}:</label></td>
- <td ><input type="text" name="long_date_format" id="general-long_date" value="{$prefs.long_date_format|escape}" size="40"/></td>
- </tr><tr>
- <td class="form"><label for="general-short_date">{tr}Short date format{/tr}:</label></td>
- <td><input type="text" name="short_date_format" id="general-short_date" value="{$prefs.short_date_format|escape}" size="40"/></td>
- </tr><tr>
- <td class="form"><label for="general-long_time">{tr}Long time format{/tr}:</label></td>
- <td><input type="text" name="long_time_format" id="general-long_time" value="{$prefs.long_time_format|escape}" size="40"/></td>
- </tr><tr>
- <td class="form"><label for="general-short_time">{tr}Short time format{/tr}:</label></td>
- <td><input type="text" name="short_time_format" id="general-short_time" value="{$prefs.short_time_format|escape}" size="40"/></td>
- </tr><tr>
- <td class="form" ><label for="general-display_fieldorder">{tr}Fields display order{/tr}:</label></td>
- <td ><select name="display_field_order" id="general-display_fieldorder">
+ </select></div>
+</div>
+<div style="padding:5px;">
+ <div align="left"><label for="general-long_date">{tr}Long date format{/tr}:</label><br /><input type="text" name="long_date_format" id="general-long_date" value="{$prefs.long_date_format|escape}" size="40" /><br /><em>{tr}Sample{/tr}: {$now|tiki_long_date}</em></div>
+</div>
+<div style="padding:5px;">
+ <div align="left"><label for="general-short_date">{tr}Short date format{/tr}:</label><br /><input type="text" name="short_date_format" id="general-short_date" value="{$prefs.short_date_format|escape}" size="40" /><br /><em>{tr}Sample{/tr}: {$now|tiki_short_date}</em></div>
+</div>
+<div style="padding:5px;">
+ <div align="left"><label for="general-long_time">{tr}Long time format{/tr}:</label><br /><input type="text" name="long_time_format" id="general-long_time" value="{$prefs.long_time_format|escape}" size="40" /><br /><em>{tr}Sample{/tr}: {$now|tiki_long_time}</em></div>
+</div>
+<div style="padding:5px;">
+ <div align="left"><label for="general-short_time">{tr}Short time format{/tr}:</label><br /><input type="text" name="short_time_format" id="general-short_time" value="{$prefs.short_time_format|escape}" size="40" /><br /><em>{tr}Sample{/tr}: {$now|tiki_short_time}</em></div>
+</div>
+<div style="padding:5px;">
+ <div align="left"><label for="general-display_fieldorder">{tr}Fields display order{/tr}:</label>
+ <select name="display_field_order" id="general-display_fieldorder">
<option value="DMY" {if $prefs.display_field_order=="DMY"}selected="selected"{/if}>{tr}Day{/tr} {tr}Month{/tr} {tr}Year{/tr}</option>
<option value="DYM" {if $prefs.display_field_order=="DYM"}selected="selected"{/if}>{tr}Day{/tr} {tr}Year{/tr} {tr}Month{/tr}</option>
<option value="MDY" {if $prefs.display_field_order=="MDY"}selected="selected"{/if}>{tr}Month{/tr} {tr}Day{/tr} {tr}Year{/tr}</option>
<option value="MYD" {if $prefs.display_field_order=="MYD"}selected="selected"{/if}>{tr}Month{/tr} {tr}Year{/tr} {tr}Day{/tr}</option>
<option value="YDM" {if $prefs.display_field_order=="YDM"}selected="selected"{/if}>{tr}Year{/tr} {tr}Day{/tr} {tr}Month{/tr}</option>
<option value="YMD" {if $prefs.display_field_order=="YMD"}selected="selected"{/if}>{tr}Year{/tr} {tr}Month{/tr} {tr}Day{/tr}</option>
- </select></td>
- </tr><tr>
- {assign var="fcnlink" value="http://www.php.net/manual/en/function.strftime.php"}
- <td colspan="2" align="center">
- <a class="link" target="strftime" href="{$fcnlink}">
- {tr}Date and Time Format Help{/tr}</a></td>
- </tr>
- </table>
+ </select>
+ </div>
+</div>
+<div style="padding:5px;">
+{assign var="fcnlink" value="http://www.php.net/manual/en/function.strftime.php"}
+<a class="link" target="strftime" href="{$fcnlink}">{tr}Date and Time Format Help{/tr}</a></div>
+
{if $prefs.feature_tabs neq 'y'}</div>{/if}
</fieldset>
@@ -392,40 +371,29 @@
</a>
</legend>
<div id="layout" style="display:{if !isset($smarty.session.tiki_cookie_jar.show_layout) and $smarty.session.tiki_cookie_jar.show_layout neq 'y'}none{else}block{/if};">{/if}
- <table class="admin" width="100%">
- <tr>
- <td class="form"><label for="user_show_realnames">{tr}When possible, show the real user name instead of login:{/tr}</label></td>
- <td><input type="checkbox" name="user_show_realnames" id="user_show_realnames" {if $prefs.user_show_realnames eq 'y'}checked="checked"{/if}/></td>
- </tr>
-
- <tr>
- <td colspan="2"><hr/></td>
- </tr>
- <tr>
- <td class="form"><label for="site_crumb_seper">{tr}Locations separator{/tr}:</label></td>
- <td>
- <div style="float: left"><input type="text" name="site_crumb_seper" id="site_crumb_seper" value="{$prefs.site_crumb_seper}" size="5" maxlength="8" /></div>
- <div>
- <small><em>{tr}Examples{/tr}</em>: » / > : -> →</small>
- </div>
- </td>
- </tr>
- <tr>
- <td class="form"><label for="site_nav_seper">{tr}Choices separator{/tr}:</label></td>
- <td>
- <div style="float: left"><input type="text" name="site_nav_seper" id="site_nav_seper" value="{$prefs.site_nav_seper}" size="5" maxlength="8" /></div>
- <div>
- <small><em>{tr}Examples{/tr}</em>: | / ¦ : </small>
- </div>
- </td>
- </tr>
- </table>
+<div style="padding:5px;">
+<div style="float:left;padding-right:10px;"><input type="checkbox" name="user_show_realnames" id="user_show_realnames" {if $prefs.user_show_realnames eq 'y'}checked="checked"{/if}/></div>
+<div align="left"><label for="user_show_realnames">{tr}Show user's real name instead of login (when possible){/tr}.</label></div>
+</div>
+<fieldset><legend>{tr}Seperators{/tr}</legend>
+<div style="padding:5px;">
+ <div align="left"><label for="site_crumb_seper">{tr}Locations (breadcrumbs){/tr}:</label> <input type="text" name="site_crumb_seper" id="site_crumb_seper" value="{$prefs.site_crumb_seper}" size="5" maxlength="8" /><br /><em>{tr}Examples{/tr}: » / > : -> →</em></div>
+</div>
+<div style="padding:5px;">
+ <div align="left"><label for="site_nav_seper">{tr}Choices{/tr}:</label> <input type="text" name="site_nav_seper" id="site_nav_seper" value="{$prefs.site_nav_seper}" size="5" maxlength="8" /><br /><em>{tr}Examples{/tr}: | / ¦ :</em></div>
+</div>
+</fieldset>
+
+
+
{if $prefs.feature_tabs neq 'y'}</div>{/if}
</fieldset>
+ <div class="button clear" style="text-align: center">
+ <input type="submit" name="new_prefs" value="{tr}Change preferences{/tr}" />
+ </div>
</form>
-
- <form class="admin" method="post" action="tiki-admin.php?page=general">
+ <form method="post" action="tiki-admin.php?page=general">
<fieldset{if $prefs.feature_tabs eq 'y'} class="tabcontent" id="content{cycle name=content assign=focustab}{$focustab}"{/if}>
{if $prefs.feature_tabs neq 'y'}
<legend class="heading" id="tab{cycle name=tabs advance=false assign=tabi}{$tabi}">
@@ -434,19 +402,20 @@
</a>
</legend>
<div id="adminpass" style="display:{if !isset($smarty.session.tiki_cookie_jar.show_adminpass) and $smarty.session.tiki_cookie_jar.show_adminpass neq 'y'}none{else}block{/if};">{/if}
+<p>Change the <strong>Admin</strong> password.</p>
<table class="admin" width="100%">
- <th colspan="2" align="center">{tr}Admin Password{/tr}</th>
<tr>
<td class="form" ><label for="general-new_pass">{tr}New password{/tr}:</label></td>
<td ><input type="password" name="adminpass" id="general-new_pass" /></td>
</tr><tr>
<td class="form"><label for="general-repeat_pass">{tr}Repeat password{/tr}:</label></td>
<td><input type="password" name="again" id="general-repeat_pass" /></td>
+ </tr><tr>
+ <td colspan="2" class="button">
+ <input type="submit" name="newadminpass" value="{tr}Change password{/tr}" />
+ </td>
</tr>
</table>
- <div class="button clear" style="text-align: center">
- <input type="submit" name="newadminpass" value="{tr}Change password{/tr}" />
- </div>
{if $prefs.feature_tabs neq 'y'}</div>{/if}
</fieldset>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|