Permalink
Browse files

tweaking header and footer links to point to language specific blog p…

…ages
  • Loading branch information...
1 parent 204344d commit 7d26326f760d8ec96e56df13b6e67edec5a2a855 @cowgp cowgp committed Aug 5, 2011
Showing with 28 additions and 6 deletions.
  1. +6 −3 .htaccess
  2. +2 −0 about.php
  3. +2 −0 drive.php
  4. +1 −0 drives.php
  5. +2 −0 feedMap.php
  6. +2 −0 glossary.php
  7. +2 −0 index.php
  8. +1 −0 info.php
  9. +2 −0 press.php
  10. +2 −0 stats.php
  11. +1 −0 submit.php
  12. +2 −0 submitDrive.php
  13. +1 −1 views/footer.php
  14. +2 −2 views/header.php
View
@@ -26,7 +26,9 @@ RewriteRule ^submit_h$ submit_headless.php [L]
RewriteRule ^submit_h/do$ submit_headless.php?action=submit [L]
RewriteRule ^staging$ staging.php?type=html [L]
RewriteRule ^10mindata$ 10mindata.php [L]
-RewriteRule ^terms$ terms.php [L]
+RewriteRule ^terms-conditions(.*)$ http://blog.safecast.org/terms-conditions/ [L]
+RewriteRule ^ja/terms-conditions(.*)$ http://blog.safecast.org/ja/terms-conditions/ [L]
+
RewriteRule ^en$ index.php?lang=en [L]
RewriteRule ^jp$ index.php?lang=jp [L]
RewriteRule ^ja$ index.php?lang=jp [L]
@@ -37,8 +39,9 @@ RewriteRule ^info$ info.php [L]
RewriteRule ^glossary$ glossary.php [L]
RewriteRule ^info$ info.php [L]
RewriteRule ^about-safecast/japan-team/ info.php [L]
-RewriteRule ^about$ about.php [L]
-RewriteRule ^ja/about-safecast/$ about.php?lang=jp [L]
+RewriteRule ^about(.*)$ http://blog.safecast.org/about [L]
+RewriteRule ^ja/about(.*)$ http://blog.safecast.org/ja/about [L]
+RewriteRule ^ja/about-safecast/$ http://blog.safecast.org/ja/about [L]
RewriteRule ^contact$ contact.php [L]
RewriteRule ^drive$ drive.php?id=2 [L]
RewriteRule ^stats$ stats.php [L]
View
@@ -21,6 +21,8 @@
$tmpl->add('css', '/style/info.css');
$tmpl->add('css', '/style/about.css');
$tmpl->set('title', 'About Safecast');
+$tmpl->set('lang', $lang);
+
$tmpl->place('header');
?>
<div class="content">
View
@@ -20,6 +20,8 @@
$tmpl->set('conceivedPart1', $translations->conceivedPart1);
$tmpl->set('conceivedPart2', $translations->conceivedPart2);
$tmpl->set('pageName', 'drives');
+$tmpl->set('lang', $lang);
+
$tmpl->place('header');
$driveId = fRequest::get('id',"integer" );
View
@@ -19,6 +19,7 @@
$tmpl->set('termsPolicy', $translations->termsPolicy);
$tmpl->set('conceivedPart1', $translations->conceivedPart1);
$tmpl->set('conceivedPart2', $translations->conceivedPart2);
+$tmpl->set('lang', $lang);
$tmpl->set('pageName', 'drives');
$action = fRequest::get('action',"string?" );
View
@@ -27,6 +27,8 @@
$tmpl->set('conceivedPart1', $translations->conceivedPart1);
$tmpl->set('conceivedPart2', $translations->conceivedPart2);
$tmpl->set('pageName', 'index');
+$tmpl->set('lang', $lang);
+
$tmpl->place('header');
?>
<div class="content">
View
@@ -4,6 +4,8 @@
$tmpl->set('siteTagline', $translations->siteTagline);
$tmpl->set('pageName', 'glossary');
$tmpl->set('title', 'RDTN.ORG Glossary');
+$tmpl->set('lang', $lang);
+
$tmpl->place('header');
?>
<div class="content">
View
@@ -29,6 +29,8 @@
$tmpl->set('conceivedPart1', $translations->conceivedPart1);
$tmpl->set('conceivedPart2', $translations->conceivedPart2);
$tmpl->set('pageName', 'index');
+$tmpl->set('lang', $lang);
+
$tmpl->place('header');
?>
<div class="content">
View
@@ -16,6 +16,7 @@
$tmpl->set('termsPolicy', $translations->termsPolicy);
$tmpl->set('conceivedPart1', $translations->conceivedPart1);
$tmpl->set('conceivedPart2', $translations->conceivedPart2);
+$tmpl->set('lang', $lang);
$tmpl->set('pageName', 'about');
$tmpl->add('css', '/style/info.css');
View
@@ -13,6 +13,8 @@
$tmpl->set('termsPolicy', $translations->termsPolicy);
$tmpl->set('title', 'Safecast Press');
$tmpl->set('pageName', 'press');
+$tmpl->set('lang', $lang);
+
$tmpl->place('header');
?>
<div class="content">
View
@@ -29,6 +29,8 @@
$tmpl->set('follow', $translations->follow);
$tmpl->set('termsPolicy', $translations->termsPolicy);
$tmpl->set('pageName', 'stats');
+$tmpl->set('lang', $lang);
+
$tmpl->place('header');
?>
View
@@ -18,6 +18,7 @@
$tmpl->set('termsPolicy', $translations->termsPolicy);
$tmpl->set('conceivedPart1', $translations->conceivedPart1);
$tmpl->set('conceivedPart2', $translations->conceivedPart2);
+$tmpl->set('lang', $lang);
$tmpl->set('pageName', 'submit');
$action = fRequest::get('action',"string?" );
View
@@ -17,6 +17,8 @@
$tmpl->set('conceivedPart1', $translations->conceivedPart1);
$tmpl->set('conceivedPart2', $translations->conceivedPart2);
$tmpl->set('pageName', 'submit');
+$tmpl->set('lang', $lang);
+
$action = fRequest::get('action',"string?" );
$driveId = fRequest::get('driveId',"integer" );
View
@@ -15,7 +15,7 @@
<span class="bold_caps">VOLUNTEER:</span> <a href="https://spreadsheets.google.com/spreadsheet/viewform?formkey=dGNfLUFXdi1lejF1TzU4NHdhZnRGWkE6MQ">Interested in helping?</a><br/>
</div>
<br/> <br/>
- <div class="terms"><a href="/terms"><?php echo $this->get('termsPolicy'); ?></a></div>
+ <div class="terms"><a href="<?php if($this->get('lang')=="jp")echo "ja/"?>/terms-conditions"><?php echo $this->get('termsPolicy'); ?></a></div>
</div>
</div>
<div class="footerColumnRight">
View
@@ -63,7 +63,7 @@ function codeAddress() {
<a href="/home"><img src="images/logo.png" alt="Safecast" align="left" /></a><br/>
</div>
<div class="mainNav">
- <div id="navBlogButton" class="mainNavButton <?php $pageName=$this->get('pageName'); if($pageName=="about")echo "navActive"; ?>"><a href="/about" title="<?php echo $this->get('aboutCaps') ?>"><?php echo $this->get('aboutCaps') ?></a></div>
+ <div id="navBlogButton" class="mainNavButton <?php $pageName=$this->get('pageName'); if($pageName=="about")echo "navActive"; ?>"><a href="<?php if($this->get('lang')=="jp")echo "ja/"?>about/" title="<?php echo $this->get('aboutCaps') ?>"><?php echo $this->get('aboutCaps') ?></a></div>
<div id="navBlogButton" class="mainNavButton <?php $pageName=$this->get('pageName'); if($pageName=="drives")echo "navActive"; ?>"><a href="/drives" title="<?php echo $this->get('maps') ?>"><?php echo $this->get('maps') ?></a></div>
<div id="navBlogButton" class="mainNavButton"><a href="http://blog.safecast.org" title="<?php echo $this->get('blog') ?>"><?php echo $this->get('blog') ?></a></div>
<div id="navBlogButton" class="mainNavButton"><a href="/wiki" title="<?php echo $this->get('wiki') ?>"><?php echo $this->get('wiki') ?></a></div>
@@ -73,6 +73,6 @@ function codeAddress() {
<div><?php echo $this->get('languageSelect'); ?></div>
<div id="navEnglish" class="mainNavButton langNavButton <?php $lang=$this->get('lang'); if($lang=="en")echo "active"; ?>"><a href="./en" title="English" >English</a></div>
<div id="navJapanese" class="mainNavButton langNavButton <?php $lang=$this->get('lang'); if($lang=="jp")echo "active"; ?>"><a href="./jp" title="日本語">日本語</a></div>
- <div id="navEnglish" class="mainNavButton langNavButton <?php $lang=$this->get('lang'); if($lang=="de")echo "active"; ?>"><a href="./de" title="Deutsch" >Deutsch</a></div>
+ <!--<div id="navEnglish" class="mainNavButton langNavButton <?php $lang=$this->get('lang'); if($lang=="de")echo "active"; ?>"><a href="./de" title="Deutsch" >Deutsch</a></div>-->
</div>
</div>

0 comments on commit 7d26326

Please sign in to comment.