Fixed in part issue 56, the templates are in the idf subfolder.

src/IDF/templates/idf/admin/base.html

@@ -1,4 +1,4 @@
-{extends "base.html"}
+{extends "idf/base.html"}
 {block tabadmin} class="active"{/block}
 {block subtabs}
 <div id="sub-tabs">

src/IDF/templates/idf/admin/downloads.html

@@ -1,4 +1,4 @@
-{extends "admin/base.html"}
+{extends "idf/admin/base.html"}
 {block docclass}yui-t1{assign $inDownloads = true}{/block}
 {block body}
 <form method="post" action=".">

src/IDF/templates/idf/admin/issue-tracking.html

@@ -1,4 +1,4 @@
-{extends "admin/base.html"}
+{extends "idf/admin/base.html"}
 {block docclass}yui-t1{assign $inIssueTracking = true}{/block}
 {block body}
 <form method="post" action=".">

src/IDF/templates/idf/admin/members.html

@@ -1,4 +1,4 @@
-{extends "admin/base.html"}
+{extends "idf/admin/base.html"}
 {block docclass}yui-t3{assign $inMembers = true}{/block}
 {block body}
 <form method="post" action=".">

src/IDF/templates/idf/admin/source.html

@@ -1,4 +1,4 @@
-{extends "admin/base.html"}
+{extends "idf/admin/base.html"}
 {block docclass}yui-t1{assign $inSource = true}{/block}
 {block body}
 {if $form.errors}

src/IDF/templates/idf/admin/summary.html

@@ -1,4 +1,4 @@
-{extends "admin/base.html"}
+{extends "idf/admin/base.html"}
 {block docclass}yui-t1{assign $inSummary = true}{/block}
 {block body}
 {if $form.errors}

src/IDF/templates/idf/admin/tabs.html

@@ -1,4 +1,4 @@
-{extends "admin/base.html"}
+{extends "idf/admin/base.html"}
 {block docclass}yui-t1{assign $inTabs = true}{/block}
 {block body}
 {if $form.errors}

src/IDF/templates/idf/base-simple.html

@@ -37,10 +37,6 @@
 {if !$user.isAnonymous()}{aurl 'url', 'IDF_Views_User::myAccount'}{blocktrans}Welcome, <strong><a class="userw" href="{$url}">{$user}</a></strong>.{/blocktrans} <a href="{url 'IDF_Views::logout'}">{trans 'Sign Out'}</a>{else}<a href="{url 'IDF_Views::login'}">{trans 'Sign in or create your account'}</a>{/if}
 | <a href="{url 'IDF_Views::faq'}">{trans 'Help'}</a>
     </p>
-{* <div id="header">
-
-</div> *}
-
 	  <h1 id="title" class="title">{block title}{$page_title}{/block}</h1>
 
   </div>

src/IDF/templates/idf/base.html

@@ -69,7 +69,7 @@
   <div id="ft">{block foot}{/block}</div>
 </div>
 <script type="text/javascript" src="{media '/idf/js/jquery-1.2.6.min.js'}"></script>
-{include 'js-hotkeys.html'}
+{include 'idf/js-hotkeys.html'}
 {block javascript}{/block}
 {if $project}
 <script type="text/javascript">{literal}

src/IDF/templates/idf/downloads/base.html

@@ -1,4 +1,4 @@
-{extends "base.html"}
+{extends "idf/base.html"}
 {block tabdownloads} class="active"{/block}
 {block subtabs}
 <div id="sub-tabs">

src/IDF/templates/idf/downloads/delete.html

@@ -1,4 +1,4 @@
-{extends "downloads/base.html"}
+{extends "idf/downloads/base.html"}
 {block docclass}yui-t3{assign $inDownloads=true}{/block}
 {block body}
 

src/IDF/templates/idf/downloads/index.html

@@ -1,4 +1,4 @@
-{extends "downloads/base.html"}
+{extends "idf/downloads/base.html"}
 {block docclass}yui-t1{assign $inDownloads=true}{/block}
 {block body}
 {$downloads.render}

src/IDF/templates/idf/downloads/submit.html

@@ -1,4 +1,4 @@
-{extends "downloads/base.html"}
+{extends "idf/downloads/base.html"}
 {block docclass}yui-t3{assign $inSubmit=true}{/block}
 {block body}
 {if $form.errors}
@@ -56,5 +56,5 @@ name.{/blocktrans}</p>
 <script type="text/javascript">
 document.getElementById('id_summary').focus()
 </script>
-{include 'downloads/js-autocomplete.html'}{/block}
+{include 'idf/downloads/js-autocomplete.html'}{/block}
 

src/IDF/templates/idf/downloads/view.html

@@ -1,4 +1,4 @@
-{extends "downloads/base.html"}
+{extends "idf/downloads/base.html"}
 {block docclass}yui-t3{assign $inDownloads=true}{/block}
 {block body}
 
@@ -65,5 +65,5 @@
 <script type="text/javascript">
 document.getElementById('id_summary').focus()
 </script>
-{include 'downloads/js-autocomplete.html'}{/if}{/block}
+{include 'idf/downloads/js-autocomplete.html'}{/if}{/block}
 

src/IDF/templates/idf/faq.html

@@ -1,4 +1,4 @@
-{extends "base-simple.html"}
+{extends "idf/base-simple.html"}
 {block docclass}yui-t3{/block}
 {block body}
 <ul>

src/IDF/templates/idf/index.html

@@ -1,4 +1,4 @@
-{extends "base-simple.html"}
+{extends "idf/base-simple.html"}
 {block docclass}yui-t1{/block}
 {block body}
 {if $projects.count() == 0}

src/IDF/templates/idf/issues/base.html

@@ -1,4 +1,4 @@
-{extends "base.html"}
+{extends "idf/base.html"}
 {block tabissues} class="active"{/block}
 {block subtabs}
 <div id="sub-tabs">

src/IDF/templates/idf/issues/by-label.html

@@ -1,4 +1,4 @@
-{extends "issues/base.html"}
+{extends "idf/issues/base.html"}
 {block docclass}yui-t1{/block}
 {block body}
 {$issues.render}

src/IDF/templates/idf/issues/create.html

@@ -1,4 +1,4 @@
-{extends "issues/base.html"}
+{extends "idf/issues/base.html"}
 {block docclass}yui-t3{assign $inCreate = true}{/block}
 {block body}
 {if $form.errors}
@@ -76,5 +76,5 @@
 <script type="text/javascript">
 document.getElementById('id_summary').focus()
 </script>
-{include 'issues/js-autocomplete.html'}{/block}
+{include 'idf/issues/js-autocomplete.html'}{/block}
 

src/IDF/templates/idf/issues/index.html

@@ -1,4 +1,4 @@
-{extends "issues/base.html"}
+{extends "idf/issues/base.html"}
 {block docclass}yui-t2{/block}
 {block body}
 {$issues.render}

src/IDF/templates/idf/issues/my-issues.html

@@ -1,4 +1,4 @@
-{extends "issues/base.html"}
+{extends "idf/issues/base.html"}
 {block docclass}yui-t2{assign $inMyIssues = true}{/block}
 {block body}
 {$issues.render}

src/IDF/templates/idf/issues/search.html

@@ -1,4 +1,4 @@
-{extends "issues/base.html"}
+{extends "idf/issues/base.html"}
 {block docclass}yui-t2{/block}
 {block body}
 {$issues.render}

src/IDF/templates/idf/issues/view.html

@@ -1,4 +1,4 @@
-{extends "issues/base.html"}
+{extends "idf/issues/base.html"}
 {block titleicon}{if $form}<form class="star" method="post" action="{url 'IDF_Views_Issue::star', array($project.shortname, $issue.id)}"><input type="image" src="{if $starred}{media '/idf/img/star.png'}{else}{media '/idf/img/star-grey.png'}{/if}" name="submit" /></form> {/if}{/block}
 {block body}
 {assign $i = 0} 
@@ -122,4 +122,4 @@
 </p>{/if}
 </div>
 {/block}
-{block javascript}{if $form}{include 'issues/js-autocomplete.html'}{/if}{/block}
+{block javascript}{if $form}{include 'idf/issues/js-autocomplete.html'}{/if}{/block}

src/IDF/templates/idf/login_form.html

@@ -1,4 +1,4 @@
-{extends "base-simple.html"}
+{extends "idf/base-simple.html"}
 {block docclass}yui-t1{/block}
 {block body}
 <form method="post" action="{url 'IDF_Views::login'}">
@@ -16,10 +16,6 @@
 
 <p><input type="submit" value="{trans 'Sign in'}" />
 </p>
-{* <p><a href="{url 'CM_Views::passwordRecovery-1', array(), true}">{trans 'Forgot your password? Click here'}</a>.</p> 
-
-
-*}
 </form>
 <script type="text/javascript">
 document.getElementById('id_login').focus()

src/IDF/templates/idf/project/home.html

@@ -1,4 +1,4 @@
-{extends "base.html"}
+{extends "idf/base.html"}
 {block docclass}yui-t2{/block}
 {block tabhome} class="active"{/block}
 {block subtabs}

src/IDF/templates/idf/project/timeline.html

@@ -1,4 +1,4 @@
-{extends "base.html"}
+{extends "idf/base.html"}
 {block docclass}yui-t2{/block}
 {block tabhome} class="active"{/block}
 {block subtabs}
@@ -6,34 +6,11 @@
 <a href="{url 'IDF_Views_Project::home', array($project.shortname)}">{trans 'Welcome'}</a> | {trans 'Updates'}{superblock}
 </div>
 {/block}
+
 {block body}
-
-
 {$timeline.render}
-
-{*
-<table summary="" class="tree-list">
-<thead>
-<tr>
-<th>{trans 'Age'}</th>
-<th>{trans 'Change'}</th>
-</tr>
-</thead>
-<tbody>
-{foreach $timeline as $item}
-<tr class="log">
-<td>{$item.creation_dtime|dateago:"wihtout"}</td>
-<td>{timeline $item, $request}</td>
-</tr>
-{/foreach}
-</tbody>
-</table>
-
-*}
 {/block}
 
-
-
 {block context}
 {if count($downloads) > 0}
 <p><strong>{trans 'Featured Downloads'}</strong><br />

src/IDF/templates/idf/register/confirmation.html

@@ -1,4 +1,4 @@
-{extends "base-simple.html"}
+{extends "idf/base-simple.html"}
 {block body}
 {if $form.errors}
 <div class="px-message-error">
@@ -61,5 +61,5 @@
 {block javascript}<script type="text/javascript">
 document.getElementById('id_first_name').focus()
 </script>
-{include 'issues/js-autocomplete.html'}{/block}
+{/block}
 

src/IDF/templates/idf/register/index.html

@@ -1,4 +1,4 @@
-{extends "base-simple.html"}
+{extends "idf/base-simple.html"}
 {block body}
 {if $form.errors}
 <div class="px-message-error">
@@ -53,5 +53,5 @@
 {block javascript}<script type="text/javascript">
 document.getElementById('id_login').focus()
 </script>
-{include 'issues/js-autocomplete.html'}{/block}
+{/block}
 

src/IDF/templates/idf/register/inputkey.html

@@ -1,4 +1,4 @@
-{extends "base-simple.html"}
+{extends "idf/base-simple.html"}
 {block body}
 {if $form.errors}
 <div class="px-message-error">
@@ -36,5 +36,5 @@
 {block javascript}<script type="text/javascript">
 document.getElementById('id_key').focus()
 </script>
-{include 'issues/js-autocomplete.html'}{/block}
+{/block}
 

src/IDF/templates/idf/source/base.html

@@ -1,4 +1,4 @@
-{extends "base.html"}
+{extends "idf/base.html"}
 {block tabsource} class="active"{/block}
 {block subtabs}
 <div id="sub-tabs">

src/IDF/templates/idf/source/changelog.html

@@ -1,4 +1,4 @@
-{extends "source/base.html"}
+{extends "idf/source/base.html"}
 {block docclass}yui-t1{assign $inChangeLog=true}{/block}
 {block body}
 <table summary="" class="tree-list">

src/IDF/templates/idf/source/commit.html

@@ -1,4 +1,4 @@
-{extends "source/base.html"}
+{extends "idf/source/base.html"}
 {block extraheader}<link rel="stylesheet" type="text/css" href="{media '/idf/css/prettify.css'}" />{/block}
 {block docclass}yui-t1{assign $inCommit=true}{/block}
 {block body}

src/IDF/templates/idf/source/git/file.html

@@ -1,4 +1,4 @@
-{extends "source/base.html"}
+{extends "idf/source/base.html"}
 {block extraheader}<link rel="stylesheet" type="text/css" href="{media '/idf/css/prettify.css'}" />{/block}
 {block docclass}yui-t1{assign $inSourceTree=true}{/block}
 {block body}

src/IDF/templates/idf/source/git/tree.html

@@ -1,4 +1,4 @@
-{extends "source/base.html"}
+{extends "idf/source/base.html"}
 {block docclass}yui-t1{assign $inSourceTree=true}{/block}
 {block body}
 <h2 class="top"><a href="{url 'IDF_Views_Source::treeBase', array($project.shortname, $commit)}">{trans 'Root'}</a><span class="sep">/</span>{if $breadcrumb}{$breadcrumb|safe}{/if}</h2>

src/IDF/templates/idf/source/svn/file.html

@@ -1,4 +1,4 @@
-{extends "source/base.html"}
+{extends "idf/source/base.html"}
 {block extraheader}<link rel="stylesheet" type="text/css" href="{media '/idf/css/prettify.css'}" />{/block}
 {block docclass}yui-t1{assign $inSourceTree=true}{/block}
 {block body}

src/IDF/templates/idf/source/svn/tree.html

@@ -1,4 +1,4 @@
-{extends "source/base.html"}
+{extends "idf/source/base.html"}
 {block docclass}yui-t1{assign $inSourceTree=true}{/block}
 {block body}
 <h2 class="top"><a href="{url 'IDF_Views_Source::treeBase', array($project.shortname, $commit)}">{trans 'Root'}</a><span class="sep">/</span>{if $breadcrumb}{$breadcrumb|safe}{/if}</h2>

src/IDF/templates/idf/user/myaccount.html

@@ -1,4 +1,4 @@
-{extends "base-simple.html"}
+{extends "idf/base-simple.html"}
 {block body}
 {if $form.errors}
 <div class="px-message-error">

src/IDF/templates/idf/user/public.html

@@ -1,4 +1,4 @@
-{extends "base-simple.html"}
+{extends "idf/base-simple.html"}
 {block body}
 <table class="form" summary="">
 <tr>