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

added: some ezc functions (item_tab_meta*) 

added: some ezc functions (gallery_tab_meta*) to gallery plugin
added: to gallery plugin: a new gallery: Gallery version 1.2.9



git-svn-id: svn://ttmath.org/publicrep/winix/trunk@917 e52654a7-88a9-db11-a3e9-0013d4bc506e
This commit is contained in:
Tomasz Sowa 2013-02-26 11:49:22 +00:00
parent 293e426ed4
commit be6e09c5af
9 changed files with 268 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

83
html/fun_gallery.html
View File

@ -46,6 +46,50 @@
[end] [end]
[if gallery_mount_type_arg_is "galleria1.2.9"]
[if gallery_tab]
<ul class="galleryimages" style="width: [gallery_width]; height: [gallery_height];">
[for gallery_tab]
<li><a href="[gallery_tab_link]"><img src="[gallery_tab_link]/-/thumb" alt="[gallery_tab_subject]"></a></li>
[end]
</ul>
[if gallery_mount_theme_arg_is "transparent"]
<script type="text/javascript">Galleria.loadTheme('[doc_base_url_common]/galleria/themes/transparent/galleria.transparent.js');</script>
[if-no winix_function_param_is "image"]
<script type="text/javascript">Galleria.configure(\{showInfo:false\}); Galleria.run('.galleryimages');</script>
[else]
<script type="text/javascript">Galleria.configure(\{showInfo:false, show: [winix_function_param_value "image"]\}); Galleria.run('.galleryimages');</script>
[end]
[else]
[if gallery_mount_theme_arg_is "transparentinfo"]
<script type="text/javascript">Galleria.loadTheme('[doc_base_url_common]/galleria/themes/transparentinfo/galleria.transparent.js');</script>
[if-no winix_function_param_is "image"]
<script type="text/javascript">Galleria.configure(\{\}); Galleria.run('.galleryimages');</script>
[else]
<script type="text/javascript">Galleria.configure(\{show: [winix_function_param_value "image"]\}); Galleria.run('.galleryimages');</script>
[end]
[else]
<script type="text/javascript">Galleria.loadTheme('[doc_base_url_common]/galleria/themes/classic/galleria.classic.js');</script>
[if-no winix_function_param_is "image"]
<script type="text/javascript">Galleria.configure(\{\}); Galleria.run('.galleryimages');</script>
[else]
<script type="text/javascript">Galleria.configure(\{show: [winix_function_param_value "image"]\}); Galleria.run('.galleryimages');</script>
[end]
[end]
[end]
[end]
[end]
[if gallery_mount_type_arg_is "galleriathumb"] [if gallery_mount_type_arg_is "galleriathumb"]
@ -79,4 +123,43 @@
[end] [end]
[if gallery_mount_type_arg_is "galleriathumb1.2.9"]
[if-no winix_function_param_is "image"]
[if gallery_tab]
<ul class="galleryimages">
[for gallery_tab]
<li><a href="[doc_base_url][dir]-/image:[gallery_tab_index]"><img src="[gallery_tab_link]/-/thumb" alt="[gallery_tab_subject]"></a></li>
[end]
</ul>
[end]
[else]
[if gallery_tab]
<ul class="galleryimages" style="width: [gallery_width]; height: [gallery_height];">
[for gallery_tab]
<li><a href="[gallery_tab_link]"><img src="[gallery_tab_link]/-/thumb" alt="[gallery_tab_subject]"></a></li>
[end]
</ul>
[if gallery_mount_theme_arg_is "transparent"]
<script type="text/javascript">Galleria.loadTheme('[doc_base_url_common]/galleria/themes/transparent/galleria.transparent.js');</script>
<script type="text/javascript">Galleria.configure(\{showInfo:false, show: [winix_function_param_value "image"]\}); Galleria.run('.galleryimages');</script>
[else]
[if gallery_mount_theme_arg_is "transparentinfo"]
<script type="text/javascript">Galleria.loadTheme('[doc_base_url_common]/galleria/themes/transparentinfo/galleria.transparent.js');</script>
<script type="text/javascript">Galleria.configure(\{show: [winix_function_param_value "image"]\}); Galleria.run('.galleryimages');</script>
[end]
[end]
[end]
[end]
[end]
</div> </div>

5
html/index_head_functions_add.html
View File

@ -102,6 +102,11 @@
<script type="text/javascript" src="[doc_base_url_common]/jquery-1.4.4.min.js"></script> <script type="text/javascript" src="[doc_base_url_common]/jquery-1.4.4.min.js"></script>
<script src="[doc_base_url_common]/aino-galleria/galleria-1.2.2.min.js" type="text/javascript"></script> <script src="[doc_base_url_common]/aino-galleria/galleria-1.2.2.min.js" type="text/javascript"></script>
[end] [end]
[if-one gallery_mount_type_arg_is "galleria1.2.9" gallery_mount_type_arg_is "galleriathumb1.2.9"]
<script type="text/javascript" src="[doc_base_url_common]/jquery-1.9.1.min.js"></script>
<script src="[doc_base_url_common]/galleria/galleria-1.2.9.min.js" type="text/javascript"></script>
[end]
[end] [end]

1
plugins/gallery/Makefile.dep
View File

@ -176,3 +176,4 @@ templates.o: ../../core/htmlfilter.h ../../templates/templates.h
templates.o: ../../templates/patterncacher.h ../../templates/indexpatterns.h templates.o: ../../templates/patterncacher.h ../../templates/indexpatterns.h
templates.o: ../../templates/patterns.h ../../templates/changepatterns.h templates.o: ../../templates/patterns.h ../../templates/changepatterns.h
templates.o: ../../templates/htmltextstream.h ../../core/sessionmanager.h templates.o: ../../templates/htmltextstream.h ../../core/sessionmanager.h
templates.o: ../../templates/miscspace.h ../../templates/templates.h

15
plugins/gallery/gallery.cpp
View File

@ -2,7 +2,7 @@
* This file is a part of Winix * This file is a part of Winix
* and is not publicly distributed * and is not publicly distributed
* *
* Copyright (c) 2011, Tomasz Sowa * Copyright (c) 2011-2013, Tomasz Sowa
* All rights reserved. * All rights reserved.
* *
*/ */
@ -53,12 +53,13 @@ void Gallery::SortPointers()
void Gallery::MakeGetDir() void Gallery::MakeGetDir()
{ {
iq.SetAll(false, false); iq.SetAll(false, false);
iq.sel_parent_id = true; iq.sel_parent_id = true;
iq.sel_subject = true; iq.sel_subject = true;
iq.sel_url = true; iq.sel_url = true;
iq.sel_type = true; iq.sel_type = true;
iq.sel_file = true; iq.sel_file = true;
iq.sel_sort_index = true; iq.sel_sort_index = true;
iq.sel_meta = true;
iq.WhereParentId(cur->request->dir_tab.back()->id); iq.WhereParentId(cur->request->dir_tab.back()->id);
iq.WhereFileType(WINIX_ITEM_FILETYPE_IMAGE); iq.WhereFileType(WINIX_ITEM_FILETYPE_IMAGE);

88
plugins/gallery/templates.cpp
View File

@ -2,7 +2,7 @@
* This file is a part of Winix * This file is a part of Winix
* and is not publicly distributed * and is not publicly distributed
* *
* Copyright (c) 2011, Tomasz Sowa * Copyright (c) 2011-2013, Tomasz Sowa
* All rights reserved. * All rights reserved.
* *
*/ */
@ -13,6 +13,7 @@
#include "core/plugin.h" #include "core/plugin.h"
#include "templates/templates.h" #include "templates/templates.h"
#include "functions/functions.h" #include "functions/functions.h"
#include "templates/miscspace.h"
@ -85,6 +86,64 @@ void gallery_tab_link(Info & i)
void gallery_tab_meta_str(Info & i)
{
if( gallery_index < gallery_info.item_sort_tab.size() )
{
Item & item = *gallery_info.item_sort_tab[gallery_index];
item.meta.Serialize(i.out, true, false);
}
}
void gallery_tab_meta(Info & i)
{
if( gallery_index < gallery_info.item_sort_tab.size() )
{
Item & item = *gallery_info.item_sort_tab[gallery_index];
space(i, item.meta);
}
}
void gallery_tab_meta_tab(Info & i)
{
if( gallery_index < gallery_info.item_sort_tab.size() )
{
Item & item = *gallery_info.item_sort_tab[gallery_index];
spaces_tab(i, item.meta);
}
}
void gallery_tab_meta_tab_value(Info & i)
{
if( gallery_index < gallery_info.item_sort_tab.size() )
{
Item & item = *gallery_info.item_sort_tab[gallery_index];
spaces_tab_value(i, item.meta);
}
}
void gallery_tab_meta_tab_has_next(Info & i)
{
if( gallery_index < gallery_info.item_sort_tab.size() )
{
Item & item = *gallery_info.item_sort_tab[gallery_index];
spaces_tab_has_next(i, item.meta);
}
}
void gallery_width(Info & i) void gallery_width(Info & i)
{ {
if( !system->mounts.pmount ) if( !system->mounts.pmount )
@ -147,17 +206,22 @@ void AddEzcFunctions(PluginInfo & info)
using TemplatesFunctions::EzcFun; using TemplatesFunctions::EzcFun;
EzcFun * fun = reinterpret_cast<EzcFun*>(info.p1); EzcFun * fun = reinterpret_cast<EzcFun*>(info.p1);
fun->Insert("gallery_tab", gallery_tab); fun->Insert("gallery_tab", gallery_tab);
fun->Insert("gallery_tab_index", gallery_tab_index); fun->Insert("gallery_tab_index", gallery_tab_index);
fun->Insert("gallery_tab_dir", gallery_tab_dir); fun->Insert("gallery_tab_dir", gallery_tab_dir);
fun->Insert("gallery_tab_url", gallery_tab_url); fun->Insert("gallery_tab_url", gallery_tab_url);
fun->Insert("gallery_tab_subject", gallery_tab_subject); fun->Insert("gallery_tab_subject", gallery_tab_subject);
fun->Insert("gallery_tab_link", gallery_tab_link); fun->Insert("gallery_tab_link", gallery_tab_link);
fun->Insert("gallery_width", gallery_width); fun->Insert("gallery_tab_meta_str", gallery_tab_meta_str);
fun->Insert("gallery_height", gallery_height); fun->Insert("gallery_tab_meta", gallery_tab_meta);
fun->Insert("gallery_has_not_mount_type", gallery_has_not_mount_type); fun->Insert("gallery_tab_meta_tab", gallery_tab_meta_tab);
fun->Insert("gallery_mount_type_arg_is", gallery_mount_type_arg_is); fun->Insert("gallery_tab_meta_tab_value", gallery_tab_meta_tab_value);
fun->Insert("gallery_mount_theme_arg_is", gallery_mount_theme_arg_is); fun->Insert("gallery_tab_meta_tab_has_next", gallery_tab_meta_tab_has_next);
fun->Insert("gallery_width", gallery_width);
fun->Insert("gallery_height", gallery_height);
fun->Insert("gallery_has_not_mount_type", gallery_has_not_mount_type);
fun->Insert("gallery_mount_type_arg_is", gallery_mount_type_arg_is);
fun->Insert("gallery_mount_theme_arg_is", gallery_mount_theme_arg_is);
} }

3
plugins/group/groups.cpp
View File

@ -58,6 +58,9 @@ size_t i, v;
for( i=0 ; i < set.spaces.size() ; ++i ) for( i=0 ; i < set.spaces.size() ; ++i )
{ {
PT::Space & group = *set.spaces[i]; PT::Space & group = *set.spaces[i];
// !! IMPROVE ME will be safer to copy the value out
// if we used accidently the group.Text later the key
// would be overwritten
const std::wstring & key = group.Text(L"key", L"value"); const std::wstring & key = group.Text(L"key", L"value");
// loop through all values in the group // loop through all values in the group

44
templates/item.cpp
View File

@ -2,7 +2,7 @@
* This file is a part of Winix * This file is a part of Winix
* and is not publicly distributed * and is not publicly distributed
* *
* Copyright (c) 2008-2012, Tomasz Sowa * Copyright (c) 2008-2013, Tomasz Sowa
* All rights reserved. * All rights reserved.
* *
*/ */
@ -803,6 +803,48 @@ void item_tab_has_next(Info & i)
i.res = item_index + 1 < cur->request->item_tab.size(); i.res = item_index + 1 < cur->request->item_tab.size();
} }
void item_tab_meta_str(Info & i)
{
if( item_index < cur->request->item_tab.size() )
cur->request->item_tab[item_index].meta.Serialize(i.out, true, false);
}
void item_tab_meta(Info & i)
{
if( item_index < cur->request->item_tab.size() )
space(i, cur->request->item_tab[item_index].meta);
}
void item_tab_meta_tab(Info & i)
{
if( item_index < cur->request->item_tab.size() )
spaces_tab(i, cur->request->item_tab[item_index].meta);
}
void item_tab_meta_tab_value(Info & i)
{
if( item_index < cur->request->item_tab.size() )
spaces_tab_value(i, cur->request->item_tab[item_index].meta);
}
void item_tab_meta_tab_has_next(Info & i)
{
if( item_index < cur->request->item_tab.size() )
spaces_tab_has_next(i, cur->request->item_tab[item_index].meta);
}
} // namespace TemplatesFunctions } // namespace TemplatesFunctions

81
templates/templates.cpp
View File

@ -359,44 +359,49 @@ void Templates::CreateFunctions()
ezc_functions.Insert("item_admin_meta_tab_value", item_admin_meta_tab_value); ezc_functions.Insert("item_admin_meta_tab_value", item_admin_meta_tab_value);
ezc_functions.Insert("item_admin_meta_tab_has_next", item_admin_meta_tab_has_next); ezc_functions.Insert("item_admin_meta_tab_has_next", item_admin_meta_tab_has_next);
ezc_functions.Insert("item_tab", item_tab); ezc_functions.Insert("item_tab", item_tab);
ezc_functions.Insert("item_tab_index", item_tab_index); ezc_functions.Insert("item_tab_index", item_tab_index);
ezc_functions.Insert("item_tab_id", item_tab_id); ezc_functions.Insert("item_tab_id", item_tab_id);
ezc_functions.Insert("item_tab_subject", item_tab_subject); ezc_functions.Insert("item_tab_subject", item_tab_subject);
ezc_functions.Insert("item_tab_subject_noescape", item_tab_subject_noescape); ezc_functions.Insert("item_tab_subject_noescape", item_tab_subject_noescape);
ezc_functions.Insert("item_tab_content", item_tab_content); ezc_functions.Insert("item_tab_content", item_tab_content);
ezc_functions.Insert("item_tab_content_noescape", item_tab_content_noescape); ezc_functions.Insert("item_tab_content_noescape", item_tab_content_noescape);
ezc_functions.Insert("item_tab_print_content", item_tab_print_content); ezc_functions.Insert("item_tab_print_content", item_tab_print_content);
ezc_functions.Insert("item_tab_privileges", item_tab_privileges); ezc_functions.Insert("item_tab_privileges", item_tab_privileges);
ezc_functions.Insert("item_tab_dir", item_tab_dir); ezc_functions.Insert("item_tab_dir", item_tab_dir);
ezc_functions.Insert("item_tab_url", item_tab_url); ezc_functions.Insert("item_tab_url", item_tab_url);
ezc_functions.Insert("item_tab_link", item_tab_link); ezc_functions.Insert("item_tab_link", item_tab_link);
ezc_functions.Insert("item_tab_filetype_is_none", item_tab_filetype_is_none); ezc_functions.Insert("item_tab_filetype_is_none", item_tab_filetype_is_none);
ezc_functions.Insert("item_tab_filetype_is_image", item_tab_filetype_is_image); ezc_functions.Insert("item_tab_filetype_is_image", item_tab_filetype_is_image);
ezc_functions.Insert("item_tab_can_read", item_tab_can_read); ezc_functions.Insert("item_tab_can_read", item_tab_can_read);
ezc_functions.Insert("item_tab_can_write", item_tab_can_write); ezc_functions.Insert("item_tab_can_write", item_tab_can_write);
ezc_functions.Insert("item_tab_user", item_tab_user); ezc_functions.Insert("item_tab_user", item_tab_user);
ezc_functions.Insert("item_tab_modification_user", item_tab_modification_user); ezc_functions.Insert("item_tab_modification_user", item_tab_modification_user);
ezc_functions.Insert("item_tab_users_different", item_tab_users_different); ezc_functions.Insert("item_tab_users_different", item_tab_users_different);
ezc_functions.Insert("item_tab_group", item_tab_group); ezc_functions.Insert("item_tab_group", item_tab_group);
ezc_functions.Insert("item_tab_date_creation", item_tab_date_creation); ezc_functions.Insert("item_tab_date_creation", item_tab_date_creation);
ezc_functions.Insert("item_tab_date_modification", item_tab_date_modification); ezc_functions.Insert("item_tab_date_modification", item_tab_date_modification);
ezc_functions.Insert("item_tab_date_creation_nice", item_tab_date_creation_nice); ezc_functions.Insert("item_tab_date_creation_nice", item_tab_date_creation_nice);
ezc_functions.Insert("item_tab_date_modification_nice", item_tab_date_modification_nice); ezc_functions.Insert("item_tab_date_modification_nice", item_tab_date_modification_nice);
ezc_functions.Insert("item_tab_dates_equal", item_tab_dates_equal); ezc_functions.Insert("item_tab_dates_equal", item_tab_dates_equal);
ezc_functions.Insert("item_tab_run", item_tab_run); ezc_functions.Insert("item_tab_run", item_tab_run);
ezc_functions.Insert("item_tab_can_use_emacs", item_tab_can_use_emacs); ezc_functions.Insert("item_tab_can_use_emacs", item_tab_can_use_emacs);
ezc_functions.Insert("item_tab_has_static_file", item_tab_has_static_file); ezc_functions.Insert("item_tab_has_static_file", item_tab_has_static_file);
ezc_functions.Insert("item_tab_has_thumb", item_tab_has_thumb); ezc_functions.Insert("item_tab_has_thumb", item_tab_has_thumb);
ezc_functions.Insert("item_tab_type_is_dir", item_tab_type_is_dir); ezc_functions.Insert("item_tab_type_is_dir", item_tab_type_is_dir);
ezc_functions.Insert("item_tab_type_is_file", item_tab_type_is_file); ezc_functions.Insert("item_tab_type_is_file", item_tab_type_is_file);
ezc_functions.Insert("item_tab_type_is_symlink", item_tab_type_is_symlink); ezc_functions.Insert("item_tab_type_is_symlink", item_tab_type_is_symlink);
ezc_functions.Insert("item_tab_is_link_to", item_tab_is_link_to); ezc_functions.Insert("item_tab_is_link_to", item_tab_is_link_to);
ezc_functions.Insert("item_tab_link_to", item_tab_link_to); ezc_functions.Insert("item_tab_link_to", item_tab_link_to);
ezc_functions.Insert("item_tab_is_link_redirect", item_tab_is_link_redirect); ezc_functions.Insert("item_tab_is_link_redirect", item_tab_is_link_redirect);
ezc_functions.Insert("item_tab_file_size", item_tab_file_size); ezc_functions.Insert("item_tab_file_size", item_tab_file_size);
ezc_functions.Insert("item_tab_sort", item_tab_sort); ezc_functions.Insert("item_tab_sort", item_tab_sort);
ezc_functions.Insert("item_tab_has_next", item_tab_has_next); ezc_functions.Insert("item_tab_has_next", item_tab_has_next);
ezc_functions.Insert("item_tab_meta_str", item_tab_meta_str);
ezc_functions.Insert("item_tab_meta", item_tab_meta);
ezc_functions.Insert("item_tab_meta_tab", item_tab_meta_tab);
ezc_functions.Insert("item_tab_meta_tab_value", item_tab_meta_tab_value);
ezc_functions.Insert("item_tab_meta_tab_has_next", item_tab_meta_tab_has_next);
/* /*

7
templates/templates.h
View File

@ -2,7 +2,7 @@
* This file is a part of Winix * This file is a part of Winix
* and is not publicly distributed * and is not publicly distributed
* *
* Copyright (c) 2008-2012, Tomasz Sowa * Copyright (c) 2008-2013, Tomasz Sowa
* All rights reserved. * All rights reserved.
* *
*/ */
@ -309,6 +309,11 @@ namespace TemplatesFunctions
void item_tab_file_size(Info & i); void item_tab_file_size(Info & i);
void item_tab_sort(Info & i); void item_tab_sort(Info & i);
void item_tab_has_next(Info & i); void item_tab_has_next(Info & i);
void item_tab_meta_str(Info & i);
void item_tab_meta(Info & i);
void item_tab_meta_tab(Info & i);
void item_tab_meta_tab_value(Info & i);
void item_tab_meta_tab_has_next(Info & i);
/* /*