tomasz.sowa/winix
1
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

added: generic html template: index_generic.html

Browse Source 
(config option: templates_index_generic)
this is a generic template without additional site-css (only uikit),
at the moment used only in ckeditor file browser

added: to Request class: index_template (std::wstring) - a name of an index html template
This commit is contained in:
Tomasz Sowa
2021-01-27 18:31:48 +01:00
parent 7a25e333db
commit 10e291bb39
12 changed files with 59 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
winixd/functions/cat.cpp
View File

@@ -51,6 +51,9 @@ Cat::Cat()
void Cat::MakeGet()
{
// IMPROVE ME this probably should be set for all winix functions
cur->request->html_template = cur->request->last_item->html_template;
if( !cur->request->is_item )
{
log << log1 << "Content: cat function requires an item" << logend;

2
winixd/functions/ls.cpp
View File

@@ -56,7 +56,7 @@ void Ls::MakeGet()
// this should be moved to ckeditor function (similarly the html content from fun_ls.html)
if( cur->request->IsParam(L"ckeditor_browse") )
{
cur->request->index_template = config->templates_index_generic;
cur->request->html_template = config->templates_index_generic;
}
if( !cur->request->is_item )

3
winixd/functions/run.cpp
View File

@@ -60,6 +60,9 @@ void Run::MakePost()
void Run::MakeGet()
{
// IMPROVE ME this probably should be set for all winix functions
cur->request->html_template = cur->request->last_item->html_template;
if( !cur->request->is_item )
{
log << log1 << "Content: Run function requires an item" << logend;

7
winixd/functions/template.cpp
View File

@@ -97,12 +97,17 @@ void Template::CreateTemplateFileName(const std::wstring & index_str)
}
else
if( index == 1 )
{
html_template = config->templates_index_generic;
}
else
if( index == 2 )
{
html_template = config->templates_index_raw;
}
else
{
index -= 2;
index -= 3;
Mount::ParamRow & par = system->mounts.pmount->param[system->mounts.MountParHtmlTemplate()];
if( !par.defined || (size_t)index >= par.arg.size() )