Changeset 2844

Timestamp:

06/15/2008 10:55:38 AM (5 months ago)

Author:

Shadowhand

Message:

Follow up to r2843

Location:

branches/website

Files:

• application/config/locale.php (modified) (2 diffs)
• application/views/layout.php (modified) (2 diffs)
• media/css/web.css (modified) (1 diff)

branches/website/application/config/locale.php

@@ -1 +1 @@
 <?php defined('SYSPATH') or die('No direct access allowed.');
+
 /**
  * List of all available languages: TLD => i18n
@@ -6 +7 @@
 (
         'com' => 'en_US',
+        'de'  => 'de_DE',
         'es'  => 'es_ES',
+        'fr'  => 'fr_FR',
         'nl'  => 'nl_NL',
-        'de'  => 'de_DE',
-        'fr'  => 'fr_FR',
         'pl'  => 'pl_PL',
         'ru'  => 'ru_RU',

branches/website/application/views/layout.php

@@ -3 +3 @@
 // HTML lang
 $lang = substr(Config::item('locale.language'), 0, 2);
+
+// Base URL
+$base_url = url::base();
 
 ?>
@@ -53 +56 @@
 <!-- Start Language Picker -->
 <ul id="languages">
-<?php foreach (Config::item('locale.tlds') as $tld => $i18n) { ?>
-        <li>
-                <a class="<?php if ($tld === TLD) echo 'active' ?>" href="<?php echo preg_replace('~(?<=kohanaphp\.)[a-z.]+~', $tld, url::current(TRUE), 1) ?>">
-                        <img alt="<?php echo $i18n ?>" src="<?php echo url::base() ?>media/img/flags/<?php echo $i18n ?>.png" width="16" height="11" />
-                </a>
-        </li>
-<?php } ?>
+<?php foreach (Config::item('locale.tlds') as $tld => $i18n): ?>
+<li><a class="<?php if ($tld === TLD) echo 'active' ?>" href="<?php echo ($url = preg_replace('/(?<=kohanaphp\.)[a-z.]+/', $tld, $base_url, 1)).Router::$complete_uri ?>"><img alt="<?php echo $i18n ?>" src="<?php echo $base_url ?>media/img/flags/<?php echo $i18n ?>.png" width="16" height="11" /></a></li>
+<?php endforeach ?>
 </ul>
 <!-- End Language Picker -->

branches/website/media/css/web.css

@@ -22 +22 @@
 
 /* Language picker */
-#languages { margin-right: 4em; }
-        #languages a { float: right; margin: 0.7em 0.3em; border: 2px solid #21364d; }
-        #languages a:hover { border-color: #345072; }
-        #languages a.active { border-color: #6593cc; }
-                #languages a img { display: block; }
+#languages { float: right; padding: 0.6em 0; margin-right: 4em; }
+        #languages li { display: inline; }
+        #languages a { display: block; float: left; padding: 0.2em; margin: 0 0.4em; border: none; background: #21364d; }
+        #languages a:hover { background-color: #345072; }
+        #languages a.active { background-color: #6593cc; }
 
 /* Developer Menu */