diff --git a/html/fun_ckeditor.html b/html/fun_ckeditor.html index 2792300..4e0d9e0 100755 --- a/html/fun_ckeditor.html +++ b/html/fun_ckeditor.html @@ -26,6 +26,7 @@ [if mount_type_is "thread"]

{form_emacs_content_thread}

[end] [if mount_type_is "ticket"]

{form_emacs_content_ticket}

[end] + [# template fun_ls.html uses the name: itemcontent to refer to this textarea item] diff --git a/html/fun_ls.html b/html/fun_ls.html index a2d0e72..d8ec734 100755 --- a/html/fun_ls.html +++ b/html/fun_ls.html @@ -3,18 +3,48 @@ [if winix_function_param_is "ckeditor_browse"] +
- [if-any item_tab] - - [end] - +
+ +
+ + + + [if-any item_tab] + +

{ls_pictures_in_dir} [dir]

+ + [else] +

{ls_no_picture}

+ [end] + +
+ [else]

{ls_header}

@@ -24,6 +54,7 @@ [if winix_function_param_is "l"] [# loading dir childs table with a parent directory] + [# now the parameter can be passed directly to if-one] [dir_childs_tab "with_parent"] [if-one dir_childs_tab item_tab] diff --git a/html/index.html b/html/index.html index bf3c58b..a1a28b9 100755 --- a/html/index.html +++ b/html/index.html @@ -4,7 +4,8 @@ [include "index_head.html"] - +[# now we don't need the check of fullscreen here] +[# we've got a second template for fullscreen -- index_fullscreen.html] [if-no winix_function_param_is "fullscreen"] @@ -44,6 +45,6 @@ -[end] [# is-no winix_function_param_is "fullscreen"] +[end] [# if-no winix_function_param_is "fullscreen"] diff --git a/html/index_fullscreen.html b/html/index_fullscreen.html new file mode 100755 index 0000000..b880a21 --- /dev/null +++ b/html/index_fullscreen.html @@ -0,0 +1,30 @@ + + + + + + + [doc_title] + + + [if doc_css_tab] + [for doc_css_tab] + + [end] + [else] + + [end] + + [include "index_head_functions_add.html"] + + + + + +
+ [include "slog.html"] + [content] +
+ + + diff --git a/locale/en b/locale/en index 71edd4a..7428fff 100755 --- a/locale/en +++ b/locale/en @@ -121,6 +121,9 @@ last_none = There is no anything information. ls_header = Directory listing +ls_pictures_in_dir = Pictures in directory +ls_no_picture = There are not any pictures in this directory + meta_header = Meta form_meta_legend = Form for changing meta info diff --git a/locale/pl b/locale/pl index 970000a..88ad6b3 100755 --- a/locale/pl +++ b/locale/pl @@ -120,6 +120,9 @@ last_none = Nie ma dostępnych żadnych informacji. ls_header = Zawartość katalogu +ls_pictures_in_dir = Obrazy w katalogu +ls_no_picture = W tym katalogu nie ma żadnego obrazu + meta_header = Meta form_meta_legend = Formularz zmiany meta informacji diff --git a/static/basic/winix.css b/static/basic/winix.css index 791c811..ce6d2e6 100755 --- a/static/basic/winix.css +++ b/static/basic/winix.css @@ -403,11 +403,56 @@ float: right; } -ul.ls_browse li { + +div#winix_ls_browse_leftcolumn { +float: left; +width: 30%; +margin: 0 2em 1em 1em; +} + +div#winix_ls_browse_leftcolumn li { +margin: 0; +padding: 0; +list-style-type: none; +list-style-image: none; +background: none; +} + +div#winix_ls_browse_leftcolumn a { +text-decoration: none; +outline-style: none; +} + +div#winix_ls_browse_leftcolumn a:hover, div#winix_ls_browse_leftcolumn a:focus { +text-decoration: underline; +} + +div#winix_ls_browse_rightcolumn { +float: left; +width: 60%; +} + +div#winix_ls_browse_rightcolumn li { display: block; float: left; -margin: 10px; +margin: 0 1em 1em 0; +padding: 0; list-style-type: none; +list-style-image: none; +background: none; +} + +div#winix_ls_browse_rightcolumn li a img { +padding: 3px; +} + +div#winix_ls_browse_rightcolumn li a:focus { +outline-style: none; +} + +div#winix_ls_browse_rightcolumn li a:hover img, div#winix_ls_browse_rightcolumn li a:focus img { +border: 1px solid black; +padding: 2px; } diff --git a/static/layout1/winix.css b/static/layout1/winix.css index d28cfef..ea463c9 100755 --- a/static/layout1/winix.css +++ b/static/layout1/winix.css @@ -742,13 +742,58 @@ float: right; } -ul.ls_browse li { +div#winix_ls_browse_leftcolumn { +float: left; +width: 30%; +margin: 0 2em 1em 1em; +} + +div#winix_ls_browse_leftcolumn li { +margin: 0; +padding: 0; +list-style-type: none; +list-style-image: none; +background: none; +} + +div#winix_ls_browse_leftcolumn a { +text-decoration: none; +outline-style: none; +} + +div#winix_ls_browse_leftcolumn a:hover, div#winix_ls_browse_leftcolumn a:focus { +text-decoration: underline; +} + +div#winix_ls_browse_rightcolumn { +float: left; +width: 60%; +} + +div#winix_ls_browse_rightcolumn li { display: block; float: left; -margin: 10px; +margin: 0 1em 1em 0; +padding: 0; list-style-type: none; +list-style-image: none; +background: none; } +div#winix_ls_browse_rightcolumn li a img { +padding: 3px; +} + +div#winix_ls_browse_rightcolumn li a:focus { +outline-style: none; +} + +div#winix_ls_browse_rightcolumn li a:hover img, div#winix_ls_browse_rightcolumn li a:focus img { +border: 1px solid black; +padding: 2px; +} + + strong { font-weight: bold; diff --git a/templates/templates.cpp b/templates/templates.cpp index 2b65cf1..2da2723 100755 --- a/templates/templates.cpp +++ b/templates/templates.cpp @@ -18,13 +18,14 @@ namespace TemplatesFunctions { -size_t pat_index; -size_t pat_err_404; -size_t pat_err_per_denied; +size_t pat_index; // main index pattern +size_t pat_index_fullscreen; // an empty pattern (without menus etc., used for ckeditor images browser) +size_t pat_err_404; // 404 error +size_t pat_err_per_denied; // permission denied error Patterns patterns; // all html patterns IndexPatterns index_patterns; // patterns for main index template (those from mountpoint) - // index_atterns uses patterns as a storage + // index_patterns uses patterns as a storage ChangePatterns change_patterns; // patterns for change_template mount option (storage is in 'patterns' too) PatternCacher pattern_cacher; // patterns for user items (files with an executable bit set) @@ -690,9 +691,10 @@ using namespace TemplatesFunctions; index_patterns.Clear(); change_patterns.Clear(); - pat_index = patterns.Add(config->templates_index); - pat_err_404 = patterns.Add(L"err_404.html"); - pat_err_per_denied = patterns.Add(L"err_per_denied.html"); + pat_index = patterns.Add(config->templates_index); + pat_index_fullscreen = patterns.Add(L"index_fullscreen.html"); + pat_err_404 = patterns.Add(L"err_404.html"); + pat_err_per_denied = patterns.Add(L"err_per_denied.html"); ReadTemplatesForFunctions(); ReadIndexTemplates(); @@ -744,20 +746,27 @@ using namespace TemplatesFunctions; Ezc::Pattern * index = 0; const std::wstring * index_file_local = 0; - if( !cur->request->last_item->html_template.empty() ) - index_file_local = &cur->request->last_item->html_template; - - if( !index_file_local ) + if( cur->request->IsParam(L"fullscreen") ) { - Mounts & mounts = TemplatesFunctions::system->mounts; - const std::wstring & temp = cur->mount->FirstArg(mounts.MountParHtmlTemplate()); - - if( !temp.empty() ) - index_file_local = &temp; + index = patterns.Get(pat_index_fullscreen, locale.GetLang()); } + else + { + if( !cur->request->last_item->html_template.empty() ) + index_file_local = &cur->request->last_item->html_template; - if( index_file_local && *index_file_local != config->templates_index ) - index = index_patterns.Get(*index_file_local, locale.GetLang()); + if( !index_file_local ) + { + Mounts & mounts = TemplatesFunctions::system->mounts; + const std::wstring & temp = cur->mount->FirstArg(mounts.MountParHtmlTemplate()); + + if( !temp.empty() ) + index_file_local = &temp; + } + + if( index_file_local && *index_file_local != config->templates_index ) + index = index_patterns.Get(*index_file_local, locale.GetLang()); + } if( !index ) index = change_patterns.Get(cur->mount->dir_id, config->templates_index, locale.GetLang());