fixed: Config::Text() returned a reference to a local variable (std::string)

added: 'static' directory with *.css and images
       we have a default layout
moved: locale from data to templates       
       notification templates have its own locale object
added: reload function reloades locale now too
added: 'nice' form of item_info in templates



git-svn-id: svn://ttmath.org/publicrep/winix/trunk@582 e52654a7-88a9-db11-a3e9-0013d4bc506e
This commit is contained in:
2010-02-15 00:31:14 +00:00
parent c58031cbf4
commit fa8d8f9ea0
38 changed files with 678 additions and 574 deletions

View File

@@ -8,6 +8,7 @@
*/
#include "templates.h"
#include "misc.h"
#include "../core/data.h"
#include "../core/request.h"
#include "../core/misc.h"
@@ -150,8 +151,8 @@ void item_url(Info & i)
void item_url_is(Info & i)
{
if( !request.is_item || !i.is )
return; // default false
if( !request.is_item || !i.is )
return; // default false
i.result = request.item.url == *i.is;
}
@@ -211,10 +212,10 @@ void item_can_remove(Info & i)
void item_info(Info & i)
{
if( static_cast<size_t>(data.locale.GetLang()) >= patterns.size() )
if( static_cast<size_t>(locale.GetLang()) >= patterns.size() )
return;
Ezc::Generator gen(i.out, patterns[data.locale.GetLang()][pat_item_info], functions);
Ezc::Generator gen(i.out, patterns[locale.GetLang()][pat_item_info], functions);
gen.Generate();
}
@@ -253,6 +254,20 @@ void item_date_modification(Info & i)
}
void item_date_creation_nice(Info & i)
{
tm * ptm = &request.item.date_creation;
TemplatesMisc::print_date_nice(i, ptm);
}
void item_date_modification_nice(Info & i)
{
tm * ptm = &request.item.date_modification;
TemplatesMisc::print_date_nice(i, ptm);
}
void item_dates_equal(Info & i)
{
tm * ptm1 = &request.item.date_creation;
@@ -483,10 +498,10 @@ void item_tab_can_read(Info & i)
void item_tab_info(Info & i)
{
if( static_cast<size_t>(data.locale.GetLang()) >= patterns.size() )
if( static_cast<size_t>(locale.GetLang()) >= patterns.size() )
return;
Ezc::Generator gen(i.out, patterns[data.locale.GetLang()][pat_item_tab_info], functions);
Ezc::Generator gen(i.out, patterns[locale.GetLang()][pat_item_tab_info], functions);
gen.Generate();
}
@@ -534,6 +549,26 @@ void item_tab_date_modification(Info & i)
}
void item_tab_date_creation_nice(Info & i)
{
if( item_index < request.item_table.size() )
{
tm * ptm = &request.item_table[item_index].date_creation;
TemplatesMisc::print_date_nice(i, ptm);
}
}
void item_tab_date_modification_nice(Info & i)
{
if( item_index < request.item_table.size() )
{
tm * ptm = &request.item_table[item_index].date_modification;
TemplatesMisc::print_date_nice(i, ptm);
}
}
void item_tab_dates_equal(Info & i)
{
if( item_index < request.item_table.size() )