diff -Nru libebox-1.3.4/ChangeLog libebox-1.3.5/ChangeLog --- libebox-1.3.4/ChangeLog 2009-08-08 19:45:35.000000000 +0100 +++ libebox-1.3.5/ChangeLog 2009-08-18 10:00:24.000000000 +0100 @@ -1,3 +1,5 @@ +1.3.5 + + moved public.css and login.css to ebox package 1.3.4 + bugfix: EBox::Sudo::sudo wasn't working properly + use ebox-dbus-check to test if we can actually connect to dbus diff -Nru /tmp/7FOvlu3rPs/libebox-1.3.4/configure /tmp/o8E6Dm2GUd/libebox-1.3.5/configure --- libebox-1.3.4/configure 2009-08-08 19:49:54.000000000 +0100 +++ libebox-1.3.5/configure 2009-08-18 10:15:40.000000000 +0100 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.63 for libebox 1.3.4. +# Generated by GNU Autoconf 2.63 for libebox 1.3.5. # # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, # 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. @@ -594,8 +594,8 @@ # Identity of this package. PACKAGE_NAME='libebox' PACKAGE_TARNAME='libebox' -PACKAGE_VERSION='1.3.4' -PACKAGE_STRING='libebox 1.3.4' +PACKAGE_VERSION='1.3.5' +PACKAGE_STRING='libebox 1.3.5' PACKAGE_BUGREPORT='' ac_unique_file="src/EBox.pm" @@ -1239,7 +1239,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures libebox 1.3.4 to adapt to many kinds of systems. +\`configure' configures libebox 1.3.5 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1305,7 +1305,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of libebox 1.3.4:";; + short | recursive ) echo "Configuration of libebox 1.3.5:";; esac cat <<\_ACEOF @@ -1380,7 +1380,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -libebox configure 1.3.4 +libebox configure 1.3.5 generated by GNU Autoconf 2.63 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1394,7 +1394,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by libebox $as_me 1.3.4, which was +It was created by libebox $as_me 1.3.5, which was generated by GNU Autoconf 2.63. Invocation command line was $ $0 $@ @@ -2113,7 +2113,7 @@ # Define the identity of the package. PACKAGE='libebox' - VERSION='1.3.4' + VERSION='1.3.5' cat >>confdefs.h <<_ACEOF @@ -4536,7 +4536,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by libebox $as_me 1.3.4, which was +This file was extended by libebox $as_me 1.3.5, which was generated by GNU Autoconf 2.63. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -4590,7 +4590,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_version="\\ -libebox config.status 1.3.4 +libebox config.status 1.3.5 configured by $0, generated by GNU Autoconf 2.63, with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff -Nru /tmp/7FOvlu3rPs/libebox-1.3.4/configure.ac /tmp/o8E6Dm2GUd/libebox-1.3.5/configure.ac --- libebox-1.3.4/configure.ac 2009-08-08 19:43:09.000000000 +0100 +++ libebox-1.3.5/configure.ac 2009-08-11 15:13:15.000000000 +0100 @@ -1,4 +1,4 @@ -AC_INIT([libebox], [1.3.4]) +AC_INIT([libebox], [1.3.5]) AC_CONFIG_AUX_DIR([config]) AC_CONFIG_SRCDIR([src/EBox.pm]) diff -Nru /tmp/7FOvlu3rPs/libebox-1.3.4/debian/changelog /tmp/o8E6Dm2GUd/libebox-1.3.5/debian/changelog --- libebox-1.3.4/debian/changelog 2009-08-18 12:12:18.000000000 +0100 +++ libebox-1.3.5/debian/changelog 2009-08-18 12:12:18.000000000 +0100 @@ -1,24 +1,16 @@ -libebox (1.3.4-0ubuntu1~ppa1~karmic2) karmic; urgency=low - - * Create links file - - -- Javier Uruen Val Mon, 10 Aug 2009 12:54:05 +0200 - -libebox (1.3.4-0ubuntu1~ppa1~karmic1) karmic; urgency=low - - * New upstream release - - -- Javier Uruen Val Sat, 08 Aug 2009 20:50:03 +0200 - -libebox (1.3.2-1ubuntu1~ppa1~karmic1) karmic; urgency=low +libebox (1.3.5-0ubuntu1~ppa1~karmic1) karmic; urgency=low [Javier Uruen Val] + * New upstream release. (Closes: #411462) * debian/control - Bump standards version - Add dependency on libsoap-lite-perl - Remove dependency on dpatch * debian/libebox.postinst - Create log directory + - Add set -e + * debian/libebox.postrm + - Add set -e * debian/patches - Drop dpatch system: + Drop 01_dbug_gconf.dpatch (Shipped by upstream) @@ -29,48 +21,6 @@ -- Javier Uruen Val Wed, 05 Aug 2009 12:29:43 +0200 -libebox (1.3.2-1) jaunty; urgency=low - - * New upstream release - - -- Isaac Clerencia Sun, 19 Jul 2009 16:40:36 +0200 - -libebox (1.3.1-1) jaunty; urgency=low - - * New upstream release - - -- Isaac Clerencia Wed, 15 Jul 2009 12:02:50 +0100 - -libebox (1.3.0-1) jaunty; urgency=low - - * New upstream release - - -- Isaac Clerencia Thu, 02 Jul 2009 15:27:12 +0100 - -libebox (1.1.30) hardy; urgency=low - - * New upstream release - - -- José Antonio Calvo Mon, 15 Jun 2009 16:11:20 +0200 - -libebox (1.1.20) hardy; urgency=low - - * New upstream release - - -- Javier Amor Garcia Fri, 05 Jun 2009 12:24:47 +0200 - -libebox (1.1) hardy; urgency=low - - * New upstream release - - -- Javier Uruen Val Tue, 13 Jan 2009 11:59:43 +0100 - -libebox (0.12.99) hardy; urgency=low - - * New upstream release - - -- José Antonio Calvo Mon, 24 Nov 2008 13:23:47 +0100 - libebox (0.12.2-0ubuntu1) jaunty; urgency=low [ Javier Uruen Val ] diff -Nru /tmp/7FOvlu3rPs/libebox-1.3.4/debian/control /tmp/o8E6Dm2GUd/libebox-1.3.5/debian/control --- libebox-1.3.4/debian/control 2009-08-18 12:12:18.000000000 +0100 +++ libebox-1.3.5/debian/control 2009-08-18 12:12:18.000000000 +0100 @@ -11,7 +11,7 @@ Depends: sudo, iproute, liblog-dispatch-perl, liblog-log4perl-perl, libhtml-mason-perl, liblocale-gettext-perl, liberror-perl, libdevel-stacktrace-perl, libintl-perl, libnet-ip-perl, gettext, libfile-slurp-perl, libreadonly-perl, libreadonly-xs-perl, libperl6-junction-perl, libmail-rfc822-address-perl, libsoap-lite-perl, libjs-scriptaculous, libjs-prototype, ${misc:Depends} Replaces: ebox (<< 0.6) Conflicts: ebox (<< 0.12.99) -Description: eBox common library for server and client +Description: eBox - Common Library eBox is a framework for the development and deployment of security-wise network services in small and medium-sized networks, offering a simplified graphical interface to non expert users. diff -Nru /tmp/7FOvlu3rPs/libebox-1.3.4/debian/libebox.postinst /tmp/o8E6Dm2GUd/libebox-1.3.5/debian/libebox.postinst --- libebox-1.3.4/debian/libebox.postinst 2009-08-18 12:12:18.000000000 +0100 +++ libebox-1.3.5/debian/libebox.postinst 2009-08-18 12:12:18.000000000 +0100 @@ -1,5 +1,6 @@ #!/bin/bash +set -e #DEBHELPER# case "$1" in diff -Nru /tmp/7FOvlu3rPs/libebox-1.3.4/debian/libebox.postrm /tmp/o8E6Dm2GUd/libebox-1.3.5/debian/libebox.postrm --- libebox-1.3.4/debian/libebox.postrm 2009-08-18 12:12:18.000000000 +0100 +++ libebox-1.3.5/debian/libebox.postrm 2009-08-18 12:12:18.000000000 +0100 @@ -1,5 +1,7 @@ #!/bin/bash +set -e + case "$1" in purge) #delete logs and temporary files when purging diff -Nru /tmp/7FOvlu3rPs/libebox-1.3.4/www/css/login.css /tmp/o8E6Dm2GUd/libebox-1.3.5/www/css/login.css --- libebox-1.3.4/www/css/login.css 2007-12-24 08:32:29.000000000 +0000 +++ libebox-1.3.5/www/css/login.css 1970-01-01 01:00:00.000000000 +0100 @@ -1,87 +0,0 @@ -#login { - width: 400px; - margin: 60px auto 20px auto; - min-width: inherit; -} - -#reason { - text-align: left; - font-weight: normal; - border-bottom: 1px solid #fa601d; - border-top: 1px solid #fa601d; - padding: 5px; - font-size: 11px; - margin: 0 0 4px 90px; - background: #fdddd9; - color: #484554; -} - -#capsWarning { - text-align: left; - font-weight: normal; - border-bottom: 1px solid #fa601d; - border-top: 1px solid #fa601d; - padding: 5px; - font-size: 11px; - margin: 0 0 4px 90px; - background: #dfef7a; - color: #484554; -} - -#logo { - float: left; -} - -body { - color: #000000; - font-family: Verdana, sans-serif; - background-color: #dff0a4; - behavior: url(/data/js/csshover.htc); - margin-top: 90px; -} - -dl { margin: 20px 0 0 90px; } - -dt { - float: left; - width: 88px; - font-size: 14px; - line-height: 24px; -} - -dd { - margin: 0 0 5px 90px; - font-size: 11px; - line-height: 24px; - color: #666; - margin-left: 88px; -} - -#loginin { - border: 10px solid #A7C73B; - padding: 15px 20px 10px 20px; - background: #fff; - text-align: left; -} - -#footer { - text-align: center; - font-size: 11px; - color: #888; -} - -#footer a { - text-decoration: underline; - color: #888; -} - -#footer a:active { - text-decoration: underline; - color: #888; -} - -#footer a:hover { - text-decoration: none; - background: #888; - color: #fff; -} diff -Nru /tmp/7FOvlu3rPs/libebox-1.3.4/www/css/public.css /tmp/o8E6Dm2GUd/libebox-1.3.5/www/css/public.css --- libebox-1.3.4/www/css/public.css 2009-06-22 12:30:47.000000000 +0100 +++ libebox-1.3.5/www/css/public.css 1970-01-01 01:00:00.000000000 +0100 @@ -1,985 +0,0 @@ -#header { - height: 46px; - background: #a6c733 url('/data/images/bkgwhite.png') top left no-repeat; - padding:0; - margin: 0; - color: transparent; -} - - -#header a:hover { - background: transparent; - color: black; -} - -#header img { - padding-top: 3px; - padding-left: 3px; - padding-bottom: 0; - margin:0; -} - -#hmenu { - position: relative; - display: block; - top: -46px; - margin-right: 0px; - float:right; -} - -#hmenu a { - display: block; - float:left; - color: #fff; - font-size: 11px; - line-height: 16px; - padding: 25px 15px 5px 15px; - text-decoration: none; -} - -#hmenu #m { background-color: #b5d448; } -#hmenu #m:hover { background-color: #C5E64E; } - -#hmenu #remote_services_link { - background-color: #bbe03a; -} -#hmenu #remote_services_link:hover { - background-color: #cce86c; -} - - -#top { - padding:0; - font-size: 0; - margin:0; -} - -#content { - z-index: 9; - margin-top: 15px; - padding-left: 180px; -} - -#menu { - clear: left; - float: left; - padding: 15px 0 0 0; -} - -#footer { - color: #888; - clear: both; - font-size: 11px; - text-align: center; - width: 100%; - margin-top: 20px; - margin-left: 0px; - padding: 3px; -} - -#footer a { - text-decoration: underline; - color: #888; -} - -#footer a:active { - text-decoration: underline; - color: #888; -} - -#footer a:hover { - text-decoration: none; - background: #888; - color: #fff; -} - -#module_list { - margin-left: 20px; - height: 60px; - overflow: auto; -} - -#widget_list { - margin-left: 20px; -} - -.help { - display: none; - border-bottom: 1px solid #1d4efa; - padding: 9pt 9pt 9pt 33pt; - color: #484554; - font-size: 8pt; - background: #DFF5FE url("/data/images/help.gif") 6pt 6pt no-repeat; - margin: 1em 0px 1em 0px; -} - -.note { - border-bottom: 1px solid #a9c500; - padding: 9pt 9pt 9pt 33pt; - margin-bottom: 10px; - color: #484554; - font-size: 8pt; - background: #dfef7a url("/data/images/msg.gif") 6pt 6pt no-repeat; - margin: 1em 0px 0em 0px; - margin-bottom: 5px; -} - -.error { - border-bottom: 1px solid #fa601d; - padding: 9pt 9pt 9pt 33pt; - color: #484554; - font-size: 8pt; - background: #FDDDD9 url("/data/images/error.gif") 6pt 6pt no-repeat; - margin: 1em 0px 0em 0px; -} - -.warning { - border-bottom: 1px solid #ebfa1d; - padding: 9pt 9pt 9pt 33pt; - color: #484554; - font-size: 8pt; - background: #f8fea5 url("/data/images/warning.gif") 6pt 6pt no-repeat; - margin: 1em 0px 0em 0px; - margin-bottom: 10px; -} - -.helptd { - width: 100%; - color: #AAAAAA; - text-align: justify; - margin-left: 30px; - padding-left: 25px; - background: url("../images/help.gif") no-repeat center left; -} - -.ifname { - color: #000000; - font-weight: bold; - border-bottom: 7px solid #FFFFFF; -} - -.tleft { text-align: left; } - -.objectAddr { - font-size: 11px; - margin-left: 30px; -} - -.test { border-bottom: 0px; } - -.ok { color: #70FC00; } - -.nok { color: #BC0606; } - -.tcenter { text-align: center; } - -.thOptions { - padding:0; - margin:0; - width: 13%; -} - -.thOptionsFwd { - padding:0; - margin:0; - background: #787878; -} - -.summarySection { - width: 100%; - margin-bottom: 15px; - margin-left:0px; -} - -.summarySection tr { - vertical-align: center; -} - -.summaryValue { - padding-left: 15px; - padding-top: 2px; - padding-bottom: 2px; - font-family: Verdana, sans-serif; - background-color: #F4F4F4; -} - -.summaryKey { - width: 35%; - color: #4c4c4c; - background-color: #ffffff; - text-align: right; - font-weight: bold; - padding: 3px 4px 3px 4px; -} - -.legend { - float:left; - margin-bottom: 15px; -} - -.dataTable { - width: 100%; - /*float: left;*/ - color:#000000; - font-size: 11px; - border: 1px solid #99cc66; - border-collapse: collapse; - border-bottom:0; - /*margin-bottom: 20px; */ -} -.dataTable thead { - background:#a3bd5b; - color: white; -} -.dataTable th { - font-family: Verdana, 'Bitstream Vera Sans', sans-serif; - padding: 8px 6px 8px 6px; - font-weight: bold; - vertical-align: middle; - border: 1px solid #658037; -} -.dataTable td { - padding: 8px 8px 8px 8px; - border-bottom: 1px solid #658037; - border-left: 1px solid #d8dac1; - border-right: 1px solid #d8dac1; -} - -.dataTable td a { - color: #000000; - background-color: none; - text-decoration: none; -} - -.dataTable td a:hover { - background: none; - text-decoration: underline; - color: #A3BD5B; -} - -.dataTable tr.highlight { background: #E58A22; } - -.dataTable tr.highlight:hover { background: #F2A349; } - -.iptable { - font-size: 11px; - margin-left: 25px; - background-color: #EEEEEE; -} - -iptable tr { - background-color: #EEEEEE; -} - -.iptableaux { - width: 100%; - margin-left: 0px; - margin-top: 10px; -} - -.iptableaux th { - color: #4f4f4f; - background-color: #e4e8f1; -} - -.tright { - text-align: right; - vertical-align: top; - white-space: nowrap; -} - -.border { border-bottom: 1px solid #CCCCCC; } - -.noborder { border: 0; } - -.endform { - padding-top: 8px; - border-top: 1px solid #CCCCCC; -} - -select { - font-size: 11px; - font-family: Verdana, sans-serif; -} - -.inputText, .inputTextError { - color: #000000; - font-size: 11px; - font-family: Verdana, sans-serif; -} - -.inputTextError { border: 3px solid red; } - -.inputText:focus { background-color: #ffffff; } - -.inputTextLogin { - color: #000000; - font-size: 11px; - font-family: Verdana, sans-serif; -} - -.inputButtonRestart { - font-size: 11px; - font-family: Verdana, sans-serif; -} - -.inputButton { - font-size: 11px; - font-family: Verdana, sans-serif; -} - -.msg { - color: #FFFFFF; - padding: 10px; - background-color: #06BC06; -} - -.logout { - font-size: 11px; - font-family: Verdana, sans-serif; - border-top: 1px solid #ccc; - border-left: 1px solid #ccc; - border-right: 1px solid #4c4c4c; - border-bottom: 1px solid #4c4c4c; - background-color: #eee; - color: #000; - padding: 2px 5px 2px 5px; -} - -body { - width: 960px; - margin: 0px; - padding:0; - margin-left:10px; - color: #000000; - font-size: 11px; - font-family: Verdana, sans-serif; - background-color: #ffffff; - behavior: url(/data/js/csshover.htc); -} - -.title { - display: block; - color: #787878; - font-weight: bold; - font-size: 17px; - background-color: #FFFFFF; - font-family: Trebuchet MS, Verdana, sans-serif; - float: left; -} - -h3 { - font-size: 14px; - font-family: Trebuchet MS, Verdana, sans-serif; - font-weight: bold; - margin-bottom: 8px; - color: #a6c733; -} - -h4 { - font-size: 12px; - color: #666464; - margin-top: 10px; - margin-bottom: 7px; - padding-left: 2px; - letter-spacing: .2ex; -} - -a { - color: #888; - text-decoration: underline; -} - -a:active { - color: #888; - text-decoration: underline; -} - -a:hover { - text-decoration: none; - background: #888; - color: #ffffff; -} - -a img { border: 0px; } - -input { - font-size: 11px; - font-family: Verdana, sans-serif; -} - -.dataTableMini caption, .ftitle { - text-align: left; - border: 0px; - padding: 2px; -} - -.dataTable caption { - font-weight: bold; - background-color: #ffffff; - text-align: left; - color: #4c4c4c; - border: 0px; - padding: 2px; -} - -.formTable { - border: 0px; - border-collapse: collapse; - border-spacing: 0px; - width: auto; -} - -.formTable td { - padding-top: 4px; - padding-bottom: 4px; -} - -.endproxyform { - margin-left: 167px; - padding-top: 7px; -} - -.ifaces { - border-bottom: 1px solid #787878; - padding-bottom: 5px; - padding-left: 15px; - padding-top: 13px; -} - -.tabs { - border-bottom: 1px solid #989898; - margin: 10px 0px 0 0; - padding: 5px 10px 5px 10px; -} - -.tabs li { - list-style: none; - display : inline; - margin-right: 5px; -} - -.tabs li a { - padding: 5px 10px 5px 10px; - border-top: 1px solid #dddddd; - border-left: 1px solid #dddddd; - border-right: 1px solid #dddddd; - background: #efefef; - color: #999; -} - -.tabs li a:hover{ -} - -.tabs li a.current{ - background: #fff; - font-weight: bold; - border: 1px solid #989898; - border-bottom: 1px solid white; -} - -.selected { - border-top: 1px solid #787878; - border-left: 1px solid #787878; - border-right: 1px solid #787878; - border-bottom: 1px solid #fff; - padding: 5px 10px 5px 10px; - background: #fff; - color: #787878; - font-weight: bold; -} - -.ifaces a { - border-top: 1px solid #dddddd; - border-left: 1px solid #dddddd; - border-right: 1px solid #dddddd; - background: #efefef; - color: #999; - padding: 5px 10px 5px 10px; -} - -.ifaces a:hover { - color: #4c4c4c; - background-color: #eeeeee; - border-top: 1px solid #aaa; - border-left: 1px solid #aaa; - border-right: 1px solid #aaa; -} - -#helpbutton { - font-size: 11px; - font-weight: bold; - font-family: Trebuchet MS, sans-serif; - text-align: center; - clear:right; - display:inline; - margin-left: 10px; -} - -#helpbutton a { color: #859E83; } - -#helpbutton a:hover { color: #ffffff; } - -#titlehelp { - width: auto; - height: 25px; -} - -#nav, #nav ul, #nav li ul { - margin: 0; - padding: 0; - list-style: none; -} - -#nav { margin-bottom: 0em; } - -#nav li, #nav li li { - display: inline; - padding: 0; - margin: 0; -} - -#nav li li { display: none; } - -#nav li a { - display: block; - padding: 8px 10px; - text-decoration: none; - padding-left: 4px; - margin: 0px; - margin-right: 0px; - color: #5E695D; - font-weight: bold; - border:0; - background-color: #ffffff; -} - -#nav li a:hover { color: #99Afb9; } - -#nav li li a { - display: block; - padding: 6px 8px 6px 20px; - margin:0; - background: none; - border-bottom:0; - border-top:0; - font-weight: normal; -} - -#nav { - line-height: 1em; - width: 160px; -} - -.sleft { float: left; } - -.sright { float: right; } - -.stitle { - color: #4c4c4c; - margin: 3px; - font-weight: bold; - padding: 1px 1px 1px 3px; - line-height: 14px; -} - -.trimp { - border-bottom: 1px solid #eeeeee; - background-color: #ffe9e8; -} - -pre { - background-color: #4B4B4B; - color: #EAEAEA; - border: 1px solid #BABABA; - padding: 10px; -} - -.notchanged { - background-color: #BBDF39; -} - -a.notchanged:hover { - background-color: #CBF23E; -} - -.changed { - background-color: #F60000; -} - -a.changed:hover { - background-color: #FF2424; -} - -.comment { - font-style: italic; - color: #4a4a4a; - font-size: 9px; -} - -#enable { - background-color: #FFFFCC; - padding: 10px; - border: 1px solid #FFCC99; - margin: 5px 0 5px 0; -} - -.enable { - background-color: #FFFFCC; - padding: 10px; - border: 1px solid #FFCC99; - margin: 5px 0 5px 0; -} -.bold { font-weight: bold; } - -.legendName { - padding-right: 10px; - } - -.hidden { - display: none; -} - -.eDataTable, .bDataTable { - width: 100%; - font-size: 11px; - background: #eff4dd; - border-left: 1px solid #d8dac1; - border-right: 1px solid #d8dac1; - border-bottom: 1px solid #d8dac1; - border-top: 1px solid #d8dac1; - border-collapse: collapse; -} -.eDataTable td, .bDataTable td { - padding: 6px; -} -.eDataTable input, .eDataTable select, -.bDataTable input, .bDataTable select { -} -.bDataTable form , .eDataTable form { - padding:0; - margin:0; -} - -.bDataTable { - border-bottom: 1px solid #d6dbbe; - border-top: 1px solid #d6dbbe; -} -.button { - cursor: pointer; -} -.insideTab { - border: 1px solid #989898; - border-top: none; - margin: 0px; - padding: 10px; -} - -.addNew { - background: #fff url('/data/images/add.gif') left no-repeat; - padding-left: 18px; -} - -.addNew:hover {  - background: #fff url('/data/images/add.gif') left no-repeat; - background: #fff url('/data/images/add.gif') left no-repeat; - color: #888; - text-decoration: underline; -} - -#field_help { - color: #888; - clear: both; - font-size: 11px; -} - -#file_comment { - width: 70%; - border:3px solid #E5503B; - color: #404040; - font-weight: bold; - padding-left: 5px; - background: #FDDDD9; -} - -.conf_file_entry { - border-top: 1px solid #ccc; - width: 70%; - margin-top: 10px; - padding-top: 6px; - margin-left: 5px; -} - -.conf_file_entry_reason { - color: #aaa; - margin-bottom: 3px; -} - -.conf_file_entry_reason span { - color: black; -} - -.conf_file_entry input { - float: right; - margin-top: 6px; -} - -.conf_file_entry .image { - margin-left: 5px; - padding-left: 5px; - border-left: 1px solid #767676; -} - -.graph { - width: 350px; - height: 200px; -} - -#finishForm { - border-top: 1px solid #ccc; - width: 95%; - margin-left:auto; - margin-right:auto; - margin-top: 10px; -} -#file_comment { - width: 95%; - margin-left:auto; - margin-right:auto; - border:3px solid #E5503B; - color: #404040; - font-weight: bold; - padding-left: 5px; - background: #FDDDD9; -} - -.conf_file_entry { - border-top: 1px solid #ccc; - width: 95%; - margin-left:auto; - margin-right:auto; - margin-top: 10px; - padding-top: 6px; - margin-left: 5px; -} - -.conf_file_entry_reason { - color: #aaa; - margin-bottom: 3px; -} - -.conf_file_entry_reason span { - color: black; -} - -.conf_file_entry input { - float: right; - margin-top: 6px; -} - -.conf_file_entry .image { - margin-left: 5px; - padding-left: 5px; - border-left: 1px solid #767676; -} - -#finishForm, .endForm { - border-top: 1px solid #ccc; - width: 95%; - margin-left: 5px; - margin-right:auto; - margin-top: 10px; -} - -.endForm { padding-top: 5px; } - -.dashboard { - display: block; - float: left; - width: 385px; -} - -#dashboard1 { - padding-right: 5px; -} - -#dashboard2 { - padding-left: 5px; -} - -.widgetHandle { - height: 100%; - width: 100%; - position: absolute; - cursor: move; - left: 0pt; - top: 0pt; - z-index: 4; -} - -.widgetTopBar { - position: relative; - z-index: 1; -} - -.widgetTopBackground { - background: #BBDF39; - height: 100%; - width: 100%; - position: absolute; - left: 0pt; - top: 0pt; - z-index: 1; -} - -.widgetName { - position: relative; - float: left; - z-index: 3; - font-size: 12px; - font-family: Verdana, sans-serif; - font-weight: bold; - color: white; - padding: 3px 6px; -} - -a.closeBox { - position: relative; - float: right; - margin-right:3px; - margin-top: 3px; - overflow:hidden; - z-index: 5; -} - -a.closeBox { - background-position: -24px 0px; -} - -a.closeBox:hover { - background-position: -24px -12px; -} - -a.minBox, a.maxBox { - position: relative; - float: left; - margin-right: 3px; - overflow:hidden; - z-index: 5; -} - -.widgetBarBox { - display: block; - width: 160px; height: 60px; float: left; margin-left: 5px; margin-right: 5px; -} - -.widgetBox { - margin-bottom: 5px; -} - -.widgetBoxIn { - border:1px solid #BBDF39; -} - -.sectionContent { - width: 100%; -} - -a.maxBox { - background-position: -15px 0px; -} - -a.maxBox:hover { - background-position: 0px 0px; -} - -a.minBox { - background-position: -15px -15px; -} - -a.minBox:hover { - background-position: 0px -15px; -} - -a.closeBox, a.closeBox:hover { - background-image:url('/data/images/widget_controls.png'); - height:12px; - width:12px; -} - -a.minBox, a.minBox:hover, a.maxBox, a.maxBox:hover { - background-image:url('/data/images/triangles.png'); - height:15px; - width:15px; -} - -.widArrow { - float: left; - margin-left: 10px; - margin-right: 10px; - margin-top: 2px; -} - -.widArrow a:hover { - background: transparent; -} - -.field_help { - color: #888; - clear: both; - font-size: 11px; -} - -.optional_field { - color: #005AA3; - clear: both; - font-size: 10px; - font-style: italic; - padding-right: 3px; -} - -.dashboardTable { - border-collapse: collapse; - border: 0; - font-size: 11px; - width: 100%; -} - -.dashboardTable thead { - color: white; - background-color: olive; -} - -.dashboardTable th { - font-family: Verdana, 'Bitstream Vera Sans', sans-serif; - padding: 3px; - font-weight: bold; - vertical-align: middle; -} -.dashboardTable td { - padding: 3px; -} - -.dashboardTable td a { - color: #000000; - background-color: none; - text-decoration: none; -} - -.dashboardTable td a:hover { - background: none; - text-decoration: underline; - color: #A3BD5B; -} - -.dashboardTable tr.highlight { background: #E58A22; } - -.separator { - color: white; - font-weight: bold; - font-size: 0.9em; - background: #BBDF39; - padding: 3px 18px 3px 10px; - margin-left: -10px; -} - diff -Nru /tmp/7FOvlu3rPs/libebox-1.3.4/www/Makefile.am /tmp/o8E6Dm2GUd/libebox-1.3.5/www/Makefile.am --- libebox-1.3.4/www/Makefile.am 2009-01-16 16:44:56.000000000 +0000 +++ libebox-1.3.5/www/Makefile.am 2009-08-18 01:23:23.000000000 +0100 @@ -38,7 +38,7 @@ js/scriptaculous/effects.js \ js/scriptaculous/dragdrop.js -css = css/public.css css/login.css css/modalbox.css +css = css/modalbox.css nobase_www_DATA = $(images) $(js) $(css) diff -Nru /tmp/7FOvlu3rPs/libebox-1.3.4/www/Makefile.in /tmp/o8E6Dm2GUd/libebox-1.3.5/www/Makefile.in --- libebox-1.3.4/www/Makefile.in 2009-08-08 19:49:56.000000000 +0100 +++ libebox-1.3.5/www/Makefile.in 2009-08-18 10:15:42.000000000 +0100 @@ -174,7 +174,7 @@ js/scriptaculous/effects.js \ js/scriptaculous/dragdrop.js -css = css/public.css css/login.css css/modalbox.css +css = css/modalbox.css nobase_www_DATA = $(images) $(js) $(css) EXTRA_DIST = $(nobase_www_DATA) MAINTAINERCLEANFILES = Makefile.in