From: Art Cancro Date: Mon, 8 Jan 2007 20:05:56 +0000 (+0000) Subject: * Merged Thierry's CSS changes X-Git-Tag: v7.86~3686 X-Git-Url: https://code.citadel.org/?p=citadel.git;a=commitdiff_plain;h=8d8c5af38e5026933ea3b9d5eb1b75f276df1d99 * Merged Thierry's CSS changes * Don't create 'local' anymore ... create 'static.local' --- diff --git a/webcit/Makefile.in b/webcit/Makefile.in index 5d1661e1a..73afa4ef3 100644 --- a/webcit/Makefile.in +++ b/webcit/Makefile.in @@ -102,6 +102,7 @@ install-setupbin: install-bin install-wwwdata: + test -d $(DESTDIR)$(WWWDIR)/static.local || mkdir -p $(DESTDIR)$(WWWDIR)/static.local test -d $(DESTDIR)$(WWWDIR)/static || mkdir -p $(DESTDIR)$(WWWDIR)/static for i in `find static -type f | grep -v .svn`; do \ $(INSTALL) $$i $(DESTDIR)$(WWWDIR)/$$i; \ @@ -120,7 +121,6 @@ install-tinymce: done install-locale: - test -d $(DESTDIR)$(LOCALEDIR)/local || mkdir -p $(DESTDIR)$(LOCALEDIR)/local for i in `find locale -type d | grep -v .svn` \ ; do \ test -d $(DESTDIR)$(LOCALEDIR)/$$i || mkdir -p $(DESTDIR)$(LOCALEDIR)/$$i; \ diff --git a/webcit/auth.c b/webcit/auth.c index d928b8022..474f65d37 100644 --- a/webcit/auth.c +++ b/webcit/auth.c @@ -329,7 +329,7 @@ void validate(void) output_headers(1, 1, 2, 0, 0, 0); wprintf("
\n" - "
" + "
" ""); wprintf(_("Validate new users")); wprintf("
\n\n
\n"); @@ -363,7 +363,7 @@ void validate(void) } wprintf("
" - "
\n"); + "
\n"); wprintf("
"); safestrncpy(user, &buf[4], sizeof user); @@ -461,7 +461,7 @@ void display_changepw(void) output_headers(1, 1, 2, 0, 0, 0); wprintf("
\n" - "
" + "
" ""); wprintf(_("Change your password")); wprintf("" @@ -478,7 +478,7 @@ void display_changepw(void) } wprintf("
" - "
\n"); + "
\n"); wprintf("

"); serv_puts("MESG changepw"); diff --git a/webcit/calendar.c b/webcit/calendar.c index 5353dfa67..d705046d2 100644 --- a/webcit/calendar.c +++ b/webcit/calendar.c @@ -356,7 +356,7 @@ void respond_to_request(void) { output_headers(1, 1, 2, 0, 0, 0); wprintf("
\n"); - wprintf("
" + wprintf("
" ""); wprintf(_("Respond to meeting request")); wprintf("" @@ -417,7 +417,7 @@ void handle_rsvp(void) { output_headers(1, 1, 2, 0, 0, 0); wprintf("
\n"); - wprintf("
" + wprintf("
" ""); wprintf(_("Update your calendar with this RSVP")); wprintf("" @@ -538,7 +538,7 @@ void display_edit_individual_task(icalcomponent *supplied_vtodo, long msgnum) { output_headers(1, 1, 2, 0, 0, 0); wprintf("
\n" - "" + "
" "" "
"); wprintf(_("Edit task")); @@ -548,7 +548,7 @@ void display_edit_individual_task(icalcomponent *supplied_vtodo, long msgnum) { ); wprintf("
" - "
"); + "
"); wprintf("
\n"); wprintf("\n", diff --git a/webcit/calendar_view.c b/webcit/calendar_view.c index 6aea0e0d9..a783a45bd 100644 --- a/webcit/calendar_view.c +++ b/webcit/calendar_view.c @@ -1011,7 +1011,7 @@ void do_tasks_view(void) { icalproperty *p; wprintf("
" - "\n\n" + "
\n\n" "
"); wprintf(_("Name of task")); wprintf(""); diff --git a/webcit/event.c b/webcit/event.c index af670ff59..af9ebe893 100644 --- a/webcit/event.c +++ b/webcit/event.c @@ -71,7 +71,7 @@ void display_edit_individual_event(icalcomponent *supplied_vevent, long msgnum) /** Begin output */ output_headers(1, 1, 2, 0, 0, 0); wprintf("
\n" - "
" + "
" ""); wprintf(_("Add or edit an event")); wprintf("" @@ -109,7 +109,7 @@ void display_edit_individual_event(icalcomponent *supplied_vevent, long msgnum) wprintf("
" - "
\n"); + "
\n"); /************************************************************ * Uncomment this to see the UID in calendar events for debugging diff --git a/webcit/floors.c b/webcit/floors.c index d91928540..bc92b4455 100644 --- a/webcit/floors.c +++ b/webcit/floors.c @@ -29,7 +29,7 @@ void display_floorconfig(char *prepend_html) output_headers(1, 1, 2, 0, 0, 0); wprintf("
\n" - "
" + "
" ""); wprintf(_("Add/change/delete floors")); wprintf("" @@ -46,7 +46,7 @@ void display_floorconfig(char *prepend_html) serv_printf("LFLR"); serv_getln(buf, sizeof buf); if (buf[0] != '1') { - wprintf("
"); + wprintf("
"); wprintf(""); wprintf(_("Error")); wprintf("\n"); diff --git a/webcit/graphics.c b/webcit/graphics.c index 00f256b98..90333ecd3 100644 --- a/webcit/graphics.c +++ b/webcit/graphics.c @@ -22,7 +22,7 @@ void display_graphics_upload(char *description, char *check_cmd, char *uplurl) output_headers(1, 1, 2, 0, 0, 0); wprintf("
\n" - "
" + "
" ""); wprintf(_("Image upload")); wprintf("" @@ -31,7 +31,7 @@ void display_graphics_upload(char *description, char *check_cmd, char *uplurl) ); wprintf("
" - "
\n"); + "
\n"); wprintf("
\n"); diff --git a/webcit/iconbar.c b/webcit/iconbar.c index 75b32a046..d0382c79e 100644 --- a/webcit/iconbar.c +++ b/webcit/iconbar.c @@ -476,7 +476,7 @@ void display_customize_iconbar(void) { output_headers(1, 1, 2, 0, 0, 0); wprintf("
\n" - "
" + "
" ""); wprintf(_("Customize the icon bar")); wprintf("" @@ -485,7 +485,7 @@ void display_customize_iconbar(void) { ); wprintf("
" - "
"); + "
"); wprintf("\n"); diff --git a/webcit/inetconf.c b/webcit/inetconf.c index bee9bc2a8..7ec1fc42f 100644 --- a/webcit/inetconf.c +++ b/webcit/inetconf.c @@ -90,7 +90,7 @@ void display_inetconf(void) output_headers(1, 1, 2, 0, 0, 0); wprintf("
\n"); - wprintf("
"); + wprintf("
"); wprintf(""); wprintf(_("Internet configuration")); wprintf("\n"); diff --git a/webcit/listsub.c b/webcit/listsub.c index 3f7e9cf53..4afb35ebc 100644 --- a/webcit/listsub.c +++ b/webcit/listsub.c @@ -51,7 +51,7 @@ void do_listsub(void) strcpy(subtype, bstr("subtype")); wprintf("
" - "
" + "
" ""); wprintf(_("List subscribe/unsubscribe")); wprintf("

\n"); diff --git a/webcit/mainmenu.c b/webcit/mainmenu.c index 99b29648a..556af35c6 100644 --- a/webcit/mainmenu.c +++ b/webcit/mainmenu.c @@ -200,7 +200,7 @@ void display_aide_menu(void) { output_headers(1, 1, 2, 0, 0, 0); wprintf("
\n" - "
" + "
" ""); wprintf(_("System Administration Menu")); wprintf("" @@ -278,7 +278,7 @@ void display_generic(void) { output_headers(1, 1, 2, 0, 0, 0); wprintf("
\n" - "
" + "
" ""); wprintf(_("Enter a server command")); wprintf("
\n" @@ -286,7 +286,7 @@ void display_generic(void) ); wprintf("
" - "
\n"); + "
\n"); wprintf("
"); wprintf(_("This screen allows you to enter Citadel server commands which are " diff --git a/webcit/messages.c b/webcit/messages.c index c212cb461..9e05d552d 100644 --- a/webcit/messages.c +++ b/webcit/messages.c @@ -966,7 +966,7 @@ void read_message(long msgnum, int printable_view, char *section) { wprintf("
\n"); /** Begin body */ - wprintf("
"); /** @@ -2836,7 +2836,7 @@ void display_enter(void) wprintf("\n"); wprintf("
\n" "
" - "
"); + "
"); /** Now check our actual recipients if there are any */ if (recipient_required) { diff --git a/webcit/netconf.c b/webcit/netconf.c index f3802961a..e4e01f27b 100644 --- a/webcit/netconf.c +++ b/webcit/netconf.c @@ -63,7 +63,7 @@ void display_add_node(void) { output_headers(1, 1, 2, 0, 0, 0); wprintf("
\n"); - wprintf("
"); + wprintf("
"); wprintf(""); wprintf(_("Add a new node")); wprintf(""); @@ -105,7 +105,7 @@ void display_edit_node(void) output_headers(1, 1, 2, 0, 0, 0); wprintf("
\n"); - wprintf("
"); + wprintf("
"); wprintf(""); wprintf(_("Edit node configuration for ")); escputs(node); @@ -171,7 +171,7 @@ void display_netconf(void) output_headers(1, 1, 2, 0, 0, 0); wprintf("
\n"); - wprintf("
"); + wprintf("
"); wprintf(""); wprintf(_("Network configuration")); wprintf("\n"); @@ -184,7 +184,7 @@ void display_netconf(void) wprintf("
\n"); wprintf(""); - wprintf("
"); + wprintf("
"); wprintf(""); wprintf(_("Currently configured nodes")); wprintf("\n"); @@ -224,7 +224,7 @@ void display_confirm_delete_node(void) output_headers(1, 1, 2, 0, 0, 0); wprintf("
\n"); - wprintf("
"); + wprintf("
"); wprintf(""); wprintf(_("Confirm delete")); wprintf("\n"); diff --git a/webcit/paging.c b/webcit/paging.c index 1bc28e488..b05378db7 100644 --- a/webcit/paging.c +++ b/webcit/paging.c @@ -19,7 +19,7 @@ void display_page(void) output_headers(1, 1, 2, 0, 0, 0); wprintf("
\n" - "
" + "
" ""); wprintf(_("Send instant message")); wprintf("" @@ -28,7 +28,7 @@ void display_page(void) ); wprintf("
" - "
\n"); + "
\n"); wprintf(_("Send an instant message to: ")); escputs(recp); diff --git a/webcit/preferences.c b/webcit/preferences.c index 987b2ac2c..2c761b05c 100644 --- a/webcit/preferences.c +++ b/webcit/preferences.c @@ -199,7 +199,7 @@ void display_preferences(void) int i; wprintf("
\n"); - wprintf("
"); + wprintf("
"); wprintf("\""); wprintf(" "); wprintf(_("Preferences and settings")); @@ -210,7 +210,7 @@ void display_preferences(void) "
\n"); wprintf("
" - "
\n"); + "\n"); if (!strcmp(tab, "admin")) { - wprintf("\n"); if (!strcmp(tab, "config")) { - wprintf("\n"); if (!strcmp(tab, "expire")) { - wprintf("\n"); if (!strcmp(tab, "access")) { - wprintf("\n"); if (!strcmp(tab, "sharing")) { - wprintf("\n"); if (!strcmp(tab, "listserv")) { - wprintf("
\n"); /** begin form */ wprintf("
\n" diff --git a/webcit/roomops.c b/webcit/roomops.c index f191a1b5a..b79351d52 100644 --- a/webcit/roomops.c +++ b/webcit/roomops.c @@ -1010,10 +1010,10 @@ void display_editroom(void) "
 "); + wprintf(""); } else { - wprintf(""); + wprintf(""); } wprintf(_("Administration")); if (!strcmp(tab, "admin")) { @@ -1026,10 +1026,10 @@ void display_editroom(void) wprintf(" "); + wprintf(""); } else { - wprintf(""); + wprintf(""); } wprintf(_("Configuration")); if (!strcmp(tab, "config")) { @@ -1042,10 +1042,10 @@ void display_editroom(void) wprintf(" "); + wprintf(""); } else { - wprintf(""); + wprintf(""); } wprintf(_("Message expire policy")); if (!strcmp(tab, "expire")) { @@ -1058,10 +1058,10 @@ void display_editroom(void) wprintf(" "); + wprintf(""); } else { - wprintf(""); + wprintf(""); } wprintf(_("Access controls")); if (!strcmp(tab, "access")) { @@ -1074,10 +1074,10 @@ void display_editroom(void) wprintf(" "); + wprintf(""); } else { - wprintf(""); + wprintf(""); } wprintf(_("Sharing")); if (!strcmp(tab, "sharing")) { @@ -1090,10 +1090,10 @@ void display_editroom(void) wprintf(" "); + wprintf(""); } else { - wprintf(""); + wprintf(""); } wprintf(_("Mailing list service")); if (!strcmp(tab, "listserv")) { @@ -1110,7 +1110,7 @@ void display_editroom(void) /** begin content of whatever tab is open now */ wprintf("
" - "\n" + "
\n" "\n" "
\n"); if (!strcmp(tab, "admin")) { @@ -1360,7 +1360,7 @@ void display_editroom(void) wprintf("
\n"); - wprintf("
"); + wprintf("
"); wprintf(_("Remote node name")); wprintf(""); wprintf(_("Remote room name")); @@ -1405,7 +1405,7 @@ void display_editroom(void) wprintf("
\n"); wprintf("		\n"); - wprintf("
"); + wprintf("
"); wprintf(_("Remote node name")); wprintf(""); wprintf(_("Remote room name")); @@ -1953,7 +1953,7 @@ void display_entroom(void) output_headers(1, 1, 2, 0, 0, 0); wprintf("
\n" - "
" + "
" ""); wprintf(_("Create a new room")); wprintf("" @@ -1962,7 +1962,7 @@ void display_entroom(void) ); wprintf("
" - "
\n"); + "
\n"); wprintf("\n"); @@ -2166,7 +2166,7 @@ void display_private(char *rname, int req_pass) { output_headers(1, 1, 2, 0, 0, 0); wprintf("
\n" - "
" + "
" ""); wprintf(_("Go to a hidden room")); wprintf("" @@ -2258,7 +2258,7 @@ void display_zap(void) output_headers(1, 1, 2, 0, 0, 0); wprintf("
\n"); - wprintf("
"); + wprintf("
"); wprintf(""); wprintf(_("Zap (forget/unsubscribe) the current room")); wprintf("\n"); @@ -2996,7 +2996,7 @@ void knrooms(void) /** title bar */ wprintf("
\n" - "
" + "
" "" ); if (!strcasecmp(listviewpref, "rooms")) { diff --git a/webcit/setup_wizard.c b/webcit/setup_wizard.c index bc2b2277a..76c7ed8e2 100644 --- a/webcit/setup_wizard.c +++ b/webcit/setup_wizard.c @@ -29,7 +29,7 @@ void do_setup_wizard(void) output_headers(1, 1, 2, 0, 0, 0); wprintf("
\n"); - wprintf("
"); + wprintf("
"); wprintf("\""); wprintf(" First time setup"); wprintf(""); diff --git a/webcit/sieve.c b/webcit/sieve.c index d0f275279..e4c97d1d8 100644 --- a/webcit/sieve.c +++ b/webcit/sieve.c @@ -73,7 +73,7 @@ void display_sieve(void) ); wprintf("
\n"); - wprintf("
"); + wprintf("
"); wprintf("" ""); wprintf(_("View/edit server-side mail filters")); @@ -82,7 +82,7 @@ void display_sieve(void) wprintf("\n
\n"); wprintf("
" - "" + "
" "
\n"); @@ -592,7 +592,7 @@ void display_add_remove_scripts(char *message) output_headers(1, 1, 2, 0, 0, 0); wprintf("
\n"); - wprintf("" + wprintf("
" "
" "" ""); diff --git a/webcit/siteconfig.c b/webcit/siteconfig.c index ceb48d1f7..c60e56fff 100644 --- a/webcit/siteconfig.c +++ b/webcit/siteconfig.c @@ -34,7 +34,7 @@ void display_siteconfig(void) output_headers(1, 1, 2, 0, 0, 0); wprintf("
\n" - "
" + "
" ""); wprintf(_("Site configuration")); wprintf("" @@ -45,7 +45,7 @@ void display_siteconfig(void) serv_printf("CONF get"); serv_getln(buf, sizeof buf); if (buf[0] != '1') { - wprintf("
"); + wprintf("
"); wprintf(""); wprintf(_("Error")); wprintf("\n"); @@ -56,7 +56,7 @@ void display_siteconfig(void) } wprintf("
" - "
"); + "
"); char *tabnames[] = { _("General"), diff --git a/webcit/smtpqueue.c b/webcit/smtpqueue.c index b226b986f..d51ec4d78 100644 --- a/webcit/smtpqueue.c +++ b/webcit/smtpqueue.c @@ -225,7 +225,7 @@ void display_smtpqueue(void) ); wprintf("
\n"); - wprintf("
"); + wprintf("
"); wprintf(""); wprintf(_("View the outbound SMTP queue")); wprintf("\n"); @@ -233,7 +233,7 @@ void display_smtpqueue(void) wprintf("\n
\n"); wprintf("
" - "" + "
" "
\n"); wprintf("
"); diff --git a/webcit/static/webcit.css b/webcit/static/webcit.css index 29d710813..099e935c3 100644 --- a/webcit/static/webcit.css +++ b/webcit/static/webcit.css @@ -568,3 +568,38 @@ div.auto_complete ul strong.highlight { } +.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, .iconbar_background, .mainmenu_b +ackground, .messages_background, .paging_background, .preferences_background, .roomops_background, .sieve_background, .siteconfig_backgrou +nd, .smtpqueue_background, .tabs_background, .useredit_background, .userlist_background, .vcard_edit_background, .who_background { + border: 0; + width: 100%; + background-color: #ffffff; +} + +.auth_banner, .event_banner, .floors_banner, .calendar_banner, .graphics_banner, .iconbar_banner, .inetconf_banner, .listsub_banner, .mainmenu_banner, .netconf_banner, .paging_banner, .preferences_banner, .roomops_banner, .setup_banner, .sieve_banner, .siteconfig_banner, .smtpqueue_banner, .summary_banner, .useredit_banner, .userlist_banner, .vcard_edit_banner, .who_banner { + border: 0; + width: 100%; + background-color: #444455; +} + + +.vcard_edit_background_alt { + border: 0; + width: 100%; + background-color: #dddddd; +} + diff --git a/webcit/summary.c b/webcit/summary.c index 3d9940389..13dfdf70a 100644 --- a/webcit/summary.c +++ b/webcit/summary.c @@ -251,7 +251,7 @@ void summary(void) { output_headers(1, 1, 2, 0, 0, 0); wprintf("
\n"); - wprintf("" + wprintf("
" "
" "" ); diff --git a/webcit/tabs.c b/webcit/tabs.c index 9c00bc99d..f0c72b069 100644 --- a/webcit/tabs.c +++ b/webcit/tabs.c @@ -52,7 +52,7 @@ void tabbed_dialog(int num_tabs, char *tabnames[]) { } wprintf("
\n"); - wprintf("
"); + wprintf("
"); } /** diff --git a/webcit/useredit.c b/webcit/useredit.c index 265f91587..585a954db 100644 --- a/webcit/useredit.c +++ b/webcit/useredit.c @@ -24,7 +24,7 @@ void select_user_to_edit(char *message, char *preselect) output_headers(1, 1, 2, 0, 0, 0); wprintf("
\n"); - wprintf("" + wprintf("
" "
" "" ""); @@ -278,7 +278,7 @@ void display_edituser(char *supplied_username, int is_new) { output_headers(1, 1, 2, 0, 0, 0); wprintf("
\n"); - wprintf("
"); + wprintf("
"); wprintf(""); wprintf(_("Edit user account: ")); escputs(username); @@ -286,7 +286,7 @@ void display_edituser(char *supplied_username, int is_new) { wprintf("\n
\n"); wprintf("
" - "
\n"); + "
\n"); wprintf("\n" "\n" - "
" + "
" ""); snprintf(title, sizeof title, _("User list for %s"), serv_info.serv_humannode); escputs(title); @@ -60,7 +60,7 @@ void userlist(void) } wprintf("
" - "
\n"); + "" "", _("User Name"), @@ -123,7 +123,7 @@ void showuser(void) output_headers(1, 1, 2, 0, 0, 0); wprintf("
\n" - "
\n"); wprintf("
%s%s%s%s%s%s
" + "
" "" "
"); wprintf(_("User profile")); @@ -133,7 +133,7 @@ void showuser(void) ); wprintf("
" - "
\n"); + "
\n"); serv_printf("OIMG _userpic_|%s", who); serv_getln(buf, sizeof buf); diff --git a/webcit/vcard_edit.c b/webcit/vcard_edit.c index cb17968a4..09f5df8a7 100644 --- a/webcit/vcard_edit.c +++ b/webcit/vcard_edit.c @@ -176,7 +176,7 @@ void do_edit_vcard(long msgnum, char *partnum, char *return_to) { /** Display the form */ output_headers(1, 1, 2, 0, 0, 0); wprintf("
\n" - "
" + "
" "" ""); wprintf(_("Edit contact information")); @@ -187,7 +187,7 @@ void do_edit_vcard(long msgnum, char *partnum, char *return_to) { wprintf("\n"); wprintf("
" - "
\n"); + "
\n"); wprintf("" "" @@ -213,7 +213,7 @@ void do_edit_vcard(long msgnum, char *partnum, char *return_to) { "value=\"%s\" maxlength=\"10\" size=\"10\">
%s
\n", suffix); - wprintf(""); + wprintf("
"); wprintf("
"); wprintf(_("Display name:")); @@ -297,7 +297,7 @@ void do_edit_vcard(long msgnum, char *partnum, char *return_to) { "value=\"%s\" maxlength=\"29\">
\n", worktel); - wprintf(""); + wprintf("
"); wprintf("
"); wprintf("" diff --git a/webcit/who.c b/webcit/who.c index e81b911e9..5215e7727 100644 --- a/webcit/who.c +++ b/webcit/who.c @@ -21,7 +21,7 @@ void who_inner_div(void) { time_t now; int bg = 0; - wprintf("
" + wprintf("
" "\n"); wprintf("\n"); wprintf("\n", _("User name")); @@ -142,7 +142,7 @@ void who(void) ); wprintf("
\n"); - wprintf("
%s
"); + wprintf("
"); wprintf("\""); @@ -223,7 +223,7 @@ void edit_me(void) output_headers(1, 1, 0, 0, 0, 0); wprintf("
\n"); - wprintf("
"); + wprintf("
"); wprintf(""); wprintf(_("Edit your session display")); wprintf("
\n");