From 2b01bf58f1bb034451069a51d0bf312f383f4bb8 Mon Sep 17 00:00:00 2001 From: Thierry Pasqualier Date: Tue, 14 Aug 2007 08:27:20 +0000 Subject: [PATCH] * cleaning HTML/CSS codes * addition of a global container (div id="global") --- webcit/mainmenu.c | 22 +- webcit/siteconfig.c | 14 +- webcit/static/head.html | 1 + webcit/static/trailing.html | 1 + webcit/static/webcit.css | 586 +----------------------------------- 5 files changed, 25 insertions(+), 599 deletions(-) diff --git a/webcit/mainmenu.c b/webcit/mainmenu.c index e53e883a7..0eda83f50 100644 --- a/webcit/mainmenu.c +++ b/webcit/mainmenu.c @@ -168,9 +168,8 @@ void display_aide_menu(void) wprintf("
"); wprintf("
" - " " - "
"); - + " " + "
"); print_menu_box(_("Global Configuration"), "adminitems", 4, "display_siteconfig", _("Edit site-wide configuration"), @@ -178,18 +177,21 @@ void display_aide_menu(void) "display_netconf", _("Configure replication with other Citadel servers"), "display_smtpqueue", _("View the outbound SMTP queue")); - print_menu_box(_("Shutdown Citadel"), "adminitems", 3, - "server_shutdown?when=now", _("Restart Now"), - "server_shutdown?when=page", _("Restart after paging users"), - "server_shutdown?when=idle", _("Restart when all users are idle")); - - wprintf(""); + wprintf(""); print_menu_box(_("User account management"), "adminitems", 2, "select_user_to_edit", _("Add, change, delete user accounts"), "validate", _("Validate new users")); - wprintf("
"); + wprintf("
"); + + + print_menu_box(_("Shutdown Citadel"), "adminitems", 3, + "server_shutdown?when=now", _("Restart Now"), + "server_shutdown?when=page", _("Restart after paging users"), + "server_shutdown?when=idle", _("Restart when all users are idle")); + + wprintf(""); print_menu_box(_("Rooms and Floors"), "adminitems", 1, "display_floorconfig", _("Add, change, or delete floors")); diff --git a/webcit/siteconfig.c b/webcit/siteconfig.c index 55d945e24..203fdefac 100644 --- a/webcit/siteconfig.c +++ b/webcit/siteconfig.c @@ -39,23 +39,21 @@ void display_siteconfig(void) wprintf(""); wprintf("\n"); - wprintf("\n"); + wprintf("\n"); serv_printf("CONF get"); serv_getln(buf, sizeof buf); if (buf[0] != '1') { - wprintf("
"); - wprintf(""); + wprintf("
"); wprintf(_("Error")); - wprintf("\n"); - wprintf("

\n"); + wprintf("
\n"); wprintf("%s
\n", &buf[4]); wDumpContent(1); + wprintf("\n"); return; } - wprintf("
" - "
"); + wprintf("
"); char *tabnames[] = { _("General"), @@ -655,7 +653,7 @@ void display_siteconfig(void) wprintf(" "); wprintf("\n", _("Cancel")); wprintf("\n"); - wprintf("
\n"); + wprintf("
\n"); wDumpContent(1); } diff --git a/webcit/static/head.html b/webcit/static/head.html index 1aa064098..134e14827 100644 --- a/webcit/static/head.html +++ b/webcit/static/head.html @@ -15,4 +15,5 @@ +
diff --git a/webcit/static/trailing.html b/webcit/static/trailing.html index 38acbdf19..a367cec12 100644 --- a/webcit/static/trailing.html +++ b/webcit/static/trailing.html @@ -3,5 +3,6 @@ Rounded("div.box", "small transparent top bottom"); Rounded("form.box", "small transparent top bottom"); +
diff --git a/webcit/static/webcit.css b/webcit/static/webcit.css index 9cd12ebc6..ecbe063fb 100644 --- a/webcit/static/webcit.css +++ b/webcit/static/webcit.css @@ -16,6 +16,11 @@ body { text-align: center; } +#global { + margin: 0; + padding: 0; +} + #iconbar { /* position:fixed; */ position:absolute; @@ -806,587 +811,6 @@ td li.frameset, .elements li.frameset { background: none; } -@media print { - input#toggler, .toolbar { display: none } -} - - -.treetitle { - padding:2px; - cursor:default; - - font-size: 11px; - color: #000000; -} -.editednode { - padding:2px; - cursor:default; - background-color: #FFFFFF;; - color: #000000; - - font-size: 11px; -} -.editednodeinput { - background-color: #FFFFFF;; - color: #000000; - - width: 150px; - height: 17px; - - border-style: solid; - border-width: 1px; - border-color: #000000; - - font-size: 11px; -} -.treetitleselectedfocused { - padding:2px; - cursor:default; - background-color: highlight; - color: highlighttext; - - font-size: 11px; -} -.treetitleselectedblured { - padding:2px; - cursor:default; - background-color: menu; - color: windowtext; - font-size: 11px; -} - - - -div.auto_complete { - width: 350px; - background: #fff; -} - -div.auto_complete ul { - border:1px solid #888; - margin:0; - padding:0; - width:100%; - list-style-type: none; - background: #fff; -} - -div.auto_complete ul li { - margin:0; - padding:3px; -} - -div.auto_complete ul li.selected { - background-color: #ffc; -} - -div.auto_complete ul strong.highlight { - color: #800; - margin:0; - padding:0; -} - - -.floors_config, .roomops_zap { - border: 0; - background-color: #770000; - width: 100%; -} - -.roomops_cell_label { - background-color: #FFFFFF; -} - -.roomops_cell, .roomops_cell_edit { - background-color: #CCCCCC; -} - -.auth_validate, .event_background, .calendar_background, .calendar_view_background, .graphics_background, .messages_background, .paging_background, .preferences_background, .roomops_background, .sieve_background { - border: 0; - width: 100%; - background-color: #ffffff; -} - -.siteconfig_background { - border: 0; - width: 100%; -} - -.smtpqueue_background, .tabs_background, .useredit_background, .userlist_background, .downloads_background, .vcard_edit_background { - border: 0; - width: 100%; - background-color: #ffffff; -} - -.vcard_edit_background_alt, .roomops_background_alt { - border: 0; - width: 100%; - background-color: #dddddd; -} - - -.box { - width: 98%; - padding: 0px; - background-color: #FFFFFF; -} - -.boxlabel, .boxcontent { - padding: 5px; -} - -.boxlabel { - background-color: #000088; - text-align: center; -} - -#login_screen { - margin: 3%; -} - -.login_content { - background-color: white; -} - -.login_message, .login_hello { - position: relative; - margin-left: auto; - margin-right: auto; - width: 80%; - text-align: center; -} - -.login_image { - display: block; - margin-left: auto; - margin-right: auto; - text-align: center; -} - -.login_message { - color: red; - font-weight: bold; - font-size: 16px; -} - -#login_form { - position: relative; - display: block; - margin-top: 20px; - margin-left: auto; - margin-right: auto; - margin-bottom: 20px; - padding: 6px; - width: 300px; - background-color: #DDDDDD; -} - -#login_form input, #login_form label, #login_form select { - display: block; - float: left; - margin: 6px; -} - -#login_form label { - width: 130px; - text-align: left; -} - -#pname, #uname { - width: 130px; - text-align: left; -} - -#login_form br { - clear: left; -} - -#login_form .logbuttons { - margin-left: auto; - margin-right: auto; -} - -#login_form .logbutton { - width: auto; - text-align: center; -} - -.login_infos { - display: block; - margin-top: 30px; - margin-left: auto; - margin-right: auto; - width: 80% ; - text-align: left; -} - -#address_book_popup { - position: absolute; - top: 100px; - right: 25px; - width: 320px; - height: auto; - z-index: 100; - background-color: #fff; - color: #000; - display: none; - border: 1px solid black; -} - -#address_book_popup_container_div { - position: relative; - width: 100%; - height: 100%; - background-color: #fbf4ca; -} - -#address_book_popup_middle_div { - position: relative; - background-color: #fbf4ca; -} - -#address_book_inner_div { - margin: 5px; -} - -#address_book_inner_div select { - width: 100%; - background-color: #fbf4ca; -} - -.address_book_popup_title { - font-size: 12pt; - background-color: #fbf4ca; - color: #000; -} - -.edit_col, .host_col { - display: none; -} - -.who_is_online .edit_col, .who_is_online .host_col { - display: block; -} - -.message_header, .message_subject { - font-size: 10pt; - color: black; - margin: 0; - padding: 3px; - background-color: #CCCCCC; - text-align: left; -} - -.message_subject { - padding-top: 0; - font-style: italic; - float: left; -} - -.msgbuttons { - float: right; - visibility: hidden; - margin-top: 0; - margin-right: 0; - padding: 0; -} - -#delbutton, .msgbuttons a { - font-size: 7pt; - margin: 1px; - padding: 2px; - padding-left: 5px; - padding-right: 5px; - border-top: 1px solid #CFCFCF; - border-left: 1px solid #CFCFCF; - border-right: 1px solid #808080; - border-bottom: 1px solid #000000; - background-color: #999999; - color: #000000; - font-weight: bold; - text-align: center; -} - -.msgbuttons a span { - display: none; -} - -.msgbuttons a:hover { - background-color: #AAAAAA; - text-decoration: none; -} - -.message_content { - background-color: white; - margin: 0; - padding: 3px; - clear: both; -} - -.message form div label { - display: block; - float: left; - margin: 3px; - width: 9em; - text-align: right; -} - -.message form div input, .message form div select { - margin: 3px; -} - -.imgedit { - vertical-align: middle; -} - -.send_edit_msg { - float: right; - margin-top: 0; - margin-right: 0; - padding-top: 2px; - padding-bottom: 2px; - padding-right: 50px; - padding-left: 50px; -} - -.tablabel { - font-size: 10pt; - font-weight: bold; - color: #000000; -} - -.boxlabel { - font-size: 8pt; - font-weight: bold; - color: #FFFFEE; -} - -.boxlabel a { - color: #FFFFEE; -} - -ul.adminitems { - list-style-type: none; -} - -ul.adminitems li { - list-style: none; - font-size: 13px; -} - -ul.adminitems a { - font-size: 13px; - margin: 5px; - color: #880000; - font-weight: bold; -} - -ul.adminitems span { - display: block; - font-size: 8pt; - color: #000088; -} - - -.customize { - font-size: 8pt; - font-style: italic; - color: #000044; - background-color: #DDDDCC; -} - -.room_banner_room_name { -} - -.room_banner_room_info { -} - -.room_banner_new_messages { -} - -.room_banner_start_page { -} - -.view_name, .search_name, .selectbox, .inputbox { - font-size: 7pt; - background: #444455; - color: #ddddcc; -} - -.menubar_bg { - background-color: #FF0000; -} - - -.roomlist_floor { - font-size: 12pt; - font-weight: bold; - color: #000000; -} - -.roomlist_new { - font-size: 10pt; - color: #880000; - font-weight: bold; -} - -.roomlist_old { - font-size: 10pt; - color: #000088; -} - -.ib_roomlist_floor { - font-size: 8pt; - font-weight: bold; - color: #000000; - cursor: pointer; -} - -.ib_roomlist_new { - font-size: 10px; - color: #880000; - font-weight: bold; - cursor: pointer; -} - -.ib_roomlist_old { - font-size: 10px; - color: #000088; - cursor: pointer; -} - -.mailbox_summary { - font-size: 10pt; - color: #000000; - background-color: #FFFFFF; -} - -.mailbox_summary tr { - width: 100%; -} - -.mailbox_summary td { - border-top: 1px solid darkgrey; -} - -blockquote { - color: navy !important; background-color: RGB(245,245,245) !important; -} -blockquote blockquote { - color: maroon !important; background-color: RGB(235,235,235) !important; -} -blockquote blockquote blockquote { - color: green !important; background-color: RGB(225,225,225) !important; -} -blockquote blockquote blockquote blockquote { - color: purple !important; background-color: RGB(215,215,215) !important; -} -blockquote blockquote blockquote blockquote blockquote { - color: teal !important; background-color: RGB(205,205,205) !important; -} - -blockquote pre { - margin-left: 1%; - margin-right: 1%; -} - - -var sub { - font-style: normal; -} - -.note { - font-size: 85%; - margin-left: 10%; -} - -.toolbar { - text-align: center; -} - -.toolbar IMG { - float: right; -} - -.errormsg { - color: #AA0000; - background: none; - font-weight: bold; - font-style: italic; -} - -.imsg { - color: #aaaaaa; - background: none; - font-weight: bold; - font-style: italic; - text-align: center; -} - -.warning { - color: #FF4500; - background: none; - text-decoration: none; -} - -.error strong { - color: #DC143C; - background: #FFD700; - text-decoration: none; -} - -.warning strong { - color: #FF4500; - background: #FFD700; - text-decoration: none; -} - -.warning a:link, .warning a:visited, .warning a:active { - color: #FF4500; - background: none; - text-decoration: underline; -} - -.error a:link, .error a:visited, .error a:active { - color: #DC143C; - background: none; - text-decoration: underline; -} - -.error strong a:link, .error strong a:visited, .error strong a:active { - color: #DC143C; - background: #FFD700; -} - -.warning strong a:link, .warning strong a:visited, .warning strong a:active { - color: #FF4500; - background: #FFD700; -} - -colgroup.entity { - text-align: center; -} - -.default { - text-decoration: underline; - font-style: normal; -} - -.required { - font-weight: bold; -} - -td li.transitional, .elements li.transitional { - font-weight: lighter; - color: #696969; - background: none; -} - -td li.frameset, .elements li.frameset { - font-weight: lighter; - color: #808080; - background: none; -} @media print { input#toggler, .toolbar { display: none } -- 2.30.2