diff --git a/src/IDF/Views.php b/src/IDF/Views.php index de89a5e..cc7290d 100644 --- a/src/IDF/Views.php +++ b/src/IDF/Views.php @@ -37,7 +37,7 @@ class IDF_Views public function index($request, $match) { $projects = Pluf::factory('IDF_Project')->getList(); - return Pluf_Shortcuts_RenderToResponse('index.html', + return Pluf_Shortcuts_RenderToResponse('idf/index.html', array('page_title' => __('Projects'), 'projects' => $projects), $request); @@ -90,7 +90,7 @@ class IDF_Views $init = (isset($request->GET['login'])) ? array('initial' => array('login' => $request->GET['login'])) : array(); $form = new IDF_Form_Register(null, $init); } - return Pluf_Shortcuts_RenderToResponse('register/index.html', + return Pluf_Shortcuts_RenderToResponse('idf/register/index.html', array('page_title' => $title, 'form' => $form), $request); @@ -114,7 +114,7 @@ class IDF_Views } else { $form = new IDF_Form_RegisterInputKey(); } - return Pluf_Shortcuts_RenderToResponse('register/inputkey.html', + return Pluf_Shortcuts_RenderToResponse('idf/register/inputkey.html', array('page_title' => $title, 'form' => $form), $request); @@ -157,7 +157,7 @@ class IDF_Views } else { $form = new IDF_Form_RegisterConfirmation(null, $extra); } - return Pluf_Shortcuts_RenderToResponse('register/confirmation.html', + return Pluf_Shortcuts_RenderToResponse('idf/register/confirmation.html', array('page_title' => $title, 'new_user' => $user, 'form' => $form), @@ -171,7 +171,7 @@ class IDF_Views { $title = __('Here to Help You!'); $projects = Pluf::factory('IDF_Project')->getList(); - return Pluf_Shortcuts_RenderToResponse('faq.html', + return Pluf_Shortcuts_RenderToResponse('idf/faq.html', array( 'page_title' => $title, 'projects' => $projects, diff --git a/src/IDF/Views/Download.php b/src/IDF/Views/Download.php index 23fa425..6f85f90 100644 --- a/src/IDF/Views/Download.php +++ b/src/IDF/Views/Download.php @@ -72,7 +72,7 @@ class IDF_Views_Download $pag->sort_order = array('creation_dtime', 'DESC'); $pag->setFromRequest($request); $tags = $prj->getTagCloud('downloads'); - return Pluf_Shortcuts_RenderToResponse('downloads/index.html', + return Pluf_Shortcuts_RenderToResponse('idf/downloads/index.html', array( 'page_title' => $title, 'downloads' => $pag, @@ -121,7 +121,7 @@ class IDF_Views_Download 'project' => $prj, 'user' => $request->user)); } - return Pluf_Shortcuts_RenderToResponse('downloads/view.html', + return Pluf_Shortcuts_RenderToResponse('idf/downloads/view.html', array( 'file' => $upload, 'deprecated' => $deprecated, @@ -158,7 +158,7 @@ class IDF_Views_Download array($prj->shortname)); return new Pluf_HTTP_Response_Redirect($url); } - return Pluf_Shortcuts_RenderToResponse('downloads/delete.html', + return Pluf_Shortcuts_RenderToResponse('idf/downloads/delete.html', array( 'file' => $upload, 'deprecated' => $deprecated, @@ -209,7 +209,7 @@ class IDF_Views_Download array('project' => $prj, 'user' => $request->user)); } - return Pluf_Shortcuts_RenderToResponse('downloads/submit.html', + return Pluf_Shortcuts_RenderToResponse('idf/downloads/submit.html', array( 'auto_labels' => self::autoCompleteArrays($prj), 'page_title' => $title, @@ -279,7 +279,7 @@ class IDF_Views_Download $pag->sort_order = array('creation_dtime', 'DESC'); $pag->setFromRequest($request); $tags = $prj->getTagCloud('downloads'); - return Pluf_Shortcuts_RenderToResponse('downloads/index.html', + return Pluf_Shortcuts_RenderToResponse('idf/downloads/index.html', array( 'page_title' => $title, 'label' => $tag, diff --git a/src/IDF/Views/Issue.php b/src/IDF/Views/Issue.php index 507cc1f..0863a35 100644 --- a/src/IDF/Views/Issue.php +++ b/src/IDF/Views/Issue.php @@ -65,7 +65,7 @@ class IDF_Views_Issue $pag->items_per_page = 10; $pag->no_results_text = __('No issues were found.'); $pag->setFromRequest($request); - return Pluf_Shortcuts_RenderToResponse('issues/index.html', + return Pluf_Shortcuts_RenderToResponse('idf/issues/index.html', array('project' => $prj, 'page_title' => $title, 'open' => $open, @@ -121,7 +121,7 @@ class IDF_Views_Issue $pag->items_per_page = 10; $pag->no_results_text = __('No issues were found.'); $pag->setFromRequest($request); - return Pluf_Shortcuts_RenderToResponse('issues/my-issues.html', + return Pluf_Shortcuts_RenderToResponse('idf/issues/my-issues.html', array('project' => $prj, 'page_title' => $title, 'nb_submit' => $nb_submit, @@ -175,7 +175,7 @@ class IDF_Views_Issue $form = new IDF_Form_IssueCreate(null, $params); } $arrays = self::autoCompleteArrays($prj); - return Pluf_Shortcuts_RenderToResponse('issues/create.html', + return Pluf_Shortcuts_RenderToResponse('idf/issues/create.html', array_merge( array('project' => $prj, 'form' => $form, @@ -223,7 +223,7 @@ class IDF_Views_Issue 'issues' => $pag, 'q' => $q, ); - return Pluf_Shortcuts_RenderToResponse('issues/search.html', $params, $request); + return Pluf_Shortcuts_RenderToResponse('idf/issues/search.html', $params, $request); } @@ -297,7 +297,7 @@ class IDF_Views_Issue } } $arrays = self::autoCompleteArrays($prj); - return Pluf_Shortcuts_RenderToResponse('issues/view.html', + return Pluf_Shortcuts_RenderToResponse('idf/issues/view.html', array_merge( array( 'issue' => $issue, @@ -362,7 +362,7 @@ class IDF_Views_Issue $pag->items_per_page = 10; $pag->no_results_text = __('No issues were found.'); $pag->setFromRequest($request); - return Pluf_Shortcuts_RenderToResponse('issues/index.html', + return Pluf_Shortcuts_RenderToResponse('idf/issues/index.html', array('project' => $prj, 'page_title' => $title, 'open' => $open, @@ -424,7 +424,7 @@ class IDF_Views_Issue } else { $completion = false; } - return Pluf_Shortcuts_RenderToResponse('issues/by-label.html', + return Pluf_Shortcuts_RenderToResponse('idf/issues/by-label.html', array('project' => $prj, 'completion' => $completion, 'page_title' => $title, diff --git a/src/IDF/Views/Project.php b/src/IDF/Views/Project.php index c20b48e..f166527 100644 --- a/src/IDF/Views/Project.php +++ b/src/IDF/Views/Project.php @@ -45,7 +45,7 @@ class IDF_Views_Project // the first tag is the featured, the last is the deprecated. $downloads = $tags[0]->get_idf_upload_list(); } - return Pluf_Shortcuts_RenderToResponse('project/home.html', + return Pluf_Shortcuts_RenderToResponse('idf/project/home.html', array( 'page_title' => $title, 'team' => $team, @@ -102,7 +102,7 @@ class IDF_Views_Project // the first tag is the featured, the last is the deprecated. $downloads = $tags[0]->get_idf_upload_list(); } - return Pluf_Shortcuts_RenderToResponse('project/timeline.html', + return Pluf_Shortcuts_RenderToResponse('idf/project/timeline.html', array( 'page_title' => $title, 'timeline' => $pag, @@ -136,7 +136,7 @@ class IDF_Views_Project $form = Pluf_Shortcuts_GetFormForModel($prj, $prj->getData(), $form_fields); } - return Pluf_Shortcuts_RenderToResponse('admin/summary.html', + return Pluf_Shortcuts_RenderToResponse('idf/admin/summary.html', array( 'page_title' => $title, 'form' => $form, @@ -180,7 +180,7 @@ class IDF_Views_Project } $form = new IDF_Form_IssueTrackingConf($params); } - return Pluf_Shortcuts_RenderToResponse('admin/issue-tracking.html', + return Pluf_Shortcuts_RenderToResponse('idf/admin/issue-tracking.html', array( 'page_title' => $title, 'form' => $form, @@ -223,7 +223,7 @@ class IDF_Views_Project } $form = new IDF_Form_UploadConf($params); } - return Pluf_Shortcuts_RenderToResponse('admin/downloads.html', + return Pluf_Shortcuts_RenderToResponse('idf/admin/downloads.html', array( 'page_title' => $title, 'form' => $form, @@ -255,7 +255,7 @@ class IDF_Views_Project } else { $form = new IDF_Form_MembersConf($prj->getMembershipData('string'), $params); } - return Pluf_Shortcuts_RenderToResponse('admin/members.html', + return Pluf_Shortcuts_RenderToResponse('idf/admin/members.html', array( 'page_title' => $title, 'form' => $form, @@ -300,7 +300,7 @@ class IDF_Views_Project } $form = new IDF_Form_TabsConf($params, $extra); } - return Pluf_Shortcuts_RenderToResponse('admin/tabs.html', + return Pluf_Shortcuts_RenderToResponse('idf/admin/tabs.html', array( 'page_title' => $title, 'form' => $form, @@ -345,7 +345,7 @@ class IDF_Views_Project } $form = new IDF_Form_SourceConf($params, $extra); } - return Pluf_Shortcuts_RenderToResponse('admin/source.html', + return Pluf_Shortcuts_RenderToResponse('idf/admin/source.html', array( 'page_title' => $title, 'form' => $form, diff --git a/src/IDF/Views/Source.php b/src/IDF/Views/Source.php index 1e228dd..3bfed35 100644 --- a/src/IDF/Views/Source.php +++ b/src/IDF/Views/Source.php @@ -59,7 +59,7 @@ class IDF_Views_Source } $changes = new Pluf_Template_ContextVars($changes); $scmConf = $request->conf->getVal('scm', 'git'); - return Pluf_Shortcuts_RenderToResponse('source/changelog.html', + return Pluf_Shortcuts_RenderToResponse('idf/source/changelog.html', array( 'page_title' => $title, 'title' => $title, @@ -95,7 +95,7 @@ class IDF_Views_Source if ($scmConf === 'svn') { $props = $scm->getProperties($commit); } - return Pluf_Shortcuts_RenderToResponse('source/'.$scmConf.'/tree.html', + return Pluf_Shortcuts_RenderToResponse('idf/source/'.$scmConf.'/tree.html', array( 'page_title' => $title, 'title' => $title, @@ -165,7 +165,7 @@ class IDF_Views_Source if ($scmConf === 'svn') { $props = $scm->getProperties($commit, $request_file); } - return Pluf_Shortcuts_RenderToResponse('source/'.$scmConf.'/tree.html', + return Pluf_Shortcuts_RenderToResponse('idf/source/'.$scmConf.'/tree.html', array( 'page_title' => $page_title, 'title' => $title, @@ -218,7 +218,7 @@ class IDF_Views_Source $diff = new IDF_Diff($cobject->changes); $diff->parse(); $scmConf = $request->conf->getVal('scm', 'git'); - return Pluf_Shortcuts_RenderToResponse('source/commit.html', + return Pluf_Shortcuts_RenderToResponse('idf/source/commit.html', array( 'page_title' => $page_title, 'title' => $title, @@ -257,7 +257,7 @@ class IDF_Views_Source $props = $scm->getProperties($commit, $request_file); } $content = self::highLight($extra['mime'], $scm->getBlob($request_file_info, $commit)); - return Pluf_Shortcuts_RenderToResponse('source/'.$scmConf.'/file.html', + return Pluf_Shortcuts_RenderToResponse('idf/source/'.$scmConf.'/file.html', array( 'page_title' => $page_title, 'title' => $title, diff --git a/src/IDF/Views/User.php b/src/IDF/Views/User.php index c1e9e7b..ca553ab 100644 --- a/src/IDF/Views/User.php +++ b/src/IDF/Views/User.php @@ -50,7 +50,7 @@ class IDF_Views_User } else { $form = new IDF_Form_UserAccount($request->user->getData(), $params); } - return Pluf_Shortcuts_RenderToResponse('user/myaccount.html', + return Pluf_Shortcuts_RenderToResponse('idf/user/myaccount.html', array('page_title' => __('Your Account'), 'form' => $form), $request); @@ -67,7 +67,7 @@ class IDF_Views_User if (count($users) != 1 or !$users[0]->active) { throw new Pluf_HTTP_Error404(); } - return Pluf_Shortcuts_RenderToResponse('user/public.html', + return Pluf_Shortcuts_RenderToResponse('idf/user/public.html', array('page_title' => (string) $users[0], 'member' => $users[0], 'projects' => $projects, diff --git a/src/IDF/templates/admin/base.html b/src/IDF/templates/idf/admin/base.html similarity index 97% rename from src/IDF/templates/admin/base.html rename to src/IDF/templates/idf/admin/base.html index 27dccb4..2354605 100644 --- a/src/IDF/templates/admin/base.html +++ b/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}
diff --git a/src/IDF/templates/admin/downloads.html b/src/IDF/templates/idf/admin/downloads.html similarity index 96% rename from src/IDF/templates/admin/downloads.html rename to src/IDF/templates/idf/admin/downloads.html index 3c2c1b5..c22be5e 100644 --- a/src/IDF/templates/admin/downloads.html +++ b/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}
diff --git a/src/IDF/templates/admin/issue-tracking.html b/src/IDF/templates/idf/admin/issue-tracking.html similarity index 97% rename from src/IDF/templates/admin/issue-tracking.html rename to src/IDF/templates/idf/admin/issue-tracking.html index d4820b5..f835a68 100644 --- a/src/IDF/templates/admin/issue-tracking.html +++ b/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} diff --git a/src/IDF/templates/admin/members.html b/src/IDF/templates/idf/admin/members.html similarity index 97% rename from src/IDF/templates/admin/members.html rename to src/IDF/templates/idf/admin/members.html index 6be580b..a2835c9 100644 --- a/src/IDF/templates/admin/members.html +++ b/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} diff --git a/src/IDF/templates/admin/source.html b/src/IDF/templates/idf/admin/source.html similarity index 97% rename from src/IDF/templates/admin/source.html rename to src/IDF/templates/idf/admin/source.html index aa4d6a2..d7c67cb 100644 --- a/src/IDF/templates/admin/source.html +++ b/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} diff --git a/src/IDF/templates/admin/summary.html b/src/IDF/templates/idf/admin/summary.html similarity index 97% rename from src/IDF/templates/admin/summary.html rename to src/IDF/templates/idf/admin/summary.html index a81a32b..35e7517 100644 --- a/src/IDF/templates/admin/summary.html +++ b/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} diff --git a/src/IDF/templates/admin/tabs.html b/src/IDF/templates/idf/admin/tabs.html similarity index 97% rename from src/IDF/templates/admin/tabs.html rename to src/IDF/templates/idf/admin/tabs.html index fce8782..c768035 100644 --- a/src/IDF/templates/admin/tabs.html +++ b/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} diff --git a/src/IDF/templates/base-simple.html b/src/IDF/templates/idf/base-simple.html similarity index 98% rename from src/IDF/templates/base-simple.html rename to src/IDF/templates/idf/base-simple.html index 2a5cd1c..c87aba6 100644 --- a/src/IDF/templates/base-simple.html +++ b/src/IDF/templates/idf/base-simple.html @@ -37,10 +37,6 @@ {if !$user.isAnonymous()}{aurl 'url', 'IDF_Views_User::myAccount'}{blocktrans}Welcome, {$user}.{/blocktrans} {trans 'Sign Out'}{else}{trans 'Sign in or create your account'}{/if} | {trans 'Help'}

-{* *} -

{block title}{$page_title}{/block}

diff --git a/src/IDF/templates/base.html b/src/IDF/templates/idf/base.html similarity index 99% rename from src/IDF/templates/base.html rename to src/IDF/templates/idf/base.html index 011bc64..dcb33b6 100644 --- a/src/IDF/templates/base.html +++ b/src/IDF/templates/idf/base.html @@ -69,7 +69,7 @@
{block foot}{/block}
-{include 'js-hotkeys.html'} +{include 'idf/js-hotkeys.html'} {block javascript}{/block} {if $project} -{include 'downloads/js-autocomplete.html'}{/block} +{include 'idf/downloads/js-autocomplete.html'}{/block} diff --git a/src/IDF/templates/downloads/view.html b/src/IDF/templates/idf/downloads/view.html similarity index 96% rename from src/IDF/templates/downloads/view.html rename to src/IDF/templates/idf/downloads/view.html index 8a90e95..6b50576 100644 --- a/src/IDF/templates/downloads/view.html +++ b/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 @@ -{include 'downloads/js-autocomplete.html'}{/if}{/block} +{include 'idf/downloads/js-autocomplete.html'}{/if}{/block} diff --git a/src/IDF/templates/faq.html b/src/IDF/templates/idf/faq.html similarity index 98% rename from src/IDF/templates/faq.html rename to src/IDF/templates/idf/faq.html index 0745304..87ec204 100644 --- a/src/IDF/templates/faq.html +++ b/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}