diff --git a/.gitattributes b/.gitattributes index 6be06bad..9f87d6d5 100644 --- a/.gitattributes +++ b/.gitattributes @@ -202,7 +202,7 @@ bureau/admin/sta2_doedit_raw.php -text bureau/admin/sta2_edit_raw.php -text bureau/admin/sta2_list.php -text bureau/admin/stats_members.php -text -bureau/admin/styles/style.css -text +bureau/admin/styles/base.css -text bureau/admin/template.php -text bureau/admin/web_list.php -text bureau/admin/webmail/.htaccess -text @@ -243,7 +243,6 @@ bureau/locales/fr_FR/LC_MESSAGES/messages.po -text bureau/locales/manual.pot -text bureau/locales/messages.pot -text bureau/locales/pt_BR/LC_MESSAGES/messages.po -text -bureau/style.css -text debian/.cvsignore -text debian/README.Debian -text debian/alternc.cron.d -text diff --git a/bureau/admin/adm_login.php b/bureau/admin/adm_login.php index 1675bd8a..b8b43af9 100644 --- a/bureau/admin/adm_login.php +++ b/bureau/admin/adm_login.php @@ -56,7 +56,8 @@ if (!$mem->setid($id)) { <?php __("AlternC Desktop"); ?> - + + diff --git a/bureau/admin/adm_panel.php b/bureau/admin/adm_panel.php index 05808b97..ac52eed8 100644 --- a/bureau/admin/adm_panel.php +++ b/bureau/admin/adm_panel.php @@ -44,17 +44,16 @@ include("head.php"); echo "

$error

"; } ?> -
- - - - - - - - - - +
-
+ diff --git a/bureau/admin/aide/help.php b/bureau/admin/aide/help.php index 5a0892ab..ab9b8eef 100644 --- a/bureau/admin/aide/help.php +++ b/bureau/admin/aide/help.php @@ -42,7 +42,7 @@ if (!$hlist[$hid]) { Aide en ligne <?php echo $host ?> - + @@ -54,7 +54,3 @@ if (!$hlist[$hid]) { Your browser must support frames -ames - - - diff --git a/bureau/admin/bro_main.php b/bureau/admin/bro_main.php index 0c0ff871..5dd30e72 100644 --- a/bureau/admin/bro_main.php +++ b/bureau/admin/bro_main.php @@ -129,20 +129,18 @@ include("head.php"); - - - +
- +
+

user["login"]; ?> / PathList($R,"bro_main.php") ?>
$error"; ?> 		-

- +
-
" />
diff --git a/bureau/admin/browseforfolder.php b/bureau/admin/browseforfolder.php index 5b6c22a2..621cb4fc 100644 --- a/bureau/admin/browseforfolder.php +++ b/bureau/admin/browseforfolder.php @@ -82,7 +82,8 @@ if ($select) { Browser for folder - + + Recherche d'un dossier - + +
" />
+
show_help("ftp_add"); ?> diff --git a/bureau/admin/ftp_list.php b/bureau/admin/ftp_list.php index 4501fd03..88dd2636 100644 --- a/bureau/admin/ftp_list.php +++ b/bureau/admin/ftp_list.php @@ -56,8 +56,7 @@ if ($error) {

- - + - - - - - - +
+
" name="del_" value="" />:
+
/
+
">
+
+
+ - -
 
" name="del_" value="" />">/
" />
+
" />
cancreate("ftp")) { ?> -

+

show_help("ftp_list"); ?> diff --git a/bureau/admin/head.php b/bureau/admin/head.php index b6720e12..7d9428e5 100644 --- a/bureau/admin/head.php +++ b/bureau/admin/head.php @@ -32,7 +32,8 @@ Bureau - + + diff --git a/bureau/admin/hta_add.php b/bureau/admin/hta_add.php index 4c55b31e..dab61542 100644 --- a/bureau/admin/hta_add.php +++ b/bureau/admin/hta_add.php @@ -56,7 +56,7 @@ include("head.php"); // -->
" />
" />
diff --git a/bureau/admin/index.php b/bureau/admin/index.php index 2bf7b6b5..7c6a8351 100644 --- a/bureau/admin/index.php +++ b/bureau/admin/index.php @@ -41,39 +41,48 @@ $H=getenv("HTTP_HOST"); AlternC Desktop - + + - -

+ $error"; ?> -

+ +
-
- - - - - - -
-
-

 

- - - +
- -
- - -  - -		 -

<?php __(" title="" />

-
+ + + + + + + + + + + + + + + + + +
+

+

+ + + +

+
[ ".$H." ]" ?>
+ +
diff --git a/bureau/admin/login.php b/bureau/admin/login.php index b88ba770..e30934de 100644 --- a/bureau/admin/login.php +++ b/bureau/admin/login.php @@ -40,10 +40,11 @@ if (!$mem->checkid()) { <?php __("AlternC Desktop"); ?> - + + - + diff --git a/bureau/admin/main.php b/bureau/admin/main.php index 69351b04..3fd7c402 100644 --- a/bureau/admin/main.php +++ b/bureau/admin/main.php @@ -33,7 +33,10 @@ include("head.php"); ?> </head> <body> -<?php + +<h3>Ce bureau est un lieu de développement pour arranger minimalement alterc dans l'objectif d'y faire un "theme" plus joli et personnalisable</h3> + +<div id="info"><?php // Show last login information : __("Last Login: "); @@ -87,14 +90,8 @@ if($admin->enabled) { } } -/* -<h3> -Le bureau AlternC de ce serveur est en travaux actuellement.<br /> -Il se peut que certaines parties du bureau soient inaccessibles ponctuellement.<br /> -Si une partie du bureau ne fonctionne pas pendant longtemps, n'hésitez pas, contactez le -mainteneur par mail : <a href="mailto:root@heberge.info">root@heberge.info</a> -</h3> -*/ -?> +?></div> + + </body> </html> diff --git a/bureau/admin/mem_logout.php b/bureau/admin/mem_logout.php index ffcbf4d3..195a489d 100644 --- a/bureau/admin/mem_logout.php +++ b/bureau/admin/mem_logout.php @@ -36,7 +36,8 @@ $mem->del_session(); <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="fr" lang="fr"> <head> <title><?php __("Disconnected"); ?></title> -<link rel="stylesheet" href="styles/style.css" type="text/css" /> +<link rel="stylesheet" href="styles/base.css" type="text/css" /> +<link rel="stylesheet" href="styles/custom.css" type="text/css" /> <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /> </head> <body> diff --git a/bureau/admin/mem_param.php b/bureau/admin/mem_param.php index f674922b..5b9dab8a 100644 --- a/bureau/admin/mem_param.php +++ b/bureau/admin/mem_param.php @@ -38,8 +38,8 @@ if ($help_setting) { ?> </head> -<body> -<div align="center"><h3><?php __("Settings of your account"); ?></h3></div> +<body id="mem_param"> +<h3><?php __("Settings of your account"); ?></h3> <?php if ($error) { echo "<font color=red>$error</font></body></html>"; @@ -47,66 +47,57 @@ if ($help_setting) { } ?> <hr /> -<p> -<?php __("Password change"); ?> : <br /> -<?php -if (!$mem->user["canpass"]) { - __("You cannot change your password"); - echo "</p>"; - -} else { - - __("help_chg_passwd"); ?> -</p> <form method="post" action="mem_passwd.php"> <table border="1" cellspacing="0" cellpadding="4"> +<thead><tr><td colspan="2"><?php __("Password change"); ?></td></tr></thead> +<tr><td colspan="2"> +<?php + if (!$mem->user["canpass"]) { + __("You cannot change your password"); + } + else { + __("help_chg_passwd"); +?> +</td></tr> <tr><th><?php __("Old password"); ?></th><td><input type="password" class="int" name="oldpass" value="<?php echo $oldpass; ?>" size="20" maxlength="128" /></td></tr> <tr><th><?php __("New password"); ?> (1)</th><td><input type="password" class="int" name="newpass" value="<?php echo $newpass; ?>" size="20" maxlength="60" /></td></tr> <tr><th><?php __("New password"); ?> (2)</th><td><input type="password" class="int" name="newpass2" value="<?php echo $newpass2; ?>" size="20" maxlength="61" /></td></tr> -<tr><td align="center" colspan="3"><input type="submit" class="inb" name="submit" value="<?php __("Change my password"); ?>" /></td></tr> +<tr><td colspan="3"><input type="submit" class="inb" name="submit" value="<?php __("Change my password"); ?>" /></td></tr> </table> </form> -<p>&nbsp;</p> <?php } ?> -<hr /> <form method="post" action="mem_chgmail.php"> <table border="1" cellspacing="0" cellpadding="4"> - <tr><td colspan="2"><?php __("Change the email of the account"); ?><br /> - <?php __("help_chg_mail"); ?></td></tr> + <thead><tr><td colspan="2"><?php __("Change the email of the account"); ?></td></tr></thead> + <tr><td colspan="2"><?php __("help_chg_mail"); ?></td></tr> <tr><th><?php __("Current mailbox"); ?></th><td><big><code><?php echo $mem->user["mail"]; ?></code></big></td></tr> <tr><th><?php __("New mailbox"); ?></th><td><input type="text" class="int" name="newmail" value="<?php echo $newmail; ?>" size="40" maxlength="128" /></td></tr> - <tr><td style="text-align: center" colspan="3"><input type="submit" class="inb" name="submit" value="<?php __("Change my mail"); ?>" /></td></tr> + <tr><td colspan="3"><input type="submit" class="inb" name="submit" value="<?php __("Change my mail"); ?>" /></td></tr> </table> </form> -<p>&nbsp;</p> -<hr /> <form method="post" action="mem_param.php"> <table border="1" cellspacing="0" cellpadding="4"> - <tr><td colspan="2"><?php __("Online help settings"); ?><br /> - <?php __("help_help_settings"); ?></td></tr> + <thead><tr><td colspan="2"><?php __("Online help settings");?></td></tr></thead> + <tr><td colspan="2"><?php __("help_help_settings"); ?></td></tr> <tr><th><label for="showhelp"><?php __("Do you want to see the help texts and links on each page?"); ?></label></th><td><input type="checkbox" class="inc" id="showhelp" name="showhelp" value="1" <?php if ($mem->get_help_param()) echo "checked=\"checked\""; ?> /></td></tr> - <tr><td align="center" colspan="3"><input type="submit" class="inb" name="help_setting" value="<?php __("Change these settings"); ?>" /></td></tr> + <tr><td colspan="3"><input type="submit" class="inb" name="help_setting" value="<?php __("Change these settings"); ?>" /></td></tr> </table> </form> -<p>&nbsp;</p> + <?php if ($mem->user["su"]) { ?> -<hr /> -<p> -<?php __("Admin preferences"); ?> : -</p> <form method="post" action="mem_admin.php"> -<table border="1" cellspacing="0" cellpadding="4"> -<tr><th><?php __("Members list view"); ?></th><td><select name="admlist" class="inl"> -<option value="0"<?php if ($mem->user["admlist"]==0) echo " selected=\"selected\""; ?>><?php __("Large view"); ?></option> -<option value="1"<?php if ($mem->user["admlist"]==1) echo " selected=\"selected\""; ?>><?php __("Short view"); ?></option> -</select></td></tr> -<tr><td align="center" colspan="2"><input type="submit" class="inb" name="submit" value="<?php __("Change my admin preferences"); ?>" /></td></tr> -</table> + <table border="1" cellspacing="0" cellpadding="4"> + <thead><tr><td colspan="2"><?php __("Admin preferences"); ?></td></tr></thead> + <tr><th><?php __("Members list view"); ?></th><td><select name="admlist" class="inl"> + <option value="0"<?php if ($mem->user["admlist"]==0) echo " selected=\"selected\""; ?>><?php __("Large view"); ?></option> + <option value="1"<?php if ($mem->user["admlist"]==1) echo " selected=\"selected\""; ?>><?php __("Short view"); ?></option> + </select></td></tr> + <tr><td colspan="2"><input type="submit" class="inb" name="submit" value="<?php __("Change my admin preferences"); ?>" /></td></tr> + </table> </form> -<p>&nbsp;</p> <?php } ?> <hr /> </body> diff --git a/bureau/admin/menu.php b/bureau/admin/menu.php index a0f45e60..d51f7441 100644 --- a/bureau/admin/menu.php +++ b/bureau/admin/menu.php @@ -33,11 +33,14 @@ include("head.php"); ?> <base target="right" /> </head> -<body> +<body id="menu"> +<div id="alternc-logo"><a href="http://alternc.org"><!-- img src="alternc.png" width="120" height="82" border="0" alt="AlternC" / -->AlternC</a> +<span><?php echo "$L_VERSION"; ?></span> +</div> <h3>Menu <?php echo $mem->user["login"]; ?></h3> - -<table border="1" cellspacing="0" cellpadding="4"> -<tr><td nowrap="nowrap"><a href="main.php"><?php __("Front page") ?></a><br/></td></tr> +<dl id="menu-list"> +<dt id="home"><?php __("Front page") ?></dt> +<dd class="link"><a href="main.php"><?php __("Front page") ?></a></dd> <?php $MENUPATH="/var/alternc/bureau/admin/"; $tt=fopen("menulist.txt","rb"); @@ -51,10 +54,5 @@ fclose($tt); ?> -</table> - -<p> <a href="http://alternc.org"><img src="alternc.png" width="120" height="82" border="0" alt="AlternC" /></a></p> -<p><?php echo "$L_VERSION"; ?> -</p> </body> </html> diff --git a/bureau/admin/menu_adm.php b/bureau/admin/menu_adm.php index ff201df0..9a7ff14c 100644 --- a/bureau/admin/menu_adm.php +++ b/bureau/admin/menu_adm.php @@ -35,12 +35,10 @@ if ($mem->checkRight()) { ?> -<tr><td nowrap> - <a href="adm_list.php"><font color="red"><?php __("Manage the members"); ?></font></a><br> - <a href="adm_panel.php"><font color="red"><?php __("Admin Control Panel"); ?></font></a><br> - <a href="/admin/sql/?server=2"><font color="red"><?php __("General SQL Admin"); ?></font></a><br> - -</td></tr> +<dt id="reseller">Reseller</dt> + <dd><a href="adm_list.php"><?php __("Manage the members"); ?></a></dd> + <dd><a href="adm_panel.php"><?php __("Admin Control Panel"); ?></a></dd> + <dd><a href="/admin/sql/?server=2"><?php __("General SQL Admin"); ?></a></dd> <?php } ?> diff --git a/bureau/admin/menu_aide.php b/bureau/admin/menu_aide.php index c774661d..e1bee26f 100644 --- a/bureau/admin/menu_aide.php +++ b/bureau/admin/menu_aide.php @@ -29,6 +29,5 @@ */ ?> -<tr><td nowrap="nowrap"> -<a href="http://doc.alternc.org/user/" target="help"><?php __("Online help"); ?></a><br /> -</td></tr> +<dt id="help"><?php __("Online help"); ?></dt> +<dd><a href="http://doc.alternc.org/user/" target="help"><?php __("Online help"); ?></a></dd> diff --git a/bureau/admin/menu_brouteur.php b/bureau/admin/menu_brouteur.php index 01512c04..ae9bafb8 100644 --- a/bureau/admin/menu_brouteur.php +++ b/bureau/admin/menu_brouteur.php @@ -30,6 +30,5 @@ /* ############# BROUTEUR ############# */ ?> -<tr><td nowrap="nowrap"> -<a href="bro_main.php"><?php __("File browser"); ?></a><br /> -</td></tr> +<dt id="browser"><?php __("File browser"); ?></dt> +<dd><a href="bro_main.php"><?php __("File browser"); ?></a></dd> diff --git a/bureau/admin/menu_dom.php b/bureau/admin/menu_dom.php index 54d57ac0..ed622932 100644 --- a/bureau/admin/menu_dom.php +++ b/bureau/admin/menu_dom.php @@ -32,17 +32,16 @@ $q=$quota->getquota("dom"); if ($q["t"]>0) { ?> -<tr><td nowrap="nowrap"> -<?php __("Domains"); ?><br /> +<dt><?php __("Domains"); ?></dt> <?php if ($quota->cancreate("dom")) { ?> - - <a href="dom_add.php"><?php __("Add a domain"); ?></a><br /> + <dd class="action"><a href="dom_add.php"><?php __("Add a domain"); ?></a></dd> <?php } /* Enumeration des domaines : */ $domain=$dom->enum_domains(); reset($domain); while (list($key,$val)=each($domain)) { ?> - - <a href="dom_edit.php?domain=<?php echo urlencode($val) ?>"><?php echo $val ?></a><br /> + <dd class="element"><a href="dom_edit.php?domain=<?php echo urlencode($val) ?>"><?php echo $val ?></a></dd> <?php } ?> -</td></tr> +</dd></dt> <?php } ?> diff --git a/bureau/admin/menu_ftp.php b/bureau/admin/menu_ftp.php index 20b76c9b..7a511e5a 100644 --- a/bureau/admin/menu_ftp.php +++ b/bureau/admin/menu_ftp.php @@ -32,7 +32,6 @@ $q=$quota->getquota("ftp"); if ($q["t"]>0) { ?> -<tr><td nowrap="nowrap"> -<a href="ftp_list.php"><?php __("FTP accounts"); ?></a><br /> -</td></tr> +<dt id="ftp"><?php __("FTP accounts"); ?></dt> +<dd><a href="ftp_list.php"><?php __("FTP accounts"); ?></a></dd> <?php } ?> diff --git a/bureau/admin/menu_mem.php b/bureau/admin/menu_mem.php index 3ca26448..4ea60db8 100644 --- a/bureau/admin/menu_mem.php +++ b/bureau/admin/menu_mem.php @@ -28,7 +28,7 @@ ---------------------------------------------------------------------- */ ?> -<tr><td nowrap="nowrap"> -<a href="mem_param.php"><?php __("Settings"); ?></a><br /> -<a href="mem_logout.php" target="_parent"><?php __("Logout"); ?></a><br /> -</td></tr> +<dt id="settings"><?php __("Settings"); ?></dt> +<dd><a href="mem_param.php"><?php __("Settings"); ?></a></dd> +<dt id="logout"><?php __("Logout"); ?></dt> +<dd><a href="mem_logout.php" target="_parent"><?php __("Logout"); ?></a></dd> diff --git a/bureau/admin/menu_quota.php b/bureau/admin/menu_quota.php index da9c788c..e191972e 100644 --- a/bureau/admin/menu_quota.php +++ b/bureau/admin/menu_quota.php @@ -28,6 +28,5 @@ ---------------------------------------------------------------------- */ ?> -<tr><td nowrap="nowrap"> -<a href="quota_show.php"><?php __("Show my quotas"); ?></a><br /> -</td></tr> +<dt id="quota"><?php __("Show my quotas"); ?></dt> +<dd><a href="quota_show.php"><?php __("Show my quotas"); ?></a></dd> diff --git a/bureau/admin/menu_sql.php b/bureau/admin/menu_sql.php index e6cb8cf7..3cd20e93 100644 --- a/bureau/admin/menu_sql.php +++ b/bureau/admin/menu_sql.php @@ -30,12 +30,10 @@ $r=$quota->getquota("mysql"); if ($r["t"]) { ?> -<tr><td nowrap="nowrap"> -MySQL<br /> - - <a href="sql_users_list.php"><?php __("MySQL Users") ?></a><br /> - - <a href="sql_list.php"><?php __("Databases"); ?></a><br /> - - <a target="_blank" href="sql_admin.php"><?php __("SQL Admin"); ?></a><br /> -</td></tr> +<dt id="mysql">MySQL</dt> +<dd><a href="sql_users_list.php"><?php __("MySQL Users") ?></a></dd> +<dd><a href="sql_list.php"><?php __("Databases"); ?></a></dd> +<dd><a target="_blank" href="sql_admin.php"><?php __("SQL Admin"); ?></a></dd> <?php } ?> diff --git a/bureau/admin/menu_sta2.php b/bureau/admin/menu_sta2.php index 364eaa99..9f4d4ff5 100644 --- a/bureau/admin/menu_sta2.php +++ b/bureau/admin/menu_sta2.php @@ -33,7 +33,6 @@ $q=$quota->getquota("sta2"); $r=$quota->getquota("dom"); if ($q["t"]>0 && $r["u"]>0) { ?> -<tr><td nowrap="nowrap"> -<a href="sta2_list.php"><?php __("Raw web statistics"); ?></a><br /> -</td></tr> +<dt id="stats"><?php __("Raw web statistics"); ?></dt> +<dd><a href="sta2_list.php"><?php __("Raw web statistics"); ?></a></dd> <?php } ?> diff --git a/bureau/admin/menu_web.php b/bureau/admin/menu_web.php index 9cb51c08..ddcef9c7 100644 --- a/bureau/admin/menu_web.php +++ b/bureau/admin/menu_web.php @@ -30,6 +30,5 @@ /* ############# WEB ACCESS ############# */ ?> -<tr><td nowrap="nowrap"> -<a href="hta_list.php"><?php __("Protected folders"); ?></a><br /> -</td></tr> +<dt id="web-access"><?php __("Protected folders"); ?></dt> +<dd><a href="hta_list.php"><?php __("Protected folders"); ?></a></dd> diff --git a/bureau/admin/styles/base.css b/bureau/admin/styles/base.css new file mode 100644 index 00000000..a5a4fc9f --- /dev/null +++ b/bureau/admin/styles/base.css @@ -0,0 +1,285 @@ +body { + font-family: sans-serif; + font-size: 85%; +} + +.hlp { + color: #202020; +} + +td { + color: #000000; +} + +th { +/* color: #007799;*/ +} + +h3 { + color: #CB781A; +} + +h4 { + color: #007777; +} + +hr { + border: none; + border-top: 1px solid #000; +} + +.inp { + /* Should not be use anymore !!! */ + border-color: blue; + border-width: 5px; + background-color: #500000; + color: white; +} + +.inc, .inl { + border-style: none; + color: black; +} + +.inb { + border: 1px solid #aaa; + color: black; +} + +.int { + border: 1px solid #aaa; + color: black; + +} + +.lst1 { + background-color: #FFFFFF; +} +.lst2 { + background-color: #EEEEEE; +} + +.dlogin { + text-align: center; +} + +.login { + margin-left: auto; + margin-right: auto; +} + +img { + border: 0px; + vertical-align: middle; +} + +.error { + color: red; + font-weight: bold; +} + +/* Over quota class */ +.over { + color: red; +} + +.code { + font-size: 16px; + font-family: Courier New, Fixed; + font-weight: bold; + text-align: center; +} + +a { + color:#333; + } +a:hover { + color:#CB781A; +} +a:visited { + color:#985B16; +} + +body#menu { + border-right:1px solid #000; + font-size: .9em; + padding-bottom: 2em; + margin:0; + } +body#menu img { + padding: 5px; + } +body#menu h3 { + padding-left: 5px; + margin: .5em 0; + } +#menu-list a { + display:block; + padding: 2px; + margin:0; + } +#menu-list a:hover { + color: #000; + background-color: #EBE0D0; + } +#menu dl { + margin: .5em 0; + } +#menu-list dt { + font-weight:bold; + color:#777; + font-size:.9em; + /*margin: 4px 0 2px 0;*/ + padding: 7px .1em 0 5px; + /*background-color: #ccc;*/ + border-bottom: 2px solid #ccc; + } +#menu-list dd { + padding:0; + margin:0; + font-size: 1em; + border-bottom: 1px solid #ccc; + } +#alternc-logo { + padding: .5em ; + text-align: center; + background-color: #CB781A; + } +#alternc-logo a { + color: #fff; + font-weight:bold; + } +#menu-list dd a { + padding: 0 0 0 15px; + text-decoration: none; +} + + + +/**** Login ****/ + +body.login { + text-align:center; + margin: 2em 10em; +} +#wrapper { + margin: 0 auto; +} +body.login form { + +} +.login img { + padding: 3em 1em 1em;; +} +.login form table { + width: 100%; + border: 1px solid #CB781A; + border-collapse:collapse; +} +.login form table thead { + font-weight: bold; + font-size: 1.5em; + padding: 1em; + background-color:#CB781A; +} +.login form table thead td{ + color: white; +} +.login form table td.forminfo { + padding: 1em; + border-top: 1px solid #CB781A; + border-bottom: 1px solid #CB781A; + font-size: 110%; +} + +td.username, +td.pass { + text-align: right; + padding: 0 0 0 .5em; + width: 50%; + font-weight: bold; + font-size: 1.2em; + letter-spacing: 2px; +} +td.input_username, +td.input_pass { + text-align: left; + width: 50%; + padding: 0 1em; +} +td.input_username input, +td.input_pass input { +/* width: 100%;*/ + border-color:#CB781A; + font-family: Courrier New, fixed; + padding: 2px; + font-size: 110%; +} +td.input_username input:hover, +td.input_pass input:hover { + background-color:yellow; +} +td.username, +td.input_username { + padding-top: 1em; +} +td.pass, +td.input_pass { + padding-bottom: 1em; +} +.cookie_ack { + font-size: 85%; + padding-bottom: 1em; + font-weight: bold; +} +.login form table tfoot { + background-color:#F4D9B9; + border-top: 1px solid #CB781A; + margin-top: 2em; + font-size: 85%; +} +.login form table tfoot p { + margin: .3em; +} + +input.inb { + font-weight: bold; + font-size: 100%; + letter-spacing: 2px; + padding: 1px 1em; + background-color:#fff; +} +input.inb:hover { + background-color:yellow; +} +input.inb:active { + background-color:red; + color: #fff; +} + +/** menu param (intend to be the style of all the tables) **/ + +#mem_param table { + width: 70%; + border-collapse:collapse; + margin-bottom: 1em; + } +#mem_param table thead { + background-color:#CB781A; + } +#mem_param table thead td { + color: #fff; + font-weight: bold; + } +#mem_param table th { + width: 50%; + text-align: right; + } +#mem_param table input { + } +#mem_param table input.inb { + float: right; + } +#mem_param input.inb { + font-size: .8em + } diff --git a/bureau/admin/styles/style.css b/bureau/admin/styles/style.css deleted file mode 100644 index ad10b696..00000000 --- a/bureau/admin/styles/style.css +++ /dev/null @@ -1,128 +0,0 @@ -body { - font-family: Verdana, Arial, Helvetica, sans-serif; - font-size: 12px; - color: #000000; - background-color: white; -} - -.hlp { - font-family: Helvetica, Tahoma, sans-serif; - font-size: 10px; - color: #202020; -} - -td { - font-family: Verdana, Arial, Helvetica, sans-serif; - font-size: 12px; - color: #000000; -} - -th { - font-family: Verdana, Arial, Helvetica, sans-serif; - font-size: 12px; - color: #007799; - font-weight: bold; -} - -h3 { - font-family: Verdana, Arial, Helvetica, sans-serif; - font-size: 18px; - font-weight: bold; - color: #007777; - text-align: center; -} - -h4 { - font-family: Verdana, Arial, Helvetica, sans-serif; - font-size: 16px; - font-weight: bold; - color: #007777; -} - -hr { - color: #007799; - border-color: #007799; -} - -.inp { - /* Should not be use anymore !!! */ - border-color: blue; - border-width: 5px; - background-color: #500000; - color: white; -} - -.inc, .inl { - background-color: #FFFFF0; - font-family: Verdana, Arial, Helvetica, sans-serif; - font-size: 12px; - border-style: none; - color: black; -} - -.inb { - background-color: #FFFFF0; - font-family: Verdana, Arial, Helvetica, sans-serif; - font-size: 12px; - color: black; -} - -.int { - background-color: #FFFFF0; - font-family: Verdana, Arial, Helvetica, sans-serif; - font-size: 12px; - color: black; - border-width: 1px; - border-color: black; - border-style: solid; -} - -.lst1 { - background-color: #FFFFFF; -} -.lst2 { - background-color: #EEEEEE; -} - -.dlogin { - text-align: center; -} - -.login { - margin-left: auto; - margin-right: auto; -} - -img { - border: 0px; - vertical-align: middle; -} - -.error { - color: red; - font-weight: bold; -} - -/* Over quota class */ -.over { - color: red; -} - -.code { - font-size: 16px; - font-family: Courier New, Fixed; - font-weight: bold; - text-align: center; -} - -.exp1 { - background-color: #6284F3; -} - -.exp2 { - background-color: #62F37A; -} - -.exp3 { - background-color: #F36262; -} diff --git a/bureau/head.php b/bureau/head.php index 00b98f19..0eb51e70 100644 --- a/bureau/head.php +++ b/bureau/head.php @@ -40,5 +40,5 @@ sur serveurs mutualisés, né d'Altern.org et de Lautre Net" /> <meta name="keywords" content="Hébergement, Logiciel d'hébergement, Altern, Lautre Net, GPL, Développement" /> -<link rel="stylesheet" href="/style.css" type="text/css" /> +<link rel="stylesheet" href="/admin/styles/base.css" type="text/css" /> <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /> diff --git a/bureau/style.css b/bureau/style.css deleted file mode 100644 index 2002a794..00000000 --- a/bureau/style.css +++ /dev/null @@ -1,34 +0,0 @@ -body { - font-family: Verdana, Arial, Helvetica, sans-serif; - font-size: 0.9em; - color: #000000 -} - -td { - font-family: Verdana, Arial, Helvetica, sans-serif; - font-size: 0.9em; - color: #000000 -} - -th { - font-family: Verdana, Arial, Helvetica, sans-serif; - font-size: 0.9em; - color: #007799; - font-weight: bold -} - -h3 { - font-family: Verdana, Arial, Helvetica, sans-serif; - font-size: 1.2em; - font-weight: bold; - color: #007777 -} - -hr { - color: #007799; - border-color: #007799; -} - -.inp { - background-color: #C0C0FF; -} \ No newline at end of file diff --git a/debian/changelog b/debian/changelog index 96d17335..9be2d496 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +alternc (0.9.7+dev) stable; urgency=low UNRELEASED + + * standardisation of the web interface, along with some esthetic changes, by + Marc Angles, sponsored by Koumbit + * styles can now be changed locally in admin/styles/base.css + + -- Antoine Beaupré <anarcat@koumbit.org> Thu, 10 Apr 2008 13:56:22 -0400 + alternc (0.9.7) stable; urgency=low * major release, closing more than 40 bugs, including...