[vhffs-dev] [909] Fixing display junk.

[subversion@xxxxxxxxxxxxx]

Revision: 909
Author:   beuss
Date:     2007-09-11 05:49:01 +0000 (Tue, 11 Sep 2007)

Log Message:
-----------
Fixing display junk.

Modified Paths:
--------------
    trunk/vhffs-panel/templates/user/mailuser.tmpl
    trunk/vhffs-panel/templates/user/mailuserspam.tmpl
    trunk/vhffs-panel/templates/user/mailuservirus.tmpl
    trunk/vhffs-panel/themes/vhffs/main.css


Modified: trunk/vhffs-panel/templates/user/mailuser.tmpl
===================================================================
--- trunk/vhffs-panel/templates/user/mailuser.tmpl	2007-09-11 05:22:50 UTC (rev 908)
+++ trunk/vhffs-panel/templates/user/mailuser.tmpl	2007-09-11 05:49:01 UTC (rev 909)
@@ -4,18 +4,19 @@
 					</legend>
 					
 					<p>
-						<input name="mail_activate" id="mail_activate" type="checkbox" <tmpl_if name="ACTIV_CHECKED">checked="checked"</tmpl_if> onchange="javascript:Element.toggle('mail_prefs');"/>
+						<input name="mail_activate" id="mail_activate" class="labeled"
+                            type="checkbox"
+                            <tmpl_if name="ACTIV_CHECKED">checked="checked"</tmpl_if>
+                            onchange="javascript:Element.toggle('mail_prefs');"/>
                             <label for="mail_activate"><tmpl_var name="TEXT_MAILACTIV"></label>
 					</p>
                     <div id="mail_prefs"<tmpl_unless name="ACTIV_CHECKED">style="display:none"</tmpl_unless>>
-					<p>
-						<label for="mail_usage">
-							<tmpl_var name="TEXT_MAILINFO2">
-						</label>
-					</p>
+					<p><tmpl_var name="TEXT_MAILINFO2"></p>
 					
 					<p>
-						<input name="mail_usage" id="mail_usage_box" value="1" type="radio" <tmpl_if name="POP_CHECKED">checked="checked"</tmpl_if> onchange="javascript:document.getElementById('mbox_options').style.display='';"/>
+						<input name="mail_usage" id="mail_usage_box" value="1" type="radio"
+                            class="labeled" <tmpl_if name="POP_CHECKED">checked="checked"</tmpl_if>
+                            onchange="javascript:document.getElementById('mbox_options').style.display='';"/>
 						<label for="mail_usage_box" ><tmpl_var name="TEXT_MAILBOX"></label>
 					</p>
 					<div id="mbox_options" <tmpl_unless name="POP_CHECKED">style="display:none"</tmpl_unless>>
@@ -23,7 +24,7 @@
 					</div>
 					<p>
 						<input name="mail_usage" 
-                            id="mail_usage_foward" value="2" 
+                            id="mail_usage_foward" value="2" class="labeled"
                             type="radio" <tmpl_if name="FWD_CHECKED">checked="checked"</tmpl_if>
                             onchange="javascript:document.getElementById('mbox_options').style.display='none';" />
 						<label for="mail_usage_foward"><tmpl_var name="TEXT_MAILFORWARD"></label>

Modified: trunk/vhffs-panel/templates/user/mailuserspam.tmpl
===================================================================
--- trunk/vhffs-panel/templates/user/mailuserspam.tmpl	2007-09-11 05:22:50 UTC (rev 908)
+++ trunk/vhffs-panel/templates/user/mailuserspam.tmpl	2007-09-11 05:49:01 UTC (rev 909)
@@ -1,2 +1,3 @@
-<p><input name="mail_nospam" id="mail_nospam" type="checkbox" <tmpl_var name="ACTIV_CHECKED">/>
+<p><input name="mail_nospam" id="mail_nospam" type="checkbox"
+    class="labeled" <tmpl_var name="ACTIV_CHECKED">/>
     <label for="mail_nospam"><tmpl_var name="TEXT_NOSPAM"></label></p>

Modified: trunk/vhffs-panel/templates/user/mailuservirus.tmpl
===================================================================
--- trunk/vhffs-panel/templates/user/mailuservirus.tmpl	2007-09-11 05:22:50 UTC (rev 908)
+++ trunk/vhffs-panel/templates/user/mailuservirus.tmpl	2007-09-11 05:49:01 UTC (rev 909)
@@ -1,2 +1,3 @@
-<p><input name="mail_novirus" id="mail_novirus" type="checkbox" <tmpl_var name="ACTIV_CHECKED">/>
+<p><input name="mail_novirus" id="mail_novirus" type="checkbox"
+    class="labeled" <tmpl_var name="ACTIV_CHECKED">/>
     <label for="mail_novirus"><tmpl_var name="TEXT_VIRUS"></label></p>

Modified: trunk/vhffs-panel/themes/vhffs/main.css
===================================================================
--- trunk/vhffs-panel/themes/vhffs/main.css	2007-09-11 05:22:50 UTC (rev 908)
+++ trunk/vhffs-panel/themes/vhffs/main.css	2007-09-11 05:49:01 UTC (rev 909)
@@ -297,6 +297,11 @@
     display:inline;
 }
 
+input.labeled + label {
+    float:none;
+    display:inline;
+}
+
 #mailUsage input
 {
 	margin-left: 200px;