User Biography display: remove call, do through templates directly.

diff --git a/webcit/static/t/user/list_section.html b/webcit/static/t/user/list_section.html
index 0c5f6823b05e14ec5e14714c02e470708417a7b8..1b7b559c5db6135afb1a3a65b88987d16ab78569 100644 (file)
--- a/webcit/static/t/user/list_section.html
+++ b/webcit/static/t/user/list_section.html
@@ -1,5 +1,5 @@
 <tr class="<?ITERATE:ODDEVEN>"><td>
-    <?!("COND:USERLIST:HAVEBIO", 1)><a href="showuser?who=<?USERLIST:USERNAME('U')>"><?USERLIST:USERNAME('X')></a><?!("X", 1)><??("COND:USERLIST:HAVEBIO", 2)><?USERLIST:USERNAME('X')><??("X", 2)>
+    <?!("COND:USERLIST:HAVEBIO", 1)><a href="do_template?temlpate=user_show?who=<?USERLIST:USERNAME('U')>"><?USERLIST:USERNAME('X')></a><?!("X", 1)><??("COND:USERLIST:HAVEBIO", 2)><?USERLIST:USERNAME('X')><??("X", 2)>
   </td>
 <td><?USERLIST:UID></td>
 <td><?USERLIST:ACCLVLSTR>(<?USERLIST:ACCLVLNO>)</td>

diff --git a/webcit/static/t/view_blog/comment.html b/webcit/static/t/view_blog/comment.html
index a37fdc0e2ce5960fd58c54d05131a5b57c469039..8c118f97777530ddd465c8903c81d0081cec5c63 100644 (file)
--- a/webcit/static/t/view_blog/comment.html
+++ b/webcit/static/t/view_blog/comment.html
@@ -2,8 +2,8 @@
 <div class="blog_comment_header">
 <span>
  <??("COND:MAIL:ANON",1)>
-   <?!("COND:MAIL:SUMM:RFCA", 2)><a href="showuser?who=<?MAIL:SUMM:FROM("Q")>">"<?MAIL:SUMM:FROM("X")>" &lt;<?MAIL:SUMM:RFCA>&gt;</a><?!("X", 2)>
-   <??("COND:MAIL:SUMM:RFCA", 3)><a href="showuser?who=<?MAIL:SUMM:FROM("Q")>"><?MAIL:SUMM:FROM("X")></a> 
+   <?!("COND:MAIL:SUMM:RFCA", 2)><a href="do_template?temlpate=user_show?who=<?MAIL:SUMM:FROM("Q")>">"<?MAIL:SUMM:FROM("X")>" &lt;<?MAIL:SUMM:RFCA>&gt;</a><?!("X", 2)>
+   <??("COND:MAIL:SUMM:RFCA", 3)><a href="do_template?temlpate=user_show?who=<?MAIL:SUMM:FROM("Q")>"><?MAIL:SUMM:FROM("X")></a> 
       <??("X", 3)><?!("COND:MAIL:SUMM:OTHERNODE",4)> @ <?MAIL:SUMM:H_NODE><??("X",4)>
  <??("X", 1)>
 </span>

diff --git a/webcit/static/t/view_blog/post.html b/webcit/static/t/view_blog/post.html
index e0776caa75e348c89902a76eb7e52f30999d7055..868909a44043d83a7431e296d821fe21306fa278 100644 (file)
--- a/webcit/static/t/view_blog/post.html
+++ b/webcit/static/t/view_blog/post.html
@@ -5,8 +5,8 @@
 <div class="blog_post_header">
 <span>
  <??("COND:MAIL:ANON",1)>
-   <?!("COND:MAIL:SUMM:RFCA", 2)><a href="showuser?who=<?MAIL:SUMM:FROM("Q")>">"<?MAIL:SUMM:FROM("X")>" &lt;<?MAIL:SUMM:RFCA>&gt;</a><?!("X", 2)>
-   <??("COND:MAIL:SUMM:RFCA", 3)><a href="showuser?who=<?MAIL:SUMM:FROM("Q")>"><?MAIL:SUMM:FROM("X")></a> 
+   <?!("COND:MAIL:SUMM:RFCA", 2)><a href="do_template?temlpate=user_show?who=<?MAIL:SUMM:FROM("Q")>">"<?MAIL:SUMM:FROM("X")>" &lt;<?MAIL:SUMM:RFCA>&gt;</a><?!("X", 2)>
+   <??("COND:MAIL:SUMM:RFCA", 3)><a href="do_template?temlpate=user_show?who=<?MAIL:SUMM:FROM("Q")>"><?MAIL:SUMM:FROM("X")></a> 
       <??("X", 3)><?!("COND:MAIL:SUMM:OTHERNODE",4)> @ <?MAIL:SUMM:H_NODE><??("X",4)>
  <??("X", 1)>
 </span>

diff --git a/webcit/static/t/view_message.html b/webcit/static/t/view_message.html
index c3b37c672f23c2232b4871ca818a5f90fbd68f96..8e8b5c6d8a47659818529f4791c2315dce933402 100644 (file)
--- a/webcit/static/t/view_message.html
+++ b/webcit/static/t/view_message.html
@@ -6,8 +6,8 @@
  <span><?MAIL:SUMM:DATEFULL></span>
  <?_("from ")>
  <??("COND:MAIL:ANON",1)>
-   <?!("COND:MAIL:SUMM:RFCA", 2)><a href="showuser?who=<?MAIL:SUMM:FROM("Q")>">"<?MAIL:SUMM:FROM("X")>" &lt;<?MAIL:SUMM:RFCA>&gt;</a><?!("X", 2)>
-   <??("COND:MAIL:SUMM:RFCA", 3)><a href="showuser?who=<?MAIL:SUMM:FROM("Q")>"><?MAIL:SUMM:FROM("X")></a> 
+   <?!("COND:MAIL:SUMM:RFCA", 2)><a href="do_template?temlpate=user_show?who=<?MAIL:SUMM:FROM("Q")>">"<?MAIL:SUMM:FROM("X")>" &lt;<?MAIL:SUMM:RFCA>&gt;</a><?!("X", 2)>
+   <??("COND:MAIL:SUMM:RFCA", 3)><a href="do_template?temlpate=user_show?who=<?MAIL:SUMM:FROM("Q")>"><?MAIL:SUMM:FROM("X")></a> 
       <??("X", 3)><?!("COND:MAIL:SUMM:OTHERNODE",4)> @ <?MAIL:SUMM:H_NODE><??("X",4)>
  <??("X", 1)>
  <?!("COND:MAIL:ANON", 4)>****<??("X", 4)>

diff --git a/webcit/static/t/who/bio.html b/webcit/static/t/who/bio.html
index 5f2048d887bd64c3e5ed47fbfb7b773af67c88ab..32eafb0d91ee5a89b5d0317d564c716974b889b7 100644 (file)
--- a/webcit/static/t/who/bio.html
+++ b/webcit/static/t/who/bio.html
@@ -6,25 +6,21 @@
                <ul class="room_actions"></ul>
        </div>
        <div id="navbar"><ul>
-               <li><a href="display_pageWHONAME">
+               <li><a href="display_page?recp=<?BSTR("who", "U")>">
                        <img src="static/webcit_icons/essen/16x16/chat.png" alt="">
-                       <span class="navbar_link">chat</span>
+                       <span class="navbar_link"><?_("Click here to send an instant message to")> <?BSTR("who", "X")> </span>
                </a></li>
-               <?!("WHO:ISME", 2)><li><a href="edit_me">
-                       <img src="static/webcit_icons/essen/16x16/config.png" alt="">
-                       <span class="navbar_link"><?_("edit")></span>
-               </a></li><?!("X", 2)>
        </ul></div>
 </div>
 <div id="content" class="service">
        <div id="bio_page">
                <div id="bio_pic">
-                               <img src="image?name=_userpic_?parm=<?WHO:NAME("X")>">
+               <??("COND:USER:PIC", 1, B"who")><img src="image?name=_userpic_?parm=<?BSTR("who", "U")>" alt=""><??("X", 1)>
                </div>
                <?!("X", 1)>
-               <div id="bio_title"><h1><?WHO:NAME("X")></h1></div>
+               <div id="bio_title"><h1><<?BSTR("who", "X")></h1></div>
                <div id="bio_text">
-                       <?WHO:RBIO("X")>
+       <?USER:BIO(B"who", "FJUSTIFY")>
                </div>
        </div>
 <?=("trailing")>

diff --git a/webcit/static/t/who/iconbar_section.html b/webcit/static/t/who/iconbar_section.html
index 7c3cf766592ed1705c726aab4b8dcf7c1f63bce1..fadb728e95fa09b28fbd79962e968f27c5116267 100644 (file)
--- a/webcit/static/t/who/iconbar_section.html
+++ b/webcit/static/t/who/iconbar_section.html
@@ -1 +1 @@
-<li class="<??("WHO:IDLE", 4)>activeuser<?!("X", 4)><?!("WHO:IDLE", 5)>inactiveuser<?!("X", 5)>"><a href='showuser?who=<?WHO:NAME("U")>'><?WHO:NAME("X")></a></li>
+<li class="<??("WHO:IDLE", 4)>activeuser<?!("X", 4)><?!("WHO:IDLE", 5)>inactiveuser<?!("X", 5)>"><a href="do_template?temlpate=user_show?who=<?WHO:NAME("U")>'><?WHO:NAME("X")></a></li>

diff --git a/webcit/static/t/who/section.html b/webcit/static/t/who/section.html
index 07ffcd373f03132de4ac4ad9a820dd2ba7df9444..7be58d37817532ffe53373dbbdaa500af07f443b 100644 (file)
--- a/webcit/static/t/who/section.html
+++ b/webcit/static/t/who/section.html
@@ -22,7 +22,7 @@
        </td>
        <!--  username (link to user bio/photo page)  -->
        <td>
-               <a href="showuser?who=<?WHO:NAME("U")>"><?WHO:NAME("X")></a>
+               <a href="do_template?temlpate=user_show?who=<?WHO:NAME("U")>"><?WHO:NAME("X")></a>
                <??("WHO:NSESSIONS", 6, 1)>[<?WHO:NSESSIONS>]<?!("X", 6)>
        </td>
        <!-- room -->

diff --git a/webcit/static/t/who/summary_section.html b/webcit/static/t/who/summary_section.html
index fa323dc0a8e38c5a72100b32a76dcc67fe810a6f..09f0a5338249d06f1d18d641c9bcbf3c348257f2 100644 (file)
--- a/webcit/static/t/who/summary_section.html
+++ b/webcit/static/t/who/summary_section.html
@@ -14,7 +14,7 @@
        </td>
        <td>
                <!--  username (link to user bio/photo page)  -->
-               <a href="showuser?who=<?WHO:NAME("U")>"> <?WHO:NAME("X")></a> 
+               <a href="do_template?temlpate=user_show?who=<?WHO:NAME("U")>"> <?WHO:NAME("X")></a> 
                <??("WHO:NSESSIONS", 6, 0, 1)>[<?WHO:NSESSIONS>]<?!("X", 6)>
                <!-- room -->
        </td>

diff --git a/webcit/useredit.c b/webcit/useredit.c
index d728fb1071996348415ccb93b9af0bb565e84b5d..657588a0d019809382e472ab7fc3e90d38f2a0d9 100644 (file)
--- a/webcit/useredit.c
+++ b/webcit/useredit.c
@@ -802,17 +802,10 @@ void _display_edituser(void) {
        display_edituser(NULL, 0);
 }
 
-void showuser(void)
-{
-       output_headers(1, 0, 0, 0, 1, 0);
-       do_template("user_show");
-       end_burst();
-}
 void 
 InitModule_USEREDIT
 (void)
 {
-       WebcitAddUrlHandler(HKEY("showuser"), "", 0, showuser, 0);
        WebcitAddUrlHandler(HKEY("select_user_to_edit"), "", 0, _select_user_to_edit, 0);
        WebcitAddUrlHandler(HKEY("display_edituser"), "", 0, _display_edituser, 0);
        WebcitAddUrlHandler(HKEY("edituser"), "", 0, edituser, 0);