From 44a282549723dedcd4ce6db409e9a424eb9faa7a Mon Sep 17 00:00:00 2001 From: Thierry Pasqualier Date: Sat, 25 Aug 2007 16:36:17 +0000 Subject: [PATCH] * 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 --- webcit/mainmenu.c | 4 +- webcit/po/fr.po | 4 +- webcit/preferences.c | 90 ++++++++++++++++++++++---------------------- webcit/roomops.c | 11 ++++-- 4 files changed, 55 insertions(+), 54 deletions(-) diff --git a/webcit/mainmenu.c b/webcit/mainmenu.c index c271b435f..e595709a4 100644 --- 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("
" - "" + "
" "
\n"); svprintf("BOXTITLE", WCS_STRING, _("Basic commands")); @@ -26,7 +26,7 @@ void display_main_menu(void) wprintf("\n" "" - "" + "" "
"); /**< start of first column */ wprintf("
    "); diff --git a/webcit/po/fr.po b/webcit/po/fr.po index b2de9599c..6884ad7e2 100644 --- 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 079fd6a7a..2f1e8ac09 100644 --- 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("
    \n"); - wprintf(""); - wprintf("

    "); - wprintf(_("Preferences and settings")); - wprintf("

    "); - wprintf("
    • "); - offer_start_page(); - wprintf("
    \n"); - wprintf("
    \n"); - - wprintf("
    \n"); + wprintf("
    \n"); + wprintf("
    "); + wprintf(_("Preferences and settings")); + wprintf("
    "); - wprintf("
    " - ""); + + + /** end table */ + wprintf("
    \n"); + wprintf("
    "); /** begin form */ - wprintf("
    \n" - "
    \n" - "\n"); + wprintf("\n"); wprintf("\n", WC->nonce); + /** begin table */ + wprintf("
    \n"); + /** * Room list view */ get_preference("roomlistview", buf, sizeof buf); - wprintf("\n"); @@ -247,7 +240,7 @@ void display_preferences(void) */ get_preference("calhourformat", calhourformat, sizeof calhourformat); if (calhourformat[0] == 0) strcpy(calhourformat, "12"); - wprintf("\n"); @@ -270,28 +263,28 @@ void display_preferences(void) */ get_preference("daystart", buf, sizeof buf); if (buf[0] == 0) strcpy(buf, "8"); - wprintf("\n"); /** @@ -299,28 +292,28 @@ void display_preferences(void) */ get_preference("dayend", buf, sizeof buf); if (buf[0] == 0) strcpy(buf, "17"); - wprintf("\n"); /** @@ -328,7 +321,7 @@ void display_preferences(void) */ get_preference("use_sig", buf, sizeof buf); if (buf[0] == 0) strcpy(buf, "no"); - wprintf("\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(""); /** submit buttons */ - wprintf("
    "); + wprintf("
    "); wprintf(_("Room list view")); wprintf(""); @@ -232,13 +225,13 @@ void display_preferences(void) if (!strcasecmp(buf, "folders")) wprintf(" checked"); wprintf(">"); wprintf(_("Tree (folders) view")); - wprintf("
    \n"); + wprintf("   "); wprintf(""); wprintf(_("Table (rooms) view")); - wprintf("
    \n"); + wprintf("\n"); wprintf("
    "); + wprintf("
    "); wprintf(_("Calendar hour format")); wprintf(""); @@ -255,13 +248,13 @@ void display_preferences(void) if (!strcasecmp(calhourformat, "12")) wprintf(" checked"); wprintf(">"); wprintf(_("12 hour (am/pm)")); - wprintf("
    \n"); + wprintf("   "); wprintf(""); wprintf(_("24 hour")); - wprintf("
    \n"); + wprintf("\n"); wprintf("
    "); + wprintf("
    "); wprintf(_("Calendar day view begins at:")); wprintf(""); - wprintf("\n"); for (i=0; i<=23; ++i) { if (!strcasecmp(calhourformat, "24")) { - wprintf("\n", - ((atoi(buf) == i) ? "SELECTED" : ""), + wprintf("\n", + ((atoi(buf) == i) ? "selected" : ""), i, i ); } else { - wprintf("\n", - ((atoi(buf) == i) ? "SELECTED" : ""), + wprintf("\n", + ((atoi(buf) == i) ? "selected" : ""), i, hourname[i] ); } } - wprintf("\n"); + wprintf("\n"); wprintf("
    "); + wprintf("
    "); wprintf(_("Calendar day view ends at:")); wprintf(""); - wprintf("\n"); for (i=0; i<=23; ++i) { if (!strcasecmp(calhourformat, "24")) { - wprintf("\n", - ((atoi(buf) == i) ? "SELECTED" : ""), + wprintf("\n", + ((atoi(buf) == i) ? "selected" : ""), i, i ); } else { - wprintf("\n", - ((atoi(buf) == i) ? "SELECTED" : ""), + wprintf("\n", + ((atoi(buf) == i) ? "selected" : ""), i, hourname[i] ); } } - wprintf("\n"); + wprintf("\n"); wprintf("
    "); + wprintf("
    "); wprintf(_("Attach signature to email messages?")); wprintf(""); @@ -348,7 +341,7 @@ void display_preferences(void) if (!strcasecmp(buf, "no")) wprintf(" checked"); wprintf(" onChange=\"show_or_hide_sigbox();\" >"); wprintf(_("No signature")); - wprintf("
    \n"); + wprintf(" ,  \n"); wprintf("" ); - wprintf("
    \n"); + wprintf("\n"); wprintf("
    "); + wprintf("
    "); wprintf(_("Default character set for email headers:")); wprintf(""); wprintf("
    \n" - "" + wprintf("
    "); + wprintf("" " " "\n", _("Change"), _("Cancel") ); + wprintf("
    \n"); /** end form */ - wprintf("\n"); - wprintf("
\n"); + wprintf("\n"); + wprintf("\n"); wDumpContent(1); } diff --git a/webcit/roomops.c b/webcit/roomops.c index 517865409..7073d29c3 100644 --- a/webcit/roomops.c +++ b/webcit/roomops.c @@ -3136,7 +3136,11 @@ void knrooms(void) wprintf("\n"); /** offer the ability to switch views */ - wprintf("
\n" + wprintf("
    \n"); + wprintf("
  • "); + offer_start_page(); + wprintf("
    • "); + wprintf("
  • \n" ""); - wprintf("
    • "); - offer_start_page(); - wprintf("\n"); + wprintf(""); + wprintf("
\n"); wprintf("
\n"); -- 2.39.2