remove {legend} from admin

1 files changed, 157 insertions, 167 deletions

diff --git a/templates/admin_server.tpl b/templates/admin_server.tpl
index 8df3a59..aa31686 100644
--- a/templates/admin_server.tpl
+++ b/templates/admin_server.tpl
@@ -5,206 +5,196 @@
 
 	{jstabs}
 		{jstab title="Server Settings"}
-			{legend legend="Page Setup"}
-				<div class="form-group">
-					{formfeedback warning="After changing the browser title, you might have to login again."}
-					{formlabel label="Site title" for="site_title"}
-					{forminput}
-						<input class="form-control" type="text" name="site_title" id="site_title" value="{$gBitSystem->getConfig('site_title')|escape}" />
-						{formhelp note="The title of your site. The title appears in the banner area and in the browsers top bar."}
-					{/forminput}
-				</div>
+			<div class="form-group">
+				{formfeedback warning="After changing the browser title, you might have to login again."}
+				{formlabel label="Site title" for="site_title"}
+				{forminput}
+					<input class="form-control" type="text" name="site_title" id="site_title" value="{$gBitSystem->getConfig('site_title')|escape}" />
+					{formhelp note="The title of your site. The title appears in the banner area and in the browsers top bar."}
+				{/forminput}
+			</div>
 
-				<div class="form-group">
-					{formlabel label="Site slogan" for="site_slogan"}
-					{forminput}
-						<input class="form-control" type="text" name="site_slogan" id="site_slogan" value="{$gBitSystem->getConfig('site_slogan')|escape}" />
-						{formhelp note="This slogan is (usually) shown below the site title."}
-					{/forminput}
-				</div>
+			<div class="form-group">
+				{formlabel label="Site slogan" for="site_slogan"}
+				{forminput}
+					<input class="form-control" type="text" name="site_slogan" id="site_slogan" value="{$gBitSystem->getConfig('site_slogan')|escape}" />
+					{formhelp note="This slogan is (usually) shown below the site title."}
+				{/forminput}
+			</div>
 
-				<div class="form-group">
-					{formlabel label="Site Description" for="site_description"}
-					{forminput}
-						<input class="form-control" type="text" name="site_description" id="site_description" maxlength="180" value="{$gBitSystem->getConfig('site_description')|escape}" />
-						{formhelp note="This text is used to describe your site to search engines. Some search engines use this information to create a summary of your site.<br />The text you enter here will not be visible anywhere.<br />The Limit for search engines is <strong>180</strong> characters."}
-					{/forminput}
-				</div>
+			<div class="form-group">
+				{formlabel label="Site Description" for="site_description"}
+				{forminput}
+					<input class="form-control" type="text" name="site_description" id="site_description" maxlength="180" value="{$gBitSystem->getConfig('site_description')|escape}" />
+					{formhelp note="This text is used to describe your site to search engines. Some search engines use this information to create a summary of your site.<br />The text you enter here will not be visible anywhere.<br />The Limit for search engines is <strong>180</strong> characters."}
+				{/forminput}
+			</div>
 
-				<div class="form-group">
-					{formlabel label="Site Keywords" for="site_keywords"}
-					{forminput}
-						<textarea class="form-control" cols="50" rows="5" name="site_keywords" id="site_keywords">{$gBitSystem->getConfig('site_keywords')|escape}</textarea>
-						{formhelp note="Keywords are used to tell search engines what your page is for. Based on these keywords, your site can be categorised better and searches will give you higher rankings.<br />The text you enter here will not be visible anywhere.<br />The Limit for search engines is <strong>900</strong> characters."}
-					{/forminput}
-				</div>
+			<div class="form-group">
+				{formlabel label="Site Keywords" for="site_keywords"}
+				{forminput}
+					<textarea class="form-control" cols="50" rows="5" name="site_keywords" id="site_keywords">{$gBitSystem->getConfig('site_keywords')|escape}</textarea>
+					{formhelp note="Keywords are used to tell search engines what your page is for. Based on these keywords, your site can be categorised better and searches will give you higher rankings.<br />The text you enter here will not be visible anywhere.<br />The Limit for search engines is <strong>900</strong> characters."}
+				{/forminput}
+			</div>
 
-				<div class="form-group">
-					{formlabel label="Site Notice" for="site_notice"}
-					{forminput}
-						<input class="form-control" type="text" name="site_notice" id="site_notice" maxlength="180" value="{$gBitSystem->getConfig('site_notice')|escape}" />
-						{formhelp note="This is a global notice used mostly for emergencies or times of importance as this message will appear on all pages."}
-					{/forminput}
-				</div>
+			<div class="form-group">
+				{formlabel label="Site Notice" for="site_notice"}
+				{forminput}
+					<input class="form-control" type="text" name="site_notice" id="site_notice" maxlength="180" value="{$gBitSystem->getConfig('site_notice')|escape}" />
+					{formhelp note="This is a global notice used mostly for emergencies or times of importance as this message will appear on all pages."}
+				{/forminput}
+			</div>
 
-				<div class="form-group">
-					{formlabel label="Default Error Message" for="site_error_title"}
-					{forminput}
-						<input class="form-control" type="text" name="site_error_title" id="site_error_title" maxlength="180" value="{$gBitSystem->getConfig('site_error_title')|escape}" />
-						{formhelp note="The error message to be displayed when Bitweaver did not determine the actual cause for the error; e.g., 'Page cannot be displayed', 'Not Found', or 'Seems there has been a problem.'"}
-					{/forminput}
-				</div>
+			<div class="form-group">
+				{formlabel label="Default Error Message" for="site_error_title"}
+				{forminput}
+					<input class="form-control" type="text" name="site_error_title" id="site_error_title" maxlength="180" value="{$gBitSystem->getConfig('site_error_title')|escape}" />
+					{formhelp note="The error message to be displayed when Bitweaver did not determine the actual cause for the error; e.g., 'Page cannot be displayed', 'Not Found', or 'Seems there has been a problem.'"}
+				{/forminput}
+			</div>
 
-				<div class="form-group submit">
-					<input type="submit" class="btn btn-default" name="serverTabSubmit" value="{tr}Change preferences{/tr}" />
-				</div>
-			{/legend}
+			<div class="form-group submit">
+				<input type="submit" class="btn btn-default" name="serverTabSubmit" value="{tr}Change preferences{/tr}" />
+			</div>
 		{/jstab}
 
 		{jstab title="Miscellaneous"}
-			{legend legend="Server Settings"}
-				<div class="form-group">
-					{formfeedback warning="Please make sure you know what you are doing as setting this wrongly could prevent you from logging in again."}
-					{formlabel label="Server name" for="kernel_server_name"}
-					{forminput}
-						<input class="form-control" type="text" name="kernel_server_name" id="kernel_server_name" value="{$gBitSystem->getConfig('kernel_server_name')|escape}" />
-						{formhelp note="This value should follow the pattern: <strong>yourhome.com</strong>. It is used for absolute URIs and does <strong>not</strong> require a trailing slash and a scheme name (http[s])."}
-					{/forminput}
-				</div>
+			<div class="form-group">
+				{formfeedback warning="Please make sure you know what you are doing as setting this wrongly could prevent you from logging in again."}
+				{formlabel label="Server name" for="kernel_server_name"}
+				{forminput}
+					<input class="form-control" type="text" name="kernel_server_name" id="kernel_server_name" value="{$gBitSystem->getConfig('kernel_server_name')|escape}" />
+					{formhelp note="This value should follow the pattern: <strong>yourhome.com</strong>. It is used for absolute URIs and does <strong>not</strong> require a trailing slash and a scheme name (http[s])."}
+				{/forminput}
+			</div>
 
-				<div class="form-group">
-					{if !$gBitSystem->hasValidSenderEmail()}
-						{formfeedback error="Site emailer return address is not valid!"}
-					{/if}
-					{formlabel label="Site Emailer return address" for="site_sender_email"}
-					{forminput}
-						<input class="form-control" type="text" name="site_sender_email" id="site_sender_email" value="{$gBitSystem->getConfig('site_sender_email')|escape}" />
-						{formhelp note="When users recieve an automatically generated email, this is the email address that will be used as return address."}
-					{/forminput}
-				</div>
+			<div class="form-group">
+				{if !$gBitSystem->hasValidSenderEmail()}
+					{formfeedback error="Site emailer return address is not valid!"}
+				{/if}
+				{formlabel label="Site Emailer return address" for="site_sender_email"}
+				{forminput}
+					<input class="form-control" type="text" name="site_sender_email" id="site_sender_email" value="{$gBitSystem->getConfig('site_sender_email')|escape}" />
+					{formhelp note="When users recieve an automatically generated email, this is the email address that will be used as return address."}
+				{/forminput}
+			</div>
 
 {* defaults to STORAGE_PKG_NAME now
-				<div class="form-group">
-					{formlabel label="Centralized user upload directory" for="site_upload_dir"}
-					{forminput}
-						<input class="form-control" type="text" name="site_upload_dir" id="site_upload_dir" value="{$gBitSystem->getConfig('site_upload_dir',$smarty.const.STORAGE_PKG_URL)|escape}" />
-					{/forminput}
-				</div>
+			<div class="form-group">
+				{formlabel label="Centralized user upload directory" for="site_upload_dir"}
+				{forminput}
+					<input class="form-control" type="text" name="site_upload_dir" id="site_upload_dir" value="{$gBitSystem->getConfig('site_upload_dir',$smarty.const.STORAGE_PKG_URL)|escape}" />
+				{/forminput}
+			</div>
 *}
 
-				<div class="form-group">
-					{formlabel label="Temporary directory" for="site_temp_dir"}
-					{forminput}
-						<input class="form-control" type="text" name="site_temp_dir" id="site_temp_dir" value="{$gBitSystem->getConfig('site_temp_dir',$smarty.const.TEMP_PKG_PATH)|escape}" />
-						{formhelp note="Here you can set the temp directory to a non web-accessible path for maximum security. Specify the full path to the directory where you want to store the temporary data. Make sure the server has write access to the directory and the trailing slash is required. e.g.: /tmp/bitweaver/"}
-					{/forminput}
-				</div>
+			<div class="form-group">
+				{formlabel label="Temporary directory" for="site_temp_dir"}
+				{forminput}
+					<input class="form-control" type="text" name="site_temp_dir" id="site_temp_dir" value="{$gBitSystem->getConfig('site_temp_dir',$smarty.const.TEMP_PKG_PATH)|escape}" />
+					{formhelp note="Here you can set the temp directory to a non web-accessible path for maximum security. Specify the full path to the directory where you want to store the temporary data. Make sure the server has write access to the directory and the trailing slash is required. e.g.: /tmp/bitweaver/"}
+				{/forminput}
+			</div>
 
-				<div class="form-group">
-					{formlabel label="Storage Host URI" for="storage_host"}
-					{forminput}
-						<input class="form-control" type="text" name="storage_host" id="storage_host" value="{$gBitSystem->getConfig('storage_host')|escape}" />
-						{formhelp note="If you are using a different host for all uploaded files, you can enter the URL to that host here. On the storage host you need to point to the parent directory of storage/. If this is not set correctly, users will not be able to download files. e.g.: http://my.bitweaver.storage.com/ (trailing slash is required)"}
-					{/forminput}
-				</div>
+			<div class="form-group">
+				{formlabel label="Storage Host URI" for="storage_host"}
+				{forminput}
+					<input class="form-control" type="text" name="storage_host" id="storage_host" value="{$gBitSystem->getConfig('storage_host')|escape}" />
+					{formhelp note="If you are using a different host for all uploaded files, you can enter the URL to that host here. On the storage host you need to point to the parent directory of storage/. If this is not set correctly, users will not be able to download files. e.g.: http://my.bitweaver.storage.com/ (trailing slash is required)"}
+				{/forminput}
+			</div>
 
-				<div class="form-group">
-					{formfeedback warning="After changing this setting you might have to log in again."}
-					{formlabel label="Store session data in database" for="site_store_session_db"}
-					{forminput}
-						{html_checkboxes name="site_store_session_db" values="y" checked=$gBitSystem->getConfig('site_store_session_db') labels=false id="site_store_session_db"}
-					{/forminput}
-				</div>
+			<div class="form-group">
+				{formfeedback warning="After changing this setting you might have to log in again."}
+				{forminput label="checkbox"}
+					{html_checkboxes name="site_store_session_db" values="y" checked=$gBitSystem->getConfig('site_store_session_db') labels=false id="site_store_session_db"} {tr}Store session data in database{/tr}
+				{/forminput}
+			</div>
 
-				<div class="form-group">
-					{formlabel label="Session lifetime in seconds" for="site_session_lifetime"}
-					{forminput}
-						<input size="5" type="text" name="site_session_lifetime" id="site_session_lifetime" value="{$gBitSystem->getConfig('site_session_lifetime')}" /> {tr}seconds{/tr}
-						{formhelp note=""}
-					{/forminput}
-				</div>
+			<div class="form-group">
+				{formlabel label="Session lifetime in seconds" for="site_session_lifetime"}
+				{forminput}
+					<input size="5" type="text" name="site_session_lifetime" id="site_session_lifetime" value="{$gBitSystem->getConfig('site_session_lifetime')}" /> {tr}seconds{/tr}
+					{formhelp note=""}
+				{/forminput}
+			</div>
 
-				<div class="form-group submit">
-					<input type="submit" class="btn btn-default" name="serverTabSubmit" value="{tr}Change preferences{/tr}" />
-				</div>
-			{/legend}
+			<div class="form-group submit">
+				<input type="submit" class="btn btn-default" name="serverTabSubmit" value="{tr}Change preferences{/tr}" />
+			</div>
 		{/jstab}
 
 		{jstab title="Site Access"}
-			{legend legend="Site Access"}
-				<div class="form-group">
-					{forminput label="checkbox"}
-						{html_checkboxes name="site_closed" values="y" checked=$gBitSystem->getConfig('site_closed') labels=false id="site_closed"} {tr}Disallow access to the site (except for those with permission{/tr}
-					{/forminput}
-				</div>
+			<div class="form-group">
+				{forminput label="checkbox"}
+					{html_checkboxes name="site_closed" values="y" checked=$gBitSystem->getConfig('site_closed') labels=false id="site_closed"} {tr}Disallow access to the site (except for those with permission{/tr}
+				{/forminput}
+			</div>
 
-				<div class="form-group">
-					{forminput label="checkbox"}
-						{html_checkboxes name="site_hidden" values="y" checked=$gBitSystem->getConfig('site_hidden') labels=false id="site_public"} {tr}Site is hidden and will not be crawled by search engines.{/tr}
-					{/forminput}
-				</div>
+			<div class="form-group">
+				{forminput label="checkbox"}
+					{html_checkboxes name="site_hidden" values="y" checked=$gBitSystem->getConfig('site_hidden') labels=false id="site_public"} {tr}Site is hidden and will not be crawled by search engines.{/tr}
+				{/forminput}
+			</div>
 
-				<div class="form-group">
-					{formlabel label="Message to display when site is closed" for="site_closed_msg"}
-					{forminput}
-						<input type="text" name="site_closed_msg" id="site_closed_msg" value="{$gBitSystem->getConfig('site_closed_msg')|escape}" class="form-control" />
-					{/forminput}
-				</div>
+			<div class="form-group">
+				{formlabel label="Message to display when site is closed" for="site_closed_msg"}
+				{forminput}
+					<input type="text" name="site_closed_msg" id="site_closed_msg" value="{$gBitSystem->getConfig('site_closed_msg')|escape}" class="form-control" />
+				{/forminput}
+			</div>
 
-				<div class="form-group">
-					{forminput label="checkbox"}
-						{html_checkboxes name="site_load_threshold" values="y" checked=$BitSystemPrefs.site_load_threshold labels=false id="site_load_threshold"} {tr}Disallow access when load is above the threshold{/tr}
-						{formhelp note="Disallow access when load is above the threshold (except for those with permission)"}
-					{/forminput}
-				</div>
+			<div class="form-group">
+				{forminput label="checkbox"}
+					{html_checkboxes name="site_load_threshold" values="y" checked=$BitSystemPrefs.site_load_threshold labels=false id="site_load_threshold"} {tr}Disallow access when load is above the threshold{/tr}
+					{formhelp note="Disallow access when load is above the threshold (except for those with permission)"}
+				{/forminput}
+			</div>
 
-				<div class="form-group">
-					{formlabel label="Max average server load threshold in the last minute" for="site_load_threshold"}
-					{forminput}
-						<input type="text" name="site_load_threshold" id="site_load_threshold" value="{$gBitSystem->getConfig('site_load_threshold')}" size="5" />
-					{/forminput}
-				</div>
+			<div class="form-group">
+				{formlabel label="Max average server load threshold in the last minute" for="site_load_threshold"}
+				{forminput}
+					<input type="text" name="site_load_threshold" id="site_load_threshold" value="{$gBitSystem->getConfig('site_load_threshold')}" size="5" />
+				{/forminput}
+			</div>
 
-				<div class="form-group">
-					{formlabel label="Message to display when server is too busy" for="site_busy_msg"}
-					{forminput}
-						<input type="text" name="site_busy_msg" id="site_busy_msg" value="{$gBitSystem->getConfig('site_busy_msg')}" class="form-control" />
-					{/forminput}
-				</div>
+			<div class="form-group">
+				{formlabel label="Message to display when server is too busy" for="site_busy_msg"}
+				{forminput}
+					<input type="text" name="site_busy_msg" id="site_busy_msg" value="{$gBitSystem->getConfig('site_busy_msg')}" class="form-control" />
+				{/forminput}
+			</div>
 
-				<div class="form-group submit">
-					<input type="submit" class="btn btn-default" name="siteTabSubmit" value="{tr}Change preferences{/tr}" />
-				</div>
-			{/legend}
+			<div class="form-group submit">
+				<input type="submit" class="btn btn-default" name="siteTabSubmit" value="{tr}Change preferences{/tr}" />
+			</div>
 		{/jstab}
 
 		{jstab title="Proxy"}
-			{legend legend="Proxy Settings"}
-				<div class="form-group">
-					{formlabel label="Use proxy" for="site_use_proxy"}
-					{forminput}
-						{html_checkboxes name="site_use_proxy" values="y" checked=$gBitSystem->getConfig('site_use_proxy') labels=false id="site_use_proxy"}
-					{/forminput}
-				</div>
+			<div class="form-group">
+				{forminput label="checkbox"}
+					{html_checkboxes name="site_use_proxy" values="y" checked=$gBitSystem->getConfig('site_use_proxy') labels=false id="site_use_proxy"} {tr}Use Proxy{/tr}
+				{/forminput}
+			</div>
 
-				<div class="form-group">
-					{formlabel label="Proxy Host" for="site_proxy_host"}
-					{forminput}
-						<input type="text" name="site_proxy_host" id="site_proxy_host" value="{$gBitSystem->getConfig('site_proxy_host')|escape}" class="form-control" />
-					{/forminput}
-				</div>
+			<div class="form-group">
+				{formlabel label="Proxy Host" for="site_proxy_host"}
+				{forminput}
+					<input type="text" name="site_proxy_host" id="site_proxy_host" value="{$gBitSystem->getConfig('site_proxy_host')|escape}" class="form-control" />
+				{/forminput}
+			</div>
 
-				<div class="form-group">
-					{formlabel label="Proxy port" for="site_proxy_port"}
-					{forminput}
-						<input type="text" name="site_proxy_port" id="site_proxy_port" value="{$gBitSystem->getConfig('site_proxy_port')|escape}" class="form-control" />
-					{/forminput}
-				</div>
+			<div class="form-group">
+				{formlabel label="Proxy port" for="site_proxy_port"}
+				{forminput}
+					<input type="text" name="site_proxy_port" id="site_proxy_port" value="{$gBitSystem->getConfig('site_proxy_port')|escape}" class="form-control" />
+				{/forminput}
+			</div>
 
-				<div class="form-group submit">
-					<input type="submit" class="btn btn-default" name="proxyTabSubmit" value="{tr}Change preferences{/tr}" />
-				</div>
-			{/legend}
+			<div class="form-group submit">
+				<input type="submit" class="btn btn-default" name="proxyTabSubmit" value="{tr}Change preferences{/tr}" />
+			</div>
 		{/jstab}
 	{/jstabs}
 {/form}