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

added: to gallery plugin: gallery_theme() mount option 

git-svn-id: svn://ttmath.org/publicrep/winix/trunk@718 e52654a7-88a9-db11-a3e9-0013d4bc506e
This commit is contained in:
Tomasz Sowa 2011-02-15 23:20:12 +00:00
parent 583df13139
commit c8a57f2046
13 changed files with 56 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
core/getparser.h
View File

@ -14,6 +14,7 @@
#include "requesttypes.h"
#include "misc.h"
#include "utf8.h"
#include "log.h"
class GetParser : public HttpSimpleParser

4
core/plugin.h
View File

@ -8,8 +8,8 @@
*/
#ifndef headerfilecmsluplugin
#define headerfilecmsluplugin
#ifndef headerfile_winix_core_plugin
#define headerfile_winix_core_plugin
#include <vector>
#include <string>

6
core/pluginmsg.h
View File

@ -2,14 +2,14 @@
* This file is a part of Winix
* and is not publicly distributed
*
* Copyright (c) 2008-2010, Tomasz Sowa
* Copyright (c) 2008-2011, Tomasz Sowa
* All rights reserved.
*
*/
#ifndef headerfilecmslupluginmsg
#define headerfilecmslupluginmsg
#ifndef headerfile_winix_core_pluginmsg
#define headerfile_winix_core_pluginmsg
// here you can add your own EZC functions ([function])
// PluginInfo.p1 is a pointer to Ezc::Functions object

2
core/postparser.h
View File

@ -15,6 +15,8 @@
#include "httpsimpleparser.h"
#include "requesttypes.h"
#include "misc.h"
#include "utf8.h"
#include "log.h"

29
html/fun_gallery.html
View File

@ -5,7 +5,7 @@
[if-one gallery_has_not_mount_type gallery_mount_type_arg_is "lightbox"]
[if gallery_tab]
<ul class="gallerylightbox">
<ul class="galleryimages">
[for gallery_tab]
<li><a rel="lightbox\[gallery\]" href="[gallery_tab_link]"><img src="[gallery_tab_link]/-/thumb" alt="[gallery_tab_subject]"></a></li>
[end]
@ -18,16 +18,22 @@
[if gallery_mount_type_arg_is "galleria"]
[if gallery_tab]
<ul class="images" style="width: [gallery_width]; height: [gallery_height];">
<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-no winix_function_param_is "image"]
<script type="text/javascript">$('.images').galleria();</script>
[if gallery_mount_theme_arg_is "white"]
<script type="text/javascript">Galleria.loadTheme('[doc_base_url_common]/aino-galleria/src/themes/classic/galleria.white.js');</script>
[else]
<script type="text/javascript">$('.images').galleria(\{show: [winix_function_param_value "image"]\});</script>
<script type="text/javascript">Galleria.loadTheme('[doc_base_url_common]/aino-galleria/src/themes/classic/galleria.classic.js');</script>
[end]
[if-no winix_function_param_is "image"]
<script type="text/javascript">$('.galleryimages').galleria();</script>
[else]
<script type="text/javascript">$('.galleryimages').galleria(\{show: [winix_function_param_value "image"]\});</script>
[end]
[end]
@ -39,7 +45,7 @@
[if-no winix_function_param_is "image"]
[if gallery_tab]
<ul class="gallerylightbox">
<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]
@ -47,13 +53,20 @@
[end]
[else]
[if gallery_tab]
<ul class="images" style="width: [gallery_width]; height: [gallery_height];">
<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>
<script type="text/javascript">$('.images').galleria(\{show: [winix_function_param_value "image"]\});</script>
[if gallery_mount_theme_arg_is "white"]
<script type="text/javascript">Galleria.loadTheme('[doc_base_url_common]/aino-galleria/src/themes/white/galleria.white.js');</script>
[else]
<script type="text/javascript">Galleria.loadTheme('[doc_base_url_common]/aino-galleria/src/themes/classic/galleria.classic.js');</script>
[end]
<script type="text/javascript">$('.galleryimages').galleria(\{show_info:false, show: [winix_function_param_value "image"]\});</script>
[end]
[end]

8
html/index_head_functions_add.html
View File

@ -20,7 +20,7 @@
<script type="text/javascript" src="[doc_base_url_common]/wymeditor/jquery.wymeditor.min.js"></script>
<script type="text/javascript" src="[doc_base_url_common]/wymeditor/lang/en.js"></script>
<script type="text/javascript" src="[doc_base_url_common]/wymeditor/skins/default/skin.js"></script>
<link rel="stylesheet" type="text/css" href="[doc_base_url_common]/wymeditor/skins/default/skin.css" />
<link rel="stylesheet" type="text/css" href="[doc_base_url_common]/wymeditor/skins/default/skin.css">
<script type="text/javascript">jQuery(function() \{ jQuery("textarea").wymeditor(\{ basePath: "[doc_base_url_common]/wymeditor/", iframeBasePath: "[doc_base_url]/var/", updateSelector : "form", updateEvent: 'submit' \}); \});</script>
[end]
@ -52,7 +52,11 @@
[if-one gallery_mount_type_arg_is "galleria" gallery_mount_type_arg_is "galleriathumb"]
<script type="text/javascript" src="[doc_base_url_common]/jquery-1.4.2.min.js"></script>
<script src="[doc_base_url_common]/aino-galleria/src/galleria.js" type="text/javascript"></script>
<script type="text/javascript">Galleria.loadTheme('[doc_base_url_common]/aino-galleria/src/themes/classic/galleria.classic.js');</script>
[end]
[if gallery_mount_type_arg_is "galleriathumbwhite"]
<script type="text/javascript" src="[doc_base_url_common]/jquery-1.4.2.min.js"></script>
<script src="[doc_base_url_common]/aino-galleria-white/src/galleria.js" type="text/javascript"></script>
[end]
[end]

1
plugins/gallery/galleryinfo.h
View File

@ -31,6 +31,7 @@ public:
int mount_par_gallery_size;
int mount_par_gallery_theme;
// "lightbox" (default)

9
plugins/gallery/init.cpp
View File

@ -46,11 +46,12 @@ void AddMounts(PluginInfo & info)
{
Mounts & m = info.system->mounts;
gallery_info.mount_type_gallery = m.AddMountType(L"gallery");
gallery_info.mount_type_gallery = m.AddMountType(L"gallery");
gallery_info.mount_par_gallery = m.AddMountPar(L"gallery");
gallery_info.mount_par_gallery_size = m.AddMountPar(L"gallery_size");
gallery_info.mount_par_gallery_type = m.AddMountPar(L"gallery_type");
gallery_info.mount_par_gallery = m.AddMountPar(L"gallery");
gallery_info.mount_par_gallery_size = m.AddMountPar(L"gallery_size");
gallery_info.mount_par_gallery_type = m.AddMountPar(L"gallery_type");
gallery_info.mount_par_gallery_theme = m.AddMountPar(L"gallery_theme");
}

10
plugins/gallery/templates.cpp
View File

@ -133,6 +133,13 @@ void gallery_mount_type_arg_is(Info & i)
}
void gallery_mount_theme_arg_is(Info & i)
{
i.res = system->mounts.pmount->IsArg(gallery_info.mount_par_gallery_theme, i.par);
}
void AddEzcFunctions(PluginInfo & info)
{
@ -148,7 +155,8 @@ void AddEzcFunctions(PluginInfo & info)
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_type_arg_is", gallery_mount_type_arg_is);
fun->Insert("gallery_mount_theme_arg_is", gallery_mount_theme_arg_is);
}

9
static/layout1/winix.css
View File

@ -803,21 +803,18 @@ color: black;
}
ul.gallerylightbox {
}
ul.gallerylightbox li {
ul.galleryimages li {
display: block;
float: left;
margin: 0 0 6px 10px;
}
ul.gallerylightbox a, ul.gallerylightbox a:hover, ul.gallerylightbox a:focus, ul.gallerylightbox a:active {
ul.galleryimages a, ul.galleryimages a:hover, ul.galleryimages a:focus, ul.galleryimages a:active {
background: none;
}
ul.gallerylightbox img {
display: inline;
ul.galleryimages img {
background: none;
}

1
txt/notify_email_cms.txt
View File

@ -1,6 +1,7 @@
Subject: [filter fil_qencode][if notify_add]{notify_new}[else]{notify_change}[end][end]\n
From: [filter fil_qencode]{notify_from_name}[end] <{notify_from_email}>\n
To: [filter fil_qencode][notify_to_name][end] <[notify_to_email]>\n
Content-Transfer-Encoding: 8bit
Content-Type: {notify_content_type}
\n\n

1
txt/notify_email_thread.txt
View File

@ -1,6 +1,7 @@
Subject: [filter fil_qencode][if notify_add]{notify_new}[else]{notify_reply}[end][end]\n
From: [filter fil_qencode]{notify_from_name}[end] <{notify_from_email}>\n
To: [filter fil_qencode][notify_to_name][end] <[notify_to_email]>\n
Content-Transfer-Encoding: 8bit
Content-Type: {notify_content_type}
\n\n

1
txt/notify_email_ticket.txt
View File

@ -1,6 +1,7 @@
Subject: [filter fil_qencode][if notify_add]{notify_new}[else]{notify_change}[end][end]\n
From: [filter fil_qencode]{notify_from_name}[end] <{notify_from_email}>\n
To: [filter fil_qencode][notify_to_name][end] <[notify_to_email]>\n
Content-Transfer-Encoding: 8bit
Content-Type: {notify_content_type}
\n\n