From dd67b21597b68eaf9210073c49c552190a1d483c Mon Sep 17 00:00:00 2001
From: cflakes <cflakes@726aef4b-f618-498e-8847-2d620e286838>
Date: Sun, 4 Apr 2010 14:11:22 +0000
Subject: [PATCH] Re-add lost options, fix some space, adjust some captions.

git-svn-id: https://znc.svn.sourceforge.net/svnroot/znc/trunk@1875 726aef4b-f618-498e-8847-2d620e286838
---
 modules/www/webadmin/add_edit_user.tmpl  | 37 +++++++++++++++++++-----
 modules/www/webadmin/settings.tmpl       |  2 +-
 webskins/dark-clouds/pub/dark-clouds.css | 11 +++----
 3 files changed, 35 insertions(+), 15 deletions(-)

diff --git a/modules/www/webadmin/add_edit_user.tmpl b/modules/www/webadmin/add_edit_user.tmpl
index 25a7e72a..447d0b02 100644
--- a/modules/www/webadmin/add_edit_user.tmpl
+++ b/modules/www/webadmin/add_edit_user.tmpl
@@ -23,7 +23,7 @@
 					<div><input type="password" name="password" class="half" /></div>
 				</div>
 				<div class="subsection">
-					<div class="inputlabel">Confirm Password:</div>
+					<div class="inputlabel">Confirm password:</div>
 					<div><input type="password" name="password2" class="half" /></div>
 				</div>
 				<div class="subsection half">
@@ -47,11 +47,11 @@
 		<div class="sectionbg">
 			<div class="sectionbody">
 				<div class="subsection">
-					<div class="inputlabel">Nick:</div>
+					<div class="inputlabel">Nickname:</div>
 					<div><input type="text" name="nick" value="<? VAR Nick ESC=HTML ?>" class="half" maxlength="128" /></div>
 				</div>
 				<div class="subsection">
-					<div class="inputlabel">AltNick:</div>
+					<div class="inputlabel">Alt. Nickname:</div>
 					<div><input type="text" name="altnick" value="<? VAR AltNick ESC=HTML ?>" class="half" maxlength="128" /></div>
 				</div>
 				<div style="clear: both;"></div>
@@ -65,24 +65,24 @@
 				</div>
 				<div style="clear: both;"></div>
 				<div class="subsection">
-					<div class="inputlabel">RealName:</div>
+					<div class="inputlabel">Realname:</div>
 					<div><input type="text" name="realname" value="<? VAR RealName ESC=HTML ?>" class="full" maxlength="256" /></div>
 				</div>
 				<div style="clear: both;"></div>
 
-				<div class="subsection">
 			<? IF VHostLoop ?>
+				<div class="subsection">
 					<div class="inputlabel">VHost:</div>
 					<select name="vhost">
 						<option value="">- Default -</option>
 						<? LOOP VHostLoop ?><option value="<? VAR VHost ESC=HTML ?>"<? IF Checked ?> selected="selected"<? ENDIF ?>><? VAR VHost ESC=HTML ?></option><? ENDLOOP ?>
 					</select>
-			<? ENDIF ?>
 				</div>
 				<div style="clear: both;"></div>
+			<? ENDIF ?>
 
 				<div class="subsection">
-					<div class="inputlabel">QuitMsg:</div>
+					<div class="inputlabel">Quit Message:</div>
 					<div><input type="text" name="quitmsg" value="<? VAR QuitMsg ESC=HTML ?>" class="full" maxlength="256" /></div>
 				</div>
 				<div style="clear: both;"></div>
@@ -95,6 +95,14 @@
 					<br /><span class="info">One server per line, host [+]port[ password]</span>
 				</div>
 				<div style="clear: both;"></div>
+
+				<div class="subsection">
+					<div class="inputlabel">Active:</div>
+					<div><input type="checkbox" name="doconnect" id="doconnect_checkbox"<? IF IRCConnectEnabled ?> checked="checked"<? ENDIF ?> />
+						<label for="doconnect_checkbox">Connect to IRC &amp; automatically re-connect</label></div>
+				</div>
+				<div style="clear: both;"></div>
+
 			</div>
 		</div>
 	</div>
@@ -238,6 +246,21 @@
 </textarea></div>
 					<br /><span class="info">One reply per line. Example: TIME Buy a watch!</span>
 				</div>
+				<div class="subsection">
+					<div class="inputlabel">Skin:</div>
+					<div>
+						<? IF SkinLoop ROWS > 1 ?>
+						<select name="skin">
+							<option value="">- Global -</option>
+							<? LOOP SkinLoop ?>
+							<option value="<? VAR Name ?>"<? IF Checked ?> selected="selected"<? ENDIF ?>><? IF Name == "_default_" ?>Default<? ELSE ?><? VAR Name ?><? ENDIF ?></option>
+							<? ENDLOOP ?>
+						</select>
+						<? ELSE ?>
+						No other skins found
+						<? ENDIF ?>
+					</div>
+				</div>
 				<div style="clear: both;"></div>
 			</div>
 		</div>
diff --git a/modules/www/webadmin/settings.tmpl b/modules/www/webadmin/settings.tmpl
index 683f00ed..fc59eac1 100644
--- a/modules/www/webadmin/settings.tmpl
+++ b/modules/www/webadmin/settings.tmpl
@@ -47,7 +47,7 @@
 					<div>
 						<select name="skin">
 							<? LOOP SkinLoop ?>
-							<option value="<? VAR Name ESC=HTML ?>"<? IF Checked ?> selected="selected"<? ENDIF ?>><? VAR Name ESC=HTML ?></option>
+							<option value="<? VAR Name ESC=HTML ?>"<? IF Checked ?> selected="selected"<? ENDIF ?>><? IF Name == "_default_" ?>Default<? ELSE ?><? VAR Name ?><? ENDIF ?></option>
 							<? ENDLOOP ?>
 						</select>
 					</div>
diff --git a/webskins/dark-clouds/pub/dark-clouds.css b/webskins/dark-clouds/pub/dark-clouds.css
index b68929f1..a0362072 100644
--- a/webskins/dark-clouds/pub/dark-clouds.css
+++ b/webskins/dark-clouds/pub/dark-clouds.css
@@ -62,16 +62,13 @@ h3 {
 .subsection {
 	clear: both;
 	border-top: 1px solid #000;
-	margin: 0 0 1em 0;
-	padding: 8px 10px 0 8px;
+	margin: 0;
+	padding: 8px 10px 5px 8px;
 }
 
 .subsection div {
 	display: inline-block;
-}
-
-.subsection div {
-	padding: 3px 0 0 0;
+	padding-bottom: 3px;
 }
 
 .subsection .inputlabel {
@@ -81,7 +78,7 @@ h3 {
 
 .subsection .info {
 	display: block;
-	margin-top: 3px;
+	margin: 5px 0 2px 0;
 	font-size: 80%;
 }