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

changed: the way how raw template is set

Browse Source 
option for setting raw template from 'emacs' function has been removed
         now we have index_raw.html template and it can be set from 'template' function
removed: template index_fullscreen.html
changed: some work in miscspace (changed: space_list_tab, space_list_tab_value and space_list_tab_has_next)
fixed:   main index template could not be set through 'template' function





git-svn-id: svn://ttmath.org/publicrep/winix/trunk@1039 e52654a7-88a9-db11-a3e9-0013d4bc506e
This commit is contained in:
Tomasz Sowa
2016-04-04 16:02:36 +00:00
parent abd1500f07
commit 240bf4dc5d
21 changed files with 105 additions and 445 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
winixd/templates/item.cpp
View File

@@ -5,7 +5,7 @@
*/
/*
* Copyright (c) 2008-2014, Tomasz Sowa
* Copyright (c) 2008-2016, Tomasz Sowa
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -114,9 +114,6 @@ void item_content_type_is(Item & item, Info & i)
else
if( item.content_type == Item::ct_bbcode && i.par == L"bbcode" )
i.res = true;
else
if( item.content_type == Item::ct_raw && i.par == L"raw" )
i.res = true;
}
@@ -138,7 +135,7 @@ void item_print_content(HtmlTextStream & out, const std::wstring & content, Item
HtmlEscapeFormTxt(out, content);
}
else
if( content_type == Item::ct_html || content_type == Item::ct_raw )
if( content_type == Item::ct_html )
{
out << R(content);
}
@@ -436,14 +433,14 @@ void item_meta_tab(Info & i)
void item_meta_tab_value(Info & i)
{
space_list_tab_value(i, cur->request->last_item->meta);
space_list_tab_value(i, cur->request->last_item->meta, L"item_meta_tab");
}
void item_meta_tab_has_next(Info & i)
{
space_list_tab_has_next(i, cur->request->last_item->meta);
space_list_tab_has_next(i, cur->request->last_item->meta, L"item_meta_tab");
}
@@ -469,13 +466,13 @@ void item_admin_meta_tab(Info & i)
void item_admin_meta_tab_value(Info & i)
{
space_list_tab_value(i, cur->request->last_item->ameta);
space_list_tab_value(i, cur->request->last_item->ameta, L"item_admin_meta_tab");
}
void item_admin_meta_tab_has_next(Info & i)
{
space_list_tab_has_next(i, cur->request->last_item->ameta);
space_list_tab_has_next(i, cur->request->last_item->ameta, L"item_admin_meta_tab");
}
@@ -861,7 +858,7 @@ void item_tab_meta_tab(Info & i)
void item_tab_meta_tab_value(Info & i)
{
if( item_index < cur->request->item_tab.size() )
space_list_tab_value(i, cur->request->item_tab[item_index].meta);
space_list_tab_value(i, cur->request->item_tab[item_index].meta, L"item_tab_meta_tab");
}
@@ -869,7 +866,7 @@ void item_tab_meta_tab_value(Info & i)
void item_tab_meta_tab_has_next(Info & i)
{
if( item_index < cur->request->item_tab.size() )
space_list_tab_has_next(i, cur->request->item_tab[item_index].meta);
space_list_tab_has_next(i, cur->request->item_tab[item_index].meta, L"item_tab_meta_tab");
}