diff options
author | Andreas Unterkircher <unki@netshadow.at> | 2008-05-11 09:42:36 +0200 |
---|---|---|
committer | Andreas Unterkircher <unki@netshadow.at> | 2008-05-11 09:42:36 +0200 |
commit | d97a057346bebb98be293d903a86987273cbee3e (patch) | |
tree | 6f1ff7dc2f46b8de0bf2438447cb2f5165aa4199 /themes/default/templates/index.tpl | |
parent | b5ff85f75a27397c1ab4164fdefa9d734dc0e39d (diff) | |
parent | 7731c49b82089c7b62cc70f84edbae0d39f54fd3 (diff) |
fix conflicts during merge of Arun's tree
Signed-off-by: Andreas Unterkircher <unki@netshadow.at>
Diffstat (limited to 'themes/default/templates/index.tpl')
-rw-r--r-- | themes/default/templates/index.tpl | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/themes/default/templates/index.tpl b/themes/default/templates/index.tpl index 46effe2..694f86a 100644 --- a/themes/default/templates/index.tpl +++ b/themes/default/templates/index.tpl @@ -4,7 +4,7 @@ <!-- loading --> <div id="HTML_AJAX_LOADING"> - <img src="{$web_path}/resources/loading.gif" style="vertical-align: middle;" /> Loading... + <img src="{$web_path}/resources/loading.gif" style="vertical-align: middle;" alt="Loading..." /> Loading... </div> <!-- top menu --> @@ -25,7 +25,7 @@ </div> <!-- /top menu --> - <span style="clear: both;"> + <div style="clear: both;"> <!-- option column --> <div class="options" style="float: left;"> <div> @@ -41,6 +41,6 @@ <div id="content" class="content"> { $initial_content } </div> - </span> + </div> {include file="footer.tpl"} |