| [vhffs-dev] [svn] commit: r115 - in /trunk: vhffs-api/src/Vhffs/Panel/ vhffs-panel/ vhffs-panel/templates/main/ vhffs-panel/themes/default/ vhffs-panel/themes/default/images/ vhffs-panel/themes/tuxfamily/ vhffs-panel/themes/tuxfamily/images/ |
[ Thread Index |
Date Index
| More vhffs.org/vhffs-dev Archives
]
- To: vhffs-dev@xxxxxxxxx
- Subject: [vhffs-dev] [svn] commit: r115 - in /trunk: vhffs-api/src/Vhffs/Panel/ vhffs-panel/ vhffs-panel/templates/main/ vhffs-panel/themes/default/ vhffs-panel/themes/default/images/ vhffs-panel/themes/tuxfamily/ vhffs-panel/themes/tuxfamily/images/
- From: vhffs-dev@xxxxxxxxx
- Date: Thu Dec 15 21:15:34 2005 +00
Author: soda
Date: Thu Dec 15 22:15:31 2005
New Revision: 115
Log:
some fixes and add logo for localisation
Added:
trunk/vhffs-panel/themes/default/images/en_US.png (with props)
trunk/vhffs-panel/themes/default/images/es_ES.png (with props)
trunk/vhffs-panel/themes/default/images/fr_FR.png (with props)
trunk/vhffs-panel/themes/default/images/it_IT.png (with props)
trunk/vhffs-panel/themes/tuxfamily/images/en_US.png (with props)
trunk/vhffs-panel/themes/tuxfamily/images/es_ES.png (with props)
trunk/vhffs-panel/themes/tuxfamily/images/fr_FR.png (with props)
trunk/vhffs-panel/themes/tuxfamily/images/it_IT.png (with props)
Modified:
trunk/vhffs-api/src/Vhffs/Panel/Main.pm
trunk/vhffs-panel/auth.pl
trunk/vhffs-panel/templates/main/auth.tmpl
trunk/vhffs-panel/themes/default/main.css
trunk/vhffs-panel/themes/tuxfamily/main.css
Modified: trunk/vhffs-api/src/Vhffs/Panel/Main.pm
==============================================================================
--- trunk/vhffs-api/src/Vhffs/Panel/Main.pm (original)
+++ trunk/vhffs-api/src/Vhffs/Panel/Main.pm Thu Dec 15 22:15:31 2005
@@ -16,6 +16,20 @@
use Vhffs::Panel::Menu;
use Vhffs::Panel::User;
+
+sub get_theme
+{
+ my $theme = CGI->cookie("theme" );
+ if( $theme )
+ {
+ return $theme;
+ }
+ else
+ {
+ return "default";
+ }
+}
+
sub select_lang
{
use Vhffs::Intl;
@@ -25,7 +39,7 @@
my $l;
foreach $l ( @{$langs} )
{
- $txt .= "<option name=i\"$l\">$l</option>";
+ $txt .= "<a href=\"auth.pl?lang=".$l."\"><img src=\"/themes/".get_theme()."/images/".$l.".png\" alt=\"".$l."language\"/></a>";
}
return $txt;
}
@@ -50,7 +64,11 @@
{
$lang = CGI->cookie( "lang" );
}
- setlocale(LC_ALL, $lang );
+ else
+ {
+ $lang = "en_US";
+ }
+ setlocale(LC_ALL, $lang );
bindtextdomain("vhffs", $vhffs->get_config->get_intldir);
textdomain("vhffs");
return $cookie;
@@ -486,6 +504,7 @@
}
+
sub list_themes
{
my $vhffs = shift;
Modified: trunk/vhffs-panel/auth.pl
==============================================================================
--- trunk/vhffs-panel/auth.pl (original)
+++ trunk/vhffs-panel/auth.pl Thu Dec 15 22:15:31 2005
@@ -29,8 +29,7 @@
$template->param( TEXT_LOGIN => gettext("Login") );
$template->param( TEXT_LOSTPASSWORD => gettext("I've lost my password") );
$template->param( TEXT_SUBSCRIBE => gettext("Subscribe") );
-$template->param( CHANGE_TEXT => gettext("change") );
-$template->param( LANG_TEXT => gettext("Language") );
+
$template->param( LANGS => Vhffs::Panel::Main::select_lang( $vhffs ) );
Modified: trunk/vhffs-panel/templates/main/auth.tmpl
==============================================================================
--- trunk/vhffs-panel/templates/main/auth.tmpl (original)
+++ trunk/vhffs-panel/templates/main/auth.tmpl Thu Dec 15 22:15:31 2005
@@ -11,15 +11,7 @@
</head>
<body>
<div id="chooselang">
- <form method="post" action="auth.pl">
- <tmpl_var name="LANG_TEXT">:
- <br/>
- <select name="lang">
- <tmpl_var name="LANGS">
- </select>
- <br/>
- <input type="submit" value="<tmpl_var name="CHANGE_TEXT">" />
- </form>
+ <tmpl_var name="LANGS">
</div>
<div class="logo">
Modified: trunk/vhffs-panel/themes/default/main.css
==============================================================================
--- trunk/vhffs-panel/themes/default/main.css (original)
+++ trunk/vhffs-panel/themes/default/main.css Thu Dec 15 22:15:31 2005
@@ -8,16 +8,16 @@
font-family:"Trebuchet MS",Verdana,Geneva,Arial,Helvetica,sans-serif;
}
-#chooselang form
-{
- text-align: center;
- width: 30%;
+#chooselang img
+{
+ margin-left: 10px;
+ margin-right: 10px;
}
#chooselang
{
- right: 10%;
- top: 5%;
+ right: 15%;
+ top: 10%;
position: absolute;
}
Modified: trunk/vhffs-panel/themes/tuxfamily/main.css
==============================================================================
--- trunk/vhffs-panel/themes/tuxfamily/main.css (original)
+++ trunk/vhffs-panel/themes/tuxfamily/main.css Thu Dec 15 22:15:31 2005
@@ -16,6 +16,20 @@
input:hover, textarea:hover, select:hover
{
background-color: #ffe739;
+}
+
+
+#chooselang img
+{
+ margin-left: 10px;
+ margin-right: 10px;
+}
+
+#chooselang
+{
+ right: 15%;
+ top: 10%;
+ position: absolute;
}
@@ -44,6 +58,16 @@
color: #630000;
}
+#misc
+{
+ margin-top: 3em;
+ margin-left: 20%;
+ margin-right: 20%;
+ background-color: #e76d00;
+ text-align: center;
+ color: #630000;
+}
+
.menu a:hover
{ background-color: #ffecce; }
@@ -88,14 +112,21 @@
.logo
{
- display:block;
background-image:url("./images/logo.png");
- background-color: #630000;
- text-align:right;
- width:100%;
+ width: 40%;
height:131px;
+ margin-right: 30%;
+ margin-left: 30%;
background-position:center center;
background-repeat:no-repeat;
+}
+
+.foothome
+{
+ background-color: #e76d00;
+ width: 40%;
+ margin-right: 30%;
+ margin-left: 30%;
}
.menu