* display submessages / texts while quoting messages

* sort userlists by name
* escape username for selectbox field

diff --git a/webcit/static/t/aide_usermanagement.html b/webcit/static/t/aide_usermanagement.html
index d72e4c9f026c953078d0cde5a945fc42d8e8814b..76ccbc4aeb72b88389493e86d6dc193690d1995a 100644 (file)
--- a/webcit/static/t/aide_usermanagement.html
+++ b/webcit/static/t/aide_usermanagement.html
@@ -1,4 +1,4 @@
 <ul class="adminitems">
-<li><a href="select_user_to_edit"><?_("Add, change, delete user accounts")></a></li>
+<li><a href="select_user_to_edit?SortBy=1SortOrder=1"><?_("Add, change, delete user accounts")></a></li>
 <li><a href="validate"><?_("Validate new users")></a></li>
 </ul>

diff --git a/webcit/static/t/section_userlist_select.html b/webcit/static/t/section_userlist_select.html
index 56612fca51d8cbc42fb365892280b970e949a55f..593cadeec73a779e7874818ddb8975284da89336 100644 (file)
--- a/webcit/static/t/section_userlist_select.html
+++ b/webcit/static/t/section_userlist_select.html
@@ -1 +1 @@
-<option "<?USERLIST:USERNAME>"<?%("COND:USERNAME", 1, 1, 1, " selected", "")>><?USERLIST:USERNAME("X")></option>
+<option "<?USERLIST:USERNAME("U")>"<?%("COND:USERNAME", 1, 1, 1, " selected", "")>><?USERLIST:USERNAME("X")></option>

diff --git a/webcit/static/t/view_message_replyquote.html b/webcit/static/t/view_message_replyquote.html
index ef7aa5100fed2513c8bac71314642144f3d8b6cc..8e5ca6aaa0d8af63d644fd96be215ebe5646c674 100644 (file)
--- a/webcit/static/t/view_message_replyquote.html
+++ b/webcit/static/t/view_message_replyquote.html
@@ -8,5 +8,7 @@
 <?!("COND:MAIL:ANON",5)><span><?_("from ")>***</span><??("X", 5)>
 <?!("COND:MAIL:SUBJ",6)><span class="message_subject"><?_("Subject:")> <?MAIL:SUMM:SUBJECT></span><?!("X", 6)>
 </div><?ITERATE("MAIL:MIME:ATTACH:ATT", "load_attachments")>  
- <div class="message_content"> <?MAIL:BODY> </div>
+ <div class="message_content"> <?MAIL:BODY>
+ <?!("COND:MAIL:MIME:ATTACH:SUBMESSAGES", 10)><?ITERATE("MAIL:MIME:ATTACH:SUBMESSAGES", "view_message_inline_attach")><?!("X", 10)>
+</div>
 </blockquote>