Scarab commit: svn commit: r11276 - branches/scarab_11079_legacy_with_ant_maven1/src/webapp/WEB-INF/templates/layouts/Default.vm

Author: dabbous
Date: 2012-06-08 02:59:48-0700
New Revision: 11276

Modified:
   branches/scarab_11079_legacy_with_ant_maven1/src/webapp/WEB-INF/templates/layouts/Default.vm

Log:
fixed issue with stylesheet not recognized

Modified: branches/scarab_11079_legacy_with_ant_maven1/src/webapp/WEB-INF/templates/layouts/Default.vm
Url: http://scarab.tigris.org/source/browse/scarab/branches/scarab_11079_legacy_with_ant_maven1/src/webapp/WEB-INF/templates/layouts/Default.vm?view=diff&pathrev=11276&r1=11275&r2=11276
==============================================================================
--- branches/scarab_11079_legacy_with_ant_maven1/src/webapp/WEB-INF/templates/layouts/Default.vm	(original)
+++ branches/scarab_11079_legacy_with_ant_maven1/src/webapp/WEB-INF/templates/layouts/Default.vm	2012-06-08 02:59:48-0700
@@ -14,9 +14,11 @@
       <meta http-equiv="refresh" content="$updateFrequency" />
     #end
 
-    #set ($style_file = "/skins/#getProperty('scarab.site.style').css")
-    <link rel="stylesheet" type="text/css" href="$staticLink.setPath($style_file)" />
-    <link rel="stylesheet" type="text/css" href="$staticLink.setPath("/skins/custom.css")" />
+    #set ($style = $scarabG.getTurbineConfiguration().getString("scarab.site.style"))
+    #set ($style_file = "/skins/${style}.css")
+    <!-- $style -->
+    <link rel="stylesheet" type="text/css" href='$staticLink.setPath($style_file)' />
+    <link rel="stylesheet" type="text/css" href='$staticLink.setPath("/skins/custom.css")' />
 
     <script src="$staticLink.setPath("/scripts/debug.js")" type="text/javascript"></script>
     <script src="$staticLink.setPath("/scripts/inputs.js")" type="text/javascript"></script>
@@ -196,7 +198,7 @@
    <table>
     <tr>
      <td>
-      #set ($productLogo = "#getProperty('scarab.product.logo')")
+      #set ($productLogo = $scarabG.getTurbineConfiguration().getString("scarab.product.logo"))
       #if ($productLogo.length() > 0)
       <a href="$link.setPage("Index.vm")"><img src="$staticLink.setPath("$productLogo")" alt="$productLogo" width="118" height="23" border="0" /></a>
       #end

------------------------------------------------------
http://scarab.tigris.org/ds/viewMessage.do?dsForumId=3577&dsMessageId=2969759