[xoops-svn] SF.net SVN: xoops-svn:[10228] XoopsCore/branches/2.6.x/2.6.0/htdocs

[<du...@us...>]

Revision: 10228
          http://sourceforge.net/p/xoops/svn/10228
Author:   dugris
Date:     2012-10-20 00:13:47 +0000 (Sat, 20 Oct 2012)
Log Message:
-----------
Fix for xlanguage

Modified Paths:
--------------
    XoopsCore/branches/2.6.x/2.6.0/htdocs/include/common.php
    XoopsCore/branches/2.6.x/2.6.0/htdocs/themes/default/theme.html
    XoopsCore/branches/2.6.x/2.6.0/htdocs/themes/default/xotpl/theme_user.html

Added Paths:
-----------
    XoopsCore/branches/2.6.x/2.6.0/htdocs/themes/default/xotpl/theme_language.html

Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/include/common.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/include/common.php	2012-10-18 12:42:23 UTC (rev 10227)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/include/common.php	2012-10-20 00:13:47 UTC (rev 10228)
@@ -300,4 +300,5 @@
 
 $xoops->logger->stopTime('XOOPS Boot');
 $xoops->logger->startTime('Module init');
-$xoops->preload->triggerEvent('core.include.common.end');
\ No newline at end of file
+$xoops->preload->triggerEvent('core.include.common.end');
+$xoops->preload->triggerEvent('core.include.block.language');
\ No newline at end of file

Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/themes/default/theme.html
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/themes/default/theme.html	2012-10-18 12:42:23 UTC (rev 10227)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/themes/default/theme.html	2012-10-20 00:13:47 UTC (rev 10228)
@@ -17,13 +17,15 @@
             <{includeq file="$theme_tpl/theme_menu.html"}>
             <!-- User menu -->
             <{includeq file="$theme_tpl/theme_user.html"}>
+            <!-- Language menu -->
+            <{includeq file="$theme_tpl/theme_language.html"}>
         </div>
     </div>
 </div>
 <div class="xo-hero">
     <div class="container xo-hero-content">
         <div class="row">
-            <div class="span7">        
+            <div class="span7">
                 <h1>XOOPS. Powered by You!</h1>
                 <p>easy to use dynamic web content management system written in PHP</p>
                 <p>
@@ -147,8 +149,5 @@
         </div>
     </div>
 </footer>
-<script type="text/javascript">
-    $().dropdown();
-</script>
 </body>
 </html>
\ No newline at end of file

Added: XoopsCore/branches/2.6.x/2.6.0/htdocs/themes/default/xotpl/theme_language.html
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/themes/default/xotpl/theme_language.html	                        (rev 0)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/themes/default/xotpl/theme_language.html	2012-10-20 00:13:47 UTC (rev 10228)
@@ -0,0 +1,5 @@
+<{if constant($smarty.const.XLANGUAGE_THEME_ENABLE)}>
+    <div class="pull-right">
+        <{$smarty.const.XLANGUAGE_SWITCH_CODE}>
+    </div>
+<{/if}>
\ No newline at end of file

Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/themes/default/xotpl/theme_user.html
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/themes/default/xotpl/theme_user.html	2012-10-18 12:42:23 UTC (rev 10227)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/themes/default/xotpl/theme_user.html	2012-10-20 00:13:47 UTC (rev 10228)
@@ -66,5 +66,8 @@
             </ul>
         </li>
     </ul>
+    <script type="text/javascript">
+        $('.dropdown-toggle').dropdown();
+    </script>
     <{/if}>
 </div>