* Three box with Advanced (on click Advanced icon) are display in the

current room.
it's logical, the same case for some items (for example, it was OK for bio
but not for preferences). I will correct the others.
* HTML/CSS minor change on roomops
* minor change on french translation

diff --git a/webcit/mainmenu.c b/webcit/mainmenu.c
index c271b435f3d999f52285ca4bab08616d759317b1..e595709a4c347b6b337054ae61c759de8d2522e2 100644 (file)
--- a/webcit/mainmenu.c
+++ b/webcit/mainmenu.c
@@ -18,7 +18,7 @@ void display_main_menu(void)
        output_headers(1, 1, 1, 0, 0, 0);
 
        wprintf("<div class=\"fix_scrollbar_bug\">"
-               "<table width=100%%>"
+               "<table class=\"advanced\">"
                "<tr><td colspan=\"2\">\n");
 
        svprintf("BOXTITLE", WCS_STRING, _("Basic commands"));
@@ -26,7 +26,7 @@ void display_main_menu(void)
 
        wprintf("\n"
                "<table border=0 cellspacing=1 cellpadding=1 width=99%%>"
-               "<tr>"
+               "<tr valign=\"top\">"
                "<td>");        /**< start of first column */
 
        wprintf("<ul class=\"adminitems\">");

diff --git a/webcit/po/fr.po b/webcit/po/fr.po
index b2de9599cda241e931587a16a8d1867796857bcd..6884ad7e2d0c2703d639e0158565fab18a677e10 100644 (file)
--- a/webcit/po/fr.po
+++ b/webcit/po/fr.po
@@ -3085,11 +3085,11 @@ msgstr "Une erreur est apparue en récupérant cette partie : %s\n"
 
 #: ../webcit.c:839
 msgid "Make this my start page"
-msgstr "Faire de cette page ma page de départ"
+msgstr "En faire ma page d'accueil"
 
 #: ../webcit.c:858
 msgid "You no longer have a start page selected."
-msgstr "Vous n'avez pas encore choisi de page de départ."
+msgstr "Vous n'avez pas encore choisi de page d'accueil."
 
 #: ../webcit.c:894
 msgid "Authorization Required"

diff --git a/webcit/preferences.c b/webcit/preferences.c
index 079fd6a7a8be2875c4417eb2881502bb72c58d89..2f1e8ac0949b6ac019ed74c400755767ab87f798 100644 (file)
--- a/webcit/preferences.c
+++ b/webcit/preferences.c
@@ -192,39 +192,32 @@ void set_preference(char *key, char *value, int save_to_server) {
  */
 void display_preferences(void)
 {
-       output_headers(1, 1, 2, 0, 0, 0);
+       output_headers(1, 1, 1, 0, 0, 0);
        char ebuf[300];
        char buf[256];
        char calhourformat[16];
        int i;
 
-       wprintf("<div id=\"banner\">\n");
-       wprintf("<img src=\"static/advanpage2_48x.gif\">");
-       wprintf("<h1>");
-       wprintf(_("Preferences and settings"));
-       wprintf("</h1>");
-       wprintf("<ul><li>");
-       offer_start_page();
-       wprintf("</li></ul>\n");
-       wprintf("</div>\n");
-
-       wprintf("<div id=\"content\" class=\"service\">\n");
+        wprintf("<div class=\"box\">\n");
+        wprintf("<div class=\"boxlabel\">");
+        wprintf(_("Preferences and settings"));
+        wprintf("</div>");
 
-       wprintf("<div class=\"fix_scrollbar_bug\">"
-               "<table class=\"preferences_background\"><tr><td>\n");
+        wprintf("<div class=\"boxcontent\">");
 
        /** begin form */
-       wprintf("<center>\n"
-               "<form name=\"prefform\" action=\"set_preferences\" "
-               "method=\"post\">\n"
-               "<table border=0 cellspacing=5 cellpadding=5>\n");
+       wprintf("<form name=\"prefform\" action=\"set_preferences\" "
+               "method=\"post\">\n");
        wprintf("<input type=\"hidden\" name=\"nonce\" value=\"%ld\">\n", WC->nonce);
 
+       /** begin table */
+        wprintf("<table class=\"altern\">\n");
+
        /**
         * Room list view
         */
        get_preference("roomlistview", buf, sizeof buf);
-       wprintf("<tr><td>");
+       wprintf("<tr class=\"even\"><td>");
        wprintf(_("Room list view"));
        wprintf("</td><td>");
 
@@ -232,13 +225,13 @@ void display_preferences(void)
        if (!strcasecmp(buf, "folders")) wprintf(" checked");
        wprintf(">");
        wprintf(_("Tree (folders) view"));
-       wprintf("<br></input>\n");
+       wprintf("</input>&nbsp;&nbsp;&nbsp;");
 
        wprintf("<input type=\"radio\" name=\"roomlistview\" VALUE=\"rooms\"");
        if (!strcasecmp(buf, "rooms")) wprintf(" checked");
        wprintf(">");
        wprintf(_("Table (rooms) view"));
-       wprintf("<br></input>\n");
+       wprintf("</input>\n");
 
        wprintf("</td></tr>\n");
 
@@ -247,7 +240,7 @@ void display_preferences(void)
         */
        get_preference("calhourformat", calhourformat, sizeof calhourformat);
        if (calhourformat[0] == 0) strcpy(calhourformat, "12");
-       wprintf("<tr><td>");
+       wprintf("<tr class=\"odd\"><td>");
        wprintf(_("Calendar hour format"));
        wprintf("</td><td>");
 
@@ -255,13 +248,13 @@ void display_preferences(void)
        if (!strcasecmp(calhourformat, "12")) wprintf(" checked");
        wprintf(">");
        wprintf(_("12 hour (am/pm)"));
-       wprintf("<br></input>\n");
+       wprintf("</input>&nbsp;&nbsp;&nbsp;");
 
        wprintf("<input type=\"radio\" name=\"calhourformat\" VALUE=\"24\"");
        if (!strcasecmp(calhourformat, "24")) wprintf(" checked");
        wprintf(">");
        wprintf(_("24 hour"));
-       wprintf("<br></input>\n");
+       wprintf("</input>\n");
 
        wprintf("</td></tr>\n");
 
@@ -270,28 +263,28 @@ void display_preferences(void)
         */
        get_preference("daystart", buf, sizeof buf);
        if (buf[0] == 0) strcpy(buf, "8");
-       wprintf("<tr><td>");
+       wprintf("<tr class=\"even\"><td>");
        wprintf(_("Calendar day view begins at:"));
        wprintf("</td><td>");
 
-       wprintf("<SELECT NAME=\"daystart\" SIZE=\"1\">\n");
+       wprintf("<select name=\"daystart\" size=\"1\">\n");
        for (i=0; i<=23; ++i) {
 
                if (!strcasecmp(calhourformat, "24")) {
-                       wprintf("<OPTION %s VALUE=\"%d\">%d:00</OPTION>\n",
-                               ((atoi(buf) == i) ? "SELECTED" : ""),
+                       wprintf("<option %s value=\"%d\">%d:00</option>\n",
+                               ((atoi(buf) == i) ? "selected" : ""),
                                i, i
                        );
                }
                else {
-                       wprintf("<OPTION %s VALUE=\"%d\">%s</OPTION>\n",
-                               ((atoi(buf) == i) ? "SELECTED" : ""),
+                       wprintf("<option %s value=\"%d\">%s</option>\n",
+                               ((atoi(buf) == i) ? "selected" : ""),
                                i, hourname[i]
                        );
                }
 
        }
-       wprintf("</SELECT>\n");
+       wprintf("</select>\n");
        wprintf("</td></tr>\n");
 
        /**
@@ -299,28 +292,28 @@ void display_preferences(void)
         */
        get_preference("dayend", buf, sizeof buf);
        if (buf[0] == 0) strcpy(buf, "17");
-       wprintf("<tr><td>");
+       wprintf("<tr class=\"odd\"><td>");
        wprintf(_("Calendar day view ends at:"));
        wprintf("</td><td>");
 
-       wprintf("<SELECT NAME=\"dayend\" SIZE=\"1\">\n");
+       wprintf("<select name=\"dayend\" size=\"1\">\n");
        for (i=0; i<=23; ++i) {
 
                if (!strcasecmp(calhourformat, "24")) {
-                       wprintf("<OPTION %s VALUE=\"%d\">%d:00</OPTION>\n",
-                               ((atoi(buf) == i) ? "SELECTED" : ""),
+                       wprintf("<option %s value=\"%d\">%d:00</option>\n",
+                               ((atoi(buf) == i) ? "selected" : ""),
                                i, i
                        );
                }
                else {
-                       wprintf("<OPTION %s VALUE=\"%d\">%s</OPTION>\n",
-                               ((atoi(buf) == i) ? "SELECTED" : ""),
+                       wprintf("<option %s value=\"%d\">%s</option>\n",
+                               ((atoi(buf) == i) ? "selected" : ""),
                                i, hourname[i]
                        );
                }
 
        }
-       wprintf("</SELECT>\n");
+       wprintf("</select>\n");
        wprintf("</td></tr>\n");
 
        /**
@@ -328,7 +321,7 @@ void display_preferences(void)
         */
        get_preference("use_sig", buf, sizeof buf);
        if (buf[0] == 0) strcpy(buf, "no");
-       wprintf("<tr><td>");
+       wprintf("<tr class=\"even\"><td>");
        wprintf(_("Attach signature to email messages?"));
        wprintf("</td><td>");
 
@@ -348,7 +341,7 @@ void display_preferences(void)
        if (!strcasecmp(buf, "no")) wprintf(" checked");
        wprintf(" onChange=\"show_or_hide_sigbox();\" >");
        wprintf(_("No signature"));
-       wprintf("<br></input>\n");
+       wprintf("</input>&nbsp,&nbsp;&nbsp;\n");
 
        wprintf("<input type=\"radio\" id=\"yes_sig\" name=\"use_sig\" VALUE=\"yes\"");
        if (!strcasecmp(buf, "yes")) wprintf(" checked");
@@ -364,7 +357,7 @@ void display_preferences(void)
                "</div>"
        );
 
-       wprintf("<br></input>\n");
+       wprintf("</input>\n");
 
        wprintf("</td></tr>\n");
 
@@ -376,7 +369,7 @@ void display_preferences(void)
        /** Character set to assume is in use for improperly encoded headers */
        get_preference("default_header_charset", buf, sizeof buf);
        if (buf[0] == 0) strcpy(buf, "UTF-8");
-       wprintf("<tr><td>");
+       wprintf("<tr class=\"odd\"><td>");
        wprintf(_("Default character set for email headers:"));
        wprintf("</td><td>");
        wprintf("<input type=\"text\" NAME=\"default_header_charset\" MAXLENGTH=\"32\" VALUE=\"");
@@ -385,17 +378,22 @@ void display_preferences(void)
        wprintf("</td></tr>");
 
        /** submit buttons */
-       wprintf("</table>\n"
-               "<input type=\"submit\" name=\"change_button\" value=\"%s\">"
+       wprintf("<tr class=\"even buttons\"><td colspan=\"2\">");
+       wprintf("<input type=\"submit\" name=\"change_button\" value=\"%s\">"
                "&nbsp;"
                "<INPUT type=\"submit\" name=\"cancel_button\" value=\"%s\">\n",
                _("Change"),
                _("Cancel")
        );
+       wprintf("</td></tr>");
+
+
+       /** end table */
+       wprintf("</table>\n");
 
        /** end form */
-       wprintf("</form></center>\n");
-       wprintf("</td></tr></table></div>\n");
+       wprintf("</form>\n");
+       wprintf("</div>\n");
        wDumpContent(1);
 }
 

diff --git a/webcit/roomops.c b/webcit/roomops.c
index 51786540942c92e3ef9554835e22625d5d393784..7073d29c3125807de8bc34d59a3a6f6e946b1135 100644 (file)
--- a/webcit/roomops.c
+++ b/webcit/roomops.c
@@ -3136,7 +3136,11 @@ void knrooms(void)
        wprintf("</h1>\n");
 
        /** offer the ability to switch views */
-       wprintf("<form name=\"roomlistomatic\">\n"
+       wprintf("<ul class=\"room_actions\">\n");
+       wprintf("<li class=\"start_page\">");
+       offer_start_page();
+       wprintf("</li>");
+       wprintf("<li><form name=\"roomlistomatic\">\n"
                "<select name=\"newview\" size=\"1\" "
                "OnChange=\"location.href=roomlistomatic.newview.options"
                "[selectedIndex].value\">\n");
@@ -3154,9 +3158,8 @@ void knrooms(void)
        );
 
        wprintf("</select>");
-       wprintf("</form>");
-       offer_start_page();
-       wprintf("</div>\n");
+       wprintf("</form></li>");
+       wprintf("</ul></div>\n");
 
        wprintf("<div id=\"content\" class=\"service\">\n");