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 791dd32f446fb8a866867372be07cb94ad5fa31f..694f86a88fe8d977b9972902008d08b759206ab3 100644 (file)
--- a/themes/default/templates/index.tpl
+++ b/themes/default/templates/index.tpl
@@ -1,48 +1,46 @@
  {include file="header.tpl"}
- <body onload="init_phpfspot();">
+ <body onload="init_phpfspot('{$web_path}');">
   
+  <!-- loading -->
+
+  <div id="HTML_AJAX_LOADING">
+   <img src="{$web_path}/resources/loading.gif" style="vertical-align: middle;" alt="Loading..." />&nbsp;&nbsp;Loading...
+  </div>
+
    <!-- top menu -->
  
    <div class="menu">
     <div class="icons">
-    <a href="javascript:showPhotoIndex();" onclick="click(this);" title="Show Photo Index">
-     <img src="resources/photo_index.png" alt="photo index" />
+    <a href="javascript:showPhotoIndex();" onclick="click(this);" title="Show Photo Index (CTRL+ALT+i)">
+     <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">
-     <img src="resources/reload.png" alt="reset tags" />
+    <a href="javascript:resetAll();" onclick="click(this);" title="Reset selected-tags and search results (CTRL+ALT+r)">
+     <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">
-     <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>
    </div>
    <!-- /top menu -->
  
-  <span style="clear: both;">
+  <div style="clear: both;">
    <!-- option column -->
    <div class="options" style="float: left;">
-   <table>
-    <tr>
-     <td>
-      {include file="search.tpl"}
-     </td>
-    </tr>
-    <tr>
-     <td>
-      <div id="tags">
-       {include file="tags.tpl"}
-      </div>
-     </td>
-    </tr>
-   </table>
+   <div>
+    {include file="search.tpl"}
+   </div>
+   <div id="tags">
+    {include file="tags.tpl"}
+   </div>
    </div>
    <!-- /option column -->
  
    <!-- content column -->
    <div id="content" class="content">
-   {include file="welcome.tpl"}
+   { $initial_content }
+  </div>
    </div>
-  </span>
  
  {include file="footer.tpl"}