fix conflicts during merge of Arun's tree

[phpfspot.git] / themes / default / templates / index.tpl
diff --git a/themes/default/templates/index.tpl b/themes/default/templates/index.tpl

index 87c58b9065a3a7e0c6a32050c51412399fd0f571..694f86a88fe8d977b9972902008d08b759206ab3 100644 (file)
--- a/themes/default/templates/index.tpl
+++ b/themes/default/templates/index.tpl
@@ -1,10 +1,10 @@
  {include file="header.tpl"}
  {include file="header.tpl"}
- <body onload="init_phpfspot();">
+ <body onload="init_phpfspot('{$web_path}');">
   
    <!-- loading -->
  
    <div id="HTML_AJAX_LOADING">
   
    <!-- loading -->
  
    <div id="HTML_AJAX_LOADING">
-   <img src="resources/loading.gif" style="vertical-align: middle;" alt="Loading..." />&nbsp;&nbsp;Loading...
+   <img src="{$web_path}/resources/loading.gif" style="vertical-align: middle;" alt="Loading..." />&nbsp;&nbsp;Loading...
    </div>
  
    <!-- top menu -->
    </div>
  
    <!-- top menu -->
@@ -12,13 +12,13 @@
    <div class="menu">
     <div class="icons">
      <a href="javascript:showPhotoIndex();" onclick="click(this);" title="Show Photo Index (CTRL+ALT+i)">
    <div class="menu">
     <div class="icons">
      <a href="javascript:showPhotoIndex();" onclick="click(this);" title="Show Photo Index (CTRL+ALT+i)">
-     <img src="resources/photo_index.png" alt="photo index" />
+     <img src="{$web_path}/resources/photo_index.png" alt="photo index" />
      </a>
      <a href="javascript:resetAll();" onclick="click(this);" title="Reset selected-tags and search results (CTRL+ALT+r)">
      </a>
      <a href="javascript:resetAll();" onclick="click(this);" title="Reset selected-tags and search results (CTRL+ALT+r)">
-     <img src="resources/reload.png" alt="reset tags" />
+     <img src="{$web_path}/resources/reload.png" alt="reset tags" />
      </a>
      <a href="javascript:showCredits();" onclick="click(this);" title="Show's a little credit page">
      </a>
      <a href="javascript:showCredits();" onclick="click(this);" title="Show's a little credit page">
-     <img src="resources/credits.png" alt="show credits" />
+     <img src="{$web_path}/resources/credits.png" alt="show credits" />
      </a>
     </div>
     <div class="logo">&nbsp;{$page_title}</div>
      </a>
     </div>
     <div class="logo">&nbsp;{$page_title}</div>
@@ -39,7 +39,7 @@
  
    <!-- content column -->
    <div id="content" class="content">
  
    <!-- content column -->
    <div id="content" class="content">
-   {include file="welcome.tpl"}
+   { $initial_content }
    </div>
    </div>
  
    </div>
    </div>