diff --git a/functions/rm.cpp b/functions/rm.cpp index 9db81d1..efab476 100755 --- a/functions/rm.cpp +++ b/functions/rm.cpp @@ -432,9 +432,9 @@ void Rm::Clear() void Rm::CreateJSON(bool status) { if( status ) - cur->request->page << "true\n"; + cur->request->page << "[true]\n"; else - cur->request->page << "false\n"; + cur->request->page << "[false]\n"; cur->request->page_generated = true; cur->request->use_html_filter = false; diff --git a/html/fun_upload.html b/html/fun_upload.html index 07e35cc..5b22417 100755 --- a/html/fun_upload.html +++ b/html/fun_upload.html @@ -26,127 +26,168 @@ [if-any-no winix_function_param_is "ckeditor_upload" winix_function_param_is "jquery_upload"]

{upload_header}

- - -
-
-
- {upload_form_legend} - -
- - - - + [# The file upload form used as target for the file upload widget] + + [# The fileupload-buttonbar contains buttons to add/delete files and start/cancel the upload] +
+
+ [# The fileinput-button span is used to style the file input field as button] + + + {upload_button_add_files} + + + + + + +
+ [# The global progress information] +
+ [# The global progress bar] +
+
+
+ [# The extended global progress information] +
 
+
- -[if false] - [if winix_function_param_is "multi"] - -

{upload_form_file_multi}

- - - - - - - [else] - -

{upload_form_file}

- - -

{title}:

- - -

{suggested_url}:

- - - [include "fun_emacs_post.html"] - - [end] -[end] - [if-no user_logged] -

{nick}:

- - -

{rebus_how_is_it} [rebus_question]?

- - [end] + [# The loading indicator is shown during file processing] +
+
+ [# The table listing the files available for upload/download] + + - [if false][end] -
- -
-
-
-
- - - + +[# modal-gallery is the modal dialog used for the image gallery] + + + [# The template to display files available for upload] + + + [# The template to display files available for download] + +
+ + + [end] diff --git a/html/index_head_functions_add.html b/html/index_head_functions_add.html index 4727939..ad4a12d 100755 --- a/html/index_head_functions_add.html +++ b/html/index_head_functions_add.html @@ -42,24 +42,6 @@ [end] -[# !! co to?] -[if winix_function_is "gallery-old"] - - [if-one gallery_has_not_mount_type gallery_mount_type_arg_is "lightbox"] - - - - - [end] - - [if-one gallery_mount_type_arg_is "galleria" gallery_mount_type_arg_is "galleriathumb"] - - - [end] - -[end] - - [if winix_function_is "gallery"] [if-one gallery_has_not_mount_type gallery_mount_type_arg_is "lightbox"] @@ -78,28 +60,75 @@ [if winix_function_is "upload"] - - - - - - - - - - - [# other themes] - [if false] - - - [end] - - - + + + [# Bootstrap CSS Toolkit styles] + [# I downloaded bootstrap.min.css and removed some normal elements from it such as html, body etc ] + [# I left only items with a class set] + [# ] + + + [# Generic page styles, removed, only one item there is there] + [# ] + + [# Bootstrap styles for responsive website layout, supporting different screen sizes] + + + [# Bootstrap CSS fixes for IE6] + + + [# Bootstrap Image Gallery styles] + + + [# CSS to style the file input field as button and adjust the Bootstrap progress bars] + + + [# Shim to make HTML5 elements usable in older Internet Explorer versions] + + + + + + [# can be moved to the end of a page (before tag) ] + + + [# The jQuery UI widget factory, can be omitted if jQuery UI is already included] + + + [# The Templates plugin is included to render the upload/download listings] + + + [# The Load Image plugin is included for the preview images and image resizing functionality] + + + [# The Canvas to Blob plugin is included for image resizing functionality] + + + [# Bootstrap JS and Bootstrap Image Gallery are not required, but included for the demo] + + + + [# The Iframe Transport is required for browsers without support for XHR file uploads] + + [# The basic File Upload plugin] + + [# The File Upload file processing plugin] + + [# The File Upload user interface plugin] + + [# The localization script] + + + [# do not load main.js - is is at the end of fun_upload.html ] + + + [# The XDomainRequest Transport is included for cross-domain file deletion for IE8+] + [end] + [if winix_function_is "sort"] [if-no item_is] diff --git a/locale/en b/locale/en index 3a1d9d5..9d4a287 100755 --- a/locale/en +++ b/locale/en @@ -263,31 +263,14 @@ template_form_info = Select a new template template_form_from_mount_point = from the mount point upload_header = Files manager -upload_form_file = Browse for a file -upload_form_file_multi = Browse for files -upload_form_legend = Upload form -upload_content = File description -upload_submit = Upload -upload_add_files = Add files... -upload_start_upload = Start upload -upload_cancel_upload = Cancel upload -upload_delete_files = Delete all files -upload_error = Error -upload_file_too_big = File is too big -upload_file_too_small = File is too small -upload_filetype_not_allowed = Filetype not allowed -upload_max_files_exceeded = Max number of files exceeded -upload_start = Start -upload_cancel = Cancel -upload_bytes_exceed_file_size = Uploaded bytes exceed file size -upload_empty_result = Empty file upload result -upload_partial = File was only partially uploaded -upload_no_file = No File was uploaded -upload_missing_tmp_folder = Missing a temporary folder -upload_disc_failded = Failed to write file to disk -upload_extenstion_stop = File upload stopped by extension -upload_delete = Delete - +upload_button_add_files = Add files... +upload_button_start_upload = Start upload +upload_button_cancel_upload = Cancel upload +upload_button_delete = Delete +upload_button_download = Download +upload_button_slideshow = Slideshow +upload_button_previous = Previous +upload_button_next = Next who_header = Sessions who_tab_index = Ind. diff --git a/locale/pl b/locale/pl index 919b024..ba629e1 100755 --- a/locale/pl +++ b/locale/pl @@ -284,30 +284,15 @@ template_form_from_mount_point = z punktu montowania upload_header = Menedżer plików -upload_form_file = Wybierz plik -upload_form_file_multi = Wybierz pliki -upload_form_legend = Formularz do wysłania pliku -upload_content = Opis pliku -upload_submit = Wyślij -upload_add_files = Dodaj pliki... -upload_start_upload = Rozpocznij wysyłanie -upload_cancel_upload = Przerwij wysyłanie -upload_delete_files = Skasuj wszystkie pliki -upload_error = Błąd -upload_file_too_big = Plik jest zbyt duży -upload_file_too_small = Plik jest zbyt mały -upload_filetype_not_allowed = Nieobsługiwany rodzaj pliku -upload_max_files_exceeded = Przekroczono dopuszczalną ilość plików -upload_start = Wyślij -upload_cancel = Przerwij -upload_bytes_exceed_file_size = Wysłana ilość bajtów przekracza rozmiar pliku -upload_empty_result = Otrzymano pusty wynik -upload_partial = Plik został jedynie częściowo przesłany -upload_no_file = Żaden plik nie został wysłany -upload_missing_tmp_folder = Brakuje katalogu tymczasowego -upload_disc_failded = Błąd zapisu pliku na dysk -upload_extenstion_stop = Wysyłanie pliku zatrzymane przez jakiś plugin -upload_delete = Usuń +upload_button_add_files = Dodaj pliki... +upload_button_start_upload = Wysyłaj +upload_button_cancel_upload = Przerwij wysyłanie +upload_button_delete = Usuń +upload_button_download = Ściągnij +upload_button_slideshow = Pokaz slajdów +upload_button_previous = Poprzedni +upload_button_next = Następny + who_header = Lista sesji diff --git a/templates/doc.cpp b/templates/doc.cpp index 0834f52..6dcf4f1 100755 --- a/templates/doc.cpp +++ b/templates/doc.cpp @@ -23,28 +23,30 @@ static std::wstring doc_proto_str; void doc_title(Info & i) { - size_t a; - bool was_dir = false; +bool was_dir = false; - // from 1 means skipping the root directory - for(a = 1 ; arequest->dir_tab.size() ; ++a) + for(size_t a=0 ; arequest->dir_tab.size() ; ++a) { if( !cur->request->dir_tab[a]->subject.empty() ) { + if( was_dir ) + i.out << config->title_separator; + i.out << cur->request->dir_tab[a]->subject; was_dir = true; - - if( a < cur->request->dir_tab.size()-1 ) - i.out << config->title_separator; } } - if( cur->request->is_item && !cur->request->item.subject.empty() ) + if( cur->request->is_item && + !cur->request->item.subject.empty() && + cur->request->item.subject != cur->request->dir_tab.back()->subject + ) { if( was_dir ) i.out << config->title_separator; i.out << cur->request->item.subject; + was_dir = true; } }