X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit%2Fstatic%2Ft%2Fbox_preferences.html;h=0181d6db867384ab8c6353998fda9a0131be3c70;hb=8aec1a788f381cbe18eafc729a89b303bec05944;hp=faa26c9de320808b3ac16877670a97de86197a3f;hpb=aafa773c33eef66c0d1836d034419bf96e94c156;p=citadel.git

diff --git a/webcit/static/t/box_preferences.html b/webcit/static/t/box_preferences.html
index faa26c9de..0181d6db8 100644
--- a/webcit/static/t/box_preferences.html
+++ b/webcit/static/t/box_preferences.html
@@ -1,30 +1,33 @@
-<?%("COND:PREF", 1, :"", "", "selected", "")>
-
 <form name="prefform" action="set_preferences" method="post">
 <input type="hidden" name="nonce" value="<?NONCE>">
 <table class="altern">
-<?:("roomlistview")>
 
 <tr class="even"><td><?PREF:DESCR("roomlistview")> </td>
 <td>
-  <input type="radio" name="roomlistview" VALUE="folders" <?%("COND:PREF", 1, :"roomlistview", "folders", "selected", "")> ><?_("Tree (folders) view")></input>
+  <input type="radio" name="roomlistview" VALUE="folders" 
+	 <?%("COND:PREF", 1, :"roomlistview", "folders", "checked", "")> 
+	 ><?_("Tree (folders) view")></input>
   &nbsp;&nbsp;&nbsp;
-  <input type="radio" name="roomlistview" VALUE="rooms" <?%("COND:PREF", 1, :"roomlistview", "rooms", "selected", "")>><?_("Table (rooms) view")></input>
+  <input type="radio" name="roomlistview" VALUE="rooms" <?%("COND:PREF", 1, :"roomlistview", "rooms", "checked", "")><?%("COND:PREF", 1, :"roomlistview", "", "checked", "")>><?_("Table (rooms) view")></input>
 </td>
 </tr>
 
 <tr class="odd">
-  <td><?PREF:DESCR("calhourformat")</td>
+  <td><?PREF:DESCR("calhourformat")></td>
   <td>
-    <input type="radio" name="calhourformat" VALUE="12" <?%("COND:PREF", 1, :"calhourformat", "12", "selected", "")>><?_("12 hour (am/pm)")></input>
+    <input type="radio" name="calhourformat" VALUE="12" 
+	   <?%("COND:PREF", 1, :"calhourformat", "12", "checked", "")>
+	   <?%("COND:PREF", 1, :"calhourformat", "", "checked", "")>
+	   ><?_("12 hour (am/pm)")></input>
     &nbsp;&nbsp;&nbsp;
-    <input type="radio" name="calhourformat" VALUE="24" <?%("COND:PREF", 1, :"calhourformat", "24", "selected", "")> ><?_("24 hour")></input>
+    <input type="radio" name="calhourformat" VALUE="24" <?%("COND:PREF", 1, :"calhourformat", "24", "checked", "")> ><?_("24 hour")></input>
   </td>
 </tr>
 
 
 <tr class="even"><td><?PREF:DESCR("daystart")></td><td>
 <select name="daystart" size="1">
+<?!("COND:PREF", 2, :"calhourformat", "24")>
 <option <?%("COND:PREF", 1, :"daystart", "0", "selected", "")> value="0">0:00</option>
 <option <?%("COND:PREF", 1, :"daystart", "1", "selected", "")> value="1">1:00</option>
 <option <?%("COND:PREF", 1, :"daystart", "2", "selected", "")> value="2">2:00</option>
@@ -33,7 +36,7 @@
 <option <?%("COND:PREF", 1, :"daystart", "5", "selected", "")> value="5">5:00</option>
 <option <?%("COND:PREF", 1, :"daystart", "6", "selected", "")> value="6">6:00</option>
 <option <?%("COND:PREF", 1, :"daystart", "7", "selected", "")> value="7">7:00</option>
-<option <?%("COND:PREF", 1, :"daystart", "8", "selected", "")> value="8">8:00</option>
+<option <?%("COND:PREF", 1, :"daystart", "8", "selected", "")> <?%("COND:PREF", 1, :"daystart", "", "selected", "")> value="8">8:00</option>
 <option <?%("COND:PREF", 1, :"daystart", "9", "selected", "")> value="9">9:00</option>
 <option <?%("COND:PREF", 1, :"daystart", "10", "selected", "")> value="10">10:00</option>
 <option <?%("COND:PREF", 1, :"daystart", "11", "selected", "")> value="11">11:00</option>
@@ -49,12 +52,40 @@
 <option <?%("COND:PREF", 1, :"daystart", "21", "selected", "")> value="21">21:00</option>
 <option <?%("COND:PREF", 1, :"daystart", "22", "selected", "")> value="22">22:00</option>
 <option <?%("COND:PREF", 1, :"daystart", "23", "selected", "")> value="23">23:00</option>
+<?!("X", 2)>
+<?!("COND:PREF", 3, :"calhourformat", "12")>
+<option <?%("COND:PREF", 1, :"daystart", "0", "selected", "")> value="0">12:00</option>
+<option <?%("COND:PREF", 1, :"daystart", "1", "selected", "")> value="1">1:00</option>
+<option <?%("COND:PREF", 1, :"daystart", "2", "selected", "")> value="2">2:00</option>
+<option <?%("COND:PREF", 1, :"daystart", "3", "selected", "")> value="3">3:00</option>
+<option <?%("COND:PREF", 1, :"daystart", "4", "selected", "")> value="4">4:00</option>
+<option <?%("COND:PREF", 1, :"daystart", "5", "selected", "")> value="5">5:00</option>
+<option <?%("COND:PREF", 1, :"daystart", "6", "selected", "")> value="6">6:00</option>
+<option <?%("COND:PREF", 1, :"daystart", "7", "selected", "")> value="7">7:00</option>
+<option <?%("COND:PREF", 1, :"daystart", "8", "selected", "")> <?%("COND:PREF", 1, :"daystart", "", "selected", "")>value="8">8:00</option>
+<option <?%("COND:PREF", 1, :"daystart", "9", "selected", "")> value="9">9:00</option>
+<option <?%("COND:PREF", 1, :"daystart", "10", "selected", "")> value="10">10:00</option>
+<option <?%("COND:PREF", 1, :"daystart", "11", "selected", "")> value="11">11:00</option>
+<option <?%("COND:PREF", 1, :"daystart", "12", "selected", "")> value="12">12:00</option>
+<option <?%("COND:PREF", 1, :"daystart", "13", "selected", "")> value="13"> 1:00</option>
+<option <?%("COND:PREF", 1, :"daystart", "14", "selected", "")> value="14"> 2:00</option>
+<option <?%("COND:PREF", 1, :"daystart", "15", "selected", "")> value="15"> 3:00</option>
+<option <?%("COND:PREF", 1, :"daystart", "16", "selected", "")> value="16"> 4:00</option>
+<option <?%("COND:PREF", 1, :"daystart", "17", "selected", "")> value="17"> 5:00</option>
+<option <?%("COND:PREF", 1, :"daystart", "18", "selected", "")> value="18"> 6:00</option>
+<option <?%("COND:PREF", 1, :"daystart", "19", "selected", "")> value="19"> 7:00</option>
+<option <?%("COND:PREF", 1, :"daystart", "20", "selected", "")> value="20"> 8:00</option>
+<option <?%("COND:PREF", 1, :"daystart", "21", "selected", "")> value="21"> 9:00</option>
+<option <?%("COND:PREF", 1, :"daystart", "22", "selected", "")> value="22">10:00</option>
+<option <?%("COND:PREF", 1, :"daystart", "23", "selected", "")> value="23">11:00</option>
+<?!("X", 3)>
 </select>
 </td></tr>
 
 <tr class="odd">
   <td><?PREF:DESCR("dayend")></td>
   <td><select name="dayend" size="1">
+<?!("COND:PREF", 4, :"calhourformat", "24")>
 <option <?%("COND:PREF", 1, :"dayend", "0", "selected", "")> value="0">0:00</option>
 <option <?%("COND:PREF", 1, :"dayend", "1", "selected", "")> value="1">1:00</option>
 <option <?%("COND:PREF", 1, :"dayend", "2", "selected", "")> value="2">2:00</option>
@@ -73,12 +104,39 @@
 <option <?%("COND:PREF", 1, :"dayend", "15", "selected", "")> value="15">15:00</option>
 <option <?%("COND:PREF", 1, :"dayend", "16", "selected", "")> value="16">16:00</option>
 <option <?%("COND:PREF", 1, :"dayend", "17", "selected", "")> value="17">17:00</option>
-<option <?%("COND:PREF", 1, :"dayend", "18", "selected", "")> value="18">18:00</option>
+<option <?%("COND:PREF", 1, :"dayend", "18", "selected", "")><?%("COND:PREF", 1, :"dayend", "", "selected", "")> value="18">18:00</option>
 <option <?%("COND:PREF", 1, :"dayend", "19", "selected", "")> value="19">19:00</option>
 <option <?%("COND:PREF", 1, :"dayend", "20", "selected", "")> value="20">20:00</option>
 <option <?%("COND:PREF", 1, :"dayend", "21", "selected", "")> value="21">21:00</option>
 <option <?%("COND:PREF", 1, :"dayend", "22", "selected", "")> value="22">22:00</option>
 <option <?%("COND:PREF", 1, :"dayend", "23", "selected", "")> value="23">23:00</option>
+<?!("X", 4)>
+<?!("COND:PREF", 5, :"calhourformat", "12")>
+<option <?%("COND:PREF", 1, :"dayend", "0", "selected", "")> value="0">0:00</option>
+<option <?%("COND:PREF", 1, :"dayend", "1", "selected", "")> value="1">1:00</option>
+<option <?%("COND:PREF", 1, :"dayend", "2", "selected", "")> value="2">2:00</option>
+<option <?%("COND:PREF", 1, :"dayend", "3", "selected", "")> value="3">3:00</option>
+<option <?%("COND:PREF", 1, :"dayend", "4", "selected", "")> value="4">4:00</option>
+<option <?%("COND:PREF", 1, :"dayend", "5", "selected", "")> value="5">5:00</option>
+<option <?%("COND:PREF", 1, :"dayend", "6", "selected", "")> value="6">6:00</option>
+<option <?%("COND:PREF", 1, :"dayend", "7", "selected", "")> value="7">7:00</option>
+<option <?%("COND:PREF", 1, :"dayend", "8", "selected", "")> value="8">8:00</option>
+<option <?%("COND:PREF", 1, :"dayend", "9", "selected", "")> value="9">9:00</option>
+<option <?%("COND:PREF", 1, :"dayend", "10", "selected", "")> value="10">10:00</option>
+<option <?%("COND:PREF", 1, :"dayend", "11", "selected", "")> value="11">11:00</option>
+<option <?%("COND:PREF", 1, :"dayend", "12", "selected", "")> value="12">12:00</option>
+<option <?%("COND:PREF", 1, :"dayend", "13", "selected", "")> value="13"> 1:00</option>
+<option <?%("COND:PREF", 1, :"dayend", "14", "selected", "")> value="14"> 2:00</option>
+<option <?%("COND:PREF", 1, :"dayend", "15", "selected", "")> value="15"> 3:00</option>
+<option <?%("COND:PREF", 1, :"dayend", "16", "selected", "")> value="16"> 4:00</option>
+<option <?%("COND:PREF", 1, :"dayend", "17", "selected", "")> value="17"> 5:00</option>
+<option <?%("COND:PREF", 1, :"dayend", "18", "selected", "")> value="18"><?%("COND:PREF", 1, :"dayend", "", "selected", "")> 6:00</option>
+<option <?%("COND:PREF", 1, :"dayend", "19", "selected", "")> value="19"> 7:00</option>
+<option <?%("COND:PREF", 1, :"dayend", "20", "selected", "")> value="20"> 8:00</option>
+<option <?%("COND:PREF", 1, :"dayend", "21", "selected", "")> value="21"> 9:00</option>
+<option <?%("COND:PREF", 1, :"dayend", "22", "selected", "")> value="22">10:00</option>
+<option <?%("COND:PREF", 1, :"dayend", "23", "selected", "")> value="23">11:00</option>
+<?!("X", 5)>
 </select>
 </td></tr>
 
@@ -88,8 +146,8 @@
   </td>
   <td>
     <select name="weekstart" size="1">
-      <option <?%("COND:PREF", 1, :"weekstart", "0", "selected", "") value="0"><?_("Sunday")></option>
-      <option <?%("COND:PREF", 1, :"weekstart", "1", "selected", "") value="1"><?_("Monday")></option>
+      <option <?%("COND:PREF", 1, :"weekstart", "0", "selected", "")> value="0"><?_("Sunday")></option>
+      <option <?%("COND:PREF", 1, :"weekstart", "1", "selected", "")> value="1"><?_("Monday")></option>
     </select>
   </td>
 </tr>
@@ -108,15 +166,17 @@
 	}
 	</script>
 
-signature
-
-	
-	<input type="radio" id="no_sig" name="use_sig" VALUE="no" checked onChange="show_or_hide_sigbox();" ><?_("No signature")></input>
+	<input type="radio" id="no_sig" name="use_sig" VALUE="no" onChange="show_or_hide_sigbox();" 
+<?%("COND:PREF", 1, "use_sig", "no", "checked", "")><?%("COND:PREF", 1, "use_sig", "", "checked", "")> >
+	  <?_("No signature")>
+        </input>
 	&nbsp,&nbsp;&nbsp;
-	<input type="radio" id="yes_sig" name="use_sig" VALUE="yes" onChange="show_or_hide_sigbox();" >
+	<input type="radio" id="yes_sig" name="use_sig" VALUE="yes" onChange="show_or_hide_sigbox();" 
+	       <?%("COND:PREF", 1, "use_sig", "yes", "checked", "")> >
 		<div id="signature_box"><br>
 		  <textarea name="signature" cols="40" rows="5"><?PREF:VALUE("signature")></textarea>
-		</div></input>
+		</div>
+	</input>
   </td>
 </tr>
 <script type="text/javascript">show_or_hide_sigbox();</script>
@@ -130,11 +190,45 @@ signature
   <tr class="odd">
     <td><?PREF:DESCR("emptyfloors")></td>
     <td>
-      <input type="radio" name="emptyfloors" VALUE="yes" <?%("COND:PREF", 1, :"emptyfloors", "yes", "selected", "")> ><?_("Yes")></input>
+      <input type="radio" name="emptyfloors" VALUE="yes" 
+	     <?%("COND:PREF", 1, :"emptyfloors", "yes", "checked", "")> 
+	     <?%("COND:PREF", 1, :"emptyfloors", "", "checked", "")> 
+	     ><?_("Yes")></input>
       &nbsp;&nbsp;&nbsp;
-      <input type="radio" name="emptyfloors" VALUE="no"  <?%("COND:PREF", 1, :"emptyfloors", "no",  "selected", "")> ><?_("No")></input>
+      <input type="radio" name="emptyfloors" VALUE="no"  <?%("COND:PREF", 1, :"emptyfloors", "no",  "checked", "")> ><?_("No")></input>
 </td>
 </tr>
+
+<tr class="even">
+  <td><?PREF:DESCR("defaultname")></td>
+  <td>
+<select name="defaultname" size=1 id="from_id">
+<?ITERATE("PREF:VALID:EMAIL:NAME", "section_msg_sender_name_select")>
+</select>
+
+  </td>
+</tr>
+
+<tr class="odd">
+  <td><?PREF:DESCR("defaulthandle")></td>
+  <td>
+<select name="defaulthandle" size=1 id="from_id">
+<?ITERATE("PREF:VALID:EMAIL:NAME", "section_msg_handle_select")>
+</select>
+
+  </td>
+</tr>
+
+<tr class="even">
+  <td><?PREF:DESCR("defaultfrom")></td>
+  <td>
+<select name="defaultfrom" size=1>
+<?ITERATE("PREF:VALID:EMAIL:ADDR", "section_msg_sender_from_select")>
+</select>
+  </td>
+</tr>
+
+
 </table>
 
 <div class="buttons">