Adding meta tags to layouts and translation.

Added another email to contact page.
zsol · Mar 27, 2011 · 779f2c4 · 779f2c4
1 parent 53064bd
commit 779f2c4
Show file tree

Hide file tree

Showing 9 changed files with 31 additions and 8 deletions.
diff --git a/apps/frontend/config/view.yml b/apps/frontend/config/view.yml
@@ -6,10 +6,10 @@ default:
     content-type: text/html
 
   metas:
-    #title:        CupApp
-    #description:
-    #keywords:
-    #language:     en
+    #title:       CupApp
+    #description: 
+    #keywords:    
+    #language:    
     robots:       index, follow
 
   stylesheets:    [reset.css, main.css]

diff --git a/apps/frontend/i18n/en/messages.xml b/apps/frontend/i18n/en/messages.xml
@@ -512,6 +512,14 @@
         <source>This description is too big! Maximum %%ss%% characters!</source>
         <target/>
       </trans-unit>
+      <trans-unit id="136">
+        <source>layout.metas.description</source>
+        <target>Starcraft2 replay sharing and cup organizer application</target>
+      </trans-unit>
+      <trans-unit id="137">
+        <source>layout.metas.keywords</source>
+        <target>Starcraft2, Blizzard, cup, replay, replay sharing, replay parser</target>
+      </trans-unit>
     </body>
   </file>
 </xliff>
diff --git a/apps/frontend/i18n/hu/messages.xml b/apps/frontend/i18n/hu/messages.xml
@@ -532,6 +532,14 @@
         <source>This description is too big! Maximum %%ss%% characters!</source>
         <target>Ez a leírás túl hosszú! Maximum %%ss%% karater lehet!</target>
       </trans-unit>
+      <trans-unit id="141">
+        <source>layout.metas.description</source>
+        <target>Starcraft2 replay megosztó és kupa szervező alkalmazás</target>
+      </trans-unit>
+      <trans-unit id="142">
+        <source>layout.metas.keywords</source>
+        <target>Starcraft2, Blizzard, cup, replay, replay megosztás, replay parser</target>
+      </trans-unit>
     </body>
   </file>
 </xliff>
diff --git a/apps/frontend/modules/boxes/templates/_ie6.php b/apps/frontend/modules/boxes/templates/_ie6.php
@@ -1,7 +1,6 @@
 <div class="greybox">
     <h3><img alt="warning" src="/images/icons/delete.png"/> <?php echo __('Warning!') ?></h3>
-    <p style="text-align:center;"><img src="/images/baby_seal.jpg" alt="baby_seal"/></p>
-
+    <div style="-moz-border-radius: 20px;-webkit-border-radius: 20px;margin:0px auto;width:80px;height:75px;background:url(/images/baby_seal.jpg);"></div>
     <p style="font-size:0.8em;text-align:justify;"><?php echo __('This site has never been tested on Internet Explorer ... at all! If you are still using IE6, then SHAME ON YOU! Imagine a baby seal has just died because of you! Now go and get a decent browser!'); ?></p>
     <img style="float:left;padding:3px 5px 5px 0px;" alt="nottestedinIE" src="/images/misc/not_tested_in_ie.png"/>
     <p style="font-size:0.8em;text-align:justify;"><?php echo __('Thank you for your understanding and sorry for the inconveniences it may cause.'); ?></p>

diff --git a/apps/frontend/modules/cms/templates/contactSuccess.php b/apps/frontend/modules/cms/templates/contactSuccess.php
@@ -22,5 +22,8 @@
     @cupapp.com
     </div>
     </div>
+    <div><br/><br/></div>
+    <div style="text-align:center;"><img src="/images/cupappemail.gif"/></div>
+    <br/><br/>
 <div style="clear:both;"></div>
 </div>
diff --git a/apps/frontend/templates/_metas.php b/apps/frontend/templates/_metas.php
@@ -0,0 +1,3 @@
+<meta name="description" content="<?php echo __('layout.metas.description') ?>"/>
+<meta name="keywords" content="<?php echo __('layout.metas.keywords') ?>"/>
+<meta name="language" content="<?php echo $sf_user->getCulture() ?>"/>
diff --git a/apps/frontend/templates/layout.php b/apps/frontend/templates/layout.php
@@ -1,8 +1,9 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<?php echo $sf_user->getCulture() ?>" lang="<?php echo $sf_user->getCulture() ?>">
   <head>
     <?php include_http_metas() ?>
     <?php include_metas() ?>
+    <?php include_partial('global/metas') ?>
     <title>CupApp<?php if (has_slot('title')) { echo " - "; include_slot('title'); } ?></title>
     <link rel="shortcut icon" href="/favicon.ico" />
     <?php include_stylesheets() ?>

diff --git a/apps/frontend/templates/layoutWide.php b/apps/frontend/templates/layoutWide.php
@@ -3,7 +3,8 @@
   <head>
     <?php include_http_metas() ?>
     <?php include_metas() ?>
-   <title>CupApp<?php if (has_slot('title')) { echo " - "; include_slot('title'); } ?></title>
+    <?php include_partial('global/metas') ?>
+    <title>CupApp<?php if (has_slot('title')) { echo " - "; include_slot('title'); } ?></title>
     <link rel="shortcut icon" href="/favicon.ico" />
     <?php include_stylesheets() ?>
     <?php include_javascripts() ?>

diff --git a/web/images/cupappemail.gif b/web/images/cupappemail.gif