Merge pull request #136 from fabrixxm/master

Works on settings page and field teplates

11 files changed, 385 insertions, 853 deletions

diff --git a/.htaccess b/.htaccess
index 73031b962..11bc902c4 100644
--- a/.htaccess
+++ b/.htaccess
@@ -1,4 +1,4 @@
-Options -Indexes
+#Options -Indexes
 AddType application/x-java-archive .jar
 AddType audio/ogg .oga
 
@@ -11,6 +11,7 @@ Deny from all
 
   # Protect repository directory from browsing
   RewriteRule "(^|/)\.git" - [F]
+  RewriteBase /~fabio/friendika
 
   # Rewrite current-style URLs of the form 'index.php?q=x'.
   # Also place auth information into REMOTE_USER for sites running
diff --git a/include/main.js b/include/main.js
index 216917d72..896c611d5 100644
--- a/include/main.js
+++ b/include/main.js
@@ -35,6 +35,37 @@
 		msie = $.browser.msie ;
 		
 		
+		/* setup onoff widgets */
+		$(".onoff input").each(function(){
+			val = $(this).val();
+			id = $(this).attr("id");
+			$("#"+id+"_onoff ."+ (val==0?"on":"off")).addClass("hidden");
+			
+		});
+		$(".onoff > a").click(function(event){
+			event.preventDefault();	
+			var input = $(this).siblings("input");
+			var val = 1-input.val();
+			var id = input.attr("id");
+			$("#"+id+"_onoff ."+ (val==0?"on":"off")).addClass("hidden");
+			$("#"+id+"_onoff ."+ (val==1?"on":"off")).removeClass("hidden");
+			input.val(val);
+			//console.log(id);
+		});
+		
+		/* load tinyMCE if needed and setup field_richtext */
+		if(typeof tinyMCE == "undefined") {
+			window.tinyMCEPreInit = {
+				suffix:"",
+				base: baseurl+"/library/tinymce/jscripts/tiny_mce/",
+				query:"",
+			};
+			$.getScript(baseurl	+"/library/tinymce/jscripts/tiny_mce/tiny_mce_src.js", setupFieldRichtext);
+		} else {
+			setupFieldRichtext();
+		}
+		
+		
 		/* nav update event  */
 		$('nav').bind('nav-update', function(e,data){;
 			var net = $(data).find('net').text();
@@ -308,6 +339,30 @@ function checkboxhighlight(box) {
   }
 }
 
+function setupFieldRichtext(){
+	tinyMCE.init({
+		theme : "advanced",
+		mode : "specific_textareas",
+		editor_selector: "fieldRichtext",
+		plugins : "bbcode,paste",
+		theme_advanced_buttons1 : "bold,italic,underline,undo,redo,link,unlink,image,forecolor,formatselect,code",
+		theme_advanced_buttons2 : "",
+		theme_advanced_buttons3 : "",
+		theme_advanced_toolbar_location : "top",
+		theme_advanced_toolbar_align : "center",
+		theme_advanced_blockformats : "blockquote,code",
+		paste_text_sticky : true,
+		entity_encoding : "raw",
+		add_unload_trigger : false,
+		remove_linebreaks : false,
+		force_p_newlines : false,
+		force_br_newlines : true,
+		forced_root_block : '',
+		convert_urls: false,
+		content_css: baseurl+"/view/custom_tinymce.css",
+		theme_advanced_path : false,
+	});
+}
 
 
 /** 
diff --git a/mod/settings.php b/mod/settings.php
index 9efa07d76..44de482c1 100644
--- a/mod/settings.php
+++ b/mod/settings.php
@@ -303,19 +303,31 @@ function settings_content(&$a) {
 		notice( t('Permission denied.') . EOL );
 		return;
 	}
+	
+	$tabtpl = get_markup_template("settings_tabs.tpl");
+	$tabs = replace_macros($tabtpl, array(
+		'$account' => array( t('Account settings'), $a->get_baseurl().'/settings'),
+		'$plugins' => array( t('Plugin settings'), $a->get_baseurl().'/settings/addon')
+	));
+		
+	
 
 	if(($a->argc > 1) && ($a->argv[1] === 'addon')) {
-		$o .= '<h1>' . t('Plugin Settings') . '</h1>';
-		$o .= '<div id="account-settings-link"><a href="settings">' . t('Account Settings') . '</a></div>';
-
-		$o .= '<form action="settings/addon" method="post" >';
-
+		$settings_addons = "";
+		
 		$r = q("SELECT * FROM `hook` WHERE `hook` = 'plugin_settings' ");
 		if(! count($r))
-			notice( t('No Plugin settings configured') . EOL);
+			$settings_addons = t('No Plugin settings configured');
 
-		call_hooks('plugin_settings', $o);
-		$o .= '</form>';
+		call_hooks('plugin_settings', $settings_addons);
+		
+		
+		$tpl = get_markup_template("settings_addons.tpl");
+		$o .= replace_macros($tpl, array(
+			'$title'	=> t('Plugin Settings'),
+			'$tabs'		=> $tabs,
+			'$settings_addons' => $settings_addons
+		));
 		return $o;
 	}
 		
@@ -351,7 +363,6 @@ function settings_content(&$a) {
 	}
 	else {
 		$r = null;
-		$imap_disabled = (($mail_disabled) ? ' disabled="disabled" ' : '');
 	}
 
 	$mail_server  = ((count($r)) ? $r[0]['server'] : '');
@@ -364,79 +375,59 @@ function settings_content(&$a) {
 
 	$pageset_tpl = get_markup_template('pagetypes.tpl');
 	$pagetype = replace_macros($pageset_tpl,array(
-		'$normal'         => (($a->user['page-flags'] == PAGE_NORMAL)      ? " checked=\"checked\" " : ""),
-		'$soapbox'        => (($a->user['page-flags'] == PAGE_SOAPBOX)     ? " checked=\"checked\" " : ""),
-		'$community'      => (($a->user['page-flags'] == PAGE_COMMUNITY)   ? " checked=\"checked\" " : ""),
-		'$freelove'       => (($a->user['page-flags'] == PAGE_FREELOVE)    ? " checked=\"checked\" " : ""),
-		'$page_normal'    => PAGE_NORMAL,
-		'$page_soapbox'   => PAGE_SOAPBOX,
-		'$page_community' => PAGE_COMMUNITY,
-		'$page_freelove'  => PAGE_FREELOVE,
-		'$n_l'            => t('Normal Account'),
-		'$n_d'            => t('This account is a normal personal profile'),
-		'$s_l'            => t('Soapbox Account'),
-		'$s_d'            => t('Automatically approve all connection/friend requests as read-only fans'),
-		'$c_l'            => t('Community/Celebrity Account'),
-		'$c_d'            => t('Automatically approve all connection/friend requests as read-write fans'),
-		'$f_l'            => t('Automatic Friend Account'),
-		'$f_d'            => t('Automatically approve all connection/friend requests as friends')		
+		$page_normal 	=> array('page-flags', t('Normal Account'), PAGE_NORMAL, 
+									t('This account is a normal personal profile'), 
+									($a->user['page-flags'] == PAGE_NORMAL)),
+								
+		$page_soapbox 	=> array('page-flags', t('Soapbox Account'), PAGE_SOAPBOX, 
+									t('Automatically approve all connection/friend requests as read-only fans'), 
+									($a->user['page-flags'] == PAGE_NORMAL)),
+									
+		$page_community	=> array('page-flags', t('Community/Celebrity Account'), PAGE_COMMUNITY, 
+									t('Automatically approve all connection/friend requests as read-write fans'), 
+									($a->user['page-flags'] == PAGE_COMMUNITY)),
+									
+		$page_freelove 	=> array('page-flags', t('Automatic Friend Account'), PAGE_FREELOVE, 
+									t('Automatically approve all connection/friend requests as friends'), 
+									($a->user['page-flags'] == PAGE_FREELOVE)),
 	));
 
 	$noid = get_config('system','no_openid');
 
 	if($noid) {
-		$oidhtml = '';
+		$openid_field = false;
 	}
 	else {
-		$oidhtml = '<label id="settings-openid-label" for="settings-openid" >' . t('OpenID: ') . '</label><input type="text" id="settings-openid" class="openid" name="openid_url" value="$openid" />' . t("&nbsp;\x28Optional\x29 Allow this OpenID to login to this account.");
+		$openid_field = array('openid_url', t('OpenID:'),$openid, t("\x28Optional\x29 Allow this OpenID to login to this account."));
 	}
 
 
+	$opt_tpl = get_markup_template("field_yesno.tpl");
 	if(get_config('system','publish_all')) {
 		$profile_in_dir = '<input type="hidden" name="profile_in_directory" value="1" />';
 	}
 	else {
-		$opt_tpl = get_markup_template("profile-in-directory.tpl");
 		$profile_in_dir = replace_macros($opt_tpl,array(
-			'$desc'         => t('Publish your default profile in your local site directory?'),
-			'$yes_str'      => t('Yes'),
-			'$no_str'       => t('No'),
-			'$yes_selected' => (($profile['publish'])      ? " checked=\"checked\" " : ""),
-			'$no_selected'  => (($profile['publish'] == 0) ? " checked=\"checked\" " : "")
+			'$field' 	=> array('profile_in_directory', t('Publish your default profile in your local site directory?'), $profile['publish'], '', array(t('No'),t('Yes'))),
 		));
 	}
 
 	if(strlen(get_config('system','directory_submit_url'))) {
-		$opt_tpl = get_markup_template("profile-in-netdir.tpl");
-
 		$profile_in_net_dir = replace_macros($opt_tpl,array(
-			'$desc'         => t('Publish your default profile in the global social directory?'),
-			'$yes_str'      => t('Yes'),
-			'$no_str'       => t('No'),
-			'$yes_selected' => (($profile['net-publish'])      ? " checked=\"checked\" " : ""),
-			'$no_selected'  => (($profile['net-publish'] == 0) ? " checked=\"checked\" " : "")
+			'$field' 	=> array('profile_in_netdirectory', t('Publish your default profile in the global social directory?'), $profile['net-publish'], '', array(t('No'),t('Yes'))),
 		));
 	}
 	else
 		$profile_in_net_dir = '';
 
 
-	$opt_tpl = get_markup_template("profile-hide-friends.tpl");
 	$hide_friends = replace_macros($opt_tpl,array(
-		'$desc' => t('Hide your contact/friend list from viewers of your default profile?'),
-		'$yes_str' => t('Yes'),
-		'$no_str' => t('No'),
-		'$yes_selected' => (($profile['hide-friends']) ? " checked=\"checked\" " : ""),
-		'$no_selected' => (($profile['hide-friends'] == 0) ? " checked=\"checked\" " : "")
+			'$field' 	=> array('hide-friends', t('Hide your contact/friend list from viewers of your default profile?'), $profile['hide-friends'], '', array(t('No'),t('Yes'))),
 	));
 
-	$opt_tpl = get_markup_template("profile-hide-wall.tpl");
 	$hide_wall = replace_macros($opt_tpl,array(
-		'$desc' => t('Hide profile details and all your messages from unknown viewers?'),
-		'$yes_str' => t('Yes'),
-		'$no_str' => t('No'),
-		'$yes_selected' => (($a->user['hidewall']) ? " checked=\"checked\" " : ""),
-		'$no_selected' => (($a->user['hidewall'] == 0) ? " checked=\"checked\" " : "")
+			'$field' 	=> array('hidewall',  t('Hide profile details and all your messages from unknown viewers?'), $a->user['hidewall'], '', array(t('No'),t('Yes'))),
+
 	));
 
 
@@ -444,7 +435,6 @@ function settings_content(&$a) {
 
 
 
-	$loc_checked = (($a->user['allow_location'] == 1)      ? " checked=\"checked\" " : "");
 
 	$invisible = (((! $profile['publish']) && (! $profile['net-publish']))
 		? true : false);
@@ -453,24 +443,21 @@ function settings_content(&$a) {
 		info( t('Profile is <strong>not published</strong>.') . EOL );
 
 	
-	$theme_selector = '<select name="theme" id="theme-select" >';
-	$files = glob('view/theme/*');
-
 	$default_theme = get_config('system','theme');
 	if(! $default_theme)
 		$default_theme = 'default';
-
+	
+	$themes = array();
+	$files = glob('view/theme/*');
 	if($files) {
 		foreach($files as $file) {
 			$f = basename($file);
-			$selected = (($f == $_SESSION['theme']) || ($f === $default_theme && (! x($_SESSION,'theme')))
-				? ' selected="selected" ' : '' );
 			$theme_name = ((file_exists($file . '/experimental')) ?  sprintf("%s - \x28Experimental\x29", $f) : $f);
-			$theme_selector .= '<option value="' . $f . '"' . $selected . '>' . $theme_name . '</option>';
+			$themes[$f]=$theme_name;
 		}
 	}
+	$theme_selected = (!x($_SESSION,'theme')? $default_theme : $_SESSION['theme']);
 
-	$theme_selector .= '</select>';
 
 	$subdir = ((strlen($a->get_path())) ? '<br />' . t('or') . ' ' . $a->get_baseurl() . '/profile/' . $nickname : '');
 
@@ -487,87 +474,92 @@ function settings_content(&$a) {
 
 	$celeb = ((($a->user['page-flags'] == PAGE_SOAPBOX) || ($a->user['page-flags'] == PAGE_COMMUNITY)) ? true : false);
 
-	$uexport = '<div id="uexport-link"><a href="uexport" >' . t('Export Personal Data') . '</a></div>';
-
+	
 
 	$o .= replace_macros($stpl,array(
-		'$ptitle' => t('Account Settings'),
-		'$lbl_plug' => t('Plugin Settings'),
-		'$lbl_basic' => t('Basic Settings'),
-		'$lbl_fn' => t('Full Name:'),
-		'$lbl_email' => t('Email Address:'),
-		'$lbl_tz' => t('Your Timezone:'),
-		'$lbl_loc1' => t('Default Post Location:'),
-		'$lbl_loc2' => t('Use Browser Location:'),
-		'$lbl_theme' => t('Display Theme:'),
-		'$submit' => t('Submit'),
-		'$lbl_prv' => t('Security and Privacy Settings'),
-		'$lbl_maxreq' => t('Maximum Friend Requests/Day:'),
-		'$lbl_maxrdesc' => t("\x28to prevent spam abuse\x29"),
-		'$lbl_rempost' => t('Allow friends to post to your profile page:'),
-		'$lbl_exp1' => t("Automatically expire \x28delete\x29 posts older than"),
-		'$lbl_exp2' => t('days'),
-		'$lbl_not1' => t('Notification Settings'),
-		'$lbl_not2' => t('Send a notification email when:'),
-		'$lbl_not3' => t('You receive an introduction'),
-		'$lbl_not4' => t('Your introductions are confirmed'),
-		'$lbl_not5' => t('Someone writes on your profile wall'),
-		'$lbl_not6' => t('Someone writes a followup comment'),
-		'$lbl_not7' => t('You receive a private message'),
-		'$lbl_pass1' => t('Password Settings'),
-		'$lbl_pass2' => t('Leave password fields blank unless changing'),
-		'$lbl_pass3' => t('New Password:'),
-		'$lbl_pass4' => t('Confirm:'),
-		'$lbl_advn' => t('Advanced Page Settings'),
+		'$tabs' 	=> $tabs,
+		'$ptitle' 	=> t('Account Settings'),
+
+		'$submit' 	=> t('Submit'),
 		'$baseurl' => $a->get_baseurl(),
-		'$hide_friends' => $hide_friends,
-		'$hide_wall' => $hide_wall,
-		'$oidhtml' => $oidhtml,
-		'$uexport' => $uexport,
 		'$uid' => local_user(),
-		'$username' => $username,
-		'$openid' => $openid,
-		'$email' => $email,
+		
 		'$nickname_block' => $prof_addr,
-		'$timezone' => $timezone,
-		'$zoneselect' => select_timezone($timezone),
-		'$defloc' => $defloc,
-		'$loc_checked' => $loc_checked,
-		'$profile_in_dir' => $profile_in_dir,
-		'$profile_in_net_dir' => $profile_in_net_dir,
+		'$uexport' => t('Export Personal Data'),
+		
+		
+		'$h_pass' 	=> t('Password Settings'),
+		'$password1'=> array('npassword', t('New Password:'), '', ''),
+		'$password2'=> array('confirm', t('Confirm:'), '', t('Leave password fields blank unless changing')),
+		'$openid'	=> $openid_field,
+		
+		'$h_basic' 	=> t('Basic Settings'),
+		'$username' => array('username',  t('Full Name:'), $username,''),
+		'$email' 	=> array('email', t('Email Address:'), $email, ''),
+		'$timezone' => array('timezone_select' , t('Your Timezone:'), select_timezone($timezone), ''),
+		'$defloc'	=> array('defloc', t('Default Post Location:'), $defloc, ''),
+		'$allowloc' => array('allow_location', t('Use Browser Location:'), ($a->user['allow_location'] == 1), ''),
+		'$theme'	=> array('theme', t('Display Theme:'), $theme_selected, '', $themes),
+
+
+
+		'$h_prv' 	=> t('Security and Privacy Settings'),
+
+		'$maxreq' 	=> array('maxreq', t('Maximum Friend Requests/Day:'), $maxreq ,t("\x28to prevent spam abuse\x29")),
 		'$permissions' => t('Default Post Permissions'),
 		'$permdesc' => t("\x28click to open/close\x29"),
 		'$visibility' => $profile['net-publish'],
 		'$aclselect' => populate_acl($a->user,$celeb),
-		'$sel_notify1' => (($notify & NOTIFY_INTRO)   ? ' checked="checked" ' : ''),
-		'$sel_notify2' => (($notify & NOTIFY_CONFIRM) ? ' checked="checked" ' : ''),
-		'$sel_notify3' => (($notify & NOTIFY_WALL)    ? ' checked="checked" ' : ''),
-		'$sel_notify4' => (($notify & NOTIFY_COMMENT) ? ' checked="checked" ' : ''),
-		'$sel_notify5' => (($notify & NOTIFY_MAIL)    ? ' checked="checked" ' : ''),
-		'$maxreq' => $maxreq,
-		'$expire' => $expire,
-		'$blockw_checked' => (($blockwall) ? '' : ' checked="checked" ' ),
-		'$theme' => $theme_selector,
-		'$pagetype' => $pagetype,
-		'$lbl_imap0' => t('Email/Mailbox Setup'),
+
+		'$blockwall'=> array('blockwall', t('Allow friends to post to your profile page:'), !$blockwall, ''),
+		'$expire'	=> array('expire', t("Automatically expire posts after days:"), $expire, t('If empty, posts will not expire. Expired posts will be deleted')),
+
+		'$profile_in_dir' => $profile_in_dir,
+		'$profile_in_net_dir' => $profile_in_net_dir,
+		'$hide_friends' => $hide_friends,
+		'$hide_wall' => $hide_wall,
+		
+		
+		
+		'$h_not' 	=> t('Notification Settings'),
+		'$lbl_not' 	=> t('Send a notification email when:'),
+		'$notify1'	=> array('notify1', t('You receive an introduction'), ($notify & NOTIFY_INTRO), ''),
+		'$notify2'	=> array('notify1', t('Your introductions are confirmed'), ($notify & NOTIFY_CONFIRM), ''),
+		'$notify3'	=> array('notify1', t('Someone writes on your profile wall'), ($notify & NOTIFY_WALL), ''),
+		'$notify4'	=> array('notify1', t('Someone writes a followup comment'), ($notify & NOTIFY_COMMENT), ''),
+		'$notify5'	=> array('notify1', t('You receive a private message'), ($notify & NOTIFY_MAIL), ''),
+		
+		
+		
+		'$h_imap' => t('Email/Mailbox Setup'),
 		'$imap_desc' => t("If you wish to communicate with email contacts using this service \x28optional\x29, please specify how to connect to your mailbox."),
-		'$lbl_imap1' => t('IMAP server name:'),
-		'$imap_server' => $mail_server,
-		'$lbl_imap2' => t('IMAP port:'),
-		'$imap_port' => $mail_port,
-		'$lbl_imap3' => t("Security \x28TLS or SSL\x29:"),
-		'$imap_ssl' => $mail_ssl,
-		'$lbl_imap4' => t('Email login name:'),
-		'$imap_user' => $mail_user,
-		'$lbl_imap5' => t('Email password:'),
-		'$lbl_imap6' => t("Reply-to address \x28Optional\x29:"),
-		'$imap_replyto' => $mail_replyto,
-		'$lbl_imap7' => t('Send public posts to all email contacts:'),
-		'$lbl_imap8' => t('Last successful email check:'),
-		'$lbl_imap9' => (($mail_chk === '0000-00-00 00:00:00') ? t('never') : datetime_convert('UTC', date_default_timezone_get(), $mail_chk, t('g A l F d Y'))), 
-		'$pubmail_checked' => (($mail_pubmail) ? ' checked="checked" ' : ''),
-		'$mail_disabled' => (($mail_disabled) ? '<div class="info-message">' . t('Email access is disabled on this site.') . '</div>' : ''),
-		'$imap_disabled' => $imap_disabled
+		'$imap_lastcheck' => array('imap_lastcheck', t('Last successful email check:'), $imap_last_check,''),
+		'$mail_disabled' => (($mail_disabled) ? t('Email access is disabled on this site.') : ''),
+		'$mail_server'	=> array('mail_server',  t('IMAP server name:'), $mail_server, ''),
+		'$mail_port'	=> array('mail_port', 	 t('IMAP port:'), $mail_port, ''),
+		'$mail_ssl'		=> array('mail_ssl', 	 t('Security:'), $mail_ssl, '', array( ''=>t('None'), 'TSL'=>'TSL', 'SSL'=>'SSL')),
+		'$mail_user'	=> array('mail_server',  t('Email login name:'), $mail_server, ''),
+		'$mail_pass'	=> array('mail_pass', 	 t('Email password:'), '', ''),
+		'$mail_replyto'	=> array('mail_replyto', t('Reply-to address:'), '', 'Optional'),
+		'$mail_pubmail'	=> array('mail_pubmail', t('Send public posts to all email contacts:'), $mail_pubmail, ''),
+		
+		
+		
+		
+		'$h_advn' => t('Advanced Page Settings'),
+		'$pagetype' => $pagetype,
+		
+
+		
+		
+
+		
+
+
+
+
+		
+
 	));
 
 	call_hooks('settings_form',$o);
diff --git a/view/field_checkbox.tpl b/view/field_checkbox.tpl
index 4a86da7ea..725df4cdf 100644
--- a/view/field_checkbox.tpl
+++ b/view/field_checkbox.tpl
@@ -1,6 +1,6 @@
 	
 	<div class='field checkbox'>
 		<label for='id_$field.0'>$field.1</label>
-		<input type="checkbox" name='$field.0' id='id_$field.0' {{ if $field.2 }}checked="true"{{ endif }}>
+		<input type="checkbox" name='$field.0' id='id_$field.0' value="1" {{ if $field.2 }}checked="true"{{ endif }}>
 		<span class='field_help'>$field.3</span>
 	</div>
diff --git a/view/field_richtext.tpl b/view/field_richtext.tpl
index a5a453d32..c124ee000 100644
--- a/view/field_richtext.tpl
+++ b/view/field_richtext.tpl
@@ -3,42 +3,4 @@
 		<label for='id_$field.0'>$field.1</label>
 		<textarea name='$field.0' id='id_$field.0' class="fieldRichtext">$field.2</textarea>
 		<span class='field_help'>$field.3</span>
-		<script>
-			console.log(typeof tinyMCE);
-			if(typeof tinyMCE == "undefined") {
-				tinyMCE="loading";
-				window.tinyMCEPreInit = {
-					suffix:"",
-					base: baseurl+"/library/tinymce/jscripts/tiny_mce/",
-					query:"",
-				};
-				$(function(){
-					$.getScript(baseurl	+"/library/tinymce/jscripts/tiny_mce/tiny_mce_src.js", function(){
-						tinyMCE.init({
-							theme : "advanced",
-							mode : "specific_textareas",
-							editor_selector: "fieldRichtext",
-							plugins : "bbcode,paste",
-							theme_advanced_buttons1 : "bold,italic,underline,undo,redo,link,unlink,image,forecolor,formatselect,code",
-							theme_advanced_buttons2 : "",
-							theme_advanced_buttons3 : "",
-							theme_advanced_toolbar_location : "top",
-							theme_advanced_toolbar_align : "center",
-							theme_advanced_blockformats : "blockquote,code",
-							paste_text_sticky : true,
-							entity_encoding : "raw",
-							add_unload_trigger : false,
-							remove_linebreaks : false,
-							force_p_newlines : false,
-							force_br_newlines : true,
-							forced_root_block : '',
-							convert_urls: false,
-							content_css: baseurl+"/view/custom_tinymce.css",
-							theme_advanced_path : false,
-						});
-					});
-				});
-			}
-		</script>
-		
 	</div>
diff --git a/view/pagetypes.tpl b/view/pagetypes.tpl
index b27025579..d9f873ea0 100644
--- a/view/pagetypes.tpl
+++ b/view/pagetypes.tpl
@@ -1,25 +1,4 @@
-
-		<div id="settings-normal-wrapper">
-			<label id="settings-normal-label" for="settings-normal">$n_l</label>
-			<input type="radio" name="page-flags" id="settings-normal" $normal_selected value="$page_normal" />
-			<span id="settings-normal-desc">$n_d</span>
-		</div>
-		<div id="settings-normal-break" ></div>	
-		<div id="settings-soapbox-wrapper">
-			<label id="settings-soapbox-label" for="settings-soapbox">$s_l</label>
-			<input type="radio" name="page-flags" id="settings-soapbox" $soapbox_selected value="$page_soapbox" />
-			<span id="settings-soapbox-desc">$s_d</span>
-		</div>
-		<div id="settings-soapbox-break" ></div>	
-		<div id="settings-community-wrapper">
-			<label id="settings-community-label" for="settings-community">$c_l</label>
-			<input type="radio" name="page-flags" id="settings-community" $community_selected value="$page_community" />
-			<span id="settings-community-desc">$c_d</span>
-		</div>
-		<div id="settings-community-break" ></div>	
-		<div id="settings-freelove-wrapper">
-			<label id="settings-freelove-label" for="settings-freelove">$f_l</label>
-			<input type="radio" name="page-flags" id="settings-freelove" $freelove_selected value="$page_freelove" />
-			<span id="settings-freelove-desc">$f_d</span>
-		</div>
-			<div id="settings-freelove-break" ></div>	
+	{{inc field_radio.tpl with $field=$page_normal }}{{endinc}}
+	{{inc field_radio.tpl with $field=$page_soapbox }}{{endinc}}
+	{{inc field_radio.tpl with $field=$page_community }}{{endinc}}
+	{{inc field_radio.tpl with $field=$page_freelove }}{{endinc}}
diff --git a/view/settings.tpl b/view/settings.tpl
index ca30f5856..50b59cc91 100644
--- a/view/settings.tpl
+++ b/view/settings.tpl
@@ -1,37 +1,21 @@
+$tabs
+
 <h1>$ptitle</h1>
 
 $nickname_block
 
-<div id="plugin-settings-link"><a href="settings/addon">$lbl_plug</a></div>
-
-$uexport
+<div id="uexport-link"><a href="uexport" >$uexport</a></div>
 
 
 <form action="settings" id="settings-form" method="post" autocomplete="off" >
 
 
-<h3 class="settings-heading">$lbl_pass1</h3>
-
-
-<div id="settings-password-wrapper" >
-<p id="settings-password-desc" >
-$lbl_pass2
-</p>
-<label id="settings-password-label" for="settings-password" >$lbl_pass3 </label>
-<input type="password" id="settings-password" name="npassword" />
-</div>
-<div id="settings-password-end" ></div>
+<h3 class="settings-heading">$h_pass</h3>
 
-<div id="settings-confirm-wrapper" >
-<label id="settings-confirm-label" for="settings-confirm" >$lbl_pass4 </label>
-<input type="password" id="settings-confirm" name="confirm" />
-</div>
-<div id="settings-confirm-end" ></div>
+{{inc field_password.tpl with $field=$password1 }}{{endinc}}
+{{inc field_password.tpl with $field=$password2 }}{{endinc}}
 
-<div id="settings-openid-wrapper" >
-	$oidhtml
-</div>
-<div id="settings-openid-end" ></div>
+{{inc field_input.tpl with $field=$openid }}{{endinc}}
 
 
 <div class="settings-submit-wrapper" >
@@ -39,66 +23,27 @@ $lbl_pass2
 </div>
 
 
-<h3 class="settings-heading">$lbl_basic</h3>
-
-<div id="settings-username-wrapper" >
-<label id="settings-username-label" for="settings-username" >$lbl_fn </label>
-<input type="text" name="username" id="settings-username" value="$username" />
-</div>
-<div id="settings-username-end" ></div>
-
-<div id="settings-email-wrapper" >
-<label id="settings-email-label" for="settings-email" >$lbl_email </label>
-<input type="text" name="email" id="settings-email" value="$email" />
-</div>
-<div id="settings-email-end" ></div>
-
-
-
-<div id="settings-timezone-wrapper" >
-<label id="settings-timezone-label" for="timezone_select" >$lbl_tz </label>
-$zoneselect
-</div>
-<div id="settings-timezone-end" ></div>
-
-<div id="settings-defloc-wrapper" >
-<label id="settings-defloc-label" for="settings-defloc" >$lbl_loc1 </label>
-<input type="text" name="defloc" id="settings-defloc" value="$defloc" />
-</div>
-<div id="settings-defloc-end" ></div>
-
-<div id="settings-allowloc-wrapper" >
-<label id="settings-allowloc-label" for="settings-allowloc" >$lbl_loc2 </label>
-<input type="checkbox" name="allow_location" id="settings-allowloc" value="1" $loc_checked />
-</div>
-<div id="settings-allowloc-end" ></div>
-
-
+<h3 class="settings-heading">$h_basic</h3>
 
+{{inc field_input.tpl with $field=$username }}{{endinc}}
+{{inc field_input.tpl with $field=$email }}{{endinc}}
+{{inc field_custom.tpl with $field=$timezone }}{{endinc}}
+{{inc field_input.tpl with $field=$defloc }}{{endinc}}
+{{inc field_checkbox.tpl with $field=$allowloc }}{{endinc}}
+{{inc field_select.tpl with $field=$theme }}{{endinc}}
 
-<div id="settings-theme-select">
-<label id="settings-theme-label" for="theme-select" >$lbl_theme </label>
-$theme
-</div>
-<div id="settings-theme-end"></div>
 
 <div class="settings-submit-wrapper" >
 <input type="submit" name="submit" class="settings-submit" value="$submit" />
 </div>
 
 
-<h3 class="settings-heading">$lbl_prv</h3>
+<h3 class="settings-heading">$h_prv</h3>
 
 
 <input type="hidden" name="visibility" value="$visibility" />
 
-<div id="settings-maxreq-wrapper">
-<label id="settings-maxreq-label" for="settings-maxreq" >$lbl_maxreq</label>
-<input id="settings-maxreq" name="maxreq" value="$maxreq" />
-<div id="settings-maxreq-desc">$lbl_maxrdesc</div>
-</div>
-<div id="settings-maxreq-end"></div>
-
+{{inc field_input.tpl with $field=$maxreq }}{{endinc}}
 
 $profile_in_dir
 
@@ -112,7 +57,7 @@ $hide_wall
 	<div id="settings-default-perms-menu" class="fakelink" onClick="openClose('settings-default-perms-select');" >$permissions $permdesc</div>
 	<div id="settings-default-perms-menu-end"></div>
 
-	<div id="settings-default-perms-select" style="display: none;" >
+	<div id="settings-default-perms-select" style="display: none; margin-bottom: 20px" >
 	
 		$aclselect
 
@@ -120,14 +65,10 @@ $hide_wall
 </div>
 <div id="settings-default-perms-end"></div>
 
-<div id="settings-blockw-wrapper" >
-<label id="settings-blockw-label" for="settings-blockw" >$lbl_rempost </label>
-<input type="checkbox" name="blockwall" id="settings-blockw" value="1" $blockw_checked />
-</div>
-<div id="settings-blockw-end" ></div>
+{{inc field_checkbox.tpl with $field=$blockwall }}{{endinc}}
+
+{{inc field_input.tpl with $field=$expire }}{{endinc}}
 
-<div id="settings-expire-desc">$lbl_exp1 <input type="text" size="3" name="expire" value="$expire" /> $lbl_exp2</div>
-<div id="settings-expire-end"></div>
 
 
 <div class="settings-submit-wrapper" >
@@ -136,69 +77,46 @@ $hide_wall
 
 
 
-<h3 class="settings-heading">$lbl_not1</h3>
+<h3 class="settings-heading">$h_not</h3>
 
+<div id="settings-notify-desc">$lbl_not </div>
 
-<div id="settings-notify-wrapper">
-<div id="settings-notify-desc">$lbl_not2 </div>
-<label for="notify1" id="settings-label-notify1">$lbl_not3</label>
-<input id="notify1" type="checkbox" $sel_notify1 name="notify1" value="1" />
-<div id="notify1-end"></div>
-<label for="notify2" id="settings-label-notify2">$lbl_not4</label>
-<input id="notify2" type="checkbox" $sel_notify2 name="notify2" value="2" />
-<div id="notify2-end"></div>
-<label for="notify3" id="settings-label-notify3">$lbl_not5</label>
-<input id="notify3" type="checkbox" $sel_notify3 name="notify3" value="4" />
-<div id="notify3-end"></div>
-<label for="notify4" id="settings-label-notify4">$lbl_not6</label>
-<input id="notify4" type="checkbox" $sel_notify4 name="notify4" value="8" />
-<div id="notify4-end"></div>
-<label for="notify5" id="settings-label-notify5">$lbl_not7</label>
-<input id="notify5" type="checkbox" $sel_notify5 name="notify5" value="16" />
-<div id="notify5-end"></div>
+<div class="group">
+{{inc field_checkbox.tpl with $field=$notify1 }}{{endinc}}
+{{inc field_checkbox.tpl with $field=$notify2 }}{{endinc}}
+{{inc field_checkbox.tpl with $field=$notify3 }}{{endinc}}
+{{inc field_checkbox.tpl with $field=$notify4 }}{{endinc}}
+{{inc field_checkbox.tpl with $field=$notify5 }}{{endinc}}
 </div>
-<div id="settings=notify-end"></div>
+
 
 <div class="settings-submit-wrapper" >
 <input type="submit" name="submit" class="settings-submit" value="$submit" />
 </div>
 
-<h3 class="settings-imap">$lbl_imap0</h3>
-<p>
-$imap_desc
-$mail_disabled
-</p>
-<p>
-$lbl_imap8 $lbl_imap9
-</p>
-<label for="imap-server" id="settings-label-imap1">$lbl_imap1</label>
-<input type="text" id="imap-server" name="mail_server" value="$imap_server" $imap_disabled />
-<div id="imap-server-end"></div>
-<label for="imap-port" id="settings-label-imap2">$lbl_imap2</label>
-<input type="text" id="imap-port" name="mail_port" value="$imap_port" $imap_disabled />
-<div id="imap-port-end"></div>
-<label for="imap-ssl" id="settings-label-imap3">$lbl_imap3</label>
-<input type="text" id="imap-ssl" name="mail_ssl" value="$imap_ssl" $imap_disabled />
-<div id="imap-ssl-end"></div>
-<label for="imap-user" id="settings-label-imap4">$lbl_imap4</label>
-<input type="text" id="imap-user" name="mail_user" value="$imap_user" $imap_disabled />
-<div id="imap-user-end"></div>
-<label for="imap-pass" id="settings-label-imap5">$lbl_imap5</label>
-<input type="password" id="imap-pass" name="mail_pass" value="" $imap_disabled />
-<div id="imap-pass-end"></div>
-<label for="imap-replyto" id="settings-label-imap6">$lbl_imap6</label>
-<input type="text" id="imap-replyto" name="mail_replyto" value="$imap_replyto" $imap_disabled />
-<div id="imap-replyto-end"></div>
-<label for="imap-pubmail" id="settings-label-imap7">$lbl_imap7</label>
-<input type="checkbox" name="mail_pubmail" id="imap-pubmail" $pubmail_checked value="1" $imap_disabled />
-<div id="imap-pubmail-end"></div>
+<h3 class="settings-heading">$h_imap</h3>
+{{ if $mail_disabled }}
+	<div class="info-message">$mail_disabled</div>
+{{ else }}
+	<p>$imap_desc</p>
+	{{inc field_custom.tpl with $field=$imap_lastcheck }}{{endinc}}
+	{{inc field_input.tpl with $field=$mail_server }}{{endinc}}
+	{{inc field_input.tpl with $field=$mail_port }}{{endinc}}
+	{{inc field_select.tpl with $field=$mail_ssl }}{{endinc}}
+	{{inc field_input.tpl with $field=$mail_user }}{{endinc}}
+	{{inc field_password.tpl with $field=$mail_pass }}{{endinc}}
+	{{inc field_input.tpl with $field=$mail_replyto }}{{endinc}}
+	{{inc field_checkbox.tpl with $field=$mail_pubmail }}{{endinc}}
+
+	<div class="settings-submit-wrapper" >
+		<input type="submit" name="submit" class="settings-submit" value="$submit" />
+	</div>
+{{ endif }}
+
 
-<div class="settings-submit-wrapper" >
-<input type="submit" name="submit" class="settings-submit" value="$submit" />
-</div>
 
 
-<h3 class="settings-heading">$lbl_advn</h3>
+<h3 class="settings-heading">$h_advn</h3>
 
 $pagetype
 
diff --git a/view/theme/dispy/settings.tpl b/view/theme/dispy/settings.tpl
deleted file mode 100644
index 953e5c3f2..000000000
--- a/view/theme/dispy/settings.tpl
+++ /dev/null
@@ -1,212 +0,0 @@
-<div class="tabs-wrapper">
-	<a class="tabs" id="profile-settings-link"><a href="settings">$ptitle</a>
-	<a class="tabs" id="plugin-settings-link"><a href="settings/addon">$lbl_plug</a>
-<div class="tabs-end"></div>
-</div>
-
-<h1>$ptitle</h1>
-
-
-$uexport
-
-$nickname_block
-
-
-<form action="settings" id="settings-form" method="post" autocomplete="off" >
-
-
-<h3 class="settings-heading">$lbl_pass1</h3>
-
-
-<div id="settings-password-wrapper" >
-<p id="settings-password-desc" >
-$lbl_pass2
-</p>
-<label id="settings-password-label" for="settings-password" >$lbl_pass3 </label>
-<input type="password" id="settings-password" name="npassword" />
-</div>
-<div id="settings-password-end" ></div>
-
-<div id="settings-confirm-wrapper" >
-<label id="settings-confirm-label" for="settings-confirm" >$lbl_pass4 </label>
-<input type="password" id="settings-confirm" name="confirm" />
-</div>
-<div id="settings-confirm-end" ></div>
-
-<div id="settings-openid-wrapper" >
-	$oidhtml
-</div>
-<div id="settings-openid-end" ></div>
-
-
-<div class="settings-submit-wrapper" >
-<input type="submit" name="submit" class="settings-submit" value="$submit" />
-</div>
-
-
-<h3 class="settings-heading">$lbl_basic</h3>
-
-<div id="settings-username-wrapper" >
-<label id="settings-username-label" for="settings-username" >$lbl_fn </label>
-<input type="text" name="username" id="settings-username" value="$username" />
-</div>
-<div id="settings-username-end" ></div>
-
-<div id="settings-email-wrapper" >
-<label id="settings-email-label" for="settings-email" >$lbl_email </label>
-<input type="text" name="email" id="settings-email" value="$email" />
-</div>
-<div id="settings-email-end" ></div>
-
-
-
-<div id="settings-timezone-wrapper" >
-<label id="settings-timezone-label" for="timezone_select" >$lbl_tz </label>
-$zoneselect
-</div>
-<div id="settings-timezone-end" ></div>
-
-<div id="settings-defloc-wrapper" >
-<label id="settings-defloc-label" for="settings-defloc" >$lbl_loc1 </label>
-<input type="text" name="defloc" id="settings-defloc" value="$defloc" />
-</div>
-<div id="settings-defloc-end" ></div>
-
-<div id="settings-allowloc-wrapper" >
-<label id="settings-allowloc-label" for="settings-allowloc" >$lbl_loc2 </label>
-<input type="checkbox" name="allow_location" id="settings-allowloc" value="1" $loc_checked />
-</div>
-<div id="settings-allowloc-end" ></div>
-
-
-
-
-<div id="settings-theme-select">
-<label id="settings-theme-label" for="theme-select" >$lbl_theme </label>
-$theme
-</div>
-<div id="settings-theme-end"></div>
-
-<div class="settings-submit-wrapper" >
-<input type="submit" name="submit" class="settings-submit" value="$submit" />
-</div>
-
-
-<h3 class="settings-heading">$lbl_prv</h3>
-
-
-<input type="hidden" name="visibility" value="$visibility" />
-
-<div id="settings-maxreq-wrapper">
-<label id="settings-maxreq-label" for="settings-maxreq" >$lbl_maxreq</label>
-<input id="settings-maxreq" name="maxreq" value="$maxreq" />
-<div id="settings-maxreq-desc">$lbl_maxrdesc</div>
-</div>
-<div id="settings-maxreq-end"></div>
-
-
-
-
-$profile_in_dir
-
-$profile_in_net_dir
-
-
-<div id="settings-default-perms" class="settings-default-perms" >
-	<div id="settings-default-perms-menu" class="fakelink" onClick="openClose('settings-default-perms-select');" >$permissions $permdesc</div>
-	<div id="settings-default-perms-menu-end"></div>
-
-	<div id="settings-default-perms-select" style="display: none;" >
-	
-		$aclselect
-
-	</div>
-</div>
-<div id="settings-default-perms-end"></div>
-
-<div id="settings-blockw-wrapper" >
-<label id="settings-blockw-label" for="settings-blockw" >$lbl_rempost </label>
-<input type="checkbox" name="blockwall" id="settings-blockw" value="1" $blockw_checked />
-</div>
-<div id="settings-blockw-end" ></div>
-
-
-
-<div id="settings-expire-desc">$lbl_exp1 <input type="text" size="3" name="expire" value="$expire" /> $lbl_exp2</div>
-<div id="settings-expire-end"></div>
-
-
-<div class="settings-submit-wrapper" >
-<input type="submit" name="submit" class="settings-submit" value="Submit" />
-</div>
-
-
-
-<h3 class="settings-heading">$lbl_not1</h3>
-
-
-<div id="settings-notify-wrapper">
-<div id="settings-notify-desc">$lbl_not2 </div>
-<label for="notify1" id="settings-label-notify1">$lbl_not3</label>
-<input id="notify1" type="checkbox" $sel_notify1 name="notify1" value="1" />
-<div id="notify1-end"></div>
-<label for="notify2" id="settings-label-notify2">$lbl_not4</label>
-<input id="notify2" type="checkbox" $sel_notify2 name="notify2" value="2" />
-<div id="notify2-end"></div>
-<label for="notify3" id="settings-label-notify3">$lbl_not5</label>
-<input id="notify3" type="checkbox" $sel_notify3 name="notify3" value="4" />
-<div id="notify3-end"></div>
-<label for="notify4" id="settings-label-notify4">$lbl_not6</label>
-<input id="notify4" type="checkbox" $sel_notify4 name="notify4" value="8" />
-<div id="notify4-end"></div>
-<label for="notify5" id="settings-label-notify5">$lbl_not7</label>
-<input id="notify5" type="checkbox" $sel_notify5 name="notify5" value="16" />
-<div id="notify5-end"></div>
-</div>
-<div id="settings=notify-end"></div>
-
-<div class="settings-submit-wrapper" >
-<input type="submit" name="submit" class="settings-submit" value="$submit" />
-</div>
-
-<h3 class="settings-imap">$lbl_imap0</h3>
-<p>
-$imap_desc
-$mail_disabled
-</p>
-<label for="imap-server" id="settings-label-imap1">$lbl_imap1</label>
-<input type="text" id="imap-server" name="mail_server" value="$imap_server" $imap_disabled />
-<div id="imap-server-end"></div>
-<label for="imap-port" id="settings-label-imap2">$lbl_imap2</label>
-<input type="text" id="imap-port" name="mail_port" value="$imap_port" $imap_disabled />
-<div id="imap-port-end"></div>
-<label for="imap-ssl" id="settings-label-imap3">$lbl_imap3</label>
-<input type="text" id="imap-ssl" name="mail_ssl" value="$imap_ssl" $imap_disabled />
-<div id="imap-ssl-end"></div>
-<label for="imap-user" id="settings-label-imap4">$lbl_imap4</label>
-<input type="text" id="imap-user" name="mail_user" value="$imap_user" $imap_disabled />
-<div id="imap-user-end"></div>
-<label for="imap-pass" id="settings-label-imap5">$lbl_imap5</label>
-<input type="password" id="imap-pass" name="mail_pass" value="" $imap_disabled />
-<div id="imap-pass-end"></div>
-<label for="imap-replyto" id="settings-label-imap6">$lbl_imap6</label>
-<input type="text" id="imap-replyto" name="mail_replyto" value="$imap_replyto" $imap_disabled />
-<div id="imap-replyto-end"></div>
-<label for="imap-pubmail" id="settings-label-imap7">$lbl_imap7</label>
-<input type="checkbox" name="mail_pubmail" id="imap-pubmail" $pubmail_checked value="1" $imap_disabled />
-<div id="imap-pubmail-end"></div>
-
-<div class="settings-submit-wrapper" >
-<input type="submit" name="submit" class="settings-submit" value="$submit" />
-</div>
-
-
-<h3 class="settings-heading">$lbl_advn</h3>
-
-$pagetype
-
-<div class="settings-submit-wrapper" >
-<input type="submit" name="submit" class="settings-submit" value="$submit" />
-</div>
-
-
diff --git a/view/theme/dispy/style.css b/view/theme/dispy/style.css
index 49586e307..c04a67ec9 100644
--- a/view/theme/dispy/style.css
+++ b/view/theme/dispy/style.css
@@ -741,6 +741,13 @@ div[id$="wrapper"] br { clear: left; }
 /**
  * 	register, settings & profile forms
  */
+#id_openid_url,
+.openid {
+   background: url(login-bg.gif) no-repeat;
+   background-position: 0 50%;
+   padding-left: 18px;
+}
+ 
 #settings-nickname-desc {
 	background-color: #DDEFFF;
 	-webkit-border-radius: 5px;
@@ -750,20 +757,17 @@ div[id$="wrapper"] br { clear: left; }
 }
 
 #register-form div,
-#profile-edit-form div,
-#settings-form  div { 
+#profile-edit-form div { 
 	clear: both;
 }
 
 #register-form label,
-#profile-edit-form label,
-#settings-form label {
+#profile-edit-form label {
 	width: 300px; float: left;
 }
 
 #register-form span,
-#profile-edit-form span,
-#settings-form span {
+#profile-edit-form span  {
 	color: #555753;
 	display:block;
 	margin-bottom: 20px;
@@ -956,31 +960,6 @@ div[id$="wrapper"] br { clear: left; }
 #adminpage dd {
 	margin-left: 200px;
 }
-
-#adminpage .field {
-	clear: left;
-	margin-bottom: 5px;
-	padding-bottom: 5px;
-}
-
-#adminpage .field label {
-	float: left;
-	width: 200px;
-	font-weight: bold;
-}
-
-#adminpage .field input,
-#adminpage .field textarea {
-	width: 400px;
-}
-#adminpage .field textarea { height: 100px; }
-#adminpage .field_help {
-	display: block;
-	margin-left: 200px;
-	color: #666666;
-	
-}
-
 #adminpage h3 {
 	border-bottom: 1px solid #cccccc;
 }
@@ -1013,6 +992,67 @@ div[id$="wrapper"] br { clear: left; }
 #adminpage .selectall { text-align: right; }
 
 /**
+ * Form fields
+ */
+.field {
+	margin-bottom: 10px;
+	padding-bottom: 10px;
+	overflow: auto;
+	width: 100%
+}
+
+.field label {
+	float: left;
+	width: 200px;
+}
+
+.field input,
+.field textarea {
+	width: 400px;
+}
+.field textarea { height: 100px; }
+.field_help {
+	display: block;
+	margin-left: 200px;
+	color: #666666;
+	
+}
+
+
+.field .onoff {
+	float: left;
+	width: 80px;
+}
+.field .onoff a {
+	display: block;
+	border:1px solid #666666;
+	background-image:url("../../../images/onoff.jpg");
+	background-repeat: no-repeat;
+	padding: 4px 2px 2px 2px;
+	height: 16px;
+	text-decoration: none;
+}
+.field .onoff .off {
+	border-color:#666666;
+	padding-left: 40px;
+	background-position: left center;
+	background-color: #cccccc;
+	color: #666666;
+	text-align: right;
+}
+.field .onoff .on {
+	border-color:#204A87;
+	padding-right: 40px;
+	background-position: right center;
+	background-color: #3465A4;
+	color: #FFFFFF;
+	text-align: left;
+}
+.hidden { display: none!important; }
+
+.field.radio .field_help { margin-left: 0px; }
+
+/**
  * ICONS
  */
 .icon {
diff --git a/view/theme/duepuntozero/style.css b/view/theme/duepuntozero/style.css
index 4df36b4a9..0ff41c92b 100644
--- a/view/theme/duepuntozero/style.css
+++ b/view/theme/duepuntozero/style.css
@@ -27,6 +27,7 @@ input {
 
 img { border :0px; }
 
+#id_openid_url,
 .openid {
    background: url(login-bg.gif) no-repeat;
    background-position: 0 50%;
@@ -402,130 +403,7 @@ input#dfrn-url {
 	margin-left: 50px;
 }
 
-#settings-nick-wrapper {
-	margin-top: 20px;
-
-}
-
-#settings-expire-end {
-	margin-bottom: 30px;
-}
-
-#settings-username-end,
-#settings-email-end,
-#settings-nick-end,
-#settings-defloc-end,
-#settings-allowloc-end,
-#settings-blockw-end,
-#settings-timezone-end,
-#settings-theme-end,
-#settings-password-end,
-#settings-confirm-end,
-#settings-openid-end,
-#settings-maxreq-end,
-#notify1-end,
-#notify2-end,
-#notify3-end,
-#notify4-end,
-#notify5-end,
-#imap-server-end,
-#imap-port-end,
-#imap-ssl-end,
-#imap-user-end,
-#imap-pass-end,
-#imap-replyto-end,
-#imap-pubmail-end {
-	margin-bottom: 5px;
-	clear: both;
-}
-
-#settings-username-label,
-#settings-email-label,
-#settings-nick-label,
-#settings-defloc-label,
-#settings-allowloc-label,
-#settings-blockw-label,
-#settings-timezone-label,
-#settings-theme-label,
-#settings-password-label,
-#settings-confirm-label,
-#settings-openid-label,
-#settings-maxreq-label,
-#settings-label-notify1,
-#settings-label-notify2,
-#settings-label-notify3,
-#settings-label-notify4,
-#settings-label-notify5,
-#settings-label-imap1,
-#settings-label-imap2,
-#settings-label-imap3,
-#settings-label-imap4,
-#settings-label-imap5,
-#settings-label-imap6,
-#settings-label-imap7 {
-	float: left;
-	width: 200px;
-}
-
-#settings-username,
-#settings-email,
-#settings-nick,
-#settings-defloc,
-#settings-allowloc,
-#settings-blockw,
-#timezone-select,
-#theme-select,
-#settings-password,
-#settings-confirm,
-#settings-maxreq,
-#notify1,
-#notify2,
-#notify3,
-#notify4,
-#notify5,
-#imap-server,
-#imap-port,
-#imap-ssl,
-#imap-user,
-#imap-pass,
-#imap-replyto,
-#imap-pubmail {
-	float: left;
-	margin-bottom: 20px;
-}
-
-#settings-openid {
-	float: left;
-	margin-bottom: 20px;
-	width: 127px;
-}
-	
-#settings-maxreq-desc {
-	float: left;
-	margin-left: 20px;
-}
 
-#settings-theme-label,
-#settings-defloc-label {
-	margin-top: 20px;
-}
-
-#settings-defloc {
-	margin-top: 20px;
-}
-
-
-#theme-select {
-	margin-top: 20px;
-	width: 207px;
-}
-#settings-notify-desc {
-	margin-top: 20px;
-	margin-bottom: 20px;
-}
-#settings-nick-desc {
-	width: 500px;
-}
 
 #cropimage-wrapper, #cropimage-preview-wrapper {
 	float: left;
@@ -1588,30 +1466,6 @@ input#dfrn-url {
 	width: 180px;
 }
 
-
-/*
-.profile-tabs {
-	float: left;
-	padding: 4px;
-	margin-top: 10px;
-	margin-bottom: 10px;
-	margin-right: 5px;
-	font-size: 0.8em;
-	font-weight: bold;
-	background-color: #ECECEC;
-	border: 1px solid #858585;
-}
-.profile-tabs:hover {
-	background-color: #0CBEFE;
-	color: #F5F6FB;
-	border: 1px solid #F5F6FB;
-}
-
-
-#profile-tabs-end {
-	clear: both;
-}*/
-
 .comment-edit-text-empty {
 	color: gray;
 	height: 30px;
@@ -2582,9 +2436,10 @@ a.mail-list-link {
  * Form fields
  */
 .field {
-	clear: left;
-	margin-bottom: 5px;
-	padding-bottom: 5px;
+	margin-bottom: 10px;
+	padding-bottom: 10px;
+	overflow: auto;
+	width: 100%
 }
 
 .field label {
@@ -2603,7 +2458,40 @@ a.mail-list-link {
 	color: #666666;
 	
 }
- 
+
+
+.field .onoff {
+	float: left;
+	width: 80px;
+}
+.field .onoff a {
+	display: block;
+	border:1px solid #666666;
+	background-image:url("../../../images/onoff.jpg");
+	background-repeat: no-repeat;
+	padding: 4px 2px 2px 2px;
+	height: 16px;
+	text-decoration: none;
+}
+.field .onoff .off {
+	border-color:#666666;
+	padding-left: 40px;
+	background-position: left center;
+	background-color: #cccccc;
+	color: #666666;
+	text-align: right;
+}
+.field .onoff .on {
+	border-color:#204A87;
+	padding-right: 40px;
+	background-position: right center;
+	background-color: #3465A4;
+	color: #FFFFFF;
+	text-align: left;
+}
+.hidden { display: none!important; }
+
+.field.radio .field_help { margin-left: 0px; }
 
 /**
  * ADMIN
diff --git a/view/theme/loozah/style.css b/view/theme/loozah/style.css
index df14a29db..d905b988b 100644
--- a/view/theme/loozah/style.css
+++ b/view/theme/loozah/style.css
@@ -41,12 +41,14 @@ input:hover {
 	cursor: pointer;
 }
 
+#id_openid_url,
 .openid {
    background-color: #ECECEC !important;
    background: url(login-bg.gif) no-repeat;
    background-position: 0 50%;
    padding-left: 18px;
 }
+#id_openid_url:hover,
 .openid:hover {
 	background-color: #0CBEFE !important;
 }
@@ -531,133 +533,6 @@ input#dfrn-url {
 	margin-left: 50px;
 }
 
-#settings-nick-wrapper {
-	margin-bottom: 15px;
-}
-
-#settings-expire-end {
-	margin-bottom: 30px;
-}
-
-#settings-username-end,
-#settings-email-end,
-#settings-nick-end,
-#settings-defloc-end,
-#settings-allowloc-end,
-#settings-blockw-end,
-#settings-timezone-end,
-#settings-theme-end,
-#settings-password-end,
-#settings-confirm-end,
-#settings-openid-end,
-#settings-maxreq-end,
-#notify1-end,
-#notify2-end,
-#notify3-end,
-#notify4-end,
-#notify5-end,
-#imap-server-end,
-#imap-port-end,
-#imap-ssl-end,
-#imap-user-end,
-#imap-pass-end,
-#imap-replyto-end,
-#imap-pubmail-end {
-	margin-bottom: 5px;
-	clear: both;
-}
-
-#settings-username-label,
-#settings-email-label,
-#settings-nick-label,
-#settings-defloc-label,
-#settings-allowloc-label,
-#settings-blockw-label,
-#settings-timezone-label,
-#settings-theme-label,
-#settings-password-label,
-#settings-confirm-label,
-#settings-openid-label,
-#settings-maxreq-label,
-#settings-label-notify1,
-#settings-label-notify2,
-#settings-label-notify3,
-#settings-label-notify4,
-#settings-label-notify5,
-#settings-label-imap1,
-#settings-label-imap2,
-#settings-label-imap3,
-#settings-label-imap4,
-#settings-label-imap5,
-#settings-label-imap6,
-#settings-label-imap7 {
-	float: left;
-	width: 200px;
-}
-
-#settings-username,
-#settings-email,
-#settings-nick,
-#settings-defloc,
-#settings-allowloc,
-#settings-blockw,
-#timezone-select,
-#theme-select,
-#settings-password,
-#settings-confirm,
-#settings-maxreq,
-#notify1,
-#notify2,
-#notify3,
-#notify4,
-#notify5,
-#imap-server,
-#imap-port,
-#imap-ssl,
-#imap-user,
-#imap-pass,
-#imap-replyto,
-#imap-pubmail {
-	float: left;
-	margin-bottom: 20px;
-}
-
-#settings-openid {
-	float: left;
-	margin-bottom: 20px;
-	width: 127px;
-}
-	
-#settings-maxreq-desc {
-	float: left;
-	margin-left: 20px;
-}
-
-#settings-theme-label,
-#settings-defloc-label {
-	margin-top: 20px;
-}
-
-#settings-defloc {
-	margin-top: 20px;
-}
-
-
-#theme-select {
-	margin-top: 20px;
-	width: 207px;
-}
-#settings-notify-desc {
-	margin-top: 20px;
-	margin-bottom: 20px;
-}
-#settings-nick-desc {
-	width: 500px;
-}
-
-#settings-nick {
-	margin-bottom: 30px;
-}
 
 #cropimage-wrapper, #cropimage-preview-wrapper {
 	float: left;
@@ -2594,15 +2469,15 @@ a.mail-list-link {
  * Form fields
  */
 .field {
-	clear: left;
-	margin-bottom: 5px;
-	padding-bottom: 5px;
+	margin-bottom: 10px;
+	padding-bottom: 10px;
+	overflow: auto;
+	width: 100%
 }
 
 .field label {
 	float: left;
 	width: 200px;
-	font-weight: bold;
 }
 
 .field input,
@@ -2618,6 +2493,40 @@ a.mail-list-link {
 }
 
 
+.field .onoff {
+	float: left;
+	width: 80px;
+}
+.field .onoff a {
+	display: block;
+	border:1px solid #666666;
+	background-image:url("../../../images/onoff.jpg");
+	background-repeat: no-repeat;
+	padding: 4px 2px 2px 2px;
+	height: 16px;
+	text-decoration: none;
+}
+.field .onoff .off {
+	border-color:#666666;
+	padding-left: 40px;
+	background-position: left center;
+	background-color: #cccccc;
+	color: #666666;
+	text-align: right;
+}
+.field .onoff .on {
+	border-color:#204A87;
+	padding-right: 40px;
+	background-position: right center;
+	background-color: #3465A4;
+	color: #FFFFFF;
+	text-align: left;
+}
+.hidden { display: none!important; }
+
+.field.radio .field_help { margin-left: 0px; }
+
+
 /**
  * ADMIN
  */