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

5
winixd/templates/template.cpp
View File

@@ -91,8 +91,9 @@ void template_init()
// the first item in the html template is an empty string
// added in the html template
temp_tab.clear();
temp_tab.push_back(config->templates_index); // index: 0
temp_tab.push_back(config->templates_index_raw); // index: 1
temp_tab.push_back(config->templates_index); // index: 0 (indices are used in template.cpp in functions) !! IMPROVE ME it should be done better
temp_tab.push_back(config->templates_index_generic);// index: 1
temp_tab.push_back(config->templates_index_raw); // index: 2
Mount::ParamRow & par = system->mounts.pmount->param[system->mounts.MountParHtmlTemplate()];

15
winixd/templates/templates.cpp
View File

@@ -5,7 +5,7 @@
*/
/*
* Copyright (c) 2008-2018, Tomasz Sowa
* Copyright (c) 2008-2021, Tomasz Sowa
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -46,7 +46,8 @@ namespace TemplatesFunctions
{
size_t pat_index; // main index pattern
size_t pat_index_raw; // pattern for a raw content
size_t pat_index_generic; // generic index pattern, without any css-site styles, only main css (uikit)
size_t pat_index_raw; // pattern for a raw content (raw content without html, body markup)
size_t pat_err_404; // 404 error
size_t pat_err_per_denied; // permission denied error
@@ -964,6 +965,7 @@ using namespace TemplatesFunctions;
ezc_blocks.Clear();
pat_index = patterns.Add(config->templates_index);
pat_index_generic = patterns.Add(config->templates_index_generic);
pat_index_raw = patterns.Add(config->templates_index_raw);
pat_err_404 = patterns.Add(L"err_404.html"); // !! IMPROVE ME name to the config
pat_err_per_denied = patterns.Add(L"err_per_denied.html"); // !! IMPROVE ME name to the config
@@ -1031,6 +1033,11 @@ using namespace TemplatesFunctions;
index = patterns.Get(pat_index, TemplatesFunctions::locale.GetCurLang());
}
else
if( template_name == config->templates_index_generic )
{
index = patterns.Get(pat_index_generic, TemplatesFunctions::locale.GetCurLang());
}
else
if( template_name == config->templates_index_raw )
{
index = patterns.Get(pat_index_raw, TemplatesFunctions::locale.GetCurLang());
@@ -1058,9 +1065,9 @@ using namespace TemplatesFunctions;
Ezc::Pattern * index = 0;
if( (cur->request->function == &functions->fun_cat || cur->request->function == &functions->fun_run) && !cur->request->last_item->html_template.empty() )
if( !cur->request->html_template.empty() )
{
index = SelectIndexPattern(cur->request->last_item->html_template);
index = SelectIndexPattern(cur->request->html_template);
}
else
{

5
winixd/templates/templates.h
View File

@@ -5,7 +5,7 @@
*/
/*
* Copyright (c) 2008-2018, Tomasz Sowa
* Copyright (c) 2008-2021, Tomasz Sowa
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -67,7 +67,8 @@ class Functions;
namespace TemplatesFunctions
{
extern size_t pat_index;
extern size_t pat_index_fullscreen;
extern size_t pat_index_generic;
extern size_t pat_index_raw;
extern size_t pat_err_404;
extern size_t pat_err_per_denied;